diff options
| author | gatecat <gatecat@ds0.me> | 2021-02-17 15:57:31 +0000 |
|---|---|---|
| committer | gatecat <gatecat@ds0.me> | 2021-02-17 15:57:31 +0000 |
| commit | 09535a95caef465cae025d1184167eee43a55e72 (patch) | |
| tree | 6999732b32273a302db6eefce9b94d9961be9ae8 /gowin | |
| parent | cb957795a3295e608dd22a0d3844a55d113043f9 (diff) | |
| download | nextpnr-09535a95caef465cae025d1184167eee43a55e72.tar.gz nextpnr-09535a95caef465cae025d1184167eee43a55e72.tar.bz2 nextpnr-09535a95caef465cae025d1184167eee43a55e72.zip | |
gowin: Fix IdStrings being overwritten by wireToGlobal
Signed-off-by: gatecat <gatecat@ds0.me>
Diffstat (limited to 'gowin')
| -rw-r--r-- | gowin/arch.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gowin/arch.cc b/gowin/arch.cc index 58df773c..2e742693 100644 --- a/gowin/arch.cc +++ b/gowin/arch.cc @@ -589,14 +589,14 @@ Arch::Arch(ArchArgs args) : args(args) const PairPOD pip = pips[p][j]; int destrow = row; int destcol = col; - IdString destid(pip.dest_id); - IdString gdestname = wireToGlobal(destrow, destcol, db, destid); + IdString destid(pip.dest_id), gdestid(pip.dest_id); + IdString gdestname = wireToGlobal(destrow, destcol, db, gdestid); if (wires.count(gdestname) == 0) addWire(gdestname, destid, destcol, destrow); int srcrow = row; int srccol = col; - IdString srcid(pip.src_id); - IdString gsrcname = wireToGlobal(srcrow, srccol, db, srcid); + IdString srcid(pip.src_id), gsrcid(pip.src_id); + IdString gsrcname = wireToGlobal(srcrow, srccol, db, gsrcid); if (wires.count(gsrcname) == 0) addWire(gsrcname, srcid, srccol, srcrow); } @@ -701,12 +701,12 @@ Arch::Arch(ArchArgs args) : args(args) const PairPOD pip = pips[p][j]; int destrow = row; int destcol = col; - IdString destid(pip.dest_id); - IdString gdestname = wireToGlobal(destrow, destcol, db, destid); + IdString destid(pip.dest_id), gdestid(pip.dest_id); + IdString gdestname = wireToGlobal(destrow, destcol, db, gdestid); int srcrow = row; int srccol = col; - IdString srcid(pip.src_id); - IdString gsrcname = wireToGlobal(srcrow, srccol, db, srcid); + IdString srcid(pip.src_id), gsrcid(pip.src_id); + IdString gsrcname = wireToGlobal(srcrow, srccol, db, gsrcid); snprintf(buf, 32, "R%dC%d_%s_%s", row + 1, col + 1, srcid.c_str(this), destid.c_str(this)); IdString pipname = id(buf); |