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 f6356c35028729422540bd29703807d4c26bb919..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, 1997, 1998, 1999, 2000, 2001, 2002, 2003 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.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, 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;
@@ -311,7 +306,7 @@ SEM_FN_NAME (frvbf,xor) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 static SEM_PC
 SEM_FN_NAME (frvbf,not) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_addcc.f
+#define FLD(f) abuf->fields.sfmt_scutss.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -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,70 @@ 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;
+#undef FLD
+}
+
+/* smu: smu$pack $GRi,$GRj */
+
+static SEM_PC
+SEM_FN_NAME (frvbf,smu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+{
+#define FLD(f) abuf->fields.sfmt_smass.f
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+  int UNUSED written = 0;
+  IADDR UNUSED pc = abuf->addr;
+  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
+
+  {
+    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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval);
+  }
+
+  return vpc;
+#undef FLD
+}
+
+/* smass: smass$pack $GRi,$GRj */
+
+static SEM_PC
+SEM_FN_NAME (frvbf,smass) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+{
+#define FLD(f) abuf->fields.sfmt_smass.f
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+  int UNUSED written = 0;
+  IADDR UNUSED pc = abuf->addr;
+  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 (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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval);
+  }
+
+  return vpc;
+#undef FLD
+}
+
+/* smsss: smsss$pack $GRi,$GRj */
+
+static SEM_PC
+SEM_FN_NAME (frvbf,smsss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+{
+#define FLD(f) abuf->fields.sfmt_smass.f
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+  int UNUSED written = 0;
+  IADDR UNUSED pc = abuf->addr;
+  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 (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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "iacc0", 'D', opval);
   }
 
   return vpc;
@@ -463,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;
@@ -484,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;
@@ -505,7 +563,49 @@ 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;
+#undef FLD
+}
+
+/* slass: slass$pack $GRi,$GRj,$GRk */
+
+static SEM_PC
+SEM_FN_NAME (frvbf,slass) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+{
+#define FLD(f) abuf->fields.sfmt_addcc.f
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+  int UNUSED written = 0;
+  IADDR UNUSED pc = abuf->addr;
+  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
+
+  {
+    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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+  }
+
+  return vpc;
+#undef FLD
+}
+
+/* scutss: scutss$pack $GRj,$GRk */
+
+static SEM_PC
+SEM_FN_NAME (frvbf,scutss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+{
+#define FLD(f) abuf->fields.sfmt_scutss.f
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+  int UNUSED written = 0;
+  IADDR UNUSED pc = abuf->addr;
+  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
+
+  {
+    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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
   return vpc;
@@ -531,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);
   }
 }
 
@@ -555,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);
   }
 }
 
@@ -580,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);
   }
 }
 
@@ -605,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);
   }
 }
 
@@ -630,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);
   }
 }
 
@@ -655,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);
   }
 }
 
@@ -680,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);
   }
 }
 
@@ -705,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);
   }
 }
 
@@ -776,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);
   }
 }
 
@@ -801,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);
   }
 }
 
@@ -826,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);
   }
 }
 
@@ -856,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);
   }
 }
 }
@@ -907,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);
   }
 }
 
@@ -961,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);
   }
 }
 
@@ -991,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)) {
@@ -1006,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);
   }
 }
 }
@@ -1041,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)) {
@@ -1056,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);
   }
 }
 }
@@ -1091,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)) {
@@ -1106,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);
   }
 }
 }
@@ -1145,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);
@@ -1159,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);
   }
 }
 
@@ -1188,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);
@@ -1202,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);
   }
 }
 
@@ -1231,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);
@@ -1245,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);
   }
 }
 
@@ -1282,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);
   }
 }
 
@@ -1324,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);
   }
 }
 
@@ -1353,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);
@@ -1380,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);
   }
 }
 }
@@ -1412,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);
@@ -1439,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);
   }
 }
 }
@@ -1470,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);
@@ -1486,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);
   }
 }
 }
@@ -1521,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);
   }
 }
 }
@@ -1574,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);
   }
 }
 }
@@ -1627,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);
   }
 }
 }
@@ -1678,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);
@@ -1697,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);
   }
 }
 }
@@ -1726,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);
@@ -1745,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);
   }
 }
 }
@@ -1774,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);
@@ -1793,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);
   }
 }
 }
@@ -1819,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;
@@ -1840,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;
@@ -1863,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);
@@ -1885,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);
   }
 }
 
@@ -1914,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);
@@ -1936,13 +2036,73 @@ 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);
+  }
+}
+
+  return vpc;
+#undef FLD
+}
+
+/* addss: addss$pack $GRi,$GRj,$GRk */
+
+static SEM_PC
+SEM_FN_NAME (frvbf,addss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+{
+#define FLD(f) abuf->fields.sfmt_addcc.f
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+  int UNUSED written = 0;
+  IADDR UNUSED pc = abuf->addr;
+  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
+
+{
+  {
+    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);
+    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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+  }
+}
+}
+
+  return vpc;
+#undef FLD
+}
+
+/* subss: subss$pack $GRi,$GRj,$GRk */
+
+static SEM_PC
+SEM_FN_NAME (frvbf,subss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+{
+#define FLD(f) abuf->fields.sfmt_addcc.f
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+  int UNUSED written = 0;
+  IADDR UNUSED pc = abuf->addr;
+  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
+
+{
+  {
+    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);
+    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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
+}
 }
 
   return vpc;
@@ -1963,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;
@@ -1984,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;
@@ -2005,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;
@@ -2026,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;
@@ -2047,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;
@@ -2148,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;
@@ -2169,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;
@@ -2190,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;
@@ -2211,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;
@@ -2232,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;
@@ -2258,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);
   }
 }
 
@@ -2307,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);
   }
 }
 
@@ -2361,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);
   }
 }
 
@@ -2391,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)) {
@@ -2406,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);
   }
 }
 }
@@ -2441,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)) {
@@ -2456,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);
   }
 }
 }
@@ -2491,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)) {
@@ -2506,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);
   }
 }
 }
@@ -2553,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);
   }
 }
 
@@ -2595,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);
   }
 }
 
@@ -2629,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);
@@ -2643,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);
   }
 }
 
@@ -2672,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);
@@ -2686,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);
   }
 }
 
@@ -2715,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);
@@ -2729,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);
   }
 }
 
@@ -2751,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;
@@ -2772,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;
@@ -2795,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);
@@ -2817,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);
   }
 }
 
@@ -2846,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);
@@ -2868,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);
   }
 }
 
@@ -2917,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);
   }
 }
 
@@ -2947,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);
   }
 }
 
@@ -2969,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;
@@ -2990,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;
@@ -3011,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;
@@ -3032,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;
@@ -3053,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;
@@ -3074,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;
@@ -3095,14 +3255,14 @@ 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;
 #undef FLD
 }
 
-/* ld: ld$pack @($GRi,$GRj),$GRk */
+/* ld: ld$pack $ldann($GRi,$GRj),$GRk */
 
 static SEM_PC
 SEM_FN_NAME (frvbf,ld) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
@@ -3116,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;
@@ -3137,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;
@@ -3158,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;
@@ -3179,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;
@@ -3200,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;
@@ -3226,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);
   }
 }
 }
@@ -3255,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);
   }
 }
 }
@@ -3284,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);
   }
 }
 }
@@ -3313,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);
   }
 }
 }
@@ -3342,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);
   }
 }
 }
@@ -3371,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);
   }
 }
 }
@@ -3400,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);
   }
 }
 }
@@ -3429,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);
   }
 }
 }
@@ -3439,7 +3599,7 @@ if (tmp_do_op) {
 #undef FLD
 }
 
-/* ldd: ldd$pack @($GRi,$GRj),$GRdoublek */
+/* ldd: ldd$pack $lddann($GRi,$GRj),$GRdoublek */
 
 static SEM_PC
 SEM_FN_NAME (frvbf,ldd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
@@ -3459,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);
   }
 }
 }
@@ -3488,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);
   }
 }
 }
@@ -3515,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);
   }
 }
 }
@@ -3548,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);
   }
 }
 }
@@ -3584,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);
   }
 }
 }
@@ -3740,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))) {
 {
@@ -3748,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);
 }
@@ -3777,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))) {
 {
@@ -3785,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);
 }
@@ -3814,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))) {
 {
@@ -3822,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);
 }
@@ -3851,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))) {
 {
@@ -3859,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);
 }
@@ -3888,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))) {
 {
@@ -3896,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);
 }
@@ -3930,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))) {
 {
@@ -3938,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);
 }
@@ -3974,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))) {
 {
@@ -3982,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);
 }
@@ -4018,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))) {
 {
@@ -4026,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);
 }
@@ -4062,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))) {
 {
@@ -4070,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);
 }
@@ -4106,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))) {
 {
@@ -4114,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);
 }
@@ -4145,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);
 }
@@ -4176,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);
 }
@@ -4207,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);
 }
@@ -4238,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);
 }
@@ -4274,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);
 }
@@ -4314,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);
 }
@@ -4354,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);
 }
@@ -4392,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);
   }
 }
 }
@@ -4402,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);
 }
@@ -4438,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);
   }
 }
 }
@@ -4448,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);
 }
@@ -4480,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);
 }
@@ -4513,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);
 }
@@ -4551,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);
 }
@@ -4593,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);
 }
@@ -4632,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);
 }
@@ -4666,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);
 }
@@ -4695,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);
 }
@@ -4729,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);
 }
@@ -4755,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;
@@ -4776,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;
@@ -4797,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;
@@ -4818,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;
@@ -4839,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;
@@ -4860,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;
@@ -4881,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;
@@ -4902,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;
@@ -4928,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);
   }
 }
 }
@@ -4957,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);
   }
 }
 }
@@ -4986,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);
   }
 }
 }
@@ -5015,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);
   }
 }
 }
@@ -5044,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);
   }
 }
 }
@@ -5073,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);
   }
 }
 }
@@ -5102,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);
   }
 }
 }
@@ -5131,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);
   }
 }
 }
@@ -5161,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);
   }
 }
 }
@@ -5190,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);
   }
 }
 }
@@ -5223,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);
   }
 }
 }
@@ -5259,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);
   }
 }
 }
