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

Merge pull request #968 from tpambor/gowin-osc-fix

Browse Source 
gowin: Fix z-index of oscillator
This commit is contained in:
gatecat 2022-03-30 18:57:54 +01:00 committed by GitHub
commit e96ec9a102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gowin/arch.cc
View File

@ -1012,7 +1012,7 @@ Arch::Arch(ArchArgs args) : args(args)
case ID_OSC:
snprintf(buf, 32, "R%dC%d_OSC", row + 1, col + 1);
belname = id(buf);
addBel(belname, id_OSC, Loc(col, row, 0), false);
addBel(belname, id_OSC, Loc(col, row, BelZ::osc_z), false);
portname = IdString(pairLookup(bel->ports.get(), bel->num_ports, ID_OSCOUT)->src_id);
snprintf(buf, 32, "R%dC%d_%s", row + 1, col + 1, portname.c_str(this));
addBelOutput(belname, id_OSCOUT, id(buf));
@ -1020,7 +1020,7 @@ Arch::Arch(ArchArgs args) : args(args)
case ID_OSCH:
snprintf(buf, 32, "R%dC%d_OSCH", row + 1, col + 1);
belname = id(buf);
addBel(belname, id_OSCH, Loc(col, row, 0), false);
addBel(belname, id_OSCH, Loc(col, row, BelZ::osc_z), false);
portname = IdString(pairLookup(bel->ports.get(), bel->num_ports, ID_OSCOUT)->src_id);
snprintf(buf, 32, "R%dC%d_%s", row + 1, col + 1, portname.c_str(this));
addBelOutput(belname, id_OSCOUT, id(buf));
@ -1028,7 +1028,7 @@ Arch::Arch(ArchArgs args) : args(args)
case ID_OSCF:
snprintf(buf, 32, "R%dC%d_OSCF", row + 1, col + 1);
belname = id(buf);
addBel(belname, id_OSCF, Loc(col, row, 0), false);
addBel(belname, id_OSCF, Loc(col, row, BelZ::osc_z), false);
portname = IdString(pairLookup(bel->ports.get(), bel->num_ports, ID_OSCOUT)->src_id);
snprintf(buf, 32, "R%dC%d_%s", row + 1, col + 1, portname.c_str(this));
addBelOutput(belname, id_OSCOUT, id(buf));
@ -1039,7 +1039,7 @@ Arch::Arch(ArchArgs args) : args(args)
case ID_OSCZ:
snprintf(buf, 32, "R%dC%d_OSCZ", row + 1, col + 1);
belname = id(buf);
addBel(belname, id_OSCZ, Loc(col, row, 0), false);
addBel(belname, id_OSCZ, Loc(col, row, BelZ::osc_z), false);
portname = IdString(pairLookup(bel->ports.get(), bel->num_ports, ID_OSCOUT)->src_id);
snprintf(buf, 32, "R%dC%d_%s", row + 1, col + 1, portname.c_str(this));
addBelOutput(belname, id_OSCOUT, id(buf));

3
gowin/arch.h
View File

@ -484,7 +484,8 @@ enum
mux_0_z = 10, // start Z for the MUX2LUT5 bels
iologic_0_z = 20, // start Z for the IOLOGIC bels
vcc_0_z = 277, // virtual VCC bel Z
gnd_0_z = 278 // virtual VSS bel Z
gnd_0_z = 278, // virtual VSS bel Z
osc_z = 280 // Z for the oscillator bels
};
}