Fixup for AryDeref and typos in auto gen

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

Author: lquinn2015

backends/cpp_hart_gen/lib/csr_template_helpers.rb

@@ -24,7 +24,7 @@ def type_to_cpp(xlen)
     symtab = fill_symtab_for_type(xlen, pruned_ast)
     value_result = pruned_ast.value_try do
       type_value = pruned_ast.return_value(symtab)
-      cpp = "return CsfFieldType::#{TYPE_VALUE_TO_CPP_NAME[type_value]};"
+      cpp = "return CsrFieldType::#{TYPE_VALUE_TO_CPP_NAME[type_value]};"
     end
     pruned_ast.value_else(value_result) do
       cpp = pruned_ast.gen_cpp(symtab)

backends/cpp_hart_gen/lib/gen_cpp.rb

@@ -409,7 +409,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:)})"
@@ -442,7 +442,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/csrs.cxx.erb

@@ -12,6 +12,8 @@ using namespace udb;
 #define __UDB_STATIC_PARAM(param_name) <%= name_of(:params, cfg_arch) %>::param_name
 #define __UDB_FUNC_CALL m_hart->
 #define __UDB_CONSTEXPR_FUNC_CALL <%= name_of(:hart, cfg_arch) %>::
+#define __UDB_CSR_BY_ADDR(addr) m_hart->csr(addr)
+#define __UDB_CSR_BY_NAME(csr_name) m_hart->m_csrs.csr_name
 
 <%- fields.each do |field| -%>
 <%- max_width = cfg_arch.possible_xlens.map { |xlen| field.defined_in_base?(xlen) ? field.location(xlen).size : 0 }.max -%>
@@ -65,6 +67,8 @@ void <%= name_of(:csr_field, cfg_arch, csr.name, field.name) %>::reset() {
 #undef __UDB_STATIC_PARAM
 #undef __UDB_CONSTEXPR_FUNC_CALL
 #undef __UDB_FUNC_CALL
+#undef __UDB_CSR_BY_NAME
+#undef __UDB_CSR_BY_ADDR
 
 #define __UDB_RUNTIME_PARAM(param_name) m_parent->m_params.param_name
 #define __UDB_STATIC_PARAM(param_name) <%= name_of(:params, cfg_arch) %>::param_name
@@ -74,6 +78,7 @@ void <%= name_of(:csr_field, cfg_arch, csr.name, field.name) %>::reset() {
 #define __UDB_FUNC_CALL m_parent->
 #define __UDB_CONSTEXPR_FUNC_CALL <%= name_of(:hart, cfg_arch) %>::
 #define __UDB_XLEN m_parent->xlen()
+#define __UDB_ENCODING m_parent->m_curr_insn.encoding()
 
 // constructor
 <%- fields_for_xlen = fields.select { |f| cfg_arch.possible_xlens.any? { |xlen| f.defined_in_base?(xlen) } } -%>

backends/cpp_hart_gen/templates/hart.hxx.erb

@@ -113,9 +113,28 @@ 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;
+      InstBase* m_curr_insn;
       std::array<XRegister<MXLEN>, 32> m_xregs;
 
       <%= name_of(:params, cfg_arch) %> m_params;

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;