Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr

# Conflicts:
#	common/place_sa.cc
#	ice40/arch.h

2 files changed, 20 insertions, 9 deletions

diff --git a/dummy/arch_place.cc b/dummy/arch_place.cc
index 4e712f6d..f35cb6fe 100644
--- a/dummy/arch_place.cc
+++ b/dummy/arch_place.cc
@@ -21,8 +21,13 @@
 
 NEXTPNR_NAMESPACE_BEGIN
 
-bool isValidBelForCell(Context *ctx, CellInfo *cell, BelId bel) { return true; }
+PlaceValidityChecker::PlaceValidityChecker(Context *ctx) {}
 
-bool isBelLocationValid(Context *ctx, BelId bel) { return true; }
+bool PlaceValidityChecker::isValidBelForCell(CellInfo *cell, BelId bel)
+{
+    return true;
+}
+
+bool PlaceValidityChecker::isBelLocationValid(BelId bel) { return true; }
 
 NEXTPNR_NAMESPACE_END
diff --git a/dummy/arch_place.h b/dummy/arch_place.h
index 3abd80c5..1111ac42 100644
--- a/dummy/arch_place.h
+++ b/dummy/arch_place.h
@@ -26,13 +26,19 @@ NEXTPNR_NAMESPACE_BEGIN
 
 // Architecure-specific placement functions
 
-// Whether or not a given cell can be placed at a given Bel
-// This is not intended for Bel type checks, but finer-grained constraints
-// such as conflicting set/reset signals, etc
-bool isValidBelForCell(Context *ctx, CellInfo *cell, BelId bel);
-
-// Return true whether all Bels at a given location are valid
-bool isBelLocationValid(Context *ctx, BelId bel);
+class PlaceValidityChecker
+{
+  public:
+    PlaceValidityChecker(Context *ctx);
+
+    // Whether or not a given cell can be placed at a given Bel
+    // This is not intended for Bel type checks, but finer-grained constraints
+    // such as conflicting set/reset signals, etc
+    bool isValidBelForCell(CellInfo *cell, BelId bel);
+
+    // Return true whether all Bels at a given location are valid
+    bool isBelLocationValid(BelId bel);
+};
 
 NEXTPNR_NAMESPACE_END