gdb: Convert language la_value_print field to a method

[deliverable/binutils-gdb.git] / sim / frv / sem.c

diff --git a/sim/frv/sem.c b/sim/frv/sem.c
index a7a764c8e6e7dd15803c9b658ac7162e0ef142eb..b19d3088c4dd65ff8e41ff9316e65c99558401d4 100644 (file)
--- a/sim/frv/sem.c
+++ b/sim/frv/sem.c
@@ -2,23 +2,22 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2005 Free Software Foundation, Inc.
+Copyright 1996-2020 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This file is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   It is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
 
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -30,19 +29,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "cgen-ops.h"
 
 #undef GET_ATTR
-#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
 #define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_##attr)
-#else
-#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_/**/attr)
-#endif
 
 /* This is used so that we can compile two copies of the semantic code,
    one with full feature support and one without that runs fast(er).
    FAST_P, when desired, is defined on the command line, -DFAST_P=1.  */
 #if FAST_P
 #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_semf_,fn)
-#undef TRACE_RESULT
-#define TRACE_RESULT(cpu, abuf, name, type, val)
+#undef CGEN_TRACE_RESULT
+#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val)
 #else
 #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_sem_,fn)
 #endif
@@ -52,7 +47,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 static SEM_PC
 SEM_FN_NAME (frvbf,x_invalid) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -79,7 +74,7 @@ SEM_FN_NAME (frvbf,x_invalid) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,x_after) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -100,7 +95,7 @@ SEM_FN_NAME (frvbf,x_after) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,x_before) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -121,7 +116,7 @@ SEM_FN_NAME (frvbf,x_before) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,x_cti_chain) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -151,7 +146,7 @@ SEM_FN_NAME (frvbf,x_cti_chain) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,x_chain) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -175,7 +170,7 @@ SEM_FN_NAME (frvbf,x_chain) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,x_begin) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -215,7 +210,7 @@ SEM_FN_NAME (frvbf,add) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -236,7 +231,7 @@ SEM_FN_NAME (frvbf,sub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = SUBSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -257,7 +252,7 @@ SEM_FN_NAME (frvbf,and) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = ANDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -278,7 +273,7 @@ SEM_FN_NAME (frvbf,or) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = ORSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -299,7 +294,7 @@ SEM_FN_NAME (frvbf,xor) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = XORSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -320,7 +315,7 @@ SEM_FN_NAME (frvbf,not) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = INVSI (GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -421,7 +416,7 @@ SEM_FN_NAME (frvbf,smul) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DI opval = MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
 
   return vpc;
@@ -442,7 +437,7 @@ SEM_FN_NAME (frvbf,umul) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DI opval = MULDI (ZEXTSIDI (GET_H_GR (FLD (f_GRi))), ZEXTSIDI (GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
 
   return vpc;
@@ -463,7 +458,7 @@ SEM_FN_NAME (frvbf,smu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DI opval = MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_di_write (current_cpu, frvbf_h_iacc0_set, ((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval);
   }
 
   return vpc;
@@ -482,9 +477,9 @@ SEM_FN_NAME (frvbf,smass) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    DI opval = (ANDIF (ANDIF (GTDI (MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))), 0), GTDI (GET_H_IACC0 (((UINT) 0)), 0)), LTDI (SUBDI (9223372036854775807, MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))), GET_H_IACC0 (((UINT) 0))))) ? (MAKEDI (2147483647, 0xffffffff)) : (ANDIF (ANDIF (LTDI (MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))), 0), LTDI (GET_H_IACC0 (((UINT) 0)), 0)), GTDI (SUBDI (9223372036854775808, MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))), GET_H_IACC0 (((UINT) 0))))) ? (MAKEDI (0x80000000, 0)) : (ADDDI (GET_H_IACC0 (((UINT) 0)), MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))));
+    DI opval = (ANDIF (ANDIF (GTDI (MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))), 0), GTDI (GET_H_IACC0 (((UINT) 0)), 0)), LTDI (SUBDI (MAKEDI (2147483647, 0xffffffff), MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))), GET_H_IACC0 (((UINT) 0))))) ? (MAKEDI (2147483647, 0xffffffff)) : (ANDIF (ANDIF (LTDI (MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))), 0), LTDI (GET_H_IACC0 (((UINT) 0)), 0)), GTDI (SUBDI (MAKEDI (0x80000000, 0), MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))), GET_H_IACC0 (((UINT) 0))))) ? (MAKEDI (0x80000000, 0)) : (ADDDI (GET_H_IACC0 (((UINT) 0)), MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))));
     sim_queue_fn_di_write (current_cpu, frvbf_h_iacc0_set, ((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval);
   }
 
   return vpc;
@@ -503,9 +498,9 @@ SEM_FN_NAME (frvbf,smsss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    DI opval = (ANDIF (ANDIF (LTDI (MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))), 0), GTDI (GET_H_IACC0 (((UINT) 0)), 0)), LTDI (ADDDI (9223372036854775807, MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))), GET_H_IACC0 (((UINT) 0))))) ? (MAKEDI (2147483647, 0xffffffff)) : (ANDIF (ANDIF (GTDI (MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))), 0), LTDI (GET_H_IACC0 (((UINT) 0)), 0)), GTDI (ADDDI (9223372036854775808, MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))), GET_H_IACC0 (((UINT) 0))))) ? (MAKEDI (0x80000000, 0)) : (SUBDI (GET_H_IACC0 (((UINT) 0)), MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))));
+    DI opval = (ANDIF (ANDIF (LTDI (MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))), 0), GTDI (GET_H_IACC0 (((UINT) 0)), 0)), LTDI (ADDDI (MAKEDI (2147483647, 0xffffffff), MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))), GET_H_IACC0 (((UINT) 0))))) ? (MAKEDI (2147483647, 0xffffffff)) : (ANDIF (ANDIF (GTDI (MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj)))), 0), LTDI (GET_H_IACC0 (((UINT) 0)), 0)), GTDI (ADDDI (MAKEDI (0x80000000, 0), MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))), GET_H_IACC0 (((UINT) 0))))) ? (MAKEDI (0x80000000, 0)) : (SUBDI (GET_H_IACC0 (((UINT) 0)), MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))))));
     sim_queue_fn_di_write (current_cpu, frvbf_h_iacc0_set, ((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval);
   }
 
   return vpc;
@@ -526,7 +521,7 @@ SEM_FN_NAME (frvbf,sll) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = SLLSI (GET_H_GR (FLD (f_GRi)), ANDSI (GET_H_GR (FLD (f_GRj)), 31));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -547,7 +542,7 @@ SEM_FN_NAME (frvbf,srl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = SRLSI (GET_H_GR (FLD (f_GRi)), ANDSI (GET_H_GR (FLD (f_GRj)), 31));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -568,7 +563,7 @@ SEM_FN_NAME (frvbf,sra) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = SRASI (GET_H_GR (FLD (f_GRi)), ANDSI (GET_H_GR (FLD (f_GRj)), 31));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -589,7 +584,7 @@ SEM_FN_NAME (frvbf,slass) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_shift_left_arith_saturate (current_cpu, GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -610,7 +605,7 @@ SEM_FN_NAME (frvbf,scutss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_iacc_cut (current_cpu, GET_H_IACC0 (((UINT) 0)), GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -636,7 +631,7 @@ SEM_FN_NAME (frvbf,scan) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_scan_result (current_cpu, XORSI (tmp_tmp1, tmp_tmp2));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -660,7 +655,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -685,7 +680,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = SUBSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -710,7 +705,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = ANDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -735,7 +730,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = ORSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -760,7 +755,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = XORSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -785,7 +780,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = INVSI (GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -810,7 +805,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     DI opval = MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
 }
 
@@ -881,7 +876,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = SLLSI (GET_H_GR (FLD (f_GRi)), ANDSI (GET_H_GR (FLD (f_GRj)), 31));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -906,7 +901,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = SRLSI (GET_H_GR (FLD (f_GRi)), ANDSI (GET_H_GR (FLD (f_GRj)), 31));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -931,7 +926,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = SRASI (GET_H_GR (FLD (f_GRi)), ANDSI (GET_H_GR (FLD (f_GRj)), 31));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -961,7 +956,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_scan_result (current_cpu, XORSI (tmp_tmp1, tmp_tmp2));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -1012,12 +1007,12 @@ if (LTSI (tmp_result, 0)) {
   {
     SI opval = tmp_result;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -1066,12 +1061,12 @@ if (LTSI (tmp_result, 0)) {
   {
     SI opval = tmp_result;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -1096,14 +1091,14 @@ SEM_FN_NAME (frvbf,andcc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   {
     UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 7), 4);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
 if (LTSI (tmp_tmp, 0)) {
@@ -1111,14 +1106,14 @@ if (LTSI (tmp_tmp, 0)) {
     UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 11), 8);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
   {
     UQI opval = ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 3);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -1146,14 +1141,14 @@ SEM_FN_NAME (frvbf,orcc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   {
     UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 7), 4);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
 if (LTSI (tmp_tmp, 0)) {
@@ -1161,14 +1156,14 @@ if (LTSI (tmp_tmp, 0)) {
     UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 11), 8);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
   {
     UQI opval = ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 3);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -1196,14 +1191,14 @@ SEM_FN_NAME (frvbf,xorcc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   {
     UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 7), 4);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
 if (LTSI (tmp_tmp, 0)) {
@@ -1211,14 +1206,14 @@ if (LTSI (tmp_tmp, 0)) {
     UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 11), 8);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
   {
     UQI opval = ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 3);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -1250,7 +1245,7 @@ SEM_FN_NAME (frvbf,sllcc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4);
@@ -1264,7 +1259,7 @@ if (LTSI (tmp_tmp, 0)) {
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -1293,7 +1288,7 @@ SEM_FN_NAME (frvbf,srlcc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4);
@@ -1307,7 +1302,7 @@ if (LTSI (tmp_tmp, 0)) {
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -1336,7 +1331,7 @@ SEM_FN_NAME (frvbf,sracc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4);
@@ -1350,7 +1345,7 @@ if (LTSI (tmp_tmp, 0)) {
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -1387,12 +1382,12 @@ if (EQBI (EQDI (tmp_tmp, 0), 0)) {
   {
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -1429,12 +1424,12 @@ if (EQBI (EQDI (tmp_tmp, 0), 0)) {
   {
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -1458,7 +1453,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   BI tmp_tmp;
   QI tmp_cc;
   SI tmp_result;
-  tmp_cc = CPU (h_iccr[((FLD (f_CCi)) & (3))]);
+  tmp_cc = CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]);
   tmp_tmp = ADDOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), 0);
 if (EQBI (tmp_tmp, 0)) {
   tmp_cc = ANDQI (tmp_cc, 13);
@@ -1485,13 +1480,13 @@ if (LTSI (tmp_result, 0)) {
     SI opval = tmp_result;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     UQI opval = tmp_cc;
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -1517,7 +1512,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   BI tmp_tmp;
   QI tmp_cc;
   SI tmp_result;
-  tmp_cc = CPU (h_iccr[((FLD (f_CCi)) & (3))]);
+  tmp_cc = CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]);
   tmp_tmp = SUBOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), 0);
 if (EQBI (tmp_tmp, 0)) {
   tmp_cc = ANDQI (tmp_cc, 13);
@@ -1544,13 +1539,13 @@ if (LTSI (tmp_result, 0)) {
     SI opval = tmp_result;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     UQI opval = tmp_cc;
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -1575,7 +1570,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
 {
   DI tmp_tmp;
   QI tmp_cc;
-  tmp_cc = CPU (h_iccr[((FLD (f_CCi)) & (3))]);
+  tmp_cc = CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]);
   tmp_tmp = MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))));
 if (EQDI (SRLDI (tmp_tmp, 63), 0)) {
   tmp_cc = ANDQI (tmp_cc, 7);
@@ -1591,13 +1586,13 @@ if (EQBI (EQDI (tmp_tmp, 0), 0)) {
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
   {
     UQI opval = tmp_cc;
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -1626,29 +1621,29 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   {
-    UQI opval = ORQI (ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 7), 4);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 7), 4);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
 if (LTSI (tmp_tmp, 0)) {
   {
-    UQI opval = ORQI (ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 11), 8);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 11), 8);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
   {
-    UQI opval = ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 3);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 3);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -1679,29 +1674,29 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   {
-    UQI opval = ORQI (ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 7), 4);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 7), 4);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
 if (LTSI (tmp_tmp, 0)) {
   {
-    UQI opval = ORQI (ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 11), 8);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 11), 8);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
   {
-    UQI opval = ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 3);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 3);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -1732,29 +1727,29 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   {
-    UQI opval = ORQI (ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 7), 4);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 7), 4);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
 if (LTSI (tmp_tmp, 0)) {
   {
-    UQI opval = ORQI (ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 11), 8);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 11), 8);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
   {
-    UQI opval = ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 3);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 3);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -1783,13 +1778,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   SI tmp_tmp;
   QI tmp_cc;
   tmp_shift = ANDSI (GET_H_GR (FLD (f_GRj)), 31);
