diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2020-01-21 15:02:37 -0800 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2020-01-21 15:19:41 -0800 |
| commit | 152dfd3dd4ac6ea45fba3a6ed5cc7d6f5466f998 (patch) | |
| tree | eeac9aea0a5fd16dd5f1265f6b5d12d485fb198b /techlibs/common | |
| parent | 8d1b736c4f3d30743f6b3a9cbab35bdb80b49153 (diff) | |
| download | yosys-152dfd3dd4ac6ea45fba3a6ed5cc7d6f5466f998.tar.gz yosys-152dfd3dd4ac6ea45fba3a6ed5cc7d6f5466f998.tar.bz2 yosys-152dfd3dd4ac6ea45fba3a6ed5cc7d6f5466f998.zip | |
Fix tests -- when Y_WIDTH is non-pow-2
Diffstat (limited to 'techlibs/common')
| -rw-r--r-- | techlibs/common/techmap.v | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/techlibs/common/techmap.v b/techlibs/common/techmap.v index 83bd4333c..95cfa66b2 100644 --- a/techlibs/common/techmap.v +++ b/techlibs/common/techmap.v @@ -150,11 +150,12 @@ module _90_shift_shiftx (A, B, Y); // Halve the size of $shift/$shiftx by $mux-ing A according to // the LSB of B, after discarding the zeroed bits localparam len = 2**(B_WIDTH-1); + localparam Y_WIDTH2 = 2**CLOG2_Y_WIDTH; wire [len-1:0] T, F; genvar i; - for (i = 0; i < A_WIDTH; i=i+Y_WIDTH*2) begin - assign F[i/2 +: Y_WIDTH] = A[i +: Y_WIDTH]; - assign T[i/2 +: Y_WIDTH] = (i + Y_WIDTH < A_WIDTH) ? A[i+Y_WIDTH +: Y_WIDTH] : {Y_WIDTH{extbit}}; + for (i = 0; i < A_WIDTH; i=i+Y_WIDTH2*2) begin + assign F[i/2 +: Y_WIDTH2] = A[i +: Y_WIDTH2]; + assign T[i/2 +: Y_WIDTH2] = (i + Y_WIDTH2 < A_WIDTH) ? A[i+Y_WIDTH2 +: Y_WIDTH2] : {Y_WIDTH2{extbit}}; end wire [len-1:0] AA = B[CLOG2_Y_WIDTH] ? T : F; wire [B_WIDTH-2:0] BB = {B[B_WIDTH-1:CLOG2_Y_WIDTH+1], {CLOG2_Y_WIDTH{1'b0}}}; |