C++ cleanup

Author: Derek Hower

backends/cpp_hart_gen/cpp/include/udb/bitfield.hpp

@@ -1,7 +1,5 @@
 #pragma once
 
-// #include <boost/multiprecision/cpp_int.hpp>
-
 #include <bit>
 #include <cmath>
 #include <concepts>
@@ -14,48 +12,8 @@
 #include <udb/bits.hpp>
 #include <udb/defines.hpp>
 
-// extern "C" {
-// #include "softfloat.h"
-// }
-
 namespace udb {
 
-// empty struct used as the parent of any user-defined enum
-// we use this to identify enum types at compile time
-struct Enum {};
-
-template <unsigned N> struct FixedString {
-  char buf[N + 1]{};
-  constexpr FixedString(char const *s) {
-    for (unsigned i = 0; i != N; ++i)
-      buf[i] = s[i];
-  }
-  constexpr operator char const *() const { return buf; }
-};
-template <unsigned N> FixedString(char const (&)[N]) -> FixedString<N - 1>;
-
-template <unsigned N> static consteval bool is_power_of_2() {
-  if constexpr (N == 0) {
-    return true;
-  } else {
-    unsigned M = N;
-    while ((M & 1) == 0) {
-      M = M >> 1;
-    }
-    return M == 1;
-  }
-}
-static_assert(is_power_of_2<128>());
-static_assert(is_power_of_2<64>());
-static_assert(is_power_of_2<32>());
-static_assert(is_power_of_2<16>());
-static_assert(is_power_of_2<32>());
-static_assert(is_power_of_2<16>());
-static_assert(is_power_of_2<8>());
-static_assert(is_power_of_2<4>());
-static_assert(is_power_of_2<2>());
-static_assert(is_power_of_2<1>());
-
 using uint128_t = unsigned __int128;
 using int128_t = __int128;
 

backends/cpp_hart_gen/cpp/include/udb/hart.hpp

@@ -23,25 +23,6 @@
 
 namespace udb {
 
-// probably unwise to change these
-static constexpr uint64_t LOG_MEM_REGION_SZ = 12; // 4k regions
-static constexpr uint64_t LOG_EXECMAP_CHUNK_SZ = 12;
-
-// derived values - do not modify
-static constexpr uint64_t MEM_REGION_SZ = 1UL << LOG_MEM_REGION_SZ;
-static constexpr uint64_t MEM_REGION_MASK = ~(MEM_REGION_SZ - 1);
-
-static const constexpr uint64_t NS_BIT_OFFSET = 52; // non-secure bit
-static const constexpr uint64_t NS_MASK = 1UL << NS_BIT_OFFSET;
-
-// hash used to initialize each 64-bit word in memory
-// assumes addr is the aligned physical address plus NS bit
-inline uint64_t mem_init_hash(uint64_t addr) {
-  uint8_t ns = addr >> NS_BIT_OFFSET;                    // NOLINT
-  return ((addr ^ (addr >> 4)) & 0x0f0f0f0f0f0f0f0eUL) | // NOLINT
-         (0x1010101010101010UL << ns);                   // NOLINT
-}
-
 class AbstractTracer {
 public:
   AbstractTracer() = default;

backends/cpp_hart_gen/cpp/include/udb/util.hpp

@@ -255,4 +255,26 @@ RuntimeBits concat(BitsTypes... bits) {
 static_assert(std::is_same_v<
               decltype(concat(Bits<4>{1}, Bits<4>(2), Bits<4>(3))), Bits<12>>);
 static_assert(concat(Bits<4>{1}, Bits<4>(2), Bits<4>(3)) == Bits<12>(0x123));
+
+template <unsigned N> static consteval bool is_power_of_2() {
+  if constexpr (N == 0) {
+    return true;
+  } else {
+    unsigned M = N;
+    while ((M & 1) == 0) {
+      M = M >> 1;
+    }
+    return M == 1;
+  }
+}
+static_assert(is_power_of_2<128>());
+static_assert(is_power_of_2<64>());
+static_assert(is_power_of_2<32>());
+static_assert(is_power_of_2<16>());
+static_assert(is_power_of_2<32>());
+static_assert(is_power_of_2<16>());
+static_assert(is_power_of_2<8>());
+static_assert(is_power_of_2<4>());
+static_assert(is_power_of_2<2>());
+static_assert(is_power_of_2<1>());
 } // namespace udb