@@ -5465,12 +5625,12 @@ frvbf_write_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FL
 #undef FLD
 }
 
-/* rstb: rstb$pack $GRk,@($GRi,$GRj) */
+/* std: std$pack $GRdoublek,@($GRi,$GRj) */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,rstb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+SEM_FN_NAME (frvbf,std) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_cswap.f
+#define FLD(f) abuf->fields.sfmt_cstdu.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -5478,21 +5638,22 @@ SEM_FN_NAME (frvbf,rstb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
   SI tmp_address;
+{
   tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_write_mem_QI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk)));
-frvbf_check_recovering_store (current_cpu, tmp_address, FLD (f_GRk), 1, 0);
+frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_GR_DOUBLE (FLD (f_GRk)));
+}
 }
 
   return vpc;
 #undef FLD
 }
 
-/* rsth: rsth$pack $GRk,@($GRi,$GRj) */
+/* stdf: stdf$pack $FRdoublek,@($GRi,$GRj) */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,rsth) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+SEM_FN_NAME (frvbf,stdf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_cswap.f
+#define FLD(f) abuf->fields.sfmt_cstdfu.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -5500,21 +5661,22 @@ SEM_FN_NAME (frvbf,rsth) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
   SI tmp_address;
+{
   tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_write_mem_HI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk)));
-frvbf_check_recovering_store (current_cpu, tmp_address, FLD (f_GRk), 2, 0);
+frvbf_write_mem_DF (current_cpu, pc, tmp_address, GET_H_FR_DOUBLE (FLD (f_FRk)));
+}
 }
 
   return vpc;
 #undef FLD
 }
 
-/* rst: rst$pack $GRk,@($GRi,$GRj) */
+/* stdc: stdc$pack $CPRdoublek,@($GRi,$GRj) */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,rst) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+SEM_FN_NAME (frvbf,stdc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_cswap.f
+#define FLD(f) abuf->fields.sfmt_stdcu.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -5522,21 +5684,22 @@ SEM_FN_NAME (frvbf,rst) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
   SI tmp_address;
+{
   tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_write_mem_SI (current_cpu, pc, tmp_address, GET_H_GR (FLD (f_GRk)));
-frvbf_check_recovering_store (current_cpu, tmp_address, FLD (f_GRk), 4, 0);
+frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_CPR_DOUBLE (FLD (f_CPRk)));
+}
 }
 
   return vpc;
 #undef FLD
 }
 
-/* rstbf: rstbf$pack $FRintk,@($GRi,$GRj) */
+/* stq: stq$pack $GRk,@($GRi,$GRj) */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,rstbf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+SEM_FN_NAME (frvbf,stq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_cstbfu.f
+#define FLD(f) abuf->fields.sfmt_smulcc.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -5544,21 +5707,22 @@ SEM_FN_NAME (frvbf,rstbf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
   SI tmp_address;
+{
   tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_write_mem_QI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk)));
-frvbf_check_recovering_store (current_cpu, tmp_address, FLD (f_FRk), 1, 1);
+frvbf_store_quad_GR (current_cpu, pc, tmp_address, FLD (f_GRk));
+}
 }
 
   return vpc;
 #undef FLD
 }
 
-/* rsthf: rsthf$pack $FRintk,@($GRi,$GRj) */
+/* stqf: stqf$pack $FRintk,@($GRi,$GRj) */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,rsthf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+SEM_FN_NAME (frvbf,stqf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_cstbfu.f
+#define FLD(f) abuf->fields.sfmt_cstdfu.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -5566,21 +5730,22 @@ SEM_FN_NAME (frvbf,rsthf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
   SI tmp_address;
+{
   tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_write_mem_HI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk)));
-frvbf_check_recovering_store (current_cpu, tmp_address, FLD (f_FRk), 2, 1);
+frvbf_store_quad_FRint (current_cpu, pc, tmp_address, FLD (f_FRk));
+}
 }
 
   return vpc;
 #undef FLD
 }
 
-/* rstf: rstf$pack $FRintk,@($GRi,$GRj) */
+/* stqc: stqc$pack $CPRk,@($GRi,$GRj) */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,rstf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+SEM_FN_NAME (frvbf,stqc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_cstbfu.f
+#define FLD(f) abuf->fields.sfmt_stdcu.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -5588,385 +5753,152 @@ SEM_FN_NAME (frvbf,rstf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
   SI tmp_address;
+{
   tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_write_mem_SI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk)));
-frvbf_check_recovering_store (current_cpu, tmp_address, FLD (f_FRk), 4, 1);
+frvbf_store_quad_CPR (current_cpu, pc, tmp_address, FLD (f_CPRk));
+}
 }
 
   return vpc;
 #undef FLD
 }
 
-/* std: std$pack $GRk,@($GRi,$GRj) */
+/* stbu: stbu$pack $GRk,@($GRi,$GRj) */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,std) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+SEM_FN_NAME (frvbf,stbu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_cstdu.f
+#define FLD(f) abuf->fields.sfmt_cstbu.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 {
-  SI tmp_address;
-{
+  USI tmp_address;
   tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_GR_DOUBLE (FLD (f_GRk)));
-}
+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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+  }
 }
 
   return vpc;
 #undef FLD
 }
 
-/* stdf: stdf$pack $FRk,@($GRi,$GRj) */
+/* sthu: sthu$pack $GRk,@($GRi,$GRj) */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,stdf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+SEM_FN_NAME (frvbf,sthu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_cstdfu.f
+#define FLD(f) abuf->fields.sfmt_cstbu.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 {
-  SI tmp_address;
-{
+  USI tmp_address;
   tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_write_mem_DF (current_cpu, pc, tmp_address, GET_H_FR_DOUBLE (FLD (f_FRk)));
-}
+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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+  }
 }
 
   return vpc;
 #undef FLD
 }
 
-/* stdc: stdc$pack $CPRk,@($GRi,$GRj) */
+/* stu: stu$pack $GRk,@($GRi,$GRj) */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,stdc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+SEM_FN_NAME (frvbf,stu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_stdcu.f
+#define FLD(f) abuf->fields.sfmt_cstbu.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 {
-  SI tmp_address;
-{
+  USI tmp_address;
   tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_CPR_DOUBLE (FLD (f_CPRk)));
-}
+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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+  }
 }
 
   return vpc;
 #undef FLD
 }
 
-/* rstd: rstd$pack $GRk,@($GRi,$GRj) */
+/* stbfu: stbfu$pack $FRintk,@($GRi,$GRj) */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,rstd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+SEM_FN_NAME (frvbf,stbfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_cstdu.f
+#define FLD(f) abuf->fields.sfmt_cstbfu.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 {
-  SI tmp_address;
-{
+  USI tmp_address;
   tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_GR_DOUBLE (FLD (f_GRk)));
-}
-frvbf_check_recovering_store (current_cpu, tmp_address, FLD (f_GRk), 8, 0);
+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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+  }
 }
 
   return vpc;
 #undef FLD
 }
 
-/* rstdf: rstdf$pack $FRk,@($GRi,$GRj) */
+/* sthfu: sthfu$pack $FRintk,@($GRi,$GRj) */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,rstdf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+SEM_FN_NAME (frvbf,sthfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_cstdfu.f
+#define FLD(f) abuf->fields.sfmt_cstbfu.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 {
-  SI tmp_address;
-{
+  USI tmp_address;
   tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_write_mem_DF (current_cpu, pc, tmp_address, GET_H_FR_DOUBLE (FLD (f_FRk)));
-}
-frvbf_check_recovering_store (current_cpu, tmp_address, FLD (f_FRk), 8, 1);
+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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+  }
 }
 
   return vpc;
 #undef FLD
 }
 
-/* stq: stq$pack $GRk,@($GRi,$GRj) */
+/* stfu: stfu$pack $FRintk,@($GRi,$GRj) */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,stq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+SEM_FN_NAME (frvbf,stfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_smulcc.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_address;
-{
-  tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_store_quad_GR (current_cpu, pc, tmp_address, FLD (f_GRk));
-}
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* stqf: stqf$pack $FRintk,@($GRi,$GRj) */
-
-static SEM_PC
-SEM_FN_NAME (frvbf,stqf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_cstdfu.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_address;
-{
-  tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_store_quad_FRint (current_cpu, pc, tmp_address, FLD (f_FRk));
-}
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* stqc: stqc$pack $CPRk,@($GRi,$GRj) */
-
-static SEM_PC
-SEM_FN_NAME (frvbf,stqc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_stdcu.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_address;
-{
-  tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_store_quad_CPR (current_cpu, pc, tmp_address, FLD (f_CPRk));
-}
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* rstq: rstq$pack $GRk,@($GRi,$GRj) */
-
-static SEM_PC
-SEM_FN_NAME (frvbf,rstq) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_smulcc.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_address;
-{
-  tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_store_quad_GR (current_cpu, pc, tmp_address, FLD (f_GRk));
-}
-frvbf_check_recovering_store (current_cpu, tmp_address, FLD (f_GRk), 16, 0);
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* rstqf: rstqf$pack $FRintk,@($GRi,$GRj) */
-
-static SEM_PC
-SEM_FN_NAME (frvbf,rstqf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_cstdfu.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  SI tmp_address;
-{
-  tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-frvbf_store_quad_FRint (current_cpu, pc, tmp_address, FLD (f_FRk));
-}
-frvbf_check_recovering_store (current_cpu, tmp_address, FLD (f_FRk), 16, 1);
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* stbu: stbu$pack $GRk,@($GRi,$GRj) */
-
-static SEM_PC
-SEM_FN_NAME (frvbf,stbu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_cstbu.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  USI tmp_address;
-  tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-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);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* sthu: sthu$pack $GRk,@($GRi,$GRj) */
-
-static SEM_PC
-SEM_FN_NAME (frvbf,sthu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_cstbu.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  USI tmp_address;
-  tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-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);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* stu: stu$pack $GRk,@($GRi,$GRj) */
-
-static SEM_PC
-SEM_FN_NAME (frvbf,stu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_cstbu.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  USI tmp_address;
-  tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-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);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* stbfu: stbfu$pack $FRintk,@($GRi,$GRj) */
-
-static SEM_PC
-SEM_FN_NAME (frvbf,stbfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_cstbfu.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  USI tmp_address;
-  tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-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);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* sthfu: sthfu$pack $FRintk,@($GRi,$GRj) */
-
-static SEM_PC
-SEM_FN_NAME (frvbf,sthfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_cstbfu.f
-  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-  int UNUSED written = 0;
-  IADDR UNUSED pc = abuf->addr;
-  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
-
-{
-  USI tmp_address;
-  tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
-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);
-  }
-}
-
-  return vpc;
-#undef FLD
-}
-
-/* stfu: stfu$pack $FRintk,@($GRi,$GRj) */
-
-static SEM_PC
-SEM_FN_NAME (frvbf,stfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
-{
-#define FLD(f) abuf->fields.sfmt_cstbfu.f
+#define FLD(f) abuf->fields.sfmt_cstbfu.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
@@ -5979,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);
   }
 }
 
@@ -6005,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);
   }
 }
 