-  tmp_cc = frvbf_set_icc_for_shift_left (current_cpu, GET_H_GR (FLD (f_GRi)), tmp_shift, CPU (h_iccr[((FLD (f_CCi)) & (3))]));
+  tmp_cc = frvbf_set_icc_for_shift_left (current_cpu, GET_H_GR (FLD (f_GRi)), tmp_shift, CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]));
   tmp_tmp = SLLSI (GET_H_GR (FLD (f_GRi)), tmp_shift);
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4);
@@ -1802,9 +1797,9 @@ if (LTSI (tmp_tmp, 0)) {
 }
   {
     UQI opval = tmp_cc;
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -1831,13 +1826,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   SI tmp_tmp;
   QI tmp_cc;
   tmp_shift = ANDSI (GET_H_GR (FLD (f_GRj)), 31);
-  tmp_cc = frvbf_set_icc_for_shift_right (current_cpu, GET_H_GR (FLD (f_GRi)), tmp_shift, CPU (h_iccr[((FLD (f_CCi)) & (3))]));
+  tmp_cc = frvbf_set_icc_for_shift_right (current_cpu, GET_H_GR (FLD (f_GRi)), tmp_shift, CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]));
   tmp_tmp = SRLSI (GET_H_GR (FLD (f_GRi)), tmp_shift);
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4);
@@ -1850,9 +1845,9 @@ if (LTSI (tmp_tmp, 0)) {
 }
   {
     UQI opval = tmp_cc;
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -1879,13 +1874,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   SI tmp_tmp;
   QI tmp_cc;
   tmp_shift = ANDSI (GET_H_GR (FLD (f_GRj)), 31);
-  tmp_cc = frvbf_set_icc_for_shift_right (current_cpu, GET_H_GR (FLD (f_GRi)), tmp_shift, CPU (h_iccr[((FLD (f_CCi)) & (3))]));
+  tmp_cc = frvbf_set_icc_for_shift_right (current_cpu, GET_H_GR (FLD (f_GRi)), tmp_shift, CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]));
   tmp_tmp = SRASI (GET_H_GR (FLD (f_GRi)), tmp_shift);
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4);
@@ -1898,9 +1893,9 @@ if (LTSI (tmp_tmp, 0)) {
 }
   {
     UQI opval = tmp_cc;
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -1924,7 +1919,7 @@ SEM_FN_NAME (frvbf,addx) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = ADDCSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 1)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -1945,7 +1940,7 @@ SEM_FN_NAME (frvbf,subx) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = SUBCSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 1)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -1968,12 +1963,12 @@ SEM_FN_NAME (frvbf,addxcc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   QI tmp_cc;
   tmp_cc = CPU (h_iccr[FLD (f_ICCi_1)]);
   tmp_tmp = ADDCSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1)));
-if (EQSI (ADDOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (ADDOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 13);
 } else {
   tmp_cc = ORQI (tmp_cc, 2);
 }
-if (EQSI (ADDCFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (ADDCFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 14);
 } else {
   tmp_cc = ORQI (tmp_cc, 1);
@@ -1990,12 +1985,12 @@ if (LTSI (tmp_tmp, 0)) {
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -2019,12 +2014,12 @@ SEM_FN_NAME (frvbf,subxcc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   QI tmp_cc;
   tmp_cc = CPU (h_iccr[FLD (f_ICCi_1)]);
   tmp_tmp = SUBCSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1)));
-if (EQSI (SUBOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (SUBOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 13);
 } else {
   tmp_cc = ORQI (tmp_cc, 2);
 }
-if (EQSI (SUBCFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (SUBCFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 14);
 } else {
   tmp_cc = ORQI (tmp_cc, 1);
@@ -2041,12 +2036,12 @@ if (LTSI (tmp_tmp, 0)) {
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -2069,13 +2064,13 @@ SEM_FN_NAME (frvbf,addss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (ADDOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), 0)) {
   {
     SI opval = (GTSI (GET_H_GR (FLD (f_GRi)), 0)) ? (2147483647) : (LTSI (GET_H_GR (FLD (f_GRi)), 0)) ? (0x80000000) : (0);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -2099,13 +2094,13 @@ SEM_FN_NAME (frvbf,subss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = SUBSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (SUBOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), 0)) {
   {
     SI opval = (GTSI (GET_H_GR (FLD (f_GRi)), 0)) ? (2147483647) : (LTSI (GET_H_GR (FLD (f_GRi)), 0)) ? (0x80000000) : (0);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -2128,7 +2123,7 @@ SEM_FN_NAME (frvbf,addi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -2149,7 +2144,7 @@ SEM_FN_NAME (frvbf,subi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = SUBSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -2170,7 +2165,7 @@ SEM_FN_NAME (frvbf,andi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = ANDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -2191,7 +2186,7 @@ SEM_FN_NAME (frvbf,ori) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = ORSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -2212,7 +2207,7 @@ SEM_FN_NAME (frvbf,xori) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = XORSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -2313,7 +2308,7 @@ SEM_FN_NAME (frvbf,smuli) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DI opval = MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (FLD (f_d12)));
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
 
   return vpc;
@@ -2334,7 +2329,7 @@ SEM_FN_NAME (frvbf,umuli) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DI opval = MULDI (ZEXTSIDI (GET_H_GR (FLD (f_GRi))), ZEXTSIDI (FLD (f_d12)));
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
 
   return vpc;
@@ -2355,7 +2350,7 @@ SEM_FN_NAME (frvbf,slli) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = SLLSI (GET_H_GR (FLD (f_GRi)), ANDSI (FLD (f_d12), 31));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -2376,7 +2371,7 @@ SEM_FN_NAME (frvbf,srli) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = SRLSI (GET_H_GR (FLD (f_GRi)), ANDSI (FLD (f_d12), 31));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -2397,7 +2392,7 @@ SEM_FN_NAME (frvbf,srai) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = SRASI (GET_H_GR (FLD (f_GRi)), ANDSI (FLD (f_d12), 31));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -2423,7 +2418,7 @@ SEM_FN_NAME (frvbf,scani) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_scan_result (current_cpu, XORSI (tmp_tmp1, tmp_tmp2));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -2472,12 +2467,12 @@ if (LTSI (tmp_result, 0)) {
   {
     SI opval = tmp_result;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -2526,12 +2521,12 @@ if (LTSI (tmp_result, 0)) {
   {
     SI opval = tmp_result;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -2556,14 +2551,14 @@ SEM_FN_NAME (frvbf,andicc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   {
     UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 7), 4);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
 if (LTSI (tmp_tmp, 0)) {
@@ -2571,14 +2566,14 @@ if (LTSI (tmp_tmp, 0)) {
     UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 11), 8);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
   {
     UQI opval = ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 3);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -2606,14 +2601,14 @@ SEM_FN_NAME (frvbf,oricc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   {
     UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 7), 4);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
 if (LTSI (tmp_tmp, 0)) {
@@ -2621,14 +2616,14 @@ if (LTSI (tmp_tmp, 0)) {
     UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 11), 8);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
   {
     UQI opval = ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 3);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -2656,14 +2651,14 @@ SEM_FN_NAME (frvbf,xoricc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   {
     UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 7), 4);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
 if (LTSI (tmp_tmp, 0)) {
@@ -2671,14 +2666,14 @@ if (LTSI (tmp_tmp, 0)) {
     UQI opval = ORQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 11), 8);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
   {
     UQI opval = ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 3);
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 }
@@ -2718,12 +2713,12 @@ if (EQBI (EQDI (tmp_tmp, 0), 0)) {
   {
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -2760,12 +2755,12 @@ if (EQBI (EQDI (tmp_tmp, 0), 0)) {
   {
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -2794,7 +2789,7 @@ SEM_FN_NAME (frvbf,sllicc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4);
@@ -2808,7 +2803,7 @@ if (LTSI (tmp_tmp, 0)) {
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -2837,7 +2832,7 @@ SEM_FN_NAME (frvbf,srlicc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4);
@@ -2851,7 +2846,7 @@ if (LTSI (tmp_tmp, 0)) {
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -2880,7 +2875,7 @@ SEM_FN_NAME (frvbf,sraicc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (EQSI (tmp_tmp, 0)) {
   tmp_cc = ORQI (ANDQI (tmp_cc, 7), 4);
@@ -2894,7 +2889,7 @@ if (LTSI (tmp_tmp, 0)) {
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -2916,7 +2911,7 @@ SEM_FN_NAME (frvbf,addxi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = ADDCSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 1)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -2937,7 +2932,7 @@ SEM_FN_NAME (frvbf,subxi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = SUBCSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_1)]), 1)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -2960,12 +2955,12 @@ SEM_FN_NAME (frvbf,addxicc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   QI tmp_cc;
   tmp_cc = CPU (h_iccr[FLD (f_ICCi_1)]);
   tmp_tmp = ADDCSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1)));
-if (EQSI (ADDOFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (ADDOFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 13);
 } else {
   tmp_cc = ORQI (tmp_cc, 2);
 }
-if (EQSI (ADDCFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (ADDCFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 14);
 } else {
   tmp_cc = ORQI (tmp_cc, 1);
@@ -2982,12 +2977,12 @@ if (LTSI (tmp_tmp, 0)) {
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -3011,12 +3006,12 @@ SEM_FN_NAME (frvbf,subxicc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   QI tmp_cc;
   tmp_cc = CPU (h_iccr[FLD (f_ICCi_1)]);
   tmp_tmp = SUBCSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1)));
-if (EQSI (SUBOFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (SUBOFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 13);
 } else {
   tmp_cc = ORQI (tmp_cc, 2);
 }
-if (EQSI (SUBCFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (SUBCFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 14);
 } else {
   tmp_cc = ORQI (tmp_cc, 1);
@@ -3033,12 +3028,12 @@ if (LTSI (tmp_tmp, 0)) {
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -3082,7 +3077,7 @@ if (EQBI (EQSI (ANDSI (GET_H_GR (FLD (f_GRi)), 255), ANDSI (GET_H_GR (FLD (f_GRj
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -3112,7 +3107,7 @@ if (EQBI (ORIF (EQSI (ANDSI (GET_H_GR (FLD (f_GRi)), 0xff000000), ANDSI (GET_H_G
   {
     UQI opval = tmp_cc;
     sim_queue_qi_write (current_cpu, & CPU (h_iccr[FLD (f_ICCi_1)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 }
 
@@ -3134,7 +3129,7 @@ SEM_FN_NAME (frvbf,setlo) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UHI opval = FLD (f_u16);
     sim_queue_fn_hi_write (current_cpu, frvbf_h_gr_lo_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_lo", 'x', opval);
   }
 
   return vpc;
@@ -3155,7 +3150,7 @@ SEM_FN_NAME (frvbf,sethi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UHI opval = FLD (f_u16);
     sim_queue_fn_hi_write (current_cpu, frvbf_h_gr_hi_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_hi", 'x', opval);
   }
 
   return vpc;
@@ -3176,7 +3171,7 @@ SEM_FN_NAME (frvbf,setlos) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = FLD (f_s16);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -3197,7 +3192,7 @@ SEM_FN_NAME (frvbf,ldsb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_QI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -3218,7 +3213,7 @@ SEM_FN_NAME (frvbf,ldub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -3239,7 +3234,7 @@ SEM_FN_NAME (frvbf,ldsh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_HI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -3260,7 +3255,7 @@ SEM_FN_NAME (frvbf,lduh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -3281,7 +3276,7 @@ SEM_FN_NAME (frvbf,ld) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -3302,7 +3297,7 @@ SEM_FN_NAME (frvbf,ldbf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -3323,7 +3318,7 @@ SEM_FN_NAME (frvbf,ldhf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -3344,7 +3339,7 @@ SEM_FN_NAME (frvbf,ldf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -3365,7 +3360,7 @@ SEM_FN_NAME (frvbf,ldc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_si_write (current_cpu, & CPU (h_cpr[FLD (f_CPRk)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cpr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cpr", 'x', opval);
   }
 
   return vpc;
@@ -3391,7 +3386,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_QI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3420,7 +3415,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3449,7 +3444,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_HI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3478,7 +3473,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3507,7 +3502,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3536,7 +3531,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 }
@@ -3565,7 +3560,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 }
@@ -3594,7 +3589,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 }
@@ -3624,7 +3619,7 @@ if (NESI (FLD (f_GRk), 0)) {
     DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address);
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
 }
 }
@@ -3653,7 +3648,7 @@ SEM_FN_NAME (frvbf,lddf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address);
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 }
 }
@@ -3680,7 +3675,7 @@ SEM_FN_NAME (frvbf,lddc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address);
     sim_queue_fn_di_write (current_cpu, frvbf_h_cpr_double_set, FLD (f_CPRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "cpr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cpr_double", 'D', opval);
   }
 }
 }
@@ -3713,7 +3708,7 @@ if (NESI (FLD (f_GRk), 0)) {
     DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address);
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
 }
 }
@@ -3749,7 +3744,7 @@ if (tmp_do_op) {
     DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address);
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 }
 }
@@ -3905,7 +3900,7 @@ SEM_FN_NAME (frvbf,ldsbu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_QI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
 {
@@ -3913,7 +3908,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -3942,7 +3937,7 @@ SEM_FN_NAME (frvbf,ldubu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
 {
@@ -3950,7 +3945,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -3979,7 +3974,7 @@ SEM_FN_NAME (frvbf,ldshu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_HI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
 {
@@ -3987,7 +3982,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4016,7 +4011,7 @@ SEM_FN_NAME (frvbf,lduhu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
 {
@@ -4024,7 +4019,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4053,7 +4048,7 @@ SEM_FN_NAME (frvbf,ldu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
 {
@@ -4061,7 +4056,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4095,7 +4090,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_QI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
 {
@@ -4103,7 +4098,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4139,7 +4134,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
 {
@@ -4147,7 +4142,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4183,7 +4178,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_HI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
 {
@@ -4191,7 +4186,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4227,7 +4222,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
 {
@@ -4235,7 +4230,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4271,7 +4266,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
 {
@@ -4279,7 +4274,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4310,12 +4305,12 @@ SEM_FN_NAME (frvbf,ldbfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4341,12 +4336,12 @@ SEM_FN_NAME (frvbf,ldhfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4372,12 +4367,12 @@ SEM_FN_NAME (frvbf,ldfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4403,12 +4398,12 @@ SEM_FN_NAME (frvbf,ldcu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, tmp_address);
     sim_queue_si_write (current_cpu, & CPU (h_cpr[FLD (f_CPRk)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cpr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cpr", 'x', opval);
   }
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4439,13 +4434,13 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4479,13 +4474,13 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4519,13 +4514,13 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4557,7 +4552,7 @@ if (NESI (FLD (f_GRk), 0)) {
     DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address);
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
 }
 }
@@ -4567,7 +4562,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4603,7 +4598,7 @@ if (NESI (FLD (f_GRk), 0)) {
     DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address);
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
 }
 }
@@ -4613,7 +4608,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4645,13 +4640,13 @@ SEM_FN_NAME (frvbf,lddfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address);
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 }
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4678,13 +4673,13 @@ SEM_FN_NAME (frvbf,lddcu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address);
     sim_queue_fn_di_write (current_cpu, frvbf_h_cpr_double_set, FLD (f_CPRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "cpr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cpr_double", 'D', opval);
   }
 }
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4716,14 +4711,14 @@ if (tmp_do_op) {
     DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address);
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 }
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4758,7 +4753,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4797,7 +4792,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4831,7 +4826,7 @@ frvbf_load_quad_FRint (current_cpu, pc, tmp_address, FLD (f_FRk));
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4860,7 +4855,7 @@ frvbf_load_quad_CPR (current_cpu, pc, tmp_address, FLD (f_CPRk));
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4894,7 +4889,7 @@ frvbf_load_quad_FRint (current_cpu, pc, tmp_address, FLD (f_FRk));
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_force_update (current_cpu);
 }
@@ -4920,7 +4915,7 @@ SEM_FN_NAME (frvbf,ldsbi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_QI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -4941,7 +4936,7 @@ SEM_FN_NAME (frvbf,ldshi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_HI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -4962,7 +4957,7 @@ SEM_FN_NAME (frvbf,ldi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -4983,7 +4978,7 @@ SEM_FN_NAME (frvbf,ldubi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -5004,7 +4999,7 @@ SEM_FN_NAME (frvbf,lduhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -5025,7 +5020,7 @@ SEM_FN_NAME (frvbf,ldbfi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -5046,7 +5041,7 @@ SEM_FN_NAME (frvbf,ldhfi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -5067,7 +5062,7 @@ SEM_FN_NAME (frvbf,ldfi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -5093,7 +5088,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_QI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -5122,7 +5117,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -5151,7 +5146,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_HI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -5180,7 +5175,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -5209,7 +5204,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -5238,7 +5233,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 }
@@ -5267,7 +5262,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 }
@@ -5296,7 +5291,7 @@ if (tmp_do_op) {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 }
@@ -5326,7 +5321,7 @@ if (NESI (FLD (f_GRk), 0)) {
     DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address);
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
 }
 }
@@ -5355,7 +5350,7 @@ SEM_FN_NAME (frvbf,lddfi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address);
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 }
 }
@@ -5388,7 +5383,7 @@ if (NESI (FLD (f_GRk), 0)) {
     DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address);
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
 }
 }
@@ -5424,7 +5419,7 @@ if (tmp_do_op) {
     DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address);
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 }
 }
@@ -5786,7 +5781,7 @@ frvbf_write_mem_QI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk)));
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -5812,7 +5807,7 @@ frvbf_write_mem_HI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk)));
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -5838,7 +5833,7 @@ frvbf_write_mem_WI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk)));
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -5864,7 +5859,7 @@ frvbf_write_mem_QI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk)));
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -5890,7 +5885,7 @@ frvbf_write_mem_HI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk)));
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -5916,7 +5911,7 @@ frvbf_write_mem_SI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk)));
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -5942,7 +5937,7 @@ frvbf_write_mem_SI (current_cpu, pc, tmp_address, CPU (h_cpr[FLD (f_CPRk)]));
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -5970,7 +5965,7 @@ frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_GR_DOUBLE (FLD (f_GRk)))
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -5998,7 +5993,7 @@ frvbf_write_mem_DF (current_cpu, pc, tmp_address, GET_H_FR_DOUBLE (FLD (f_FRk)))
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -6026,7 +6021,7 @@ frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_CPR_DOUBLE (FLD (f_CPRk)
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -6054,7 +6049,7 @@ frvbf_store_quad_GR (current_cpu, pc, tmp_address, FLD (f_GRk));
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -6082,7 +6077,7 @@ frvbf_store_quad_FRint (current_cpu, pc, tmp_address, FLD (f_FRk));
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -6110,7 +6105,7 @@ frvbf_store_quad_CPR (current_cpu, pc, tmp_address, FLD (f_CPRk));
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -6134,7 +6129,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_QI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -6159,7 +6154,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -6184,7 +6179,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_HI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -6209,7 +6204,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -6234,7 +6229,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -6259,7 +6254,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 
@@ -6284,7 +6279,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 
@@ -6309,7 +6304,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 
@@ -6339,7 +6334,7 @@ if (NESI (FLD (f_GRk), 0)) {
     DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address);
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
 }
 }
@@ -6371,7 +6366,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address);
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 }
 }
@@ -6426,14 +6421,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_QI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -6463,14 +6458,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -6500,14 +6495,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_HI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -6537,14 +6532,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -6574,14 +6569,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_GRi), FLD (f_GRk))) {
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -6611,13 +6606,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_UQI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -6646,13 +6641,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_UHI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -6681,13 +6676,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frvbf_read_mem_SI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -6718,7 +6713,7 @@ if (NESI (FLD (f_GRk), 0)) {
     DI opval = frvbf_read_mem_DI (current_cpu, pc, tmp_address);
     sim_queue_fn_di_write (current_cpu, frvbf_h_gr_double_set, FLD (f_GRk), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr_double", 'D', opval);
   }
 }
 }
@@ -6727,7 +6722,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -6758,14 +6753,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     DF opval = frvbf_read_mem_DF (current_cpu, pc, tmp_address);
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 }
   {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -6798,7 +6793,7 @@ if (NESI (FLD (f_GRi), FLD (f_GRk))) {
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7018,7 +7013,7 @@ frvbf_write_mem_QI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk)));
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7048,7 +7043,7 @@ frvbf_write_mem_HI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk)));
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7078,7 +7073,7 @@ frvbf_write_mem_SI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk)));
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7108,7 +7103,7 @@ frvbf_write_mem_QI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk)));
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7138,7 +7133,7 @@ frvbf_write_mem_HI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk)));
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7168,7 +7163,7 @@ frvbf_write_mem_SI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk)));
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7200,7 +7195,7 @@ frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_GR_DOUBLE (FLD (f_GRk)))
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7232,7 +7227,7 @@ frvbf_write_mem_DF (current_cpu, pc, tmp_address, GET_H_FR_DOUBLE (FLD (f_FRk)))
     SI opval = tmp_address;
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7456,7 +7451,7 @@ frvbf_check_swap_address (current_cpu, tmp_address);
   {
     SI opval = frvbf_read_mem_WI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_write_mem_WI (current_cpu, pc, tmp_address, tmp_tmp);
 }
@@ -7485,7 +7480,7 @@ frvbf_check_swap_address (current_cpu, tmp_address);
   {
     SI opval = frvbf_read_mem_WI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_write_mem_WI (current_cpu, pc, tmp_address, tmp_tmp);
 }
@@ -7516,7 +7511,7 @@ frvbf_check_swap_address (current_cpu, tmp_address);
     SI opval = frvbf_read_mem_WI (current_cpu, pc, tmp_address);
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 frvbf_write_mem_WI (current_cpu, pc, tmp_address, tmp_tmp);
 }
