diff options
| author | Eddie Hung <e.hung@imperial.ac.uk> | 2018-07-26 21:00:26 -0700 |
|---|---|---|
| committer | Eddie Hung <e.hung@imperial.ac.uk> | 2018-07-26 21:00:26 -0700 |
| commit | d5c2332ebf5dd9b84e3a6fd2a99e8df70150bd33 (patch) | |
| tree | 0f641516654085dd24bb69889ef466041234f684 /generic/arch.h | |
| parent | f45e688354c13f38bda3ba4064587880a25980fe (diff) | |
| parent | e5acd80247264fed41dfc1e7e07efa8a10a67fae (diff) | |
| download | nextpnr-d5c2332ebf5dd9b84e3a6fd2a99e8df70150bd33.tar.gz nextpnr-d5c2332ebf5dd9b84e3a6fd2a99e8df70150bd33.tar.bz2 nextpnr-d5c2332ebf5dd9b84e3a6fd2a99e8df70150bd33.zip | |
Merge remote-tracking branch 'origin/master' into redist_slack
Diffstat (limited to 'generic/arch.h')
| -rw-r--r-- | generic/arch.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/generic/arch.h b/generic/arch.h index 97ed1ac2..01a90ee1 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -31,7 +31,7 @@ struct WireInfo; struct PipInfo { - IdString name, bound_net; + IdString name, type, bound_net; WireId srcWire, dstWire; DelayInfo delay; DecalXY decalxy; @@ -39,7 +39,7 @@ struct PipInfo struct WireInfo { - IdString name, bound_net; + IdString name, type, bound_net; std::vector<PipId> downhill, uphill, aliases; BelPin uphill_bel_pin; std::vector<BelPin> downhill_bel_pins; @@ -96,9 +96,9 @@ struct Arch : BaseCtx float grid_distance_to_delay; - void addWire(IdString name, int x, int y); - void addPip(IdString name, IdString srcWire, IdString dstWire, DelayInfo delay); - void addAlias(IdString name, IdString srcWire, IdString dstWire, DelayInfo delay); + void addWire(IdString name, IdString type, int x, int y); + void addPip(IdString name, IdString type, IdString srcWire, IdString dstWire, DelayInfo delay); + void addAlias(IdString name, IdString type, IdString srcWire, IdString dstWire, DelayInfo delay); void addBel(IdString name, IdString type, Loc loc, bool gb); void addBelInput(IdString bel, IdString name, IdString wire); @@ -157,6 +157,7 @@ struct Arch : BaseCtx WireId getWireByName(IdString name) const; IdString getWireName(WireId wire) const; + IdString getWireType(WireId wire) const; uint32_t getWireChecksum(WireId wire) const; void bindWire(WireId wire, IdString net, PlaceStrength strength); void unbindWire(WireId wire); @@ -169,6 +170,7 @@ struct Arch : BaseCtx PipId getPipByName(IdString name) const; IdString getPipName(PipId pip) const; + IdString getPipType(PipId pip) const; uint32_t getPipChecksum(PipId pip) const; void bindPip(PipId pip, IdString net, PlaceStrength strength); void unbindPip(PipId pip); |