3 files changed, 18 insertions, 13 deletions
diff --git a/common/bits.cc b/common/bits.cc
index 1fe65544..36c7539a 100644
--- a/common/bits.cc
+++ b/common/bits.cc
@@ -24,7 +24,8 @@
 
 namespace nextpnr {
 
-int Bits::generic_popcount(unsigned int v) {
+int Bits::generic_popcount(unsigned int v)
+{
     unsigned int c; // c accumulates the total bits set in v
     for (c = 0; v; c++) {
         v &= v - 1; // clear the least significant bit set
@@ -33,13 +34,14 @@ int Bits::generic_popcount(unsigned int v) {
     return c;
 }
 
-int Bits::generic_ctz(unsigned int x) {
-    if(x == 0) {
+int Bits::generic_ctz(unsigned int x)
+{
+    if (x == 0) {
         throw std::runtime_error("Cannot call ctz with arg = 0");
     }
 
-    for(size_t i = 0; i < std::numeric_limits<unsigned int>::digits; ++i) {
-        if((x & (1 << i)) != 0) {
+    for (size_t i = 0; i < std::numeric_limits<unsigned int>::digits; ++i) {
+        if ((x & (1 << i)) != 0) {
             return i;
         }
     }
@@ -48,4 +50,4 @@ int Bits::generic_ctz(unsigned int x) {
     throw std::runtime_error("Unreachable!");
 }
 
-};
+}; // namespace nextpnr
diff --git a/common/bits.h b/common/bits.h
index 1abf6735..d1598a8e 100644
--- a/common/bits.h
+++ b/common/bits.h
@@ -34,18 +34,20 @@
 
 #if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
 #include <intrin.h>
-#pragma intrinsic(_BitScanForward,_BitScanReverse,__popcnt)
+#pragma intrinsic(_BitScanForward, _BitScanReverse, __popcnt)
 #endif
 
 // Uses plain nextpnr namespace to avoid header inclusion nightmare that is
 // "nextpnr.h".
 namespace nextpnr {
 
-struct Bits {
+struct Bits
+{
     static int generic_popcount(unsigned int x);
     static int generic_ctz(unsigned int x);
 
-    static int popcount(unsigned int x) {
+    static int popcount(unsigned int x)
+    {
 #if defined(__GNUC__) || defined(__clang__)
         return __builtin_popcount(x);
 #elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
@@ -55,7 +57,8 @@ struct Bits {
 #endif
     }
 
-    static int ctz(unsigned int x) {
+    static int ctz(unsigned int x)
+    {
 #if defined(__GNUC__) || defined(__clang__)
         return __builtin_ctz(x);
 #elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
@@ -68,6 +71,6 @@ struct Bits {
     }
 };
 
-};
+}; // namespace nextpnr
 
 #endif /* BITS_H */
diff --git a/common/nextpnr.h b/common/nextpnr.h
index ed227fb6..59198d6d 100644
--- a/common/nextpnr.h
+++ b/common/nextpnr.h
@@ -1146,7 +1146,7 @@ template <typename R> struct ArchAPI : BaseCtx
     virtual WireId getBelPinWire(BelId bel, IdString pin) const = 0;
     virtual PortType getBelPinType(BelId bel, IdString pin) const = 0;
     virtual typename R::BelPinsRangeT getBelPins(BelId bel) const = 0;
-    virtual typename R::CellBelPinRangeT getBelPinsForCellPin(CellInfo *cell_info, IdString pin) const = 0;
+    virtual typename R::CellBelPinRangeT getBelPinsForCellPin(const CellInfo *cell_info, IdString pin) const = 0;
     // Wire methods
     virtual typename R::AllWiresRangeT getWires() const = 0;
     virtual WireId getWireByName(IdStringList name) const = 0;
@@ -1298,7 +1298,7 @@ template <typename R> struct BaseArch : ArchAPI<R>
         return empty_if_possible<typename R::BelAttrsRangeT>();
     }
 
-    virtual typename R::CellBelPinRangeT getBelPinsForCellPin(CellInfo *cell_info, IdString pin) const override
+    virtual typename R::CellBelPinRangeT getBelPinsForCellPin(const CellInfo *cell_info, IdString pin) const override
     {
         return return_if_match<std::array<IdString, 1>, typename R::CellBelPinRangeT>({pin});
     }