Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@ -57,9 +57,9 @@ namespace tmpl {
|
||||
delayprog<N_dly_cfg> dly(.in = in.r, .out = _req, .s = dly_cfg, .supply = supply);
|
||||
|
||||
// sig buff the reset signal
|
||||
bool _reset_BX, _reset_BXX[N];
|
||||
bool _reset_BX, _reset_BXX[N*2];
|
||||
BUF_X4 reset_buf(.a=reset_B, .y=_reset_BX,.vdd=supply.vdd,.vss=supply.vss);
|
||||
sigbuf<N> reset_bufarray(.in=_reset_BX, .out=_reset_BXX, .supply=supply);
|
||||
sigbuf<N*2> reset_bufarray(.in=_reset_BX, .out=_reset_BXX, .supply=supply);
|
||||
|
||||
// sig buff the req
|
||||
bool _reqX, _reqXX[N*2];
|
||||
@ -128,8 +128,8 @@ namespace tmpl {
|
||||
t_buf_func[i].vss=supply.vss;
|
||||
t_buf_func[i].pr_B = _reset_BXX[i];
|
||||
t_buf_func[i].sr_B = _reset_BXX[i];
|
||||
f_buf_func[i].pr_B = _reset_BXX[i];
|
||||
f_buf_func[i].sr_B = _reset_BXX[i];
|
||||
f_buf_func[i].pr_B = _reset_BXX[i+N];
|
||||
f_buf_func[i].sr_B = _reset_BXX[i+N];
|
||||
)
|
||||
|
||||
}
|
||||
|
@ -501,11 +501,12 @@ namespace tmpl {
|
||||
AND2_X1 and2(.a = _drop, .b = _in_vX, .vss = supply.vss, .vdd = supply.vdd);
|
||||
OR2_X1 or2(.a = out.a, .b = and2.y, .vss = supply.vss, .vdd = supply.vdd);
|
||||
A_2C_B_X1 ack_Cel(.c1 = or2.y, .c2 = _in_vX, .y = in.a);
|
||||
_in_vX = in.v;
|
||||
// _in_vX = in.v;
|
||||
|
||||
// Sigbufs
|
||||
sigbuf<N*2> sb_dropB(.in = _dropB, .supply = supply);
|
||||
sigbuf<N*2> sb_in_v(.in = _in_vX, .supply = supply);
|
||||
sigbuf<N*2+1> sb_in_v(.in = _in_vX, .supply = supply);
|
||||
sb_in_v.out[2*N] = in.v;
|
||||
|
||||
AND3_X1 and_t[N];
|
||||
AND3_X1 and_f[N];
|
||||
|
Reference in New Issue
Block a user