@@ -6013,7 +5945,7 @@ frvbf_write_mem_SI (current_cpu, pc, tmp_address, CPU (h_cpr[FLD (f_CPRk)]));
 #undef FLD
 }
 
-/* stdu: stdu$pack $GRk,@($GRi,$GRj) */
+/* stdu: stdu$pack $GRdoublek,@($GRi,$GRj) */
 
 static SEM_PC
 SEM_FN_NAME (frvbf,stdu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
@@ -6033,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);
   }
 }
 
@@ -6041,7 +5973,7 @@ frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_GR_DOUBLE (FLD (f_GRk)))
 #undef FLD
 }
 
-/* stdfu: stdfu$pack $FRk,@($GRi,$GRj) */
+/* stdfu: stdfu$pack $FRdoublek,@($GRi,$GRj) */
 
 static SEM_PC
 SEM_FN_NAME (frvbf,stdfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
@@ -6061,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);
   }
 }
 
@@ -6069,7 +6001,7 @@ frvbf_write_mem_DF (current_cpu, pc, tmp_address, GET_H_FR_DOUBLE (FLD (f_FRk)))
 #undef FLD
 }
 
-/* stdcu: stdcu$pack $CPRk,@($GRi,$GRj) */
+/* stdcu: stdcu$pack $CPRdoublek,@($GRi,$GRj) */
 
 static SEM_PC
 SEM_FN_NAME (frvbf,stdcu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
@@ -6089,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);
   }
 }
 
@@ -6117,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);
   }
 }
 
@@ -6145,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);
   }
 }
 
@@ -6173,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);
   }
 }
 
@@ -6197,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);
   }
 }
 
@@ -6222,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);
   }
 }
 
@@ -6247,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);
   }
 }
 
@@ -6272,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);
   }
 }
 
@@ -6297,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);
   }
 }
 
@@ -6322,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);
   }
 }
 
@@ -6347,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);
   }
 }
 
@@ -6372,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);
   }
 }
 
@@ -6402,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);
   }
 }
 }
@@ -6434,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);
   }
 }
 }
@@ -6489,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);
   }
 }
 }
@@ -6526,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);
   }
 }
 }
@@ -6563,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);
   }
 }
 }
@@ -6600,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);
   }
 }
 }
@@ -6637,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);
   }
 }
 }
@@ -6674,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);
   }
 }
 }
@@ -6709,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);
   }
 }
 }
@@ -6744,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);
   }
 }
 }
@@ -6781,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);
   }
 }
 }
@@ -6790,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);
   }
 }
 }
@@ -6821,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);
   }
 }
 }
@@ -6861,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);
   }
 }
 }
@@ -6986,7 +6918,7 @@ frvbf_write_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FL
 #undef FLD
 }
 
-/* cstd: cstd$pack $GRk,@($GRi,$GRj),$CCi,$cond */
+/* cstd: cstd$pack $GRdoublek,@($GRi,$GRj),$CCi,$cond */
 
 static SEM_PC
 SEM_FN_NAME (frvbf,cstd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
@@ -7011,7 +6943,7 @@ frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_GR_DOUBLE (FLD (f_GRk)))
 #undef FLD
 }
 
-/* cstdf: cstdf$pack $FRk,@($GRi,$GRj),$CCi,$cond */
+/* cstdf: cstdf$pack $FRdoublek,@($GRi,$GRj),$CCi,$cond */
 
 static SEM_PC
 SEM_FN_NAME (frvbf,cstdf) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
@@ -7081,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);
   }
 }
 }
@@ -7111,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);
   }
 }
 }
@@ -7141,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);
   }
 }
 }
@@ -7171,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);
   }
 }
 }
@@ -7201,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);
   }
 }
 }
@@ -7231,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);
   }
 }
 }
@@ -7241,7 +7173,7 @@ frvbf_write_mem_SI (current_cpu, pc, tmp_address, GET_H_FR_INT (FLD (f_FRk)));
 #undef FLD
 }
 
-/* cstdu: cstdu$pack $GRk,@($GRi,$GRj),$CCi,$cond */
+/* cstdu: cstdu$pack $GRdoublek,@($GRi,$GRj),$CCi,$cond */
 
 static SEM_PC
 SEM_FN_NAME (frvbf,cstdu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
@@ -7263,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);
   }
 }
 }
@@ -7273,7 +7205,7 @@ frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_GR_DOUBLE (FLD (f_GRk)))
 #undef FLD
 }
 
-/* cstdfu: cstdfu$pack $FRk,@($GRi,$GRj),$CCi,$cond */
+/* cstdfu: cstdfu$pack $FRdoublek,@($GRi,$GRj),$CCi,$cond */
 
 static SEM_PC
 SEM_FN_NAME (frvbf,cstdfu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
@@ -7295,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);
   }
 }
 }
@@ -7407,7 +7339,7 @@ frvbf_write_mem_SI (current_cpu, pc, ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12))
 #undef FLD
 }
 
-/* stdi: stdi$pack $GRk,@($GRi,$d12) */
+/* stdi: stdi$pack $GRdoublek,@($GRi,$d12) */
 
 static SEM_PC
 SEM_FN_NAME (frvbf,stdi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
@@ -7430,7 +7362,7 @@ frvbf_write_mem_DI (current_cpu, pc, tmp_address, GET_H_GR_DOUBLE (FLD (f_GRk)))
 #undef FLD
 }
 
-/* stdfi: stdfi$pack $FRk,@($GRi,$d12) */
+/* stdfi: stdfi$pack $FRdoublek,@($GRi,$d12) */
 
 static SEM_PC
 SEM_FN_NAME (frvbf,stdfi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
@@ -7515,10 +7447,11 @@ SEM_FN_NAME (frvbf,swap) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SI tmp_address;
   tmp_tmp = GET_H_GR (FLD (f_GRk));
   tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
+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);
 }
@@ -7543,10 +7476,11 @@ SEM_FN_NAME (frvbf,swapi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SI tmp_address;
   tmp_tmp = GET_H_GR (FLD (f_GRk));
   tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), FLD (f_d12));
+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);
 }
@@ -7572,11 +7506,12 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   SI tmp_address;
   tmp_tmp = GET_H_GR (FLD (f_GRk));
   tmp_address = ADDSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)));
+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);
 }
@@ -7601,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;
@@ -7622,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;
@@ -7646,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 {
@@ -7661,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);
   }
 }
 }
@@ -7694,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);
   }
 }
 }
@@ -7727,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 {
@@ -7754,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);
   }
 }
 }
@@ -7799,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);
   }
 }
 }
@@ -7843,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);
   }
 }
 
@@ -7868,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);
   }
 }
 
@@ -7895,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 {
@@ -7910,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);
   }
 }
 }
@@ -7944,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);
   }
 }
 }
@@ -7974,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;
@@ -7995,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;
@@ -8018,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);
   }
 }
 
@@ -8061,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);
   }
 }
 }
@@ -8089,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);
   }
 }
 }
@@ -8117,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);
   }
 }
 }
@@ -8145,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);
   }
 }
 }
@@ -8173,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);
   }
 }
 }
@@ -8201,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);
   }
 }
 }
@@ -8229,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);
   }
 }
 }
@@ -8257,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);
   }
 }
 }
@@ -8285,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);
   }
 }
 }
@@ -8313,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);
   }
 }
 }
@@ -8341,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);
   }
 }
 }
@@ -8369,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);
   }
 }
 }
@@ -8397,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);
   }
 }
 }
@@ -8425,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);
   }
 }
 }
@@ -8451,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);
   }
 }
 
@@ -8494,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);
   }
 }
 }
@@ -8522,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);
   }
 }
 }
@@ -8550,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);
   }
 }
 }
@@ -8578,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);
   }
 }
 }
@@ -8606,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);
   }
 }
 }
@@ -8634,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);
   }
 }
 }
@@ -8662,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);
   }
 }
 }
@@ -8690,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);
   }
 }
 }
@@ -8718,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);
   }
 }
 }
@@ -8746,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);
   }
 }
 }
@@ -8774,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);
   }
 }
 }
@@ -8802,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);
   }
 }
 }
@@ -8830,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);
   }
 }
 }
@@ -8858,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);
   }
 }
 }
@@ -8887,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)) {
@@ -8895,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 {
@@ -8904,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);
   }
 }
 }
@@ -8932,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);
   }
 }
 
@@ -8975,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);
   }
 }
 }
@@ -9003,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);
   }
 }
 }
@@ -9031,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);
   }
 }
 }
@@ -9059,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);
   }
 }
 }
@@ -9087,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);
   }
 }
 }
@@ -9115,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);
   }
 }
 }
@@ -9143,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);
   }
 }
 }
@@ -9171,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);
   }
 }
 }
@@ -9199,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);
   }
 }
 }
@@ -9227,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);
   }
 }
 }
@@ -9255,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);
   }
 }
 }
@@ -9283,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);
   }
 }
 }
@@ -9311,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);
   }
 }
 }
@@ -9339,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);
   }
 }
 }
@@ -9365,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);
   }
 }
 
@@ -9408,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);
   }
 }
 }
@@ -9436,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);
   }
 }
 }
@@ -9464,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);
   }
 }
 }
@@ -9492,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);
   }
 }
 }
@@ -9520,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);
   }
 }
 }
@@ -9548,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);
   }
 }
 }
