Fixups for Insn.hxx generation and hard defintions

Signed-off-by: Luke Quinn <[email protected]>

Author: lquinn2015

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

@@ -170,9 +170,11 @@ namespace udb {
     virtual void set_xreg(unsigned num, uint64_t value) = 0;
 
     virtual CsrBase* csr(unsigned address) = 0;
-
     virtual const CsrBase* csr(unsigned address) const = 0;
 
+    virtual CsrBase* csr(const std::string &address) = 0;
+    virtual const CsrBase* csr(const std::string &address) const = 0;
+
     virtual void printState(FILE* out = stdout) const = 0;
 
     virtual bool implemented_Q_(const ExtensionName& ext) = 0;

backends/cpp_hart_gen/templates/hart.hxx.erb

@@ -123,6 +123,10 @@ namespace udb {
       // return it->second;
     }
 
+    const <%= name_of(:params, cfg_arch) %>& params() const {
+      return m_params;
+    }
+
     private:
       XReg m_pc;
       XReg m_next_pc;

backends/cpp_hart_gen/templates/inst.hxx.erb

@@ -3,6 +3,7 @@
 #include <udb/bits.hpp>
 #include <type_traits>
 #include <udb/util.hpp>
+#include <udb/inst.hpp>
 
 <%- ilist = cfg_arch.fully_configured? ? cfg_arch.transitive_implemented_instructions : cfg_arch.instructions -%>
 
@@ -70,6 +71,13 @@ namespace udb {
 #define __UDB_FUNC_CALL m_parent->
 #define __UDB_CSR_BY_ADDR(addr) m_parent->csr(addr)
 #define __UDB_CSR_BY_NAME(csr_name) m_parent->m_csrs.csr_name
+#define __UDB_ENCODING this->encoding()
+#define __UDB_RUNTIME_PARAM(field) m_parent->params().field
+#define __UDB_STRUCT(type) struct <%= cfg_arch.name %>type_Struct
+#define __UDB_SET_PC(new_pc) m_parent->set_next_pc(new_pc)
+#define __UDB_PC m_parent->pc()
+#define __UDB_MUTABLE_GLOBAL(x) m_parent->x
+#define __UDB_CONSTEXPR_FUNC_CALL
 
 
     void execute() override {
@@ -102,6 +110,13 @@ namespace udb {
 #undef __UDB__FUNC__CALL
 #undef __UDB_CSR_BY_ADDR
 #undef __UDB_CSR_BY_NAME
+#undef __UDB_ENCODING
+#undef __UDB_RUNTIME_PARAM
+#undef __UDB_STRUCT
+#undef __UDB_PC
+#undef __UDB_CONSTEXPR_FUNC_CALL
+#undef __UDB_SET_PC
+
 
   private:
     <%= name_of(:hart, cfg_arch) %> * const m_parent;