Refactoring bind/unbind API

Signed-off-by: Clifford Wolf <clifford@clifford.at>

2 files changed, 21 insertions, 21 deletions

diff --git a/dummy/arch.cc b/dummy/arch.cc
index 64c0ca1e..4adff2ca 100644
--- a/dummy/arch.cc
+++ b/dummy/arch.cc
@@ -36,16 +36,15 @@ IdString Arch::getBelName(BelId bel) const { return IdString(); }
 
 uint32_t Arch::getBelChecksum(BelId bel) const { return 0; }
 
-void Arch::bindBel(BelId bel, IdString cell) {}
+void Arch::bindBel(BelId bel, IdString cell, PlaceStrength strength) {}
 
 void Arch::unbindBel(BelId bel) {}
 
 bool Arch::checkBelAvail(BelId bel) const { return false; }
 
-IdString Arch::getBelCell(BelId bel, bool conflicting) const
-{
-    return IdString();
-}
+IdString Arch::getBoundBelCell(BelId bel) const { return IdString(); }
+
+IdString Arch::getConflictingBelCell(BelId bel) const { return IdString(); }
 
 const std::vector<BelId> &Arch::getBels() const
 {
@@ -79,16 +78,15 @@ IdString Arch::getWireName(WireId wire) const { return IdString(); }
 
 uint32_t Arch::getWireChecksum(WireId wire) const { return 0; }
 
-void Arch::bindWire(WireId wire, IdString net) {}
+void Arch::bindWire(WireId wire, IdString net, PlaceStrength strength) {}
 
 void Arch::unbindWire(WireId wire) {}
 
 bool Arch::checkWireAvail(WireId wire) const { return false; }
 
-IdString Arch::getWireNet(WireId wire, bool conflicting) const
-{
-    return IdString();
-}
+IdString Arch::getBoundWireNet(WireId wire) const { return IdString(); }
+
+IdString Arch::getConflictingWireNet(WireId wire) const { return IdString(); }
 
 const std::vector<WireId> &Arch::getWires() const
 {
@@ -104,16 +102,15 @@ IdString Arch::getPipName(PipId pip) const { return IdString(); }
 
 uint32_t Arch::getPipChecksum(PipId wire) const { return 0; }
 
-void Arch::bindPip(PipId pip, IdString net) {}
+void Arch::bindPip(PipId pip, IdString net, PlaceStrength strength) {}
 
 void Arch::unbindPip(PipId pip) {}
 
 bool Arch::checkPipAvail(PipId pip) const { return false; }
 
-IdString Arch::getPipNet(PipId pip, bool conflicting) const
-{
-    return IdString();
-}
+IdString Arch::getBoundPipNet(PipId pip) const { return IdString(); }
+
+IdString Arch::getConflictingPipNet(PipId pip) const { return IdString(); }
 
 const std::vector<PipId> &Arch::getPips() const
 {
diff --git a/dummy/arch.h b/dummy/arch.h
index 5bdf633e..2a778689 100644
--- a/dummy/arch.h
+++ b/dummy/arch.h
@@ -88,10 +88,11 @@ struct Arch : BaseCtx
     BelId getBelByName(IdString name) const;
     IdString getBelName(BelId bel) const;
     uint32_t getBelChecksum(BelId bel) const;
-    void bindBel(BelId bel, IdString cell);
+    void bindBel(BelId bel, IdString cell, PlaceStrength strength);
     void unbindBel(BelId bel);
     bool checkBelAvail(BelId bel) const;
-    IdString getBelCell(BelId bel, bool conflicting = false) const;
+    IdString getBoundBelCell(BelId bel) const;
+    IdString getConflictingBelCell(BelId bel) const;
     const std::vector<BelId> &getBels() const;
     const std::vector<BelId> &getBelsByType(BelType type) const;
     BelType getBelType(BelId bel) const;
@@ -102,19 +103,21 @@ struct Arch : BaseCtx
     WireId getWireByName(IdString name) const;
     IdString getWireName(WireId wire) const;
     uint32_t getWireChecksum(WireId wire) const;
-    void bindWire(WireId wire, IdString net);
+    void bindWire(WireId wire, IdString net, PlaceStrength strength);
     void unbindWire(WireId wire);
     bool checkWireAvail(WireId wire) const;
-    IdString getWireNet(WireId wire, bool conflicting = false) const;
+    IdString getBoundWireNet(WireId wire) const;
+    IdString getConflictingWireNet(WireId wire) const;
     const std::vector<WireId> &getWires() const;
 
     PipId getPipByName(IdString name) const;
     IdString getPipName(PipId pip) const;
     uint32_t getPipChecksum(PipId pip) const;
-    void bindPip(PipId pip, IdString net);
+    void bindPip(PipId pip, IdString net, PlaceStrength strength);
     void unbindPip(PipId pip);
     bool checkPipAvail(PipId pip) const;
-    IdString getPipNet(PipId pip, bool conflicting = false) const;
+    IdString getBoundPipNet(PipId pip) const;
+    IdString getConflictingPipNet(PipId pip) const;
     const std::vector<PipId> &getPips() const;
     WireId getPipSrcWire(PipId pip) const;
     WireId getPipDstWire(PipId pip) const;