@@ -9576,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);
   }
 }
 }
@@ -9604,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);
   }
 }
 }
@@ -9632,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);
   }
 }
 }
@@ -9660,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);
   }
 }
 }
@@ -9688,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);
   }
 }
 }
@@ -9716,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);
   }
 }
 }
@@ -9744,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);
   }
 }
 }
@@ -9772,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);
   }
 }
 }
@@ -9801,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)) {
@@ -9809,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 {
@@ -9818,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);
   }
 }
 }
@@ -9849,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*/
 }
@@ -9878,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)) {
@@ -9887,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 {
@@ -9896,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);
   }
 }
 }
@@ -9928,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)) {
@@ -9937,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 {
@@ -9946,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);
   }
 }
 }
@@ -9978,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)) {
@@ -9987,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 {
@@ -9996,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);
   }
 }
 }
@@ -10028,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)) {
@@ -10037,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 {
@@ -10046,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);
   }
 }
 }
@@ -10078,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)) {
@@ -10087,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 {
@@ -10096,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);
   }
 }
 }
@@ -10128,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)) {
@@ -10137,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 {
@@ -10146,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);
   }
 }
 }
@@ -10178,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)) {
@@ -10187,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 {
@@ -10196,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);
   }
 }
 }
@@ -10228,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)) {
@@ -10237,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 {
@@ -10246,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);
   }
 }
 }
@@ -10278,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)) {
@@ -10287,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 {
@@ -10296,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);
   }
 }
 }
@@ -10328,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)) {
@@ -10337,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 {
@@ -10346,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);
   }
 }
 }
@@ -10378,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)) {
@@ -10387,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 {
@@ -10396,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);
   }
 }
 }
@@ -10428,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)) {
@@ -10437,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 {
@@ -10446,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);
   }
 }
 }
@@ -10478,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)) {
@@ -10487,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 {
@@ -10496,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);
   }
 }
 }
@@ -10528,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)) {
@@ -10537,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 {
@@ -10546,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);
   }
 }
 }
@@ -10578,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)) {
@@ -10586,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 {
@@ -10595,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);
   }
 }
 }
@@ -10626,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*/
 }
@@ -10655,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)) {
@@ -10664,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 {
@@ -10673,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);
   }
 }
 }
@@ -10705,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)) {
@@ -10714,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 {
@@ -10723,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);
   }
 }
 }
@@ -10755,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)) {
@@ -10764,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 {
@@ -10773,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);
   }
 }
 }
@@ -10805,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)) {
@@ -10814,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 {
@@ -10823,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);
   }
 }
 }
@@ -10855,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)) {
@@ -10864,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 {
@@ -10873,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);
   }
 }
 }
@@ -10905,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)) {
@@ -10914,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 {
@@ -10923,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);
   }
 }
 }
@@ -10955,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)) {
@@ -10964,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 {
@@ -10973,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);
   }
 }
 }
@@ -11005,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)) {
@@ -11014,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 {
@@ -11023,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);
   }
 }
 }
@@ -11055,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)) {
@@ -11064,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 {
@@ -11073,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);
   }
 }
 }
@@ -11105,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)) {
@@ -11114,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 {
@@ -11123,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);
   }
 }
 }
@@ -11155,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)) {
@@ -11164,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 {
@@ -11173,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);
   }
 }
 }
@@ -11205,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)) {
@@ -11214,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 {
@@ -11223,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);
   }
 }
 }
@@ -11255,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)) {
@@ -11264,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 {
@@ -11273,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);
   }
 }
 }
@@ -11305,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)) {
@@ -11314,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 {
@@ -11323,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);
   }
 }
 }
@@ -11354,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);
 }
@@ -11363,7 +11298,7 @@ frvbf_model_branch (current_cpu, pc, 2);
 #undef FLD
 }
 
-/* calll: calll$pack @($GRi,$GRj) */
+/* calll: calll$pack $callann($GRi,$GRj) */
 
 static SEM_PC
 SEM_FN_NAME (frvbf,calll) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
@@ -11381,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);
 }
@@ -11408,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);
 }
@@ -11435,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);
 }
@@ -11460,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);
 }
@@ -11484,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);
 }
@@ -11498,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;
@@ -11547,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;
@@ -12072,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;
@@ -12597,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;
@@ -13122,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;
@@ -13640,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;
@@ -13666,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;
@@ -13687,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;
@@ -13708,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;
@@ -13729,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;
@@ -13750,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;
@@ -13771,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;
@@ -13792,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;
@@ -13813,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;
@@ -13834,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;
@@ -13855,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;
@@ -13876,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;
@@ -13897,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;
@@ -13920,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);
   }
 }
 
@@ -13952,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);
   }
 }
 
@@ -13984,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);
   }
 }
 
@@ -14016,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);
   }
 }
 
@@ -14048,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);
   }
 }
 
@@ -14080,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);
   }
 }
 
@@ -14112,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);
   }
 }
 
@@ -14144,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);
   }
 }
 
@@ -14176,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);
   }
 }
 
@@ -14208,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);
   }
 }
 
@@ -14240,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);
   }
 }
 
@@ -14272,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);
   }
 }
 
@@ -14304,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);
   }
 }
 
@@ -14336,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);
   }
 }
 
@@ -14366,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;
@@ -14387,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;
@@ -14410,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);
   }
 }
 
@@ -14442,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);
   }
 }
 
@@ -14474,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);
   }
 }
 
@@ -14506,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);
   }
 }
 
@@ -14538,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);
   }
 }
 
@@ -14570,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);
   }
 }
 
@@ -14602,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);
   }
 }
 
@@ -14634,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);
   }
 }
 
@@ -14666,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);
   }
 }
 
@@ -14698,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);
   }
 }
 
@@ -14730,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);
   }
 }
 
@@ -14762,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);
   }
 }
 
@@ -14794,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);
   }
 }
 
@@ -14826,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);
   }
 }
 
@@ -14858,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);
   }
 }
 
@@ -14890,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);
   }
 }
 
@@ -14923,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 {
@@ -14938,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);
   }
 }
 
@@ -14964,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 {
@@ -14979,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);
   }
 }
 
@@ -15005,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 {
@@ -15020,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);
   }
 }
 
@@ -15046,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 {
@@ -15061,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);
   }
 }
 
@@ -15087,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 {
@@ -15102,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);
   }
 }
 
@@ -15128,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 {
@@ -15143,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);
   }
 }
 
@@ -15169,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 {
@@ -15184,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);
   }
 }
 
@@ -15210,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 {
@@ -15225,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);
   }
 }
 
@@ -15251,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 {
@@ -15266,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);
   }
 }
 
@@ -15292,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 {
@@ -15307,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);
   }
 }
 
@@ -15333,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 {
@@ -15348,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);
   }
 }
 
@@ -15374,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 {
@@ -15389,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);
   }
 }
 
@@ -15415,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 {
@@ -15430,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);
   }
 }
 
@@ -15456,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 {
@@ -15471,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);
   }
 }
 
@@ -15496,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);
   }
 }
 
@@ -15528,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);
   }
 }
 
@@ -15561,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 {
@@ -15576,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);
   }
 }
 
@@ -15602,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 {
@@ -15617,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);
   }
 }
 
@@ -15643,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 {
@@ -15658,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);
   }
 }
 
@@ -15684,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 {
@@ -15699,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);
   }
 }
 
@@ -15725,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 {
@@ -15740,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);
   }
 }
 
@@ -15766,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 {
@@ -15781,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);
   }
 }
 
@@ -15807,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 {
@@ -15822,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);
   }
 }
 
@@ -15848,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 {
@@ -15863,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);
   }
 }
 
@@ -15889,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 {
@@ -15904,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);
   }
 }
 
@@ -15930,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 {
@@ -15945,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);
   }
 }
 
@@ -15971,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 {
@@ -15986,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);
   }
 }
 
@@ -16012,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 {
@@ -16027,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);
   }
 }
 
@@ -16053,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 {
@@ -16068,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);
   }
 }
 
@@ -16094,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 {
@@ -16109,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);
   }
 }
 
@@ -16138,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);
 }
@@ -16169,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);
 }
@@ -16299,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;
@@ -16316,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;
@@ -16333,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;
@@ -16350,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;
@@ -16435,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;
@@ -16452,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;
@@ -16464,12 +16399,12 @@ SEM_FN_NAME (frvbf,membar) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 #undef FLD
 }
 
-/* cop1: cop1$pack $s6_1,$CPRi,$CPRj,$CPRk */
+/* lrai: lrai$pack $GRi,$GRk,$LRAE,$LRAD,$LRAS */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,cop1) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+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;
@@ -16481,12 +16416,12 @@ SEM_FN_NAME (frvbf,cop1) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 #undef FLD
 }
 
-/* cop2: cop2$pack $s6_1,$CPRi,$CPRj,$CPRk */
+/* lrad: lrad$pack $GRi,$GRk,$LRAE,$LRAD,$LRAS */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,cop2) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+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;
@@ -16498,41 +16433,92 @@ SEM_FN_NAME (frvbf,cop2) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 #undef FLD
 }
 
-/* clrgr: clrgr$pack $GRk */
+/* tlbpr: tlbpr$pack $GRi,$GRj,$TLBPRopx,$TLBPRL */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,clrgr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+SEM_FN_NAME (frvbf,tlbpr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_swapi.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-{
-frv_ref_SI (GET_H_GR (FLD (f_GRk)));
-frvbf_clear_ne_flags (current_cpu, FLD (f_GRk), 0);
-}
+((void) 0); /*nop*/
 
   return vpc;
 #undef FLD
 }
 
-/* clrfr: clrfr$pack $FRk */
+/* cop1: cop1$pack $s6_1,$CPRi,$CPRj,$CPRk */
 
 static SEM_PC
-SEM_FN_NAME (frvbf,clrfr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+SEM_FN_NAME (frvbf,cop1) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
-#define FLD(f) abuf->fields.sfmt_cfmadds.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-{
-frv_ref_SI (GET_H_FR (FLD (f_FRk)));
-frvbf_clear_ne_flags (current_cpu, FLD (f_FRk), 1);
-}
+((void) 0); /*nop*/
+
+  return vpc;
+#undef FLD
+}
+
+/* cop2: cop2$pack $s6_1,$CPRi,$CPRj,$CPRk */
+
+static SEM_PC
+SEM_FN_NAME (frvbf,cop2) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+{
+#define FLD(f) abuf->fields.sfmt_empty.f
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+  int UNUSED written = 0;
+  IADDR UNUSED pc = abuf->addr;
+  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
+
+((void) 0); /*nop*/
+
+  return vpc;
+#undef FLD
+}
+
+/* clrgr: clrgr$pack $GRk */
+
+static SEM_PC
+SEM_FN_NAME (frvbf,clrgr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+{
+#define FLD(f) abuf->fields.sfmt_swapi.f
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+  int UNUSED written = 0;
+  IADDR UNUSED pc = abuf->addr;
+  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
+
+{
+frv_ref_SI (GET_H_GR (FLD (f_GRk)));
+frvbf_clear_ne_flags (current_cpu, FLD (f_GRk), 0);
+}
+
+  return vpc;
+#undef FLD
+}
+
+/* clrfr: clrfr$pack $FRk */
+
+static SEM_PC
+SEM_FN_NAME (frvbf,clrfr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+{
+#define FLD(f) abuf->fields.sfmt_cfmadds.f
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+  int UNUSED written = 0;
+  IADDR UNUSED pc = abuf->addr;
+  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
+
+{
+frv_ref_SI (GET_H_FR (FLD (f_FRk)));
+frvbf_clear_ne_flags (current_cpu, FLD (f_FRk), 1);
+}
 
   return vpc;
 #undef FLD
@@ -16543,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;
@@ -16560,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;
@@ -16611,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;
@@ -16628,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;
@@ -16652,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;
@@ -16673,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;
@@ -16694,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;
@@ -16715,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;
@@ -16737,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);
   }
 }
 
@@ -16765,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);
   }
 }
 
@@ -16794,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);
   }
 }
 
@@ -16824,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);
   }
 }
 
@@ -16853,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);
   }
 }
 
@@ -16878,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);
   }
 }
 
@@ -16904,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);
   }
 }
 
@@ -16928,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);
   }
 }
 
@@ -16952,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;
@@ -16973,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;
@@ -16995,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);
   }
 }
 
@@ -17024,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);
   }
 }
 
@@ -17045,9 +17031,9 @@ SEM_FN_NAME (frvbf,fnegs) (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->negsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
+    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;
@@ -17066,9 +17052,9 @@ SEM_FN_NAME (frvbf,fnegd) (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->negdf) (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRj)));
+    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;
@@ -17088,14 +17074,14 @@ 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)));
+    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);
   }
 }
 
@@ -17116,10 +17102,10 @@ SEM_FN_NAME (frvbf,cfnegs) (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->negsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -17140,9 +17126,9 @@ SEM_FN_NAME (frvbf,fabss) (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->abssf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
+    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;
@@ -17161,9 +17147,9 @@ SEM_FN_NAME (frvbf,fabsd) (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->absdf) (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRj)));
+    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;
@@ -17183,14 +17169,14 @@ 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)));
+    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);
   }
 }
 
@@ -17211,10 +17197,10 @@ SEM_FN_NAME (frvbf,cfabss) (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->abssf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -17235,9 +17221,9 @@ SEM_FN_NAME (frvbf,fsqrts) (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->sqrtsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
+    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;
@@ -17257,14 +17243,14 @@ 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)));
+    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);
   }
 }
 
@@ -17286,15 +17272,15 @@ SEM_FN_NAME (frvbf,nfdsqrts) (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->sqrtsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -17314,9 +17300,9 @@ SEM_FN_NAME (frvbf,fsqrtd) (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->sqrtdf) (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRj)));
+    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;
@@ -17336,10 +17322,10 @@ SEM_FN_NAME (frvbf,cfsqrts) (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->sqrtsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -17362,9 +17348,9 @@ SEM_FN_NAME (frvbf,nfsqrts) (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->sqrtsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -17384,9 +17370,9 @@ SEM_FN_NAME (frvbf,fadds) (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->addsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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;
@@ -17405,9 +17391,9 @@ SEM_FN_NAME (frvbf,fsubs) (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->subsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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;
@@ -17426,9 +17412,9 @@ SEM_FN_NAME (frvbf,fmuls) (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->mulsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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;
@@ -17447,9 +17433,9 @@ SEM_FN_NAME (frvbf,fdivs) (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->divsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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;
@@ -17468,9 +17454,9 @@ SEM_FN_NAME (frvbf,faddd) (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->adddf) (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj)));
+    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;
@@ -17489,9 +17475,9 @@ SEM_FN_NAME (frvbf,fsubd) (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->subdf) (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj)));
+    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;
@@ -17510,9 +17496,9 @@ SEM_FN_NAME (frvbf,fmuld) (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->muldf) (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj)));
+    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;
@@ -17531,9 +17517,9 @@ SEM_FN_NAME (frvbf,fdivd) (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->divdf) (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj)));
+    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;
@@ -17553,10 +17539,10 @@ SEM_FN_NAME (frvbf,cfadds) (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->addsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -17578,10 +17564,10 @@ SEM_FN_NAME (frvbf,cfsubs) (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->subsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -17603,10 +17589,10 @@ SEM_FN_NAME (frvbf,cfmuls) (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->mulsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -17628,10 +17614,10 @@ SEM_FN_NAME (frvbf,cfdivs) (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->divsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -17654,9 +17640,9 @@ SEM_FN_NAME (frvbf,nfadds) (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->addsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -17678,9 +17664,9 @@ SEM_FN_NAME (frvbf,nfsubs) (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->subsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -17702,9 +17688,9 @@ SEM_FN_NAME (frvbf,nfmuls) (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)));
+    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);
   }
 }
 
@@ -17726,9 +17712,9 @@ SEM_FN_NAME (frvbf,nfdivs) (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->divsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -17747,35 +17733,35 @@ SEM_FN_NAME (frvbf,fcmps) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-if ((* CGEN_CPU_FPU (current_cpu)->ops->gtsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
   {
     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)))) {
+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)))) {
   {
     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)))) {
+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)))) {
   {
     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);
   }
 }
 }
@@ -17797,35 +17783,35 @@ SEM_FN_NAME (frvbf,fcmpd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
-if ((* CGEN_CPU_FPU (current_cpu)->ops->gtdf) (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj)))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->gtdf (CGEN_CPU_FPU (current_cpu), GET_H_FR_DOUBLE (FLD (f_FRi)), GET_H_FR_DOUBLE (FLD (f_FRj)))) {
   {
     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)))) {
+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)))) {
   {
     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)))) {
+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)))) {
   {
     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);
   }
 }
 }
@@ -17848,35 +17834,35 @@ SEM_FN_NAME (frvbf,cfcmps) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
-if ((* CGEN_CPU_FPU (current_cpu)->ops->gtsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
   {
     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)))) {
+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)))) {
   {
     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)))) {
+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)))) {
   {
     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);
   }
 }
 }
@@ -17900,68 +17886,68 @@ SEM_FN_NAME (frvbf,fdcmps) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 {
-if ((* CGEN_CPU_FPU (current_cpu)->ops->gtsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
   {
     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)))) {
+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)))) {
   {
     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)))) {
+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)))) {
   {
     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);
   }
 }
 }
@@ -17985,9 +17971,9 @@ SEM_FN_NAME (frvbf,fmadds) (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->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)));
+    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;
@@ -18006,9 +17992,9 @@ SEM_FN_NAME (frvbf,fmsubs) (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->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)));
+    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;
@@ -18027,9 +18013,9 @@ SEM_FN_NAME (frvbf,fmaddd) (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->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)));
+    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;
@@ -18048,9 +18034,9 @@ SEM_FN_NAME (frvbf,fmsubd) (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->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)));
+    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;
@@ -18070,14 +18056,14 @@ 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)));
+    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);
   }
 }
 
@@ -18099,15 +18085,15 @@ SEM_FN_NAME (frvbf,nfdmadds) (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->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)));
+    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);
   }
 }
 
@@ -18128,10 +18114,10 @@ SEM_FN_NAME (frvbf,cfmadds) (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->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)));
+    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);
   }
 }
 
@@ -18153,10 +18139,10 @@ SEM_FN_NAME (frvbf,cfmsubs) (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->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)));
+    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);
   }
 }
 
@@ -18179,9 +18165,9 @@ SEM_FN_NAME (frvbf,nfmadds) (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->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)));
+    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);
   }
 }
 
@@ -18203,9 +18189,9 @@ SEM_FN_NAME (frvbf,nfmsubs) (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->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)));
+    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);
   }
 }
 
@@ -18226,14 +18212,14 @@ 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)));
+    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);
   }
 }
 
@@ -18254,14 +18240,14 @@ 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)));
+    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);
   }
 }
 
@@ -18282,24 +18268,24 @@ 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)));
+    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);
   }
 }
 
@@ -18320,24 +18306,24 @@ 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)));
+    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);
   }
 }
 
@@ -18362,24 +18348,24 @@ frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 2));
 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)));
+    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);
   }
 }
 
@@ -18404,24 +18390,24 @@ frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 2));
 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)));
+    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);
   }
 }
 
@@ -18443,16 +18429,16 @@ SEM_FN_NAME (frvbf,cfmas) (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->mulsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 }
@@ -18476,16 +18462,16 @@ SEM_FN_NAME (frvbf,cfmss) (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->mulsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 }
@@ -18508,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);
   }
 }
 
@@ -18536,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);
   }
 }
 
@@ -18565,15 +18551,15 @@ SEM_FN_NAME (frvbf,nfmas) (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)));
+    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);
   }
 }
 
@@ -18595,15 +18581,15 @@ SEM_FN_NAME (frvbf,nfmss) (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)));
+    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);
   }
 }
 
@@ -18624,14 +18610,14 @@ 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)));
+    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);
   }
 }
 
@@ -18652,14 +18638,14 @@ 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)));
+    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);
   }
 }
 
@@ -18680,14 +18666,14 @@ 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)));
+    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);
   }
 }
 
@@ -18708,14 +18694,14 @@ 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)));
+    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);
   }
 }
 
@@ -18736,14 +18722,14 @@ 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)));
+    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);
   }
 }
 