@@ -7541,7 +7536,7 @@ SEM_FN_NAME (frvbf,movgf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = GET_H_GR (FLD (f_GRj));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -7562,7 +7557,7 @@ SEM_FN_NAME (frvbf,movfg) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = GET_H_FR_INT (FLD (f_FRk));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRj), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -7586,13 +7581,13 @@ if (EQSI (FLD (f_GRj), 0)) {
     SI opval = 0;
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     USI opval = 0;
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 } else {
@@ -7601,13 +7596,13 @@ if (EQSI (FLD (f_GRj), 0)) {
     SI opval = GET_H_GR (FLD (f_GRj));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = GET_H_GR (((FLD (f_GRj)) + (1)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 1));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 }
@@ -7634,13 +7629,13 @@ if (NESI (FLD (f_GRj), 0)) {
     SI opval = GET_H_FR_INT (FLD (f_FRk));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRj), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
-    USI opval = GET_H_FR_INT (((FLD (f_FRk)) + (1)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ((FLD (f_GRj)) + (1)), opval);
+    USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 1));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 1), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7667,25 +7662,25 @@ if (EQSI (FLD (f_GRj), 0)) {
     SI opval = 0;
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     USI opval = 0;
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     USI opval = 0;
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (2)), opval);
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     USI opval = 0;
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (3)), opval);
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 3), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 } else {
@@ -7694,25 +7689,25 @@ if (EQSI (FLD (f_GRj), 0)) {
     SI opval = GET_H_GR (FLD (f_GRj));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = GET_H_GR (((FLD (f_GRj)) + (1)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 1));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = GET_H_GR (((FLD (f_GRj)) + (2)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (2)), opval);
+    USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 2));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = GET_H_GR (((FLD (f_GRj)) + (3)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (3)), opval);
+    USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 3));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 3), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 }
@@ -7739,25 +7734,25 @@ if (NESI (FLD (f_GRj), 0)) {
     SI opval = GET_H_FR_INT (FLD (f_FRk));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRj), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
-    USI opval = GET_H_FR_INT (((FLD (f_FRk)) + (1)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ((FLD (f_GRj)) + (1)), opval);
+    USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 1));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
-    USI opval = GET_H_FR_INT (((FLD (f_FRk)) + (2)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ((FLD (f_GRj)) + (2)), opval);
+    USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 2));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 2), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
-    USI opval = GET_H_FR_INT (((FLD (f_FRk)) + (3)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ((FLD (f_GRj)) + (3)), opval);
+    USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 3));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 3), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7783,7 +7778,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = GET_H_GR (FLD (f_GRj));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 
@@ -7808,7 +7803,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = GET_H_FR_INT (FLD (f_FRk));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRj), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -7835,13 +7830,13 @@ if (EQSI (FLD (f_GRj), 0)) {
     SI opval = 0;
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     USI opval = 0;
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 } else {
@@ -7850,13 +7845,13 @@ if (EQSI (FLD (f_GRj), 0)) {
     SI opval = GET_H_GR (FLD (f_GRj));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = GET_H_GR (((FLD (f_GRj)) + (1)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 1));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 }
@@ -7884,13 +7879,13 @@ if (ANDIF (NESI (FLD (f_GRj), 0), EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_
     SI opval = GET_H_FR_INT (FLD (f_FRk));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRj), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
-    USI opval = GET_H_FR_INT (((FLD (f_FRk)) + (1)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ((FLD (f_GRj)) + (1)), opval);
+    USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 1));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7914,7 +7909,7 @@ SEM_FN_NAME (frvbf,movgs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     USI opval = GET_H_GR (FLD (f_GRj));
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, FLD (f_spr), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 
   return vpc;
@@ -7935,7 +7930,7 @@ SEM_FN_NAME (frvbf,movsg) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = GET_H_SPR (FLD (f_spr));
     sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, FLD (f_GRj), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -7958,7 +7953,7 @@ frvbf_model_branch (current_cpu, FLD (i_label16), FLD (f_hint));
   {
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 
@@ -8001,7 +7996,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2))) {
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8029,7 +8024,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)))) {
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8057,7 +8052,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)), XORBI
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8085,7 +8080,7 @@ if (NOTBI (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)),
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8113,7 +8108,7 @@ if (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)), TRUNC
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8141,7 +8136,7 @@ if (NOTBI (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3))
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8169,7 +8164,7 @@ if (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)), TRUNCQIBI (SRLQI
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8197,7 +8192,7 @@ if (NOTBI (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)), TRUNCQIBI
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8225,7 +8220,7 @@ if (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1))) {
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8253,7 +8248,7 @@ if (NOTBI (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)))) {
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8281,7 +8276,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3))) {
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8309,7 +8304,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)))) {
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8337,7 +8332,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1))) {
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8365,7 +8360,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1)))) {
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8391,7 +8386,7 @@ frvbf_model_branch (current_cpu, FLD (i_label16), FLD (f_hint));
   {
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 
@@ -8434,7 +8429,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), ORIF (
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8462,7 +8457,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3))) {
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8490,7 +8485,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQ
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8518,7 +8513,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQ
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8546,7 +8541,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQ
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8574,7 +8569,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQ
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8602,7 +8597,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2))) {
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8630,7 +8625,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF (
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8658,7 +8653,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1)), TRUNCQ
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8686,7 +8681,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQ
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8714,7 +8709,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1))) {
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8742,7 +8737,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF (
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8770,7 +8765,7 @@ if (TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1))) {
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8798,7 +8793,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF (
     USI opval = FLD (i_label16);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8827,7 +8822,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (EQSI (FLD (f_ccond), 0)) {
 if (NESI (tmp_tmp, 0)) {
@@ -8835,7 +8830,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -8844,7 +8839,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8872,7 +8867,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 
@@ -8915,7 +8910,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2))) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8943,7 +8938,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)))) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8971,7 +8966,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)), XORBI
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -8999,7 +8994,7 @@ if (NOTBI (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)),
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9027,7 +9022,7 @@ if (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)), TRUNC
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9055,7 +9050,7 @@ if (NOTBI (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3))
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9083,7 +9078,7 @@ if (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)), TRUNCQIBI (SRLQI
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9111,7 +9106,7 @@ if (NOTBI (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)), TRUNCQIBI
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9139,7 +9134,7 @@ if (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1))) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9167,7 +9162,7 @@ if (NOTBI (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)))) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9195,7 +9190,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3))) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9223,7 +9218,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)))) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9251,7 +9246,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1))) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9279,7 +9274,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1)))) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9305,7 +9300,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 
@@ -9348,7 +9343,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3))) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9376,7 +9371,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), ORIF (
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9404,7 +9399,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQ
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9432,7 +9427,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQ
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9460,7 +9455,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQ
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9488,7 +9483,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQ
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9516,7 +9511,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2))) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9544,7 +9539,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF (
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9572,7 +9567,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1)), TRUNCQ
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9600,7 +9595,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQ
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9628,7 +9623,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1))) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9656,7 +9651,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF (
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9684,7 +9679,7 @@ if (TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1))) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9712,7 +9707,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF (
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9741,7 +9736,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (EQSI (FLD (f_ccond), 0)) {
 if (NESI (tmp_tmp, 0)) {
@@ -9749,7 +9744,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -9758,7 +9753,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9789,7 +9784,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 ((void) 0); /*nop*/
 }
@@ -9818,7 +9813,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -9827,7 +9822,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -9836,7 +9831,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9868,7 +9863,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -9877,7 +9872,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -9886,7 +9881,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9918,7 +9913,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)), XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1))))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -9927,7 +9922,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -9936,7 +9931,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -9968,7 +9963,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (NOTBI (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)), XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1)))))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -9977,7 +9972,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -9986,7 +9981,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10018,7 +10013,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1)))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10027,7 +10022,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10036,7 +10031,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10068,7 +10063,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (NOTBI (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1))))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10077,7 +10072,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10086,7 +10081,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10118,7 +10113,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2)))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10127,7 +10122,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10136,7 +10131,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10168,7 +10163,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (NOTBI (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 4), 2))))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10177,7 +10172,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10186,7 +10181,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10218,7 +10213,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10227,7 +10222,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10236,7 +10231,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10268,7 +10263,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (NOTBI (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 1)))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10277,7 +10272,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10286,7 +10281,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10318,7 +10313,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10327,7 +10322,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10336,7 +10331,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10368,7 +10363,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 8), 3)))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10377,7 +10372,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10386,7 +10381,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10418,7 +10413,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10427,7 +10422,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10436,7 +10431,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10468,7 +10463,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_2)]), 2), 1)))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10477,7 +10472,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10486,7 +10481,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10518,7 +10513,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (EQSI (FLD (f_ccond), 0)) {
 if (NESI (tmp_tmp, 0)) {
@@ -10526,7 +10521,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10535,7 +10530,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10566,7 +10561,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 ((void) 0); /*nop*/
 }
@@ -10595,7 +10590,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10604,7 +10599,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10613,7 +10608,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10645,7 +10640,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1)), TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1))))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10654,7 +10649,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10663,7 +10658,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10695,7 +10690,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1)))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10704,7 +10699,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10713,7 +10708,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10745,7 +10740,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1)))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10754,7 +10749,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10763,7 +10758,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10795,7 +10790,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1)))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10804,7 +10799,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10813,7 +10808,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10845,7 +10840,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1)))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10854,7 +10849,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10863,7 +10858,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10895,7 +10890,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10904,7 +10899,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10913,7 +10908,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10945,7 +10940,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1)), TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1))))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -10954,7 +10949,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -10963,7 +10958,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -10995,7 +10990,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1)), TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1)))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -11004,7 +10999,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -11013,7 +11008,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -11045,7 +11040,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -11054,7 +11049,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -11063,7 +11058,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -11095,7 +11090,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -11104,7 +11099,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -11113,7 +11108,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -11145,7 +11140,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1))))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -11154,7 +11149,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -11163,7 +11158,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -11195,7 +11190,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 1))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -11204,7 +11199,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -11213,7 +11208,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -11245,7 +11240,7 @@ frvbf_model_branch (current_cpu, GET_H_SPR (((UINT) 272)), FLD (f_hint));
   {
     USI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_spr_set, ((UINT) 273), opval);
