diff options
| -rw-r--r-- | dummy/chip.cc | 6 | ||||
| -rw-r--r-- | dummy/chip.h | 7 | ||||
| -rw-r--r-- | ice40/chip.h | 7 |
3 files changed, 11 insertions, 9 deletions
diff --git a/dummy/chip.cc b/dummy/chip.cc index 4184bc67..2ca02964 100644 --- a/dummy/chip.cc +++ b/dummy/chip.cc @@ -34,7 +34,7 @@ void Chip::unbindBel(BelId bel) {} bool Chip::checkBelAvail(BelId bel) const { return false; } -IdString Chip::getBelCell(BelId bel) const { return IdString(); } +IdString Chip::getBelCell(BelId bel, bool conflicting) const { return IdString(); } const vector<BelId> &Chip::getBels() const { @@ -72,7 +72,7 @@ void Chip::unbindWire(WireId wire) {} bool Chip::checkWireAvail(WireId wire) const { return false; } -IdString Chip::getWireNet(WireId wire) const { return IdString(); } +IdString Chip::getWireNet(WireId wire, bool conflicting) const { return IdString(); } const vector<WireId> &Chip::getWires() const { @@ -92,7 +92,7 @@ void Chip::unbindPip(PipId pip) {} bool Chip::checkPipAvail(PipId pip) const { return false; } -IdString Chip::getPipNet(PipId pip) const { return IdString(); } +IdString Chip::getPipNet(PipId pip, bool conflicting) const { return IdString(); } const vector<PipId> &Chip::getPips() const { diff --git a/dummy/chip.h b/dummy/chip.h index da9ee7af..60db776e 100644 --- a/dummy/chip.h +++ b/dummy/chip.h @@ -74,7 +74,7 @@ struct Chip void bindBel(BelId bel, IdString cell); void unbindBel(BelId bel); bool checkBelAvail(BelId bel) const; - IdString getBelCell(BelId bel) const; + IdString getBelCell(BelId bel, bool conflicting=false) const; const vector<BelId> &getBels() const; const vector<BelId> &getBelsByType(BelType type) const; BelType getBelType(BelId bel) const; @@ -87,7 +87,7 @@ struct Chip void bindWire(WireId wire, IdString net); void unbindWire(WireId wire); bool checkWireAvail(WireId wire) const; - IdString getWireNet(WireId wire) const; + IdString getWireNet(WireId wire, bool conflicting=false) const; const vector<WireId> &getWires() const; PipId getPipByName(IdString name) const; @@ -95,7 +95,7 @@ struct Chip void bindPip(PipId pip, IdString net); void unbindPip(PipId pip); bool checkPipAvail(PipId pip) const; - IdString getPipNet(PipId pip) const; + IdString getPipNet(PipId pip, bool conflicting=false) const; const vector<PipId> &getPips() const; WireId getPipSrcWire(PipId pip) const; WireId getPipDstWire(PipId pip) const; @@ -107,6 +107,7 @@ struct Chip void getBelPosition(BelId bel, float &x, float &y) const; void getWirePosition(WireId wire, float &x, float &y) const; void getPipPosition(PipId pip, float &x, float &y) const; + vector<GraphicElement> getBelGraphics(BelId bel) const; vector<GraphicElement> getWireGraphics(WireId wire) const; vector<GraphicElement> getPipGraphics(PipId pip) const; diff --git a/ice40/chip.h b/ice40/chip.h index 252cf303..b7492d2f 100644 --- a/ice40/chip.h +++ b/ice40/chip.h @@ -449,7 +449,7 @@ struct Chip return bel_to_cell[bel.index] == IdString(); } - IdString getBelCell(BelId bel) const + IdString getBelCell(BelId bel, bool conflicting=false) const { assert(bel != BelId()); return bel_to_cell[bel.index]; @@ -539,7 +539,7 @@ struct Chip return wire_to_net[wire.index] == IdString(); } - IdString getWireNet(WireId wire) const + IdString getWireNet(WireId wire, bool conflicting=false) const { assert(wire != WireId()); return wire_to_net[wire.index]; @@ -596,7 +596,7 @@ struct Chip return !switches_locked[chip_info.pip_data[pip.index].switch_index]; } - IdString getPipNet(PipId pip) const + IdString getPipNet(PipId pip, bool conflicting=false) const { assert(pip != PipId()); return pip_to_net[pip.index]; @@ -668,6 +668,7 @@ struct Chip void getBelPosition(BelId bel, float &x, float &y) const; void getWirePosition(WireId wire, float &x, float &y) const; void getPipPosition(PipId pip, float &x, float &y) const; + vector<GraphicElement> getBelGraphics(BelId bel) const; vector<GraphicElement> getWireGraphics(WireId wire) const; vector<GraphicElement> getPipGraphics(PipId pip) const; |