@@ -18764,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);
   }
 }
 
@@ -18793,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);
   }
 }
 
@@ -18823,15 +18809,15 @@ SEM_FN_NAME (frvbf,nfdadds) (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->addsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -18853,15 +18839,15 @@ SEM_FN_NAME (frvbf,nfdsubs) (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->subsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -18883,15 +18869,15 @@ SEM_FN_NAME (frvbf,nfdmuls) (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)));
+    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);
   }
 }
 
@@ -18913,15 +18899,15 @@ SEM_FN_NAME (frvbf,nfddivs) (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->divsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -18943,15 +18929,15 @@ SEM_FN_NAME (frvbf,nfdsads) (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->addsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)));
+    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);
   }
 }
 
@@ -18972,69 +18958,69 @@ SEM_FN_NAME (frvbf,nfdcmps) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
 frvbf_set_ne_index (current_cpu, FLD (f_FRk));
-if ((* CGEN_CPU_FPU (current_cpu)->ops->gtsf) (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (FLD (f_FRj)))) {
   {
     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)))) {
+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)))) {
   {
     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)))) {
+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)))) {
   {
     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);
   }
 }
 }
@@ -19060,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;
@@ -19081,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;
@@ -19103,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);
   }
 }
 
@@ -19140,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);
   }
 }
 
@@ -19167,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);
   }
 }
 
@@ -19190,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);
   }
 }
 }
@@ -19234,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;
@@ -19255,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;
@@ -19276,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;
@@ -19299,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);
   }
 }
 
@@ -19324,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);
   }
 }
 
@@ -19349,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);
   }
 }
 
@@ -19372,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;
@@ -19395,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);
   }
 }
 
@@ -19418,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;
@@ -19439,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;
@@ -19458,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;
@@ -19479,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;
@@ -19502,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;
@@ -19523,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;
@@ -19544,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;
@@ -19565,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;
@@ -19594,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);
   }
 }
 }
@@ -19625,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;
@@ -19647,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);
   }
 }
 
@@ -19685,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);
   }
 }
 
@@ -19723,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);
   }
 }
 
@@ -19765,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);
   }
 }
 }
@@ -19799,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);
   }
 }
 
@@ -19845,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);
   }
 }
 
@@ -19877,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);
   }
 }
 }
@@ -19960,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);
   }
 }
 }
@@ -20095,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);
   }
 }
 }
@@ -20157,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)) {
@@ -20175,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)) {
@@ -20183,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);
   }
 }
 }
@@ -20198,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);
   }
 }
 }
@@ -20256,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)) {
@@ -20274,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)) {
@@ -20282,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);
   }
 }
 }
@@ -20297,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);
   }
 }
 }
@@ -20352,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);
   }
 }
 }
@@ -20445,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);
 }
@@ -20468,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);
 }
@@ -20502,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);
   }
 }
 }
@@ -20542,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);
 }
@@ -20565,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);
 }
@@ -20599,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);
   }
 }
 }
@@ -20639,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);
 }
@@ -20662,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);
 }
@@ -20696,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);
   }
 }
 }
@@ -20736,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);
 }
@@ -20759,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);
 }
@@ -20793,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);
   }
 }
 }
@@ -20834,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);
 }
@@ -20857,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);
 }
@@ -20891,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);
   }
 }
 }
@@ -20933,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);
 }
@@ -20956,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);
 }
@@ -20990,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);
   }
 }
 }
@@ -21032,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);
 }
@@ -21055,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);
 }
@@ -21089,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);
   }
 }
 }
@@ -21131,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);
 }
@@ -21154,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);
 }
@@ -21188,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);
   }
 }
 }
@@ -21235,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);
 }
@@ -21261,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);
 }
@@ -21295,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);
 }
@@ -21335,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);
 }
@@ -21369,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);
   }
 }
 }
@@ -21416,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);
 }
@@ -21442,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);
 }
@@ -21476,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);
 }
@@ -21516,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);
 }
@@ -21550,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);
   }
 }
 }
@@ -21597,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);
 }
@@ -21623,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);
 }
@@ -21657,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);
 }
@@ -21697,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);
 }
@@ -21731,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);
   }
 }
 }
@@ -21778,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);
 }
@@ -21804,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);
 }
@@ -21838,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);
 }
@@ -21878,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);
 }
@@ -21912,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);
   }
 }
 }
@@ -21960,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);
 }
@@ -21986,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);
 }
@@ -22020,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);
 }
@@ -22060,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);
 }
@@ -22094,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);
   }
 }
 }
@@ -22143,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);
 }
@@ -22169,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);
 }
@@ -22203,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);
 }
@@ -22243,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);
 }
@@ -22277,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);
   }
 }
 }
@@ -22326,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);
 }
@@ -22352,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);
 }
@@ -22386,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);
 }
@@ -22426,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);
 }
@@ -22460,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);
   }
 }
 }
@@ -22509,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);
 }
@@ -22535,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);
 }
@@ -22569,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);
 }
@@ -22609,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);
 }
@@ -22643,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);
   }
 }
 }
@@ -22668,6 +22654,270 @@ frvbf_media_overflow (current_cpu, 1);
 #undef FLD
 }
 
+/* mqlclrhs: mqlclrhs$pack $FRintieven,$FRintjeven,$FRintkeven */
+
+static SEM_PC
+SEM_FN_NAME (frvbf,mqlclrhs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+{
+#define FLD(f) abuf->fields.sfmt_cmqaddhss.f
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+  int UNUSED written = 0;
+  IADDR UNUSED pc = abuf->addr;
+  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
+
+if (ORIF (ANDSI (FLD (f_FRi), SUBSI (2, 1)), ORIF (ANDSI (FLD (f_FRj), SUBSI (2, 1)), ANDSI (FLD (f_FRk), SUBSI (2, 1))))) {
+frvbf_media_register_not_aligned (current_cpu);
+} else {
+{
+  HI tmp_a1;
+  HI tmp_a2;
+  HI tmp_a3;
+  HI tmp_a4;
+  HI tmp_b1;
+  HI tmp_b2;
+  HI tmp_b3;
+  HI tmp_b4;
+  {
+    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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+  }
+{
+  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 (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, ADDSI (FLD (f_FRk), 0), opval);
+    written |= (1 << 15);
+    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, ADDSI (FLD (f_FRk), 0), opval);
+    written |= (1 << 17);
+    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, ADDSI (FLD (f_FRk), 1), opval);
+    written |= (1 << 16);
+    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, ADDSI (FLD (f_FRk), 1), opval);
+    written |= (1 << 18);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+  }
+}
+}
+
+  abuf->written = written;
+  return vpc;
+#undef FLD
+}
+
+/* mqlmths: mqlmths$pack $FRintieven,$FRintjeven,$FRintkeven */
+
+static SEM_PC
+SEM_FN_NAME (frvbf,mqlmths) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+{
+#define FLD(f) abuf->fields.sfmt_cmqaddhss.f
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+  int UNUSED written = 0;
+  IADDR UNUSED pc = abuf->addr;
+  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
+
+if (ORIF (ANDSI (FLD (f_FRi), SUBSI (2, 1)), ORIF (ANDSI (FLD (f_FRj), SUBSI (2, 1)), ANDSI (FLD (f_FRk), SUBSI (2, 1))))) {
+frvbf_media_register_not_aligned (current_cpu);
+} else {
+{
+  HI tmp_a1;
+  HI tmp_a2;
+  HI tmp_a3;
+  HI tmp_a4;
+  HI tmp_b1;
+  HI tmp_b2;
+  HI tmp_b3;
+  HI tmp_b4;
+  {
+    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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
+  }
+{
+  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 (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, ADDSI (FLD (f_FRk), 0), opval);
+    written |= (1 << 15);
+    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, ADDSI (FLD (f_FRk), 0), opval);
+    written |= (1 << 17);
+    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, ADDSI (FLD (f_FRk), 1), opval);
+    written |= (1 << 16);
+    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, ADDSI (FLD (f_FRk), 1), opval);
+    written |= (1 << 18);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+  }
+}
+}
+
+  abuf->written = written;
+  return vpc;
+#undef FLD
+}
+
+/* mqsllhi: mqsllhi$pack $FRintieven,$u6,$FRintkeven */
+
+static SEM_PC
+SEM_FN_NAME (frvbf,mqsllhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+{
+#define FLD(f) abuf->fields.sfmt_mqsllhi.f
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+  int UNUSED written = 0;
+  IADDR UNUSED pc = abuf->addr;
+  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
+
+if (ORIF (ANDSI (FLD (f_FRi), SUBSI (2, 1)), ANDSI (FLD (f_FRk), SUBSI (2, 1)))) {
+frvbf_media_register_not_aligned (current_cpu);
+} else {
+{
+  {
+    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);
+    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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", '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);
+    written |= (1 << 11);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", '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);
+    written |= (1 << 13);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', 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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', 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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+  }
+}
+}
+
+  abuf->written = written;
+  return vpc;
+#undef FLD
+}
+
+/* mqsrahi: mqsrahi$pack $FRintieven,$u6,$FRintkeven */
+
+static SEM_PC
+SEM_FN_NAME (frvbf,mqsrahi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
+{
+#define FLD(f) abuf->fields.sfmt_mqsllhi.f
+  ARGBUF *abuf = SEM_ARGBUF (sem_arg);
+  int UNUSED written = 0;
+  IADDR UNUSED pc = abuf->addr;
+  SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
+
+if (ORIF (ANDSI (FLD (f_FRi), SUBSI (2, 1)), ANDSI (FLD (f_FRk), SUBSI (2, 1)))) {
+frvbf_media_register_not_aligned (current_cpu);
+} else {
+{
+  {
+    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);
+    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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_int", '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);
+    written |= (1 << 11);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", '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);
+    written |= (1 << 13);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', 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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', 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);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
+  }
+}
+}
+
+  abuf->written = written;
+  return vpc;
+#undef FLD
+}
+
 /* maddaccs: maddaccs$pack $ACC40Si,$ACC40Sk */
 
 static SEM_PC
@@ -22679,30 +22929,32 @@ SEM_FN_NAME (frvbf,maddaccs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Si))) {
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Si), SUBSI (2, 1))) {
 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 << 3);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 4);
+    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 << 3);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 4);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -22710,12 +22962,14 @@ 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 << 3);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 4);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
+}
+}
 }
 
   abuf->written = written;
@@ -22734,30 +22988,32 @@ SEM_FN_NAME (frvbf,msubaccs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Si))) {
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Si), SUBSI (2, 1))) {
 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 << 3);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 4);
+    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 << 3);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 4);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -22765,12 +23021,14 @@ 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 << 3);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 4);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
+}
+}
 }
 
   abuf->written = written;
@@ -22789,6 +23047,8 @@ SEM_FN_NAME (frvbf,mdaddaccs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Si))) {
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Si), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -22798,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);
 }
@@ -22825,47 +23085,49 @@ 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);
   }
 }
 }
 }
 }
 }
+}
+}
 }
 
   abuf->written = written;
@@ -22884,6 +23146,8 @@ SEM_FN_NAME (frvbf,mdsubaccs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Si))) {
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Si), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -22893,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);
 }
@@ -22920,47 +23184,49 @@ 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);
   }
 }
 }
 }
 }
 }
+}
+}
 }
 
   abuf->written = written;
@@ -22979,6 +23245,8 @@ SEM_FN_NAME (frvbf,masaccs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Si))) {
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Si), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -22988,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);
 }
@@ -23015,47 +23283,49 @@ 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);
   }
 }
 }
 }
 }
 }
+}
+}
 }
 
   abuf->written = written;
@@ -23074,6 +23344,8 @@ SEM_FN_NAME (frvbf,mdasaccs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Si))) {
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Si), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -23083,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);
 }
@@ -23110,115 +23382,117 @@ 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);
   }
 }
 }
 }
 }
 }
+}
+}
 }
 
   abuf->written = written;
@@ -23237,6 +23511,7 @@ SEM_FN_NAME (frvbf,mmulhs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -23246,24 +23521,25 @@ 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);
   }
 }
+}
 }
 
   abuf->written = written;
@@ -23282,6 +23558,7 @@ SEM_FN_NAME (frvbf,mmulhu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -23291,24 +23568,25 @@ 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);
   }
 }
+}
 }
 
   abuf->written = written;
@@ -23327,6 +23605,7 @@ SEM_FN_NAME (frvbf,mmulxhs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -23336,24 +23615,25 @@ 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);
   }
 }
+}
 }
 
   abuf->written = written;
@@ -23372,6 +23652,7 @@ SEM_FN_NAME (frvbf,mmulxhu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -23381,24 +23662,25 @@ 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);
   }
 }
+}
 }
 
   abuf->written = written;
@@ -23417,6 +23699,7 @@ SEM_FN_NAME (frvbf,cmmulhs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -23427,25 +23710,26 @@ 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);
   }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -23464,6 +23748,7 @@ SEM_FN_NAME (frvbf,cmmulhu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -23474,25 +23759,26 @@ 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);
   }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -23511,6 +23797,7 @@ SEM_FN_NAME (frvbf,mqmulhs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -23523,43 +23810,44 @@ 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);
   }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -23578,6 +23866,7 @@ SEM_FN_NAME (frvbf,mqmulhu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -23590,43 +23879,44 @@ 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);
   }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -23645,6 +23935,7 @@ SEM_FN_NAME (frvbf,mqmulxhs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -23657,43 +23948,44 @@ 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);
   }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -23712,6 +24004,7 @@ SEM_FN_NAME (frvbf,mqmulxhu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -23724,43 +24017,44 @@ 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);
   }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -23779,6 +24073,7 @@ SEM_FN_NAME (frvbf,cmqmulhs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -23792,44 +24087,45 @@ 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);
   }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -23848,6 +24144,7 @@ SEM_FN_NAME (frvbf,cmqmulhu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -23861,44 +24158,45 @@ 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);
   }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -23917,6 +24215,7 @@ SEM_FN_NAME (frvbf,mmachs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -23926,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;
@@ -23940,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);
 }
@@ -23951,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);
 }
@@ -23960,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);
 }
@@ -23983,23 +24282,24 @@ 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);
   }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -24018,6 +24318,7 @@ SEM_FN_NAME (frvbf,mmachu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Uk))) {
 if (ANDSI (FLD (f_ACC40Uk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -24027,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;
@@ -24041,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);
 }
@@ -24052,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);
 }
@@ -24061,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);
 }
@@ -24084,23 +24385,24 @@ 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);
   }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -24119,6 +24421,7 @@ SEM_FN_NAME (frvbf,mmrdhs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -24128,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;
@@ -24142,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);
 }
@@ -24153,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);
 }
@@ -24162,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);
 }
@@ -24185,23 +24488,24 @@ 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);
   }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -24220,6 +24524,7 @@ SEM_FN_NAME (frvbf,mmrdhu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Uk))) {
 if (ANDSI (FLD (f_ACC40Uk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -24229,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;
@@ -24243,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);
 }
@@ -24254,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);
 }
@@ -24263,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);
 }
@@ -24286,23 +24591,24 @@ 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);
   }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -24321,6 +24627,7 @@ SEM_FN_NAME (frvbf,cmmachs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -24331,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;
@@ -24345,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);
 }
@@ -24356,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);
 }
@@ -24365,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);
 }
@@ -24388,24 +24695,25 @@ 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);
   }
 }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -24424,6 +24732,7 @@ SEM_FN_NAME (frvbf,cmmachu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Uk))) {
 if (ANDSI (FLD (f_ACC40Uk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -24434,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;
@@ -24448,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);
 }
@@ -24459,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);
 }
@@ -24468,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);
 }
@@ -24491,24 +24800,25 @@ 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);
   }
 }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -24527,6 +24837,7 @@ SEM_FN_NAME (frvbf,mqmachs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -24539,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;
@@ -24553,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);
 }
@@ -24564,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);
 }
@@ -24573,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);
 }
@@ -24596,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);
 }
@@ -24636,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);
 }
@@ -24670,24 +24981,25 @@ 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);
   }
 }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -24706,6 +25018,7 @@ SEM_FN_NAME (frvbf,mqmachu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Uk))) {
 if (ANDSI (FLD (f_ACC40Uk), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -24718,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;
@@ -24732,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);
 }
@@ -24743,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);
 }
@@ -24752,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);
 }
@@ -24775,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);
 }
@@ -24815,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);
 }
@@ -24849,24 +25162,25 @@ 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);
   }
 }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -24885,6 +25199,7 @@ SEM_FN_NAME (frvbf,cmqmachs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -24898,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;
@@ -24912,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);
 }
@@ -24923,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);
 }
@@ -24932,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);
 }
@@ -24955,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);
 }
@@ -24995,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);
 }
@@ -25029,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);
   }
 }
 }
@@ -25048,6 +25363,7 @@ frvbf_media_overflow (current_cpu, 1);
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -25066,6 +25382,7 @@ SEM_FN_NAME (frvbf,cmqmachu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Uk))) {
 if (ANDSI (FLD (f_ACC40Uk), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -25079,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;
@@ -25093,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);
 }
@@ -25104,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);
 }
@@ -25113,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);
 }
@@ -25136,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);
 }
@@ -25176,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);
 }
@@ -25210,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);
   }
 }
 }
@@ -25229,6 +25546,7 @@ frvbf_media_overflow (current_cpu, 1);
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -25247,6 +25565,7 @@ SEM_FN_NAME (frvbf,mqxmachs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -25259,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);
 }
@@ -25282,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);
 }
@@ -25316,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;
@@ -25347,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);
 }
@@ -25358,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);
 }
@@ -25367,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);
 }
@@ -25390,24 +25709,25 @@ 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);
   }
 }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -25426,6 +25746,7 @@ SEM_FN_NAME (frvbf,mqxmacxhs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -25438,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);
 }
@@ -25461,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);
 }
@@ -25495,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;
@@ -25526,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);
 }
@@ -25537,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);
 }
@@ -25546,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);
 }
@@ -25569,24 +25890,25 @@ 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);
   }
 }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -25605,6 +25927,7 @@ SEM_FN_NAME (frvbf,mqmacxhs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (4, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -25617,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;
@@ -25631,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);
 }
@@ -25642,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);
 }
@@ -25651,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);
 }
@@ -25674,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);
 }
@@ -25714,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);
 }
@@ -25748,24 +26071,25 @@ 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);
   }
 }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -25784,16 +26108,17 @@ SEM_FN_NAME (frvbf,mcpxrs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 {
   HI tmp_argihi;
   HI tmp_argilo;
   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;
@@ -25806,8 +26131,8 @@ 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 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 9);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25817,8 +26142,8 @@ 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 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 9);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25826,12 +26151,13 @@ 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 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 9);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -25850,16 +26176,17 @@ SEM_FN_NAME (frvbf,mcpxru) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 {
   UHI tmp_argihi;
   UHI tmp_argilo;
   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;
@@ -25872,8 +26199,8 @@ 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 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 9);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25883,8 +26210,8 @@ 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 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 9);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25892,12 +26219,13 @@ 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 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 9);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -25916,16 +26244,17 @@ SEM_FN_NAME (frvbf,mcpxis) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 {
   HI tmp_argihi;
   HI tmp_argilo;
   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;
@@ -25938,8 +26267,8 @@ 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 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 9);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25949,8 +26278,8 @@ 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 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 9);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -25958,12 +26287,13 @@ 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 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 9);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -25982,16 +26312,17 @@ SEM_FN_NAME (frvbf,mcpxiu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 {
   UHI tmp_argihi;
   UHI tmp_argilo;
   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;
@@ -26004,8 +26335,8 @@ 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 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 9);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26015,8 +26346,8 @@ 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 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 9);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26024,12 +26355,13 @@ 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 << 8);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 9);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -26049,16 +26381,17 @@ SEM_FN_NAME (frvbf,cmcpxrs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 {
   HI tmp_argihi;
   HI tmp_argilo;
   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;
@@ -26071,8 +26404,8 @@ 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 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 11);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26082,8 +26415,8 @@ 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 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 11);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26091,13 +26424,14 @@ 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 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 11);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -26117,16 +26451,17 @@ SEM_FN_NAME (frvbf,cmcpxru) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 {
   UHI tmp_argihi;
   UHI tmp_argilo;
   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;
@@ -26139,8 +26474,8 @@ 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 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 11);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26150,8 +26485,8 @@ 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 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 11);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26159,13 +26494,14 @@ 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 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 11);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -26185,16 +26521,17 @@ SEM_FN_NAME (frvbf,cmcpxis) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 {
   HI tmp_argihi;
   HI tmp_argilo;
   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;
@@ -26207,8 +26544,8 @@ 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 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 11);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26218,8 +26555,8 @@ 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 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 11);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26227,13 +26564,14 @@ 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 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 11);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -26253,16 +26591,17 @@ SEM_FN_NAME (frvbf,cmcpxiu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
 if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 {
   UHI tmp_argihi;
   UHI tmp_argilo;
   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;
@@ -26275,8 +26614,8 @@ 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 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 11);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26286,8 +26625,8 @@ 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 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 11);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 frvbf_media_overflow (current_cpu, 8);
 }
@@ -26295,13 +26634,14 @@ 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 << 10);
-    TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
+    written |= (1 << 11);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -26320,6 +26660,7 @@ SEM_FN_NAME (frvbf,mqcpxrs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -26332,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;
@@ -26349,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);
 }
@@ -26360,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);
 }
@@ -26369,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;
@@ -26390,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);
 }
@@ -26401,24 +26742,25 @@ 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);
   }
 }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -26437,6 +26779,7 @@ SEM_FN_NAME (frvbf,mqcpxru) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -26449,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;
@@ -26466,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);
 }
@@ -26477,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);
 }
@@ -26486,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;
@@ -26507,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);
 }
@@ -26518,24 +26861,25 @@ 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);
   }
 }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -26554,6 +26898,7 @@ SEM_FN_NAME (frvbf,mqcpxis) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -26566,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;
@@ -26583,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);
 }
@@ -26594,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);
 }
@@ -26603,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;
@@ -26624,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);
 }
@@ -26635,24 +26980,25 @@ 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);
   }
 }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -26671,6 +27017,7 @@ SEM_FN_NAME (frvbf,mqcpxiu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   IADDR UNUSED pc = abuf->addr;
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
+if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
 if (ANDSI (FLD (f_ACC40Sk), SUBSI (2, 1))) {
 frvbf_media_acc_not_aligned (current_cpu);
 } else {
@@ -26683,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;
@@ -26700,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);
 }
@@ -26711,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);
 }
@@ -26720,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;
@@ -26741,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);
 }
@@ -26752,24 +27099,25 @@ 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);
   }
 }
 }
 }
 }
 }
+}
 }
 
   abuf->written = written;
@@ -26791,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);
   }
 }
 
@@ -26826,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);
   }
 }
 }
@@ -26870,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);
   }
 }
 }
@@ -26930,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);
   }
 }
 }
@@ -26983,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);
   }
 }
 
@@ -27017,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);
   }
 }
 }
@@ -27086,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);
   }
 }
 }
@@ -27147,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);
   }
 }
 }
@@ -27230,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);
   }
 }
 }
@@ -27289,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);
@@ -27302,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);
   }
 }
 }
@@ -27350,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);
   }
 }
 }
@@ -27409,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);
@@ -27422,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);
   }
 }
 }
@@ -27470,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);
   }
 }
 }
@@ -27553,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);
@@ -27566,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);
   }
 }
 }
@@ -27628,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;
@@ -27688,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;
@@ -27709,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;
@@ -27730,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;
@@ -27753,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);
   }
 }
 
@@ -27766,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;
@@ -27783,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;
@@ -27800,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;
@@ -27833,9 +28181,14 @@ static const struct sem_fn_desc sem_fns[] = {
   { FRVBF_INSN_NUDIV, SEM_FN_NAME (frvbf,nudiv) },
   { FRVBF_INSN_SMUL, SEM_FN_NAME (frvbf,smul) },
   { FRVBF_INSN_UMUL, SEM_FN_NAME (frvbf,umul) },
+  { FRVBF_INSN_SMU, SEM_FN_NAME (frvbf,smu) },
+  { FRVBF_INSN_SMASS, SEM_FN_NAME (frvbf,smass) },
+  { FRVBF_INSN_SMSSS, SEM_FN_NAME (frvbf,smsss) },
   { FRVBF_INSN_SLL, SEM_FN_NAME (frvbf,sll) },
   { FRVBF_INSN_SRL, SEM_FN_NAME (frvbf,srl) },
   { FRVBF_INSN_SRA, SEM_FN_NAME (frvbf,sra) },
+  { FRVBF_INSN_SLASS, SEM_FN_NAME (frvbf,slass) },
+  { FRVBF_INSN_SCUTSS, SEM_FN_NAME (frvbf,scutss) },
   { FRVBF_INSN_SCAN, SEM_FN_NAME (frvbf,scan) },
   { FRVBF_INSN_CADD, SEM_FN_NAME (frvbf,cadd) },
   { FRVBF_INSN_CSUB, SEM_FN_NAME (frvbf,csub) },
@@ -27873,6 +28226,8 @@ static const struct sem_fn_desc sem_fns[] = {
   { FRVBF_INSN_SUBX, SEM_FN_NAME (frvbf,subx) },
   { FRVBF_INSN_ADDXCC, SEM_FN_NAME (frvbf,addxcc) },
   { FRVBF_INSN_SUBXCC, SEM_FN_NAME (frvbf,subxcc) },
+  { FRVBF_INSN_ADDSS, SEM_FN_NAME (frvbf,addss) },
+  { FRVBF_INSN_SUBSS, SEM_FN_NAME (frvbf,subss) },
   { FRVBF_INSN_ADDI, SEM_FN_NAME (frvbf,addi) },
   { FRVBF_INSN_SUBI, SEM_FN_NAME (frvbf,subi) },
   { FRVBF_INSN_ANDI, SEM_FN_NAME (frvbf,andi) },
@@ -27991,22 +28346,12 @@ static const struct sem_fn_desc sem_fns[] = {
   { FRVBF_INSN_STHF, SEM_FN_NAME (frvbf,sthf) },
   { FRVBF_INSN_STF, SEM_FN_NAME (frvbf,stf) },
   { FRVBF_INSN_STC, SEM_FN_NAME (frvbf,stc) },
-  { FRVBF_INSN_RSTB, SEM_FN_NAME (frvbf,rstb) },
-  { FRVBF_INSN_RSTH, SEM_FN_NAME (frvbf,rsth) },
-  { FRVBF_INSN_RST, SEM_FN_NAME (frvbf,rst) },
-  { FRVBF_INSN_RSTBF, SEM_FN_NAME (frvbf,rstbf) },
-  { FRVBF_INSN_RSTHF, SEM_FN_NAME (frvbf,rsthf) },
-  { FRVBF_INSN_RSTF, SEM_FN_NAME (frvbf,rstf) },
   { FRVBF_INSN_STD, SEM_FN_NAME (frvbf,std) },
   { FRVBF_INSN_STDF, SEM_FN_NAME (frvbf,stdf) },
   { FRVBF_INSN_STDC, SEM_FN_NAME (frvbf,stdc) },
-  { FRVBF_INSN_RSTD, SEM_FN_NAME (frvbf,rstd) },
-  { FRVBF_INSN_RSTDF, SEM_FN_NAME (frvbf,rstdf) },
   { FRVBF_INSN_STQ, SEM_FN_NAME (frvbf,stq) },
   { FRVBF_INSN_STQF, SEM_FN_NAME (frvbf,stqf) },
   { FRVBF_INSN_STQC, SEM_FN_NAME (frvbf,stqc) },
-  { FRVBF_INSN_RSTQ, SEM_FN_NAME (frvbf,rstq) },
-  { FRVBF_INSN_RSTQF, SEM_FN_NAME (frvbf,rstqf) },
   { FRVBF_INSN_STBU, SEM_FN_NAME (frvbf,stbu) },
   { FRVBF_INSN_STHU, SEM_FN_NAME (frvbf,sthu) },
   { FRVBF_INSN_STU, SEM_FN_NAME (frvbf,stu) },
@@ -28346,6 +28691,9 @@ static const struct sem_fn_desc sem_fns[] = {
   { FRVBF_INSN_DCUL, SEM_FN_NAME (frvbf,dcul) },
   { FRVBF_INSN_BAR, SEM_FN_NAME (frvbf,bar) },
   { FRVBF_INSN_MEMBAR, SEM_FN_NAME (frvbf,membar) },
+  { FRVBF_INSN_LRAI, SEM_FN_NAME (frvbf,lrai) },
+  { FRVBF_INSN_LRAD, SEM_FN_NAME (frvbf,lrad) },
+  { FRVBF_INSN_TLBPR, SEM_FN_NAME (frvbf,tlbpr) },
   { FRVBF_INSN_COP1, SEM_FN_NAME (frvbf,cop1) },
   { FRVBF_INSN_COP2, SEM_FN_NAME (frvbf,cop2) },
   { FRVBF_INSN_CLRGR, SEM_FN_NAME (frvbf,clrgr) },
@@ -28493,6 +28841,10 @@ static const struct sem_fn_desc sem_fns[] = {
   { FRVBF_INSN_CMQADDHUS, SEM_FN_NAME (frvbf,cmqaddhus) },
   { FRVBF_INSN_CMQSUBHSS, SEM_FN_NAME (frvbf,cmqsubhss) },
   { FRVBF_INSN_CMQSUBHUS, SEM_FN_NAME (frvbf,cmqsubhus) },
+  { FRVBF_INSN_MQLCLRHS, SEM_FN_NAME (frvbf,mqlclrhs) },
+  { FRVBF_INSN_MQLMTHS, SEM_FN_NAME (frvbf,mqlmths) },
+  { FRVBF_INSN_MQSLLHI, SEM_FN_NAME (frvbf,mqsllhi) },
+  { FRVBF_INSN_MQSRAHI, SEM_FN_NAME (frvbf,mqsrahi) },
   { FRVBF_INSN_MADDACCS, SEM_FN_NAME (frvbf,maddaccs) },
   { FRVBF_INSN_MSUBACCS, SEM_FN_NAME (frvbf,msubaccs) },
   { FRVBF_INSN_MDADDACCS, SEM_FN_NAME (frvbf,mdaddaccs) },