-    TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "spr", 'x', opval);
   }
 if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 8), 3)), ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 4), 2)), TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_2)]), 2), 1))))) {
 if (EQSI (FLD (f_ccond), 0)) {
@@ -11254,7 +11249,7 @@ if (NESI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 } else {
@@ -11263,7 +11258,7 @@ if (EQSI (tmp_tmp, 0)) {
     USI opval = GET_H_SPR (((UINT) 272));
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -11294,7 +11289,7 @@ frvbf_set_write_next_vliw_addr_to_LR (current_cpu, 1);
   {
     USI opval = ANDSI (ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))), 0xfffffffc);
     sim_queue_pc_write (current_cpu, opval);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 frvbf_model_branch (current_cpu, pc, 2);
 }
@@ -11321,7 +11316,7 @@ frvbf_set_write_next_vliw_addr_to_LR (current_cpu, 1);
   {
     USI opval = ANDSI (ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))), 0xfffffffc);
     sim_queue_pc_write (current_cpu, opval);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 frvbf_model_branch (current_cpu, pc, 2);
 }
@@ -11348,7 +11343,7 @@ frvbf_set_write_next_vliw_addr_to_LR (current_cpu, 1);
   {
     USI opval = ANDSI (ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)), 0xfffffffc);
     sim_queue_pc_write (current_cpu, opval);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 frvbf_model_branch (current_cpu, pc, 2);
 }
@@ -11375,7 +11370,7 @@ frvbf_set_write_next_vliw_addr_to_LR (current_cpu, 1);
   {
     USI opval = ANDSI (ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12)), 0xfffffffc);
     sim_queue_pc_write (current_cpu, opval);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 frvbf_model_branch (current_cpu, pc, 2);
 }
@@ -11400,7 +11395,7 @@ frvbf_set_write_next_vliw_addr_to_LR (current_cpu, 1);
   {
     USI opval = FLD (i_label24);
     sim_queue_pc_write (current_cpu, opval);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 frvbf_model_branch (current_cpu, pc, 2);
 }
@@ -11424,7 +11419,7 @@ SEM_FN_NAME (frvbf,rett) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     USI opval = frv_rett (current_cpu, pc, FLD (f_debug));
     sim_queue_pc_write (current_cpu, opval);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 frvbf_model_branch (current_cpu, pc, 2);
 }
@@ -11438,7 +11433,7 @@ frvbf_model_branch (current_cpu, pc, 2);
 static SEM_PC
 SEM_FN_NAME (frvbf,rei) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -11487,7 +11482,7 @@ frv_itrap (current_cpu, pc, GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
 static SEM_PC
 SEM_FN_NAME (frvbf,tno) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -12012,7 +12007,7 @@ frv_itrap (current_cpu, pc, GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
 static SEM_PC
 SEM_FN_NAME (frvbf,ftno) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -12537,7 +12532,7 @@ frv_itrap (current_cpu, pc, GET_H_GR (FLD (f_GRi)), FLD (f_d12));
 static SEM_PC
 SEM_FN_NAME (frvbf,tino) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -13062,7 +13057,7 @@ frv_itrap (current_cpu, pc, GET_H_GR (FLD (f_GRi)), FLD (f_d12));
 static SEM_PC
 SEM_FN_NAME (frvbf,ftino) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -13580,7 +13575,7 @@ frv_break (current_cpu);
 static SEM_PC
 SEM_FN_NAME (frvbf,mtrap) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -13606,7 +13601,7 @@ SEM_FN_NAME (frvbf,andcr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UQI opval = frvbf_cr_logic (current_cpu, 0, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)]));
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 
   return vpc;
@@ -13627,7 +13622,7 @@ SEM_FN_NAME (frvbf,orcr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UQI opval = frvbf_cr_logic (current_cpu, 1, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)]));
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 
   return vpc;
@@ -13648,7 +13643,7 @@ SEM_FN_NAME (frvbf,xorcr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UQI opval = frvbf_cr_logic (current_cpu, 2, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)]));
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 
   return vpc;
@@ -13669,7 +13664,7 @@ SEM_FN_NAME (frvbf,nandcr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UQI opval = frvbf_cr_logic (current_cpu, 3, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)]));
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 
   return vpc;
@@ -13690,7 +13685,7 @@ SEM_FN_NAME (frvbf,norcr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UQI opval = frvbf_cr_logic (current_cpu, 4, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)]));
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 
   return vpc;
@@ -13711,7 +13706,7 @@ SEM_FN_NAME (frvbf,andncr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UQI opval = frvbf_cr_logic (current_cpu, 5, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)]));
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 
   return vpc;
@@ -13732,7 +13727,7 @@ SEM_FN_NAME (frvbf,orncr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UQI opval = frvbf_cr_logic (current_cpu, 6, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)]));
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 
   return vpc;
@@ -13753,7 +13748,7 @@ SEM_FN_NAME (frvbf,nandncr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UQI opval = frvbf_cr_logic (current_cpu, 7, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)]));
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 
   return vpc;
@@ -13774,7 +13769,7 @@ SEM_FN_NAME (frvbf,norncr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UQI opval = frvbf_cr_logic (current_cpu, 8, CPU (h_cccr[FLD (f_CRi)]), CPU (h_cccr[FLD (f_CRj)]));
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 
   return vpc;
@@ -13795,7 +13790,7 @@ SEM_FN_NAME (frvbf,notcr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UQI opval = XORQI (CPU (h_cccr[FLD (f_CRj)]), 1);
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRk)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 
   return vpc;
@@ -13816,7 +13811,7 @@ SEM_FN_NAME (frvbf,ckra) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 
   return vpc;
@@ -13837,7 +13832,7 @@ SEM_FN_NAME (frvbf,ckno) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 
   return vpc;
@@ -13860,14 +13855,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -13892,14 +13887,14 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -13924,14 +13919,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)), XORBI
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -13956,14 +13951,14 @@ if (NOTBI (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)),
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -13988,14 +13983,14 @@ if (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)), TRUNC
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14020,14 +14015,14 @@ if (NOTBI (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3))
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14052,14 +14047,14 @@ if (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)), TRUNCQIBI (SRLQI
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14084,14 +14079,14 @@ if (NOTBI (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)), TRUNCQIBI
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14116,14 +14111,14 @@ if (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14148,14 +14143,14 @@ if (NOTBI (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14180,14 +14175,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14212,14 +14207,14 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14244,14 +14239,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 2), 1))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14276,14 +14271,14 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 2), 1)))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14306,7 +14301,7 @@ SEM_FN_NAME (frvbf,fckra) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 
   return vpc;
@@ -14327,7 +14322,7 @@ SEM_FN_NAME (frvbf,fckno) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 
   return vpc;
@@ -14350,14 +14345,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), ORIF (
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14382,14 +14377,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14414,14 +14409,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), TRUNCQ
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14446,14 +14441,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14478,14 +14473,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), TRUNCQ
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14510,14 +14505,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14542,14 +14537,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14574,14 +14569,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF (
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14606,14 +14601,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 2), 1)), TRUNCQ
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14638,14 +14633,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14670,14 +14665,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 2), 1))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14702,14 +14697,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF (
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14734,14 +14729,14 @@ if (TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 1))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14766,14 +14761,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF (
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14798,14 +14793,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14830,14 +14825,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14863,14 +14858,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -14878,7 +14873,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2))) {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14904,14 +14899,14 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -14919,7 +14914,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)))) {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14945,14 +14940,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)), XORBI
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -14960,7 +14955,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)), XORBI
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -14986,14 +14981,14 @@ if (NOTBI (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)),
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15001,7 +14996,7 @@ if (NOTBI (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 4), 2)),
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15027,14 +15022,14 @@ if (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)), TRUNC
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15042,7 +15037,7 @@ if (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)), TRUNC
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15068,14 +15063,14 @@ if (NOTBI (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3))
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15083,7 +15078,7 @@ if (NOTBI (XORBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3))
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15109,14 +15104,14 @@ if (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)), TRUNCQIBI (SRLQI
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15124,7 +15119,7 @@ if (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)), TRUNCQIBI (SRLQI
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15150,14 +15145,14 @@ if (NOTBI (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)), TRUNCQIBI
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15165,7 +15160,7 @@ if (NOTBI (ORIF (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)), TRUNCQIBI
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15191,14 +15186,14 @@ if (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15206,7 +15201,7 @@ if (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1))) {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15232,14 +15227,14 @@ if (NOTBI (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15247,7 +15242,7 @@ if (NOTBI (TRUNCQIBI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 1)))) {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15273,14 +15268,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15288,7 +15283,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3))) {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15314,14 +15309,14 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15329,7 +15324,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 8), 3)))) {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15355,14 +15350,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 2), 1))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15370,7 +15365,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 2), 1))) {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15396,14 +15391,14 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 2), 1)))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15411,7 +15406,7 @@ if (NOTBI (TRUNCQIBI (SRLQI (ANDQI (CPU (h_iccr[FLD (f_ICCi_3)]), 2), 1)))) {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_int)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15436,14 +15431,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15468,14 +15463,14 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15501,14 +15496,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), ORIF (
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15516,7 +15511,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), ORIF (
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15542,14 +15537,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15557,7 +15552,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3))) {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15583,14 +15578,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), TRUNCQ
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15598,7 +15593,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), TRUNCQ
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15624,14 +15619,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15639,7 +15634,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15665,14 +15660,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), TRUNCQ
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15680,7 +15675,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2)), TRUNCQ
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15706,14 +15701,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15721,7 +15716,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15747,14 +15742,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15762,7 +15757,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 4), 2))) {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15788,14 +15783,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF (
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15803,7 +15798,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF (
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15829,14 +15824,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 2), 1)), TRUNCQ
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15844,7 +15839,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 2), 1)), TRUNCQ
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15870,14 +15865,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15885,7 +15880,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), TRUNCQ
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15911,14 +15906,14 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 2), 1))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15926,7 +15921,7 @@ if (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 2), 1))) {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15952,14 +15947,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF (
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -15967,7 +15962,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF (
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -15993,14 +15988,14 @@ if (TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 1))) {
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -16008,7 +16003,7 @@ if (TRUNCQIBI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 1))) {
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -16034,14 +16029,14 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF (
     UQI opval = 3;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 } else {
@@ -16049,7 +16044,7 @@ if (ORIF (TRUNCQIBI (SRLQI (ANDQI (CPU (h_fccr[FLD (f_FCCi_3)]), 8), 3)), ORIF (
     UQI opval = 0;
     sim_queue_qi_write (current_cpu, & CPU (h_cccr[FLD (f_CRj_float)]), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cccr", 'x', opval);
   }
 }
 
@@ -16078,7 +16073,7 @@ frvbf_set_write_next_vliw_addr_to_LR (current_cpu, 1);
     USI opval = ANDSI (ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))), 0xfffffffc);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 frvbf_model_branch (current_cpu, pc, 2);
 }
