Fixed a few ast sytnax errors

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

Author: lquinn2015

backends/cpp_hart_gen/lib/gen_cpp.rb

@@ -232,10 +232,20 @@ def gen_cpp(symtab, indent, indent_spaces: 2)
 
   class CsrFieldAssignmentAst
     def gen_cpp(symtab, indent, indent_spaces: 2)
-      if csr_field.idx.is_a?(AstNode)
-        "#{' '*indent}__UDB_CSR_BY_ADDR(#{csr_field.idx.gen_cpp(symtab, 0)})._hw_write(#{write_value.gen_cpp(symtab, 0, indent_spaces:)})"
+
+      field  = csr_field.field_def(symtab)
+      if symtab.cfg_arch.multi_xlen? && field.dynamic_location?
+        if csr_field.idx.is_a?(AstNode)
+          "#{' '*indent}__UDB_CSR_BY_ADDR(#{csr_field.idx.gen_cpp(symtab, 0)}).#{field.name}()._hw_write(#{write_value.gen_cpp(symtab, 0, indent_spaces:)}, __UDB_XLEN)"
+        else
+          "#{' '*indent}__UDB_CSR_BY_NAME(#{csr_field.csr_name(symtab)}).#{field.name}()._hw_write(#{write_value.gen_cpp(symtab, 0, indent_spaces:)}, __UDB_XLEN)"
+        end
       else
-        "#{' '*indent}__UDB_CSR_BY_NAME(#{csr_field.csr_name(symtab)})._hw_write(#{write_value.gen_cpp(symtab, 0, indent_spaces:)})"
+        if csr_field.idx.is_a?(AstNode)
+          "#{' '*indent}__UDB_CSR_BY_ADDR(#{csr_field.idx.gen_cpp(symtab, 0)}).#{field.name}()._hw_write(#{write_value.gen_cpp(symtab, 0, indent_spaces:)})"
+        else
+          "#{' '*indent}__UDB_CSR_BY_NAME(#{csr_field.csr_name(symtab)}).#{field.name}()._hw_write(#{write_value.gen_cpp(symtab, 0, indent_spaces:)})"
+        end
       end
     end
   end
@@ -301,8 +311,8 @@ def gen_cpp(symtab, indent = 0, indent_spaces: 2)
         else
           "#{' ' * indent}__UDB_MUTABLE_GLOBAL(#{text_value})"
         end
-      elsif text_value == "imm"
-          "#{' ' * indent} imm()"
+      elsif !var.nil? && var.decode_var?
+        "#{' ' * indent}#{text_value}()"
       else
         "#{' ' * indent}#{text_value}"
       end
@@ -428,12 +438,16 @@ def gen_cpp(symtab, indent = 0, indent_spaces: 2)
 
   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_CALL  xregRef(#{index.gen_cpp(symtab, 0, indent_spaces:)})"
-      else
-        if var.type(symtab).integral?
+      if var.type(symtab).integral?
+        if index.constexpr?(symtab)
           "#{' '*indent}extract<#{index.gen_cpp(symtab, 0)}, 1, #{var.type(symtab).width}>(#{var.gen_cpp(symtab, 0, indent_spaces:)})"
+        else
+          "#{' '*indent}extract( #{var.gen_cpp(symtab, 0, indent_spaces:)}, #{index.gen_cpp(symtab, 0)}, 1)"
+        end
+      else
+        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_CALL  xregRef(#{index.gen_cpp(symtab, 0, indent_spaces:)})"
         else
           "#{' '*indent}#{var.gen_cpp(symtab, 0, indent_spaces:)}[#{index.gen_cpp(symtab, 0, indent_spaces:)}]"
         end

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 -%>

backends/cpp_hart_gen/templates/inst.hxx.erb

@@ -78,11 +78,12 @@ namespace udb {
 #define __UDB_PC m_parent->pc()
 #define __UDB_MUTABLE_GLOBAL(x) m_parent->x
 #define __UDB_CONSTEXPR_FUNC_CALL <%= name_of(:hart, cfg_arch)%>::
+#define __UDB_CONST_GLOBAL(F) <%= name_of(:hart, cfg_arch)%>:: F
 
     void execute() override {
 
       <%- if inst.operation_ast(cfg_arch.symtab).nil? -%>
-        m_parent->udb_assert(false, "There is no operation() defined for this instruction");
+        m_parent->assert(false, "There is no operation() defined for this instruction");
       <%- else -%>
       <%- if !inst.base.nil? -%>
         <%- pruned_ast = inst.pruned_operation_ast(cfg_arch.symtab, inst.base) -%>
@@ -115,6 +116,7 @@ namespace udb {
 #undef __UDB_PC
 #undef __UDB_CONSTEXPR_FUNC_CALL
 #undef __UDB_SET_PC
+#undef __UDB_CONST_GLOBAL
 
 
   private: