small fix for imm and const expr

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

Author: lquinn2015

backends/cpp_hart_gen/lib/gen_cpp.rb

@@ -301,6 +301,8 @@ def gen_cpp(symtab, indent = 0, indent_spaces: 2)
         else
           "#{' ' * indent}__UDB_MUTABLE_GLOBAL(#{text_value})"
         end
+      elsif text_value == "imm"
+          "#{' ' * indent} imm()"
       else
         "#{' ' * indent}#{text_value}"
       end

backends/cpp_hart_gen/templates/inst.hxx.erb

@@ -77,13 +77,12 @@ namespace udb {
 #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
-
+#define __UDB_CONSTEXPR_FUNC_CALL <%= name_of(:hart, cfg_arch)%>::
 
     void execute() override {
 
       <%- if inst.operation_ast(cfg_arch.symtab).nil? -%>
-      assert(!"There is no operation() defined for this instruction");
+        m_parent->udb_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) -%>