Merge remote-tracking branch 'origin/cpp_hart' into cpp_hart

Author: Derek Hower

backends/cpp_hart_gen/lib/gen_cpp.rb

@@ -428,7 +428,7 @@ class AryElementAccessAst
     def gen_cpp(symtab, indent = 0, indent_spaces: 2)
       if var.text_value.start_with?("X")
         #"#{' '*indent}#{var.gen_cpp(symtab, 0, indent_spaces:)}[#{index.gen_cpp(symtab, 0, indent_spaces:)}]"
-        "#{' '*indent} __UDB__FUNC__OBJ  xregRef(#{index.gen_cpp(symtab, 0, indent_spaces:)})"
+        "#{' '*indent} __UDB_FUNC_CALL  xregRef(#{index.gen_cpp(symtab, 0, indent_spaces:)})"
       else
         if var.type(symtab).integral?
           "#{' '*indent}extract<#{index.gen_cpp(symtab, 0)}, 1, #{var.type(symtab).width}>(#{var.gen_cpp(symtab, 0, indent_spaces:)})"
@@ -461,7 +461,7 @@ class AryElementAssignmentAst
     def gen_cpp(symtab, indent = 0, indent_spaces: 2)
       if lhs.text_value.start_with?("X")
         #"#{' '*indent}  #{lhs.gen_cpp(symtab, 0, indent_spaces:)}[#{idx.gen_cpp(symtab, 0, indent_spaces:)}] = #{rhs.gen_cpp(symtab, 0, indent_spaces:)}"
-        "#{' '*indent} __UDB__FUNC__OBJ xregRef ( #{idx.gen_cpp(symtab, 0, indent_spaces:)} ) = #{rhs.gen_cpp(symtab, 0, indent_spaces:)}"
+        "#{' '*indent} __UDB_FUNC_CALL xregRef ( #{idx.gen_cpp(symtab, 0, indent_spaces:)} ) = #{rhs.gen_cpp(symtab, 0, indent_spaces:)}"
       else
         "#{' '*indent}#{lhs.gen_cpp(symtab, 0, indent_spaces:)}[#{idx.gen_cpp(symtab, 0, indent_spaces:)}] = #{rhs.gen_cpp(symtab, 0, indent_spaces:)}"
       end

backends/cpp_hart_gen/templates/hart.hxx.erb

@@ -105,6 +105,24 @@ namespace udb {
       // return it->second;
     }
 
+    CsrBase* csr(const std::string& address) override {
+      return nullptr;
+      // auto it = m_csr_map.find(address);
+      // if (it == m_csr_map.end()) {
+      //   return nullptr;
+      // }
+      // return it->second;
+    }
+
+    const CsrBase* csr(const std::string& address) const override {
+      return nullptr;
+      // auto it = m_csr_map.find(address);
+      // if (it == m_csr_map.end()) {
+      //   return nullptr;
+      // }
+      // return it->second;
+    }
+
     private:
       XReg m_pc;
       XReg m_next_pc;

backends/cpp_hart_gen/templates/inst.hxx.erb

@@ -67,7 +67,9 @@ namespace udb {
     <%- end -%>
     <%- end -%>
 
-#define __UDB__FUNC__OBJ m_parent->
+#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
 
 
     void execute() override {
@@ -97,7 +99,9 @@ namespace udb {
       <%- end -%>
     }
 
-#undef __UDB__FUNC__OBJ
+#undef __UDB__FUNC__CALL
+#undef __UDB_CSR_BY_ADDR
+#undef __UDB_CSR_BY_NAME
 
   private:
     <%= name_of(:hart, cfg_arch) %> * const m_parent;