From 5d481eb79db9a82753bc869d790908f010ac8a68 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Mon, 30 May 2022 22:04:16 +0200
Subject: [PATCH] fix generation of non-exception code

---
 gen_input/templates/interp/CORENAME.cpp.gtl | 34 +++++++++------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/gen_input/templates/interp/CORENAME.cpp.gtl b/gen_input/templates/interp/CORENAME.cpp.gtl
index 6041e9b..56dc1a1 100644
--- a/gen_input/templates/interp/CORENAME.cpp.gtl
+++ b/gen_input/templates/interp/CORENAME.cpp.gtl
@@ -301,25 +301,21 @@ typename vm_base<ARCH>::virt_addr_t vm_impl<ARCH>::execute_inst(finish_cond_e co
             if(this->sync_exec && PRE_SYNC) this->do_sync(PRE_SYNC, static_cast<unsigned>(inst_id));
             switch(inst_id){<%instructions.eachWithIndex{instr, idx -> %>
             case arch::traits<ARCH>::opcode_e::${instr.name}: {
-		        <%instr.fields.eachLine{%>${it}
-		        <%}%>if(this->disass_enabled){
-		            /* generate console output when executing the command */
-		            <%instr.disass.eachLine{%>${it}
-		            <%}%>
-		        }
-		        // used registers<%instr.usedVariables.each{ k,v->
-		        if(v.isArray) {%>
-		        auto* ${k} = reinterpret_cast<uint${nativeTypeSize(v.type.size)}_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::${k}0]);<% }else{ %> 
-		        auto* ${k} = reinterpret_cast<uint${nativeTypeSize(v.type.size)}_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::${k}]);
-		        <%}}%>// calculate next pc value
-		        *NEXT_PC = *PC + ${instr.length/8};
-		        // execute instruction
-                try {
-                <%instr.behavior.eachLine{%>${it}
-		        <%}%>
-		        } catch(...){}
-		        TRAP_${instr.name}:break;
-	    	}// @suppress("No break at end of case")<%}%>
+                <%instr.fields.eachLine{%>${it}
+                <%}%>if(this->disass_enabled){
+                    /* generate console output when executing the command */<%instr.disass.eachLine{%>
+                    ${it}<%}%>
+                }
+                // used registers<%instr.usedVariables.each{ k,v->
+                if(v.isArray) {%>
+                auto* ${k} = reinterpret_cast<uint${nativeTypeSize(v.type.size)}_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::${k}0]);<% }else{ %> 
+                auto* ${k} = reinterpret_cast<uint${nativeTypeSize(v.type.size)}_t*>(this->regs_base_ptr+arch::traits<ARCH>::reg_byte_offsets[arch::traits<ARCH>::${k}]);
+                <%}}%>// calculate next pc value
+                *NEXT_PC = *PC + ${instr.length/8};
+                // execute instruction<%instr.behavior.eachLine{%>
+                ${it}<%}%>
+                TRAP_${instr.name}:break;
+            }// @suppress("No break at end of case")<%}%>
             default: {
                 *NEXT_PC = *PC + ((instr & 3) == 3 ? 4 : 2);
                 raise(0,  2);