Fix gen problems

Author: Derek Hower

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

@@ -123,25 +123,34 @@ namespace udb {
     BitfieldMember& operator=(const _Bits<N, Signed>& value);
 
     template <std::integral Type>
-    bool operator==(const Type& other) { return other == static_cast<Bits<Size>>(*this); }
+    bool operator==(const Type& other) const { return other == static_cast<Bits<Size>>(*this); }
 
     template <unsigned N, bool Signed>
-    bool operator==(const _Bits<N, Signed>& other) { return other == static_cast<Bits<Size>>(*this); }
+    bool operator==(const _Bits<N, Signed>& other) const { return other == static_cast<Bits<Size>>(*this); }
 
     template <unsigned N, bool Signed>
-    bool operator>(const _Bits<N, Signed>& other) { return static_cast<Bits<Size>>(*this) > other; }
+    bool operator>(const _Bits<N, Signed>& other) const { return static_cast<Bits<Size>>(*this) > other; }
 
     template <unsigned N, bool Signed>
-    bool operator>=(const _Bits<N, Signed>& other) { return static_cast<Bits<Size>>(*this) >= other; }
+    bool operator>=(const _Bits<N, Signed>& other) const { return static_cast<Bits<Size>>(*this) >= other; }
 
     template <unsigned N, bool Signed>
-    bool operator<=(const _Bits<N, Signed>& other) { return static_cast<Bits<Size>>(*this) <= other; }
+    bool operator<=(const _Bits<N, Signed>& other) const { return static_cast<Bits<Size>>(*this) <= other; }
 
     template <unsigned OtherParentSize, unsigned OtherStart, unsigned OtherSize>
-    bool operator<(const BitfieldMember<OtherParentSize, OtherStart, OtherSize>& other) { return static_cast<Bits<Size>>(*this) > static_cast<Bits<OtherSize>>(*this); }
+    bool operator<(const BitfieldMember<OtherParentSize, OtherStart, OtherSize>& other) const { return static_cast<Bits<Size>>(*this) > static_cast<Bits<OtherSize>>(*this); }
+
+
+
+    template <unsigned N, bool Signed>
+    Bits<Size> operator>>(const _Bits<N, Signed>& shamt) const { return static_cast<Bits<Size>>(*this) >> shamt; }
+    template <typename T>
+      requires (std::integral<T>)
+    Bits<Size> operator>>(const T& shamt) const { return static_cast<Bits<Size>>(*this) >> shamt; }
+
 
     template <unsigned N, bool Signed>
-    Bits<Size> operator&(const _Bits<N, Signed>& other) { return static_cast<Bits<Size>>(*this) & other; }
+    Bits<Size> operator&(const _Bits<N, Signed>& other) const { return static_cast<Bits<Size>>(*this) & other; }
 
     Bits<Bits<Size>::InfinitePrecision> operator<<(const int& shamt) const { return static_cast<Bits<Size>>(*this) << shamt; }
 

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

@@ -34,7 +34,7 @@ namespace udb {
     if constexpr (size == bits_len) {
       return value;
     } else {
-      constexpr Bits<bits_len> mask = (static_cast<Bits<bits_len>>(1).template const_sll<size>()) - 1;
+      constexpr Bits<bits_len> mask = (static_cast<Bits<bits_len>>(1).template sll<size>()) - 1;
       return (value >> start) & mask;
     }
   }
@@ -48,12 +48,13 @@ namespace udb {
     if constexpr (size == BitfieldMemberSize) {
       return value;
     } else {
-      constexpr Bits<BitfieldMemberSize> mask = (static_cast<Bits<BitfieldMemberSize>>(1).template const_sll<size>()) - 1;
+      constexpr Bits<BitfieldMemberSize> mask = (static_cast<Bits<BitfieldMemberSize>>(1).template sll<size>()) - 1;
       return (value >> start) & mask;
     }
   }
   // extract bits, where the extraction is not known at compile time
   template <typename T>
+    requires (std::integral<T>)
   T extract(T value, unsigned start, unsigned size)
   {
     udb_assert((start + size) <= sizeof(T)*8, "extraction out of bound");
@@ -66,6 +67,24 @@ namespace udb {
     }
   }
 
+  template<unsigned P, unsigned N, unsigned M, typename StartType, typename SizeType>
+  Bits<BitfieldMember<P, N, M>::Width> extract(const BitfieldMember<P, N, M>& value, const StartType& start, const SizeType& size)
+  {
+    udb_assert((start + size) <= (BitfieldMember<P, N, M>::Width), "extraction out of bound");
+
+    if (size == BitfieldMember<P, N, M>::Width) {
+      return static_cast<const Bits<BitfieldMember<P, N, M>::Width>>(value);
+    } else {
+      if constexpr (BitfieldMember<P, N, M>::Width < 64) {
+        uint64_t mask = (1ull << size) - 1;
+        return (value >> start) & mask;
+      } else {
+        Bits<BitfieldMember<P, N, M>::Width> mask = (static_cast<Bits<BitfieldMember<P, N, M>::Width>>(1) << size) - 1;
+        return (value >> start) & mask;
+      }
+    }
+  }
+
   template <unsigned MSB, unsigned LSB, unsigned T>
   constexpr Bits<T> bit_insert(const Bits<T>& target, const Bits<MSB - LSB + 1>& value)
   {

backends/cpp_hart_gen/templates/csrs.cxx.erb

@@ -29,7 +29,7 @@ CsrFieldType <%= name_of(:csr_field, cfg_arch, csr.name, field.name) %>::type(co
   <%- if field.defined_in_all_bases? && cfg_arch.multi_xlen? -%>
   if (xlen == 32) {
     <%= field.type_to_cpp(32) %>
-    } else { // if (xlen == 64)
+  } else { // if (xlen == 64)
     <%= field.type_to_cpp(64) %>
   }
   <%- else -%>