@@ -16109,7 +16104,7 @@ frvbf_set_write_next_vliw_addr_to_LR (current_cpu, 1);
     USI opval = ANDSI (ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj))), 0xfffffffc);
     sim_queue_pc_write (current_cpu, opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 frvbf_model_branch (current_cpu, pc, 2);
 }
@@ -16239,7 +16234,7 @@ frvbf_data_cache_flush (current_cpu, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FL
 static SEM_PC
 SEM_FN_NAME (frvbf,witlb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16256,7 +16251,7 @@ SEM_FN_NAME (frvbf,witlb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,wdtlb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16273,7 +16268,7 @@ SEM_FN_NAME (frvbf,wdtlb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,itlbi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16290,7 +16285,7 @@ SEM_FN_NAME (frvbf,itlbi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,dtlbi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16375,7 +16370,7 @@ frvbf_data_cache_unlock (current_cpu, GET_H_GR (FLD (f_GRi)));
 static SEM_PC
 SEM_FN_NAME (frvbf,bar) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16392,7 +16387,7 @@ SEM_FN_NAME (frvbf,bar) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,membar) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16409,7 +16404,7 @@ SEM_FN_NAME (frvbf,membar) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,lrai) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16426,7 +16421,7 @@ SEM_FN_NAME (frvbf,lrai) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,lrad) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16443,7 +16438,7 @@ SEM_FN_NAME (frvbf,lrad) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,tlbpr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16460,7 +16455,7 @@ SEM_FN_NAME (frvbf,tlbpr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,cop1) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16477,7 +16472,7 @@ SEM_FN_NAME (frvbf,cop1) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,cop2) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16534,7 +16529,7 @@ frvbf_clear_ne_flags (current_cpu, FLD (f_FRk), 1);
 static SEM_PC
 SEM_FN_NAME (frvbf,clrga) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16551,7 +16546,7 @@ frvbf_clear_ne_flags (current_cpu, -1, 0);
 static SEM_PC
 SEM_FN_NAME (frvbf,clrfa) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16602,7 +16597,7 @@ frvbf_commit (current_cpu, FLD (f_FRk), 1);
 static SEM_PC
 SEM_FN_NAME (frvbf,commitga) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16619,7 +16614,7 @@ frvbf_commit (current_cpu, -1, 0);
 static SEM_PC
 SEM_FN_NAME (frvbf,commitfa) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -16643,9 +16638,9 @@ SEM_FN_NAME (frvbf,fitos) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), GET_H_FR_INT (FLD (f_FRj)));
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
   return vpc;
@@ -16664,9 +16659,9 @@ SEM_FN_NAME (frvbf,fstoi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
+    SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -16685,9 +16680,9 @@ SEM_FN_NAME (frvbf,fitod) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    DF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsidf (CGEN_CPU_FPU (current_cpu), GET_H_FR_INT (FLD (f_FRj)));
+    DF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsidf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 
   return vpc;
@@ -16706,9 +16701,9 @@ SEM_FN_NAME (frvbf,fdtoi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixdfsi (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRj)));
+    SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixdfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_DOUBLE (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -16728,14 +16723,14 @@ SEM_FN_NAME (frvbf,fditos) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), GET_H_FR_INT (FLD (f_FRj)));
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), GET_H_FR_INT (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -16756,14 +16751,14 @@ SEM_FN_NAME (frvbf,fdstoi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
   {
-    SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
+    SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    USI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 
@@ -16785,15 +16780,15 @@ SEM_FN_NAME (frvbf,nfditos) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
 frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), GET_H_FR_INT (FLD (f_FRj)));
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), GET_H_FR_INT (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -16815,15 +16810,15 @@ SEM_FN_NAME (frvbf,nfdstoi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
 frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
-    SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
+    SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    USI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    USI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 
@@ -16844,10 +16839,10 @@ SEM_FN_NAME (frvbf,cfitos) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), GET_H_FR_INT (FLD (f_FRj)));
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -16869,10 +16864,10 @@ SEM_FN_NAME (frvbf,cfstoi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   {
-    SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
+    SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 
@@ -16895,9 +16890,9 @@ SEM_FN_NAME (frvbf,nfitos) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
 frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), GET_H_FR_INT (FLD (f_FRj)));
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -16919,9 +16914,9 @@ SEM_FN_NAME (frvbf,nfstoi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
 frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
-    SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
+    SI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 
@@ -16943,7 +16938,7 @@ SEM_FN_NAME (frvbf,fmovs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = GET_H_FR (FLD (f_FRj));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
   return vpc;
@@ -16964,7 +16959,7 @@ SEM_FN_NAME (frvbf,fmovd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DF opval = GET_H_FR_DOUBLE (FLD (f_FRj));
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 
   return vpc;
@@ -16986,12 +16981,12 @@ SEM_FN_NAME (frvbf,fdmovs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = GET_H_FR (FLD (f_FRj));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = GET_H_FR (((FLD (f_FRj)) + (1)));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = GET_H_FR (ADDSI (FLD (f_FRj), 1));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17015,7 +17010,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SF opval = GET_H_FR (FLD (f_FRj));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17038,7 +17033,7 @@ SEM_FN_NAME (frvbf,fnegs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->negsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
   return vpc;
@@ -17059,7 +17054,7 @@ SEM_FN_NAME (frvbf,fnegd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DF opval = CGEN_CPU_FPU (current_cpu)->ops->negdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRj)));
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 
   return vpc;
@@ -17081,12 +17076,12 @@ SEM_FN_NAME (frvbf,fdnegs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->negsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->negsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->negsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17110,7 +17105,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->negsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17133,7 +17128,7 @@ SEM_FN_NAME (frvbf,fabss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->abssf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
   return vpc;
@@ -17154,7 +17149,7 @@ SEM_FN_NAME (frvbf,fabsd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DF opval = CGEN_CPU_FPU (current_cpu)->ops->absdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRj)));
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 
   return vpc;
@@ -17176,12 +17171,12 @@ SEM_FN_NAME (frvbf,fdabss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->abssf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->abssf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->abssf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17205,7 +17200,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->abssf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17228,7 +17223,7 @@ SEM_FN_NAME (frvbf,fsqrts) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
   return vpc;
@@ -17250,12 +17245,12 @@ SEM_FN_NAME (frvbf,fdsqrts) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17279,13 +17274,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17307,7 +17302,7 @@ SEM_FN_NAME (frvbf,fsqrtd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRj)));
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 
   return vpc;
@@ -17330,7 +17325,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17355,7 +17350,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17377,7 +17372,7 @@ SEM_FN_NAME (frvbf,fadds) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
   return vpc;
@@ -17398,7 +17393,7 @@ SEM_FN_NAME (frvbf,fsubs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
   return vpc;
@@ -17419,7 +17414,7 @@ SEM_FN_NAME (frvbf,fmuls) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
   return vpc;
@@ -17440,7 +17435,7 @@ SEM_FN_NAME (frvbf,fdivs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
   return vpc;
@@ -17461,7 +17456,7 @@ SEM_FN_NAME (frvbf,faddd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DF opval = CGEN_CPU_FPU (current_cpu)->ops->adddf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj)));
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 
   return vpc;
@@ -17482,7 +17477,7 @@ SEM_FN_NAME (frvbf,fsubd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DF opval = CGEN_CPU_FPU (current_cpu)->ops->subdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj)));
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 
   return vpc;
@@ -17503,7 +17498,7 @@ SEM_FN_NAME (frvbf,fmuld) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DF opval = CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj)));
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 
   return vpc;
@@ -17524,7 +17519,7 @@ SEM_FN_NAME (frvbf,fdivd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DF opval = CGEN_CPU_FPU (current_cpu)->ops->divdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj)));
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 
   return vpc;
@@ -17547,7 +17542,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17572,7 +17567,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17597,7 +17592,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17622,7 +17617,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17647,7 +17642,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17671,7 +17666,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17695,7 +17690,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17719,7 +17714,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -17743,7 +17738,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
@@ -17751,7 +17746,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR
     UQI opval = 8;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
@@ -17759,14 +17754,14 @@ if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR
     UQI opval = 4;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 }
 }
@@ -17793,7 +17788,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->gtdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (CGEN_CPU_FPU (current_cpu)->ops->eqdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj)))) {
@@ -17801,7 +17796,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->eqdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_
     UQI opval = 8;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (CGEN_CPU_FPU (current_cpu)->ops->ltdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj)))) {
@@ -17809,14 +17804,14 @@ if (CGEN_CPU_FPU (current_cpu)->ops->ltdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_
     UQI opval = 4;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 }
 }
@@ -17844,7 +17839,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
@@ -17852,7 +17847,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR
     UQI opval = 8;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
@@ -17860,14 +17855,14 @@ if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR
     UQI opval = 4;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 }
 }
@@ -17896,7 +17891,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
@@ -17904,7 +17899,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR
     UQI opval = 8;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
@@ -17912,47 +17907,47 @@ if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR
     UQI opval = 4;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 }
 }
 }
-if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) {
   {
     UQI opval = 2;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
-if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) {
   {
     UQI opval = 8;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
-if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) {
   {
     UQI opval = 4;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 }
 }
@@ -17978,7 +17973,7 @@ SEM_FN_NAME (frvbf,fmadds) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
   return vpc;
@@ -17999,7 +17994,7 @@ SEM_FN_NAME (frvbf,fmsubs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
   return vpc;
@@ -18020,7 +18015,7 @@ SEM_FN_NAME (frvbf,fmaddd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DF opval = CGEN_CPU_FPU (current_cpu)->ops->adddf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj))), GET_H_FR_DOUBLE (FLD (f_FRk)));
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 
   return vpc;
@@ -18041,7 +18036,7 @@ SEM_FN_NAME (frvbf,fmsubd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DF opval = CGEN_CPU_FPU (current_cpu)->ops->subdf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj))), GET_H_FR_DOUBLE (FLD (f_FRk)));
     sim_queue_fn_df_write (current_cpu, frvbf_h_fr_double_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_double", 'f', opval);
   }
 
   return vpc;
@@ -18063,12 +18058,12 @@ SEM_FN_NAME (frvbf,fdmadds) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1)))), GET_H_FR (((FLD (f_FRk)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))), GET_H_FR (ADDSI (FLD (f_FRk), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18092,13 +18087,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1)))), GET_H_FR (((FLD (f_FRk)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))), GET_H_FR (ADDSI (FLD (f_FRk), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18122,7 +18117,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18147,7 +18142,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18172,7 +18167,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18196,7 +18191,7 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj))), GET_H_FR (FLD (f_FRk)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18219,12 +18214,12 @@ SEM_FN_NAME (frvbf,fmas) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18247,12 +18242,12 @@ SEM_FN_NAME (frvbf,fmss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18275,22 +18270,22 @@ SEM_FN_NAME (frvbf,fdmas) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (2))), GET_H_FR (((FLD (f_FRj)) + (2))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (2)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 2)), GET_H_FR (ADDSI (FLD (f_FRj), 2)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 2), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (3))), GET_H_FR (((FLD (f_FRj)) + (3))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (3)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 3)), GET_H_FR (ADDSI (FLD (f_FRj), 3)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 3), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18313,22 +18308,22 @@ SEM_FN_NAME (frvbf,fdmss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (2))), GET_H_FR (((FLD (f_FRj)) + (2))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (2)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 2)), GET_H_FR (ADDSI (FLD (f_FRj), 2)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 2), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (3))), GET_H_FR (((FLD (f_FRj)) + (3))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (3)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 3)), GET_H_FR (ADDSI (FLD (f_FRj), 3)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 3), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18355,22 +18350,22 @@ frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 3));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (2))), GET_H_FR (((FLD (f_FRj)) + (2))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (2)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 2)), GET_H_FR (ADDSI (FLD (f_FRj), 2)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 2), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (3))), GET_H_FR (((FLD (f_FRj)) + (3))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (3)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 3)), GET_H_FR (ADDSI (FLD (f_FRj), 3)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 3), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18397,22 +18392,22 @@ frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 3));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (2))), GET_H_FR (((FLD (f_FRj)) + (2))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (2)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 2)), GET_H_FR (ADDSI (FLD (f_FRj), 2)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 2), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (3))), GET_H_FR (((FLD (f_FRj)) + (3))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (3)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 3)), GET_H_FR (ADDSI (FLD (f_FRj), 3)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 3), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18437,13 +18432,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 }
@@ -18470,13 +18465,13 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 }
@@ -18499,14 +18494,14 @@ SEM_FN_NAME (frvbf,fmad) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)))));
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRi))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRj)))));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->adddf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1)))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, CGEN_CPU_FPU (current_cpu)->ops->adddf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (ADDSI (FLD (f_FRi), 1))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (ADDSI (FLD (f_FRj), 1)))));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18527,14 +18522,14 @@ SEM_FN_NAME (frvbf,fmsd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)))));
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRi))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (FLD (f_FRj)))));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->subdf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1)))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, CGEN_CPU_FPU (current_cpu)->ops->subdf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (ADDSI (FLD (f_FRi), 1))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), FPCONV_DEFAULT, GET_H_FR (ADDSI (FLD (f_FRj), 1)))));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18558,13 +18553,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18588,13 +18583,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18617,12 +18612,12 @@ SEM_FN_NAME (frvbf,fdadds) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18645,12 +18640,12 @@ SEM_FN_NAME (frvbf,fdsubs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18673,12 +18668,12 @@ SEM_FN_NAME (frvbf,fdmuls) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18701,12 +18696,12 @@ SEM_FN_NAME (frvbf,fddivs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18729,12 +18724,12 @@ SEM_FN_NAME (frvbf,fdsads) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18755,14 +18750,14 @@ SEM_FN_NAME (frvbf,fdmulcs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (((FLD (f_FRj)) + (1))));
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (FLD (f_FRj)));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (FLD (f_FRj)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18784,15 +18779,15 @@ SEM_FN_NAME (frvbf,nfdmulcs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
 frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (((FLD (f_FRj)) + (1))));
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (FLD (f_FRj)));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (FLD (f_FRj)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18816,13 +18811,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18846,13 +18841,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18876,13 +18871,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18906,13 +18901,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18936,13 +18931,13 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
     SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
 
@@ -18968,7 +18963,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
@@ -18976,7 +18971,7 @@ if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR
     UQI opval = 8;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
@@ -18984,48 +18979,48 @@ if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR
     UQI opval = 4;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCi_2)]), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 }
 }
 }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
