caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pack DFF fixes

Browse Source
This commit is contained in:
Miodrag Milanovic 2024-12-25 08:54:54 +01:00
parent 63beb45950
commit d41f13bde9
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
himbaechel/uarch/gatemate/constids.inc
View File

@ -109,10 +109,12 @@ X(INIT_L30)
X(O1) X(O1)
X(O2) X(O2)
X(CC_DFF) X(CC_DFF)
X(Q) X(Q)
X(D) X(D)
X(R) X(R)
X(S) X(S)
X(FF_INIT) X(FF_INIT)
X(CC_BUFG)
X(BUFG)

11
himbaechel/uarch/gatemate/pack.cc
View File

@ -324,7 +324,7 @@ void GateMatePacker::pack_cpe()
ci.renamePort(id_Q, id_OUT1); ci.renamePort(id_Q, id_OUT1);
ci.disconnectPort(id_EN); ci.disconnectPort(id_EN);
ci.disconnectPort(id_SR); ci.disconnectPort(id_SR);
ci.params[id_O1] = Property(0b11, 2); ci.params[id_O1] = Property(0b00, 2);
ci.params[id_INIT_L20] = Property(0b1010, 4); ci.params[id_INIT_L20] = Property(0b1010, 4);
ci.params[id_INIT_L00] = Property(0b1010, 4); ci.params[id_INIT_L00] = Property(0b1010, 4);
ci.params[id_INIT_L10] = Property(0b1010, 4); ci.params[id_INIT_L10] = Property(0b1010, 4);
@ -332,10 +332,17 @@ void GateMatePacker::pack_cpe()
ci.params[id_EN] = Property(0b11, 2); ci.params[id_EN] = Property(0b11, 2);
ci.params[id_R] = Property(0b11, 2); ci.params[id_R] = Property(0b11, 2);
ci.params[id_S] = Property(0b11, 2); ci.params[id_S] = Property(0b11, 2);
ci.params[id_CLK] = Property(0b10, 2);
ci.params[id_FF_INIT] = Property(0b10, 2); ci.params[id_FF_INIT] = Property(0b10, 2);
ci.unsetParam(ctx->id("SR_VAL"));
ci.unsetParam(ctx->id("SR_INV"));
ci.unsetParam(ctx->id("EN_INV"));
ci.unsetParam(ctx->id("CLK_INV"));
ci.unsetParam(ctx->id("INIT"));
ci.type = id_CPE; ci.type = id_CPE;
} }
} }
void GateMatePacker::pack_constants() void GateMatePacker::pack_constants()