-if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) {
   {
     UQI opval = 2;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
-if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) {
   {
     UQI opval = 8;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
-if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) {
   {
     UQI opval = 4;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 }
 }
@@ -19051,7 +19046,7 @@ SEM_FN_NAME (frvbf,mhsetlos) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UHI opval = FLD (f_u12);
     sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 
   return vpc;
@@ -19072,7 +19067,7 @@ SEM_FN_NAME (frvbf,mhsethis) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UHI opval = FLD (f_u12);
     sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 
   return vpc;
@@ -19094,17 +19089,17 @@ SEM_FN_NAME (frvbf,mhdsets) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     UHI opval = FLD (f_u12);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = FLD (f_u12);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 
@@ -19131,7 +19126,7 @@ SEM_FN_NAME (frvbf,mhsetloh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UHI opval = tmp_tmp;
     sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 
@@ -19158,7 +19153,7 @@ SEM_FN_NAME (frvbf,mhsethih) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     UHI opval = tmp_tmp;
     sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 
@@ -19181,28 +19176,28 @@ SEM_FN_NAME (frvbf,mhdseth) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
   HI tmp_tmp;
-  tmp_tmp = GET_H_FR_HI (((FLD (f_FRk)) + (0)));
+  tmp_tmp = GET_H_FR_HI (ADDSI (FLD (f_FRk), 0));
   tmp_tmp = ANDHI (tmp_tmp, 2047);
   tmp_tmp = ORHI (tmp_tmp, SLLSI (ANDSI (FLD (f_s5), 31), 11));
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 {
   HI tmp_tmp;
-  tmp_tmp = GET_H_FR_LO (((FLD (f_FRk)) + (0)));
+  tmp_tmp = GET_H_FR_LO (ADDSI (FLD (f_FRk), 0));
   tmp_tmp = ANDHI (tmp_tmp, 2047);
   tmp_tmp = ORHI (tmp_tmp, SLLSI (ANDSI (FLD (f_s5), 31), 11));
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -19225,7 +19220,7 @@ SEM_FN_NAME (frvbf,mand) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = ANDSI (GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -19246,7 +19241,7 @@ SEM_FN_NAME (frvbf,mor) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = ORSI (GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -19267,7 +19262,7 @@ SEM_FN_NAME (frvbf,mxor) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = XORSI (GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -19290,7 +19285,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = ANDSI (GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 
@@ -19315,7 +19310,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = ORSI (GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 
@@ -19340,7 +19335,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = XORSI (GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 
@@ -19363,7 +19358,7 @@ SEM_FN_NAME (frvbf,mnot) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = INVSI (GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -19386,7 +19381,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = INVSI (GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 
@@ -19409,7 +19404,7 @@ SEM_FN_NAME (frvbf,mrotli) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = ROLSI (GET_H_FR_INT (FLD (f_FRi)), ANDSI (FLD (f_u6), 31));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -19430,7 +19425,7 @@ SEM_FN_NAME (frvbf,mrotri) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = RORSI (GET_H_FR_INT (FLD (f_FRi)), ANDSI (FLD (f_u6), 31));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -19449,9 +19444,9 @@ SEM_FN_NAME (frvbf,mwcut) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = frvbf_cut (current_cpu, GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (((FLD (f_FRi)) + (1))), GET_H_FR_INT (FLD (f_FRj)));
+    SI opval = frvbf_cut (current_cpu, GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (ADDSI (FLD (f_FRi), 1)), GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -19470,9 +19465,9 @@ SEM_FN_NAME (frvbf,mwcuti) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = frvbf_cut (current_cpu, GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (((FLD (f_FRi)) + (1))), FLD (f_u6));
+    SI opval = frvbf_cut (current_cpu, GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (ADDSI (FLD (f_FRi), 1)), FLD (f_u6));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -19493,7 +19488,7 @@ SEM_FN_NAME (frvbf,mcut) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_media_cut (current_cpu, GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -19514,7 +19509,7 @@ SEM_FN_NAME (frvbf,mcuti) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_media_cut (current_cpu, GET_H_ACC40S (FLD (f_ACC40Si)), FLD (f_s6));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -19535,7 +19530,7 @@ SEM_FN_NAME (frvbf,mcutss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_media_cut_ss (current_cpu, GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -19556,7 +19551,7 @@ SEM_FN_NAME (frvbf,mcutssi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_media_cut_ss (current_cpu, GET_H_ACC40S (FLD (f_ACC40Si)), FLD (f_s6));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -19585,13 +19580,13 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = frvbf_media_cut_ss (current_cpu, GET_H_ACC40S (FLD (f_ACC40Si)), FLD (f_s6));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = frvbf_media_cut_ss (current_cpu, GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))), FLD (f_s6));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    USI opval = frvbf_media_cut_ss (current_cpu, GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)), FLD (f_s6));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 }
@@ -19616,7 +19611,7 @@ SEM_FN_NAME (frvbf,maveh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frvbf_media_average (current_cpu, GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -19638,22 +19633,22 @@ SEM_FN_NAME (frvbf,msllhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    UHI opval = SLLHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    UHI opval = SLLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = SLLHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    UHI opval = SLLHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 
@@ -19676,22 +19671,22 @@ SEM_FN_NAME (frvbf,msrlhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    UHI opval = SRLHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    UHI opval = SRLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = SRLHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    UHI opval = SRLHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 
@@ -19714,22 +19709,22 @@ SEM_FN_NAME (frvbf,msrahi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    UHI opval = SRAHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    UHI opval = SRAHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = SRAHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    UHI opval = SRAHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 
@@ -19756,13 +19751,13 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = ROLSI (GET_H_FR_INT (FLD (f_FRi)), ANDSI (FLD (f_s6), 31));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = ROLSI (GET_H_FR_INT (((FLD (f_FRi)) + (1))), ANDSI (FLD (f_s6), 31));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    USI opval = ROLSI (GET_H_FR_INT (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_s6), 31));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 }
@@ -19790,26 +19785,26 @@ SEM_FN_NAME (frvbf,mcplhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   tmp_shift = ANDSI (FLD (f_u6), 15);
-  tmp_arg1 = SLLHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), tmp_shift);
+  tmp_arg1 = SLLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), tmp_shift);
 if (NEHI (tmp_shift, 0)) {
 {
-  tmp_arg2 = GET_H_FR_HI (((FLD (f_FRi)) + (1)));
+  tmp_arg2 = GET_H_FR_HI (ADDSI (FLD (f_FRi), 1));
   tmp_arg2 = SRLHI (SLLHI (tmp_arg2, SUBSI (15, tmp_shift)), SUBSI (15, tmp_shift));
   tmp_arg1 = ORHI (tmp_arg1, tmp_arg2);
 }
 }
   {
     UHI opval = tmp_arg1;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 
@@ -19836,14 +19831,14 @@ SEM_FN_NAME (frvbf,mcpli) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 if (NESI (tmp_shift, 0)) {
 {
   SI tmp_tmp1;
-  tmp_tmp1 = SRLSI (SLLSI (GET_H_FR_INT (((FLD (f_FRi)) + (1))), SUBSI (31, tmp_shift)), SUBSI (31, tmp_shift));
+  tmp_tmp1 = SRLSI (SLLSI (GET_H_FR_INT (ADDSI (FLD (f_FRi), 1)), SUBSI (31, tmp_shift)), SUBSI (31, tmp_shift));
   tmp_tmp = ORSI (tmp_tmp, tmp_tmp1);
 }
 }
   {
     SI opval = tmp_tmp;
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
 
@@ -19868,56 +19863,56 @@ SEM_FN_NAME (frvbf,msaths) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 if (GTHI (tmp_argihi, tmp_argjhi)) {
   {
     UHI opval = tmp_argjhi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 } else {
 if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) {
   {
     UHI opval = INVHI (tmp_argjhi);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argihi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 if (GTHI (tmp_argilo, tmp_argjlo)) {
   {
     UHI opval = tmp_argjlo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 } else {
 if (LTHI (tmp_argilo, INVHI (tmp_argjlo))) {
   {
     UHI opval = INVHI (tmp_argjlo);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argilo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -19951,113 +19946,113 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 if (GTHI (tmp_argihi, tmp_argjhi)) {
   {
     UHI opval = tmp_argjhi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 } else {
 if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) {
   {
     UHI opval = INVHI (tmp_argjhi);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argihi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 if (GTHI (tmp_argilo, tmp_argjlo)) {
   {
     UHI opval = tmp_argjlo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 } else {
 if (LTHI (tmp_argilo, INVHI (tmp_argjlo))) {
   {
     UHI opval = INVHI (tmp_argjlo);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argilo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 if (GTHI (tmp_argihi, tmp_argjhi)) {
   {
     UHI opval = tmp_argjhi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 } else {
 if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) {
   {
     UHI opval = INVHI (tmp_argjhi);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argihi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 if (GTHI (tmp_argilo, tmp_argjlo)) {
   {
     UHI opval = tmp_argjlo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 } else {
 if (LTHI (tmp_argilo, INVHI (tmp_argjlo))) {
   {
     UHI opval = INVHI (tmp_argjlo);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argilo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -20086,39 +20081,39 @@ SEM_FN_NAME (frvbf,msathu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 if (GTUHI (tmp_argihi, tmp_argjhi)) {
   {
     UHI opval = tmp_argjhi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argihi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 if (GTUHI (tmp_argilo, tmp_argjlo)) {
   {
     UHI opval = tmp_argjlo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argilo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -20148,17 +20143,17 @@ frvbf_media_cr_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 if (GTHI (tmp_argihi, tmp_argjhi)) {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (EQHI (tmp_argihi, tmp_argjhi)) {
@@ -20166,7 +20161,7 @@ if (EQHI (tmp_argihi, tmp_argjhi)) {
     UQI opval = 8;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (LTHI (tmp_argihi, tmp_argjhi)) {
@@ -20174,14 +20169,14 @@ if (LTHI (tmp_argihi, tmp_argjhi)) {
     UQI opval = 4;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 }
 }
@@ -20189,32 +20184,32 @@ if (LTHI (tmp_argihi, tmp_argjhi)) {
 if (GTHI (tmp_argilo, tmp_argjlo)) {
   {
     UQI opval = 2;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (EQHI (tmp_argilo, tmp_argjlo)) {
   {
     UQI opval = 8;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (LTHI (tmp_argilo, tmp_argjlo)) {
   {
     UQI opval = 4;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 }
 }
@@ -20247,17 +20242,17 @@ frvbf_media_cr_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 if (GTUHI (tmp_argihi, tmp_argjhi)) {
   {
     UQI opval = 2;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (EQHI (tmp_argihi, tmp_argjhi)) {
@@ -20265,7 +20260,7 @@ if (EQHI (tmp_argihi, tmp_argjhi)) {
     UQI opval = 8;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (LTUHI (tmp_argihi, tmp_argjhi)) {
@@ -20273,14 +20268,14 @@ if (LTUHI (tmp_argihi, tmp_argjhi)) {
     UQI opval = 4;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
     sim_queue_qi_write (current_cpu, & CPU (h_fccr[FLD (f_FCCk)]), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 }
 }
@@ -20288,32 +20283,32 @@ if (LTUHI (tmp_argihi, tmp_argjhi)) {
 if (GTUHI (tmp_argilo, tmp_argjlo)) {
   {
     UQI opval = 2;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (EQHI (tmp_argilo, tmp_argjlo)) {
   {
     UQI opval = 8;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
 if (LTUHI (tmp_argilo, tmp_argjlo)) {
   {
     UQI opval = 4;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 }
 }
@@ -20343,72 +20338,72 @@ SEM_FN_NAME (frvbf,mabshs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
-  tmp_arghi = GET_H_FR_HI (((FLD (f_FRj)) + (0)));
-  tmp_arglo = GET_H_FR_LO (((FLD (f_FRj)) + (0)));
-if (GTDI (ABSHI (tmp_arghi), 32767)) {
+  tmp_arghi = GET_H_FR_HI (ADDSI (FLD (f_FRj), 0));
+  tmp_arglo = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0));
+if (GTDI (ABSDI (EXTHIDI (tmp_arghi)), 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
-if (LTDI (ABSHI (tmp_arghi), -32768)) {
+if (LTDI (ABSDI (EXTHIDI (tmp_arghi)), -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
-    UHI opval = ABSHI (tmp_arghi);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = ABSDI (EXTHIDI (tmp_arghi));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
-if (GTDI (ABSHI (tmp_arglo), 32767)) {
+if (GTDI (ABSDI (EXTHIDI (tmp_arglo)), 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
-if (LTDI (ABSHI (tmp_arglo), -32768)) {
+if (LTDI (ABSDI (EXTHIDI (tmp_arglo)), -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
-    UHI opval = ABSHI (tmp_arglo);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = ABSDI (EXTHIDI (tmp_arglo));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -20436,21 +20431,21 @@ SEM_FN_NAME (frvbf,maddhss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = ADDDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -20459,32 +20454,32 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = ADDDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -20493,18 +20488,18 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -20533,21 +20528,21 @@ SEM_FN_NAME (frvbf,maddhus) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = ADDDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -20556,32 +20551,32 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = ADDDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -20590,18 +20585,18 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -20630,21 +20625,21 @@ SEM_FN_NAME (frvbf,msubhss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = SUBDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -20653,32 +20648,32 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = SUBDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -20687,18 +20682,18 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -20727,21 +20722,21 @@ SEM_FN_NAME (frvbf,msubhus) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = SUBDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -20750,32 +20745,32 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = SUBDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -20784,18 +20779,18 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -20825,21 +20820,21 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = ADDDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -20848,32 +20843,32 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = ADDDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -20882,18 +20877,18 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -20924,21 +20919,21 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = ADDDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -20947,32 +20942,32 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = ADDDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -20981,18 +20976,18 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -21023,21 +21018,21 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = SUBDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -21046,32 +21041,32 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = SUBDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -21080,18 +21075,18 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -21122,21 +21117,21 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = SUBDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -21145,32 +21140,32 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = SUBDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -21179,18 +21174,18 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -21226,24 +21221,24 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = ADDDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -21252,32 +21247,32 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = ADDDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -21286,38 +21281,38 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = ADDDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -21326,32 +21321,32 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = ADDDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -21360,18 +21355,18 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -21407,24 +21402,24 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = ADDDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -21433,32 +21428,32 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = ADDDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -21467,38 +21462,38 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = ADDDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -21507,32 +21502,32 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = ADDDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -21541,18 +21536,18 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -21588,24 +21583,24 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = SUBDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -21614,32 +21609,32 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = SUBDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -21648,38 +21643,38 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = SUBDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -21688,32 +21683,32 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = SUBDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -21722,18 +21717,18 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -21769,24 +21764,24 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = SUBDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -21795,32 +21790,32 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = SUBDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -21829,38 +21824,38 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = SUBDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -21869,32 +21864,32 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = SUBDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -21903,18 +21898,18 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -21951,24 +21946,24 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = ADDDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -21977,32 +21972,32 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = ADDDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -22011,38 +22006,38 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = ADDDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -22051,32 +22046,32 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = ADDDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -22085,18 +22080,18 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -22134,24 +22129,24 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = ADDDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -22160,32 +22155,32 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = ADDDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -22194,38 +22189,38 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = ADDDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -22234,32 +22229,32 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = ADDDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -22268,18 +22263,18 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -22317,24 +22312,24 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = SUBDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -22343,32 +22338,32 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = SUBDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -22377,38 +22372,38 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = SUBDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -22417,32 +22412,32 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = SUBDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -22451,18 +22446,18 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -22500,24 +22495,24 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = SUBDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -22526,32 +22521,32 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = SUBDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -22560,38 +22555,38 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argihi, tmp_argjhi);
+  tmp_tmp = SUBDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -22600,32 +22595,32 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBHI (tmp_argilo, tmp_argjlo);
+  tmp_tmp = SUBDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
 if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -22634,18 +22629,18 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -22686,43 +22681,43 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_a1 = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_a2 = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_b1 = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_b2 = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_a1 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_a2 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_b1 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_b2 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
-  tmp_a3 = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_a4 = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_b3 = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_b4 = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_a3 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_a4 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_b3 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_b4 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     UHI opval = (LEUHI (ABSHI (tmp_a1), ABSHI (tmp_b1))) ? (0) : (LEHI (0, tmp_b1)) ? (tmp_a1) : (EQHI (tmp_a1, -32768)) ? (32767) : (NEGHI (tmp_a1));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = (LEUHI (ABSHI (tmp_a2), ABSHI (tmp_b2))) ? (0) : (LEHI (0, tmp_b2)) ? (tmp_a2) : (EQHI (tmp_a2, -32768)) ? (32767) : (NEGHI (tmp_a2));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
     UHI opval = (LEUHI (ABSHI (tmp_a3), ABSHI (tmp_b3))) ? (0) : (LEHI (0, tmp_b3)) ? (tmp_a3) : (EQHI (tmp_a3, -32768)) ? (32767) : (NEGHI (tmp_a3));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = (LEUHI (ABSHI (tmp_a4), ABSHI (tmp_b4))) ? (0) : (LEHI (0, tmp_b4)) ? (tmp_a4) : (EQHI (tmp_a4, -32768)) ? (32767) : (NEGHI (tmp_a4));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -22759,43 +22754,43 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_a1 = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_a2 = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_b1 = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_b2 = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_a1 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_a2 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_b1 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_b2 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
-  tmp_a3 = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_a4 = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_b3 = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_b4 = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_a3 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_a4 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_b3 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_b4 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     UHI opval = (ANDIF (GTHI (tmp_b1, -32768), GEHI (tmp_a1, ABSHI (tmp_b1)))) ? (tmp_b1) : (GTHI (tmp_a1, NEGHI (ABSHI (tmp_b1)))) ? (tmp_a1) : (EQHI (tmp_b1, -32768)) ? (32767) : (NEGHI (tmp_b1));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = (ANDIF (GTHI (tmp_b2, -32768), GEHI (tmp_a2, ABSHI (tmp_b2)))) ? (tmp_b2) : (GTHI (tmp_a2, NEGHI (ABSHI (tmp_b2)))) ? (tmp_a2) : (EQHI (tmp_b2, -32768)) ? (32767) : (NEGHI (tmp_b2));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
     UHI opval = (ANDIF (GTHI (tmp_b3, -32768), GEHI (tmp_a3, ABSHI (tmp_b3)))) ? (tmp_b3) : (GTHI (tmp_a3, NEGHI (ABSHI (tmp_b3)))) ? (tmp_a3) : (EQHI (tmp_b3, -32768)) ? (32767) : (NEGHI (tmp_b3));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = (ANDIF (GTHI (tmp_b4, -32768), GEHI (tmp_a4, ABSHI (tmp_b4)))) ? (tmp_b4) : (GTHI (tmp_a4, NEGHI (ABSHI (tmp_b4)))) ? (tmp_a4) : (EQHI (tmp_b4, -32768)) ? (32767) : (NEGHI (tmp_b4));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -22824,37 +22819,37 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    UHI opval = SLLHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = SLLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = SLLHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = SLLHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = SLLHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = SLLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = SLLHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = SLLHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -22883,37 +22878,37 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    UHI opval = SRAHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = SRAHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = SRAHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = SRAHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = SRAHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = SRAHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = SRAHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = SRAHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -22941,25 +22936,25 @@ frvbf_media_acc_not_aligned (current_cpu);
 } else {
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
-if (GTDI (tmp_tmp, 549755813887)) {
+  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
+if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
-    DI opval = 549755813887;
+    DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
-if (LTDI (tmp_tmp, INVDI (549755813887))) {
+if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
-    DI opval = INVDI (549755813887);
+    DI opval = INVDI (MAKEDI (127, 0xffffffff));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -22968,7 +22963,7 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -23000,25 +22995,25 @@ frvbf_media_acc_not_aligned (current_cpu);
 } else {
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
-if (GTDI (tmp_tmp, 549755813887)) {
+  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
+if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
-    DI opval = 549755813887;
+    DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
-if (LTDI (tmp_tmp, INVDI (549755813887))) {
+if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
-    DI opval = INVDI (549755813887);
+    DI opval = INVDI (MAKEDI (127, 0xffffffff));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -23027,7 +23022,7 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -23063,25 +23058,25 @@ frvbf_media_acc_not_aligned (current_cpu);
 {
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
-if (GTDI (tmp_tmp, 549755813887)) {
+  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
+if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
-    DI opval = 549755813887;
+    DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
-if (LTDI (tmp_tmp, INVDI (549755813887))) {
+if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
-    DI opval = INVDI (549755813887);
+    DI opval = INVDI (MAKEDI (127, 0xffffffff));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -23090,41 +23085,41 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Si)) + (2))), GET_H_ACC40S (((FLD (f_ACC40Si)) + (3))));
-if (GTDI (tmp_tmp, 549755813887)) {
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 2)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 3)));
+if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
-    DI opval = 549755813887;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    DI opval = MAKEDI (127, 0xffffffff);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
-if (LTDI (tmp_tmp, INVDI (549755813887))) {
+if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
-    DI opval = INVDI (549755813887);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    DI opval = INVDI (MAKEDI (127, 0xffffffff));
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -23162,25 +23157,25 @@ frvbf_media_acc_not_aligned (current_cpu);
 {
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
-if (GTDI (tmp_tmp, 549755813887)) {
+  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
+if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
-    DI opval = 549755813887;
+    DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
-if (LTDI (tmp_tmp, INVDI (549755813887))) {
+if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
-    DI opval = INVDI (549755813887);
+    DI opval = INVDI (MAKEDI (127, 0xffffffff));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -23189,41 +23184,41 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40S (((FLD (f_ACC40Si)) + (2))), GET_H_ACC40S (((FLD (f_ACC40Si)) + (3))));
-if (GTDI (tmp_tmp, 549755813887)) {
+  tmp_tmp = SUBDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 2)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 3)));
+if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
-    DI opval = 549755813887;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    DI opval = MAKEDI (127, 0xffffffff);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
-if (LTDI (tmp_tmp, INVDI (549755813887))) {
+if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
-    DI opval = INVDI (549755813887);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    DI opval = INVDI (MAKEDI (127, 0xffffffff));
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -23261,25 +23256,25 @@ frvbf_media_acc_not_aligned (current_cpu);
 {
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
-if (GTDI (tmp_tmp, 549755813887)) {
+  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
+if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
-    DI opval = 549755813887;
+    DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
-if (LTDI (tmp_tmp, INVDI (549755813887))) {
+if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
-    DI opval = INVDI (549755813887);
+    DI opval = INVDI (MAKEDI (127, 0xffffffff));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -23288,41 +23283,41 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
-if (GTDI (tmp_tmp, 549755813887)) {
+  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
+if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
-    DI opval = 549755813887;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    DI opval = MAKEDI (127, 0xffffffff);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
-if (LTDI (tmp_tmp, INVDI (549755813887))) {
+if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
-    DI opval = INVDI (549755813887);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    DI opval = INVDI (MAKEDI (127, 0xffffffff));
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -23360,25 +23355,25 @@ frvbf_media_acc_not_aligned (current_cpu);
 {
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
-if (GTDI (tmp_tmp, 549755813887)) {
+  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
+if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
-    DI opval = 549755813887;
+    DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
 } else {
-if (LTDI (tmp_tmp, INVDI (549755813887))) {
+if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
-    DI opval = INVDI (549755813887);
+    DI opval = INVDI (MAKEDI (127, 0xffffffff));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -23387,109 +23382,109 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
-if (GTDI (tmp_tmp, 549755813887)) {
+  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
+if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
-    DI opval = 549755813887;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    DI opval = MAKEDI (127, 0xffffffff);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
-if (LTDI (tmp_tmp, INVDI (549755813887))) {
+if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
-    DI opval = INVDI (549755813887);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    DI opval = INVDI (MAKEDI (127, 0xffffffff));
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Si)) + (2))), GET_H_ACC40S (((FLD (f_ACC40Si)) + (3))));
-if (GTDI (tmp_tmp, 549755813887)) {
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 2)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 3)));
+if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
-    DI opval = 549755813887;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    DI opval = MAKEDI (127, 0xffffffff);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
-if (LTDI (tmp_tmp, INVDI (549755813887))) {
+if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
-    DI opval = INVDI (549755813887);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    DI opval = INVDI (MAKEDI (127, 0xffffffff));
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40S (((FLD (f_ACC40Si)) + (2))), GET_H_ACC40S (((FLD (f_ACC40Si)) + (3))));
-if (GTDI (tmp_tmp, 549755813887)) {
+  tmp_tmp = SUBDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 2)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 3)));
+if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
-    DI opval = 549755813887;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    DI opval = MAKEDI (127, 0xffffffff);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
-if (LTDI (tmp_tmp, INVDI (549755813887))) {
+if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
-    DI opval = INVDI (549755813887);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    DI opval = INVDI (MAKEDI (127, 0xffffffff));
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -23526,22 +23521,22 @@ frvbf_media_acc_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -23573,22 +23568,22 @@ frvbf_media_acc_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -23620,22 +23615,22 @@ frvbf_media_acc_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -23667,22 +23662,22 @@ frvbf_media_acc_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjlo));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -23715,22 +23710,22 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -23764,22 +23759,22 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -23815,40 +23810,40 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -23884,40 +23879,40 @@ frvbf_media_register_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -23953,40 +23948,40 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -24022,40 +24017,40 @@ frvbf_media_register_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjlo));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -24092,40 +24087,40 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -24163,40 +24158,40 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -24230,10 +24225,10 @@ frvbf_media_acc_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -24244,7 +24239,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
     DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -24255,7 +24250,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
     DI opval = MAKEDI (0xffffff80, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -24264,21 +24259,21 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -24287,18 +24282,18 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -24333,10 +24328,10 @@ frvbf_media_acc_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -24347,7 +24342,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
     UDI opval = MAKEDI (255, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -24358,7 +24353,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
     UDI opval = MAKEDI (0, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -24367,21 +24362,21 @@ frvbf_media_overflow (current_cpu, 8);
     UDI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (1))), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 1)), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -24390,18 +24385,18 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 }
 }
@@ -24436,10 +24431,10 @@ frvbf_media_acc_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -24450,7 +24445,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
     DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -24461,7 +24456,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
     DI opval = MAKEDI (0xffffff80, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -24470,21 +24465,21 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = SUBDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -24493,18 +24488,18 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -24539,10 +24534,10 @@ frvbf_media_acc_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -24553,7 +24548,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
     UDI opval = MAKEDI (255, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -24564,7 +24559,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
     UDI opval = MAKEDI (0, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -24573,21 +24568,21 @@ frvbf_media_overflow (current_cpu, 8);
     UDI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (1))), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
+  tmp_tmp = SUBDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 1)), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -24596,18 +24591,18 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 }
 }
@@ -24643,10 +24638,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -24657,7 +24652,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
     DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -24668,7 +24663,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
     DI opval = MAKEDI (0xffffff80, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -24677,21 +24672,21 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -24700,18 +24695,18 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -24748,10 +24743,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -24762,7 +24757,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
     UDI opval = MAKEDI (255, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -24773,7 +24768,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
     UDI opval = MAKEDI (0, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -24782,21 +24777,21 @@ frvbf_media_overflow (current_cpu, 8);
     UDI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (1))), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 1)), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -24805,18 +24800,18 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 }
 }
@@ -24855,10 +24850,10 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -24869,7 +24864,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
     DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -24880,7 +24875,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
     DI opval = MAKEDI (0xffffff80, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -24889,21 +24884,21 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -24912,38 +24907,38 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (2))), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 2)), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -24952,32 +24947,32 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (3))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 3)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -24986,18 +24981,18 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -25036,10 +25031,10 @@ frvbf_media_register_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -25050,7 +25045,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
     UDI opval = MAKEDI (255, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25061,7 +25056,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
     UDI opval = MAKEDI (0, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25070,21 +25065,21 @@ frvbf_media_overflow (current_cpu, 8);
     UDI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (1))), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 1)), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -25093,38 +25088,38 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (2))), MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 2)), MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -25133,32 +25128,32 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (3))), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 3)), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -25167,18 +25162,18 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 }
 }
@@ -25218,10 +25213,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -25232,7 +25227,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
     DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25243,7 +25238,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
     DI opval = MAKEDI (0xffffff80, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25252,21 +25247,21 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -25275,38 +25270,38 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (2))), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 2)), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -25315,32 +25310,32 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (3))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 3)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 22);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -25349,18 +25344,18 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 22);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 22);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -25401,10 +25396,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -25415,7 +25410,7 @@ if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
     UDI opval = MAKEDI (255, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25426,7 +25421,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
     UDI opval = MAKEDI (0, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25435,21 +25430,21 @@ frvbf_media_overflow (current_cpu, 8);
     UDI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, FLD (f_ACC40Uk), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (1))), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 1)), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -25458,38 +25453,38 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (2))), MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 2)), MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -25498,32 +25493,32 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (3))), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 3)), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval);
     written |= (1 << 22);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -25532,18 +25527,18 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval);
     written |= (1 << 22);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval);
     written |= (1 << 22);
-    TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
 }
 }
@@ -25583,21 +25578,21 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (2))), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 2)), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -25606,32 +25601,32 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (3))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 3)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -25640,27 +25635,27 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -25671,7 +25666,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
     DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25682,7 +25677,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
     DI opval = MAKEDI (0xffffff80, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25691,21 +25686,21 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -25714,18 +25709,18 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -25764,21 +25759,21 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (2))), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 2)), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -25787,32 +25782,32 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (3))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 3)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -25821,27 +25816,27 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -25852,7 +25847,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
     DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25863,7 +25858,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
     DI opval = MAKEDI (0xffffff80, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25872,21 +25867,21 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -25895,18 +25890,18 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -25945,10 +25940,10 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -25959,7 +25954,7 @@ if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
     DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25970,7 +25965,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
     DI opval = MAKEDI (0xffffff80, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25979,21 +25974,21 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -26002,38 +25997,38 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (2))), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 2)), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
@@ -26042,32 +26037,32 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 2);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (3))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 3)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
@@ -26076,18 +26071,18 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 1);
 }
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -26120,10 +26115,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26137,7 +26132,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) {
     DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26148,7 +26143,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) {
     DI opval = MAKEDI (0xffffff80, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26157,7 +26152,7 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp1;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -26188,10 +26183,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26205,7 +26200,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) {
     DI opval = MAKEDI (255, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26216,7 +26211,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) {
     DI opval = MAKEDI (0, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26225,7 +26220,7 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp1;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -26256,10 +26251,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26273,7 +26268,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) {
     DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26284,7 +26279,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) {
     DI opval = MAKEDI (0xffffff80, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26293,7 +26288,7 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp1;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -26324,10 +26319,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26341,7 +26336,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) {
     DI opval = MAKEDI (255, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26352,7 +26347,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) {
     DI opval = MAKEDI (0, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26361,7 +26356,7 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp1;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -26393,10 +26388,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26410,7 +26405,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) {
     DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26421,7 +26416,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) {
     DI opval = MAKEDI (0xffffff80, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26430,7 +26425,7 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp1;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -26463,10 +26458,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26480,7 +26475,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) {
     DI opval = MAKEDI (255, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26491,7 +26486,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) {
     DI opval = MAKEDI (0, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26500,7 +26495,7 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp1;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -26533,10 +26528,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26550,7 +26545,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) {
     DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26561,7 +26556,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) {
     DI opval = MAKEDI (0xffffff80, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26570,7 +26565,7 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp1;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -26603,10 +26598,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26620,7 +26615,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) {
     DI opval = MAKEDI (255, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26631,7 +26626,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) {
     DI opval = MAKEDI (0, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26640,7 +26635,7 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp1;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -26678,10 +26673,10 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26695,7 +26690,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) {
     DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26706,7 +26701,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) {
     DI opval = MAKEDI (0xffffff80, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26715,16 +26710,16 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp1;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26736,9 +26731,9 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -26747,18 +26742,18 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp1;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -26797,10 +26792,10 @@ frvbf_media_register_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26814,7 +26809,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) {
     DI opval = MAKEDI (255, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26825,7 +26820,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) {
     DI opval = MAKEDI (0, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26834,16 +26829,16 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp1;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26855,9 +26850,9 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -26866,18 +26861,18 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) {
 {
   {
     DI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp1;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -26916,10 +26911,10 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26933,7 +26928,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) {
     DI opval = MAKEDI (127, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26944,7 +26939,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) {
     DI opval = MAKEDI (0xffffff80, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26953,16 +26948,16 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp1;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26974,9 +26969,9 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -26985,18 +26980,18 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp1;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -27035,10 +27030,10 @@ frvbf_media_register_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -27052,7 +27047,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) {
     DI opval = MAKEDI (255, 0xffffffff);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -27063,7 +27058,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) {
     DI opval = MAKEDI (0, 0);
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -27072,16 +27067,16 @@ frvbf_media_overflow (current_cpu, 8);
     DI opval = tmp_tmp1;
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -27093,9 +27088,9 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
@@ -27104,18 +27099,18 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) {
 {
   {
     DI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 4);
 }
 } else {
   {
     DI opval = tmp_tmp1;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
@@ -27144,19 +27139,19 @@ SEM_FN_NAME (frvbf,mexpdhw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
   UHI tmp_tmp;
 if (ANDSI (FLD (f_u6), 1)) {
-  tmp_tmp = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
 } else {
-  tmp_tmp = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
 }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 
@@ -27179,21 +27174,21 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
 {
   UHI tmp_tmp;
 if (ANDSI (FLD (f_u6), 1)) {
-  tmp_tmp = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
 } else {
-  tmp_tmp = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
 }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -27223,36 +27218,36 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 if (ANDSI (FLD (f_u6), 1)) {
-  tmp_tmp = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
 } else {
-  tmp_tmp = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
 }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -27283,36 +27278,36 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 if (ANDSI (FLD (f_u6), 1)) {
-  tmp_tmp = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
 } else {
-  tmp_tmp = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
 }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -27336,14 +27331,14 @@ SEM_FN_NAME (frvbf,mpackh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 
@@ -27370,46 +27365,46 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 {
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRj)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -27439,38 +27434,38 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (ADDSI (0, 1))), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), ADDSI (0, 1)), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (ADDSI (0, 1))), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), ADDSI (0, 1)), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -27500,64 +27495,64 @@ frvbf_media_register_not_aligned (current_cpu);
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRi)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRi), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (ADDSI (0, 1))), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), ADDSI (0, 1)), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (ADDSI (0, 1))), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), ADDSI (0, 1)), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 {
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRi)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (2)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRi)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (2)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (ADDSI (2, 1))), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), ADDSI (2, 1)), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (ADDSI (2, 1))), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), ADDSI (2, 1)), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -27583,40 +27578,40 @@ SEM_FN_NAME (frvbf,mbtoh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 if (ANDSI (FLD (f_FRk), SUBSI (2, 1))) {
 frvbf_media_register_not_aligned (current_cpu);
 } else {
 {
   {
-    UHI opval = GET_H_FR_3 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_2 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_1 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_0 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -27642,12 +27637,12 @@ SEM_FN_NAME (frvbf,cmbtoh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 if (ANDSI (FLD (f_FRk), SUBSI (2, 1))) {
 frvbf_media_register_not_aligned (current_cpu);
@@ -27655,28 +27650,28 @@ frvbf_media_register_not_aligned (current_cpu);
 if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
 {
   {
-    UHI opval = GET_H_FR_3 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_2 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_1 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_0 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -27703,40 +27698,40 @@ SEM_FN_NAME (frvbf,mhtob) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 if (ANDSI (FLD (f_FRj), SUBSI (2, 1))) {
 frvbf_media_register_not_aligned (current_cpu);
 } else {
 {
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_3_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_3_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "fr_3", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_3", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_2_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_2_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_2", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_2", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRj)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_1_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRj), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_1_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_1", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_1", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRj)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_0_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_0_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_0", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_0", 'x', opval);
   }
 }
 }
@@ -27762,12 +27757,12 @@ SEM_FN_NAME (frvbf,cmhtob) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 if (ANDSI (FLD (f_FRj), SUBSI (2, 1))) {
 frvbf_media_register_not_aligned (current_cpu);
@@ -27775,28 +27770,28 @@ frvbf_media_register_not_aligned (current_cpu);
 if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
 {
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_3_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_3_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_3", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_3", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_2_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_2_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_2", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_2", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRj)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_1_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRj), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_1_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "fr_1", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_1", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRj)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_0_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_0_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_0", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_0", 'x', opval);
   }
 }
 }
@@ -27823,64 +27818,64 @@ SEM_FN_NAME (frvbf,mbtohe) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 if (ANDSI (FLD (f_FRk), SUBSI (4, 1))) {
 frvbf_media_register_not_aligned (current_cpu);
 } else {
 {
   {
-    UHI opval = GET_H_FR_3 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_3 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_2 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_2 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_1 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (2)), opval);
+    UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_1 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (2)), opval);
+    UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_0 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (3)), opval);
+    UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 3), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_0 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (3)), opval);
+    UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 3), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -27906,12 +27901,12 @@ SEM_FN_NAME (frvbf,cmbtohe) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRj), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     SI opval = frv_ref_SI (GET_H_FR_INT (FLD (f_FRk)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 if (ANDSI (FLD (f_FRk), SUBSI (4, 1))) {
 frvbf_media_register_not_aligned (current_cpu);
@@ -27919,52 +27914,52 @@ frvbf_media_register_not_aligned (current_cpu);
 if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
 {
   {
-    UHI opval = GET_H_FR_3 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_3 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_2 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_2 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_1 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (2)), opval);
+    UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_1 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (2)), opval);
+    UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_0 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (3)), opval);
+    UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 3), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_0 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (3)), opval);
+    UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 3), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
@@ -27981,7 +27976,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
 static SEM_PC
 SEM_FN_NAME (frvbf,mnop) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -28041,7 +28036,7 @@ SEM_FN_NAME (frvbf,mrdacc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = GET_H_ACC40S (FLD (f_ACC40Si));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -28062,7 +28057,7 @@ SEM_FN_NAME (frvbf,mrdaccg) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = GET_H_ACCG (FLD (f_ACCGi));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
-    TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 
   return vpc;
@@ -28083,7 +28078,7 @@ SEM_FN_NAME (frvbf,mwtacc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     DI opval = ORDI (ANDDI (GET_H_ACC40S (FLD (f_ACC40Sk)), MAKEDI (0xffffffff, 0)), GET_H_FR_INT (FLD (f_FRi)));
     sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, FLD (f_ACC40Sk), opval);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 
   return vpc;
@@ -28106,7 +28101,7 @@ frv_ref_SI (GET_H_ACCG (FLD (f_ACCGk)));
   {
     USI opval = GET_H_FR_INT (FLD (f_FRi));
     sim_queue_fn_si_write (current_cpu, frvbf_h_accg_set, FLD (f_ACCGk), opval);
-    TRACE_RESULT (current_cpu, abuf, "accg", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "accg", 'x', opval);
   }
 }
 
@@ -28119,7 +28114,7 @@ frv_ref_SI (GET_H_ACCG (FLD (f_ACCGk)));
 static SEM_PC
 SEM_FN_NAME (frvbf,mcop1) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -28136,7 +28131,7 @@ frvbf_media_cop (current_cpu, 1);
 static SEM_PC
 SEM_FN_NAME (frvbf,mcop2) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -28153,7 +28148,7 @@ frvbf_media_cop (current_cpu, 2);
 static SEM_PC
 SEM_FN_NAME (frvbf,fnop) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;