gas: avoid spurious failures in non-ELF targets in the SPARC testsuite.

[deliverable/binutils-gdb.git] / sim / cris / semcrisv32f-switch.c

diff --git a/sim/cris/semcrisv32f-switch.c b/sim/cris/semcrisv32f-switch.c
index 65c1c0ab86d43449b34761436700c0e22775dbd8..3f5d61ba7274ae86d45caaf6719f4999556d543e 100644 (file)
--- a/sim/cris/semcrisv32f-switch.c
+++ b/sim/cris/semcrisv32f-switch.c
@@ -2,23 +2,22 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2005 Free Software Foundation, Inc.
+Copyright 1996-2016 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This file is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   It is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
 
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -265,21 +264,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 /* If hyper-fast [well not unnecessarily slow] execution is selected, turn
    off frills like tracing and profiling.  */
-/* FIXME: A better way would be to have TRACE_RESULT check for something
+/* FIXME: A better way would be to have CGEN_TRACE_RESULT check for something
    that can cause it to be optimized out.  Another way would be to emit
    special handlers into the instruction "stream".  */
 
 #if FAST_P
-#undef TRACE_RESULT
-#define TRACE_RESULT(cpu, abuf, name, type, val)
+#undef CGEN_TRACE_RESULT
+#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val)
 #endif
 
 #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
 
 {
 
@@ -310,7 +305,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
 {
   SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
@@ -335,7 +330,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
 {
   SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
@@ -354,7 +349,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
 {
   SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
@@ -373,7 +368,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
 {
   SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
@@ -401,7 +396,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
 {
   SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
@@ -423,7 +418,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
 {
   SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   vpc = SEM_NEXT_VPC (sem_arg, pc, 0);
@@ -466,19 +461,19 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTQI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -486,12 +481,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -519,19 +514,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTHI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -539,12 +534,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -569,18 +564,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -588,12 +583,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -618,7 +613,7 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
 SET_H_NBIT_MOVE (LTSI (tmp_newval, 0));
@@ -629,12 +624,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -654,23 +649,25 @@ SET_H_VBIT_MOVE (0);
   vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 {
-  QI tmp_newval;
-  tmp_newval = GET_H_GR (FLD (f_operand1));
+  QI tmp_tmpops;
+  SI tmp_newval;
+  tmp_tmpops = GET_H_GR (FLD (f_operand1));
+  tmp_newval = EXTQISI (tmp_tmpops);
   {
-    SI opval = EXTQISI (tmp_newval);
+    SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -678,12 +675,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -703,23 +700,25 @@ SET_H_VBIT_MOVE (0);
   vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 {
-  HI tmp_newval;
-  tmp_newval = GET_H_GR (FLD (f_operand1));
+  HI tmp_tmpops;
+  SI tmp_newval;
+  tmp_tmpops = GET_H_GR (FLD (f_operand1));
+  tmp_newval = EXTHISI (tmp_tmpops);
   {
-    SI opval = EXTHISI (tmp_newval);
+    SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -727,12 +726,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -752,23 +751,25 @@ SET_H_VBIT_MOVE (0);
   vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 {
-  QI tmp_newval;
-  tmp_newval = GET_H_GR (FLD (f_operand1));
+  QI tmp_tmpops;
+  SI tmp_newval;
+  tmp_tmpops = GET_H_GR (FLD (f_operand1));
+  tmp_newval = ZEXTQISI (tmp_tmpops);
   {
-    SI opval = ZEXTQISI (tmp_newval);
+    SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -776,12 +777,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -801,23 +802,25 @@ SET_H_VBIT_MOVE (0);
   vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
 
 {
-  HI tmp_newval;
-  tmp_newval = GET_H_GR (FLD (f_operand1));
+  HI tmp_tmpops;
+  SI tmp_newval;
+  tmp_tmpops = GET_H_GR (FLD (f_operand1));
+  tmp_newval = ZEXTHISI (tmp_tmpops);
   {
-    SI opval = ZEXTHISI (tmp_newval);
+    SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -825,12 +828,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -858,19 +861,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTQI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -878,12 +881,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -911,19 +914,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTHI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -931,12 +934,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -961,18 +964,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -980,12 +983,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1010,18 +1013,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -1029,12 +1032,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1059,18 +1062,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -1078,12 +1081,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1108,18 +1111,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -1127,12 +1130,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1157,18 +1160,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -1176,12 +1179,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1212,39 +1215,39 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1275,39 +1278,39 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1340,33 +1343,33 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTQI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1399,33 +1402,33 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTHI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1458,33 +1461,33 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1523,7 +1526,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -1536,33 +1539,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTQI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1602,7 +1605,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -1615,33 +1618,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTHI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1681,7 +1684,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -1694,33 +1697,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1754,33 +1757,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTQI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1813,33 +1816,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTHI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1872,33 +1875,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1931,33 +1934,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -1996,7 +1999,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -2009,33 +2012,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -2075,7 +2078,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -2088,33 +2091,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -2148,33 +2151,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -2207,33 +2210,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -2272,7 +2275,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -2285,33 +2288,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -2351,7 +2354,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -2364,33 +2367,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -2424,33 +2427,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -2483,33 +2486,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -2545,7 +2548,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -2556,19 +2559,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_tmp, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTQI (tmp_tmp, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -2576,12 +2579,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -2618,7 +2621,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -2629,19 +2632,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_tmp, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTHI (tmp_tmp, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -2649,12 +2652,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -2691,7 +2694,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -2699,18 +2702,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_tmp;
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmp, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -2718,12 +2721,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -2760,7 +2763,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -2770,26 +2773,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) {
     SI opval = tmp_tmp;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 } else {
   {
     SI opval = tmp_tmp;
     SET_H_GR (FLD (f_operand2), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTSI (tmp_tmp, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -2797,12 +2800,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -2839,7 +2842,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -2849,26 +2852,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) {
     SI opval = tmp_tmp;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 } else {
   {
     SI opval = tmp_tmp;
     SET_H_GR (FLD (f_operand2), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTSI (tmp_tmp, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -2876,12 +2879,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -2918,7 +2921,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -2928,26 +2931,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) {
     SI opval = tmp_tmp;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 } else {
   {
     SI opval = tmp_tmp;
     SET_H_GR (FLD (f_operand2), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTSI (tmp_tmp, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -2955,12 +2958,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -2997,7 +3000,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3007,26 +3010,26 @@ if (ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) {
     SI opval = tmp_tmp;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 } else {
   {
     SI opval = tmp_tmp;
     SET_H_GR (FLD (f_operand2), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTSI (tmp_tmp, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmp, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -3034,12 +3037,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3072,19 +3075,19 @@ cgen_rtx_error (current_cpu, "move-r-spr: trying to set a read-only special regi
     SI opval = tmp_tmp;
     SET_H_SR (FLD (f_operand2), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3110,16 +3113,12 @@ cgen_rtx_error (current_cpu, "move-r-spr: trying to set a read-only special regi
   tmp_prno = FLD (f_operand2);
   tmp_newval = GET_H_SR (FLD (f_operand2));
 if (EQSI (tmp_prno, 2)) {
-{
-  SI tmp_oldregval;
-  tmp_oldregval = GET_H_RAW_GR_ACR (FLD (f_operand1));
   {
-    SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00));
+    SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
-}
 }
  else if (EQSI (tmp_prno, 3)) {
 {
@@ -3129,7 +3128,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3138,7 +3137,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
  else if (EQSI (tmp_prno, 6)) {
@@ -3146,7 +3145,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
  else if (EQSI (tmp_prno, 7)) {
@@ -3154,7 +3153,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
  else if (EQSI (tmp_prno, 9)) {
@@ -3162,7 +3161,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
  else if (EQSI (tmp_prno, 10)) {
@@ -3170,7 +3169,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
  else if (EQSI (tmp_prno, 11)) {
@@ -3178,7 +3177,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
  else if (EQSI (tmp_prno, 12)) {
@@ -3186,7 +3185,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
  else if (EQSI (tmp_prno, 13)) {
@@ -3194,7 +3193,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
  else if (EQSI (tmp_prno, 14)) {
@@ -3202,7 +3201,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
  else if (EQSI (tmp_prno, 15)) {
@@ -3210,7 +3209,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
  else if (EQSI (tmp_prno, 0)) {
@@ -3221,7 +3220,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3233,7 +3232,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3245,7 +3244,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3254,7 +3253,7 @@ if (EQSI (tmp_prno, 2)) {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
  else {
@@ -3264,12 +3263,12 @@ cgen_rtx_error (current_cpu, "move-spr-r from unimplemented register");
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3293,26 +3292,26 @@ cgen_rtx_error (current_cpu, "move-spr-r from unimplemented register");
   SI tmp_newval;
   tmp_rno = FLD (f_operand2);
 if (EQSI (tmp_rno, 2)) {
-  tmp_newval = EXTQISI (({   SI tmp_addr;
-  QI tmp_tmp_mem;
+  tmp_newval = ({   SI tmp_addr;
+  SI tmp_tmp_mem;
   BI tmp_postinc;
   tmp_postinc = FLD (f_memmode);
 ;   tmp_addr = ((EQBI (GET_H_INSN_PREFIXED_P (), 0)) ? (GET_H_GR (FLD (f_operand1))) : (GET_H_PREFIXREG_V32 ()));
-;   tmp_tmp_mem = GETMEMQI (current_cpu, pc, tmp_addr);
+;   tmp_tmp_mem = GETMEMSI (current_cpu, pc, tmp_addr);
 ; if (NEBI (tmp_postinc, 0)) {
 {
 if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
-  tmp_addr = ADDSI (tmp_addr, 1);
+  tmp_addr = ADDSI (tmp_addr, 4);
 }
   {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
-; tmp_tmp_mem; }));
+; tmp_tmp_mem; });
 }
  else if (EQSI (tmp_rno, 3)) {
   tmp_newval = EXTQISI (({   SI tmp_addr;
@@ -3330,7 +3329,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3352,7 +3351,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3374,7 +3373,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3396,7 +3395,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3418,7 +3417,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3440,7 +3439,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3462,7 +3461,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3484,7 +3483,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3506,7 +3505,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3528,7 +3527,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3550,7 +3549,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -3562,18 +3561,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register");
   {
     SI opval = tmp_newval;
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3596,18 +3595,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register");
   {
     SI opval = FLD (f_indir_pc__dword);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3629,18 +3628,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register");
   {
     SI opval = FLD (f_indir_pc__dword);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3662,18 +3661,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register");
   {
     SI opval = FLD (f_indir_pc__dword);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3695,18 +3694,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register");
   {
     SI opval = FLD (f_indir_pc__dword);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3728,18 +3727,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register");
   {
     SI opval = FLD (f_indir_pc__dword);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3761,18 +3760,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register");
   {
     SI opval = FLD (f_indir_pc__dword);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3794,18 +3793,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register");
   {
     SI opval = FLD (f_indir_pc__dword);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3827,18 +3826,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register");
   {
     SI opval = FLD (f_indir_pc__dword);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3860,18 +3859,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register");
   {
     SI opval = FLD (f_indir_pc__dword);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3893,18 +3892,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register");
   {
     SI opval = FLD (f_indir_pc__dword);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3926,18 +3925,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register");
   {
     SI opval = FLD (f_indir_pc__dword);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -3959,18 +3958,18 @@ cgen_rtx_error (current_cpu, "Trying to set unimplemented special register");
   {
     SI opval = FLD (f_indir_pc__dword);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -4001,16 +4000,16 @@ if (ANDIF (GET_H_V32_V32 (), NEBI (CPU (h_xbit), 0))) {
 if (EQBI (CPU (h_pbit), 0)) {
 {
   {
-    QI opval = GET_H_SR (FLD (f_operand2));
-    SETMEMQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    SI opval = GET_H_SR (FLD (f_operand2));
+    SETMEMSI (current_cpu, pc, tmp_addr, opval);
+    written |= (1 << 13);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4018,27 +4017,27 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
   {
-    QI opval = GET_H_SR (FLD (f_operand2));
-    SETMEMQI (current_cpu, pc, tmp_addr, opval);
-    written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    SI opval = GET_H_SR (FLD (f_operand2));
+    SETMEMSI (current_cpu, pc, tmp_addr, opval);
+    written |= (1 << 13);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
 {
 if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
-  tmp_addr = ADDSI (tmp_addr, 1);
+  tmp_addr = ADDSI (tmp_addr, 4);
 }
   {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4057,13 +4056,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     QI opval = GET_H_SR (FLD (f_operand2));
     SETMEMQI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4071,7 +4070,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4079,7 +4078,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     QI opval = GET_H_SR (FLD (f_operand2));
     SETMEMQI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4091,7 +4090,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4110,13 +4109,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4124,7 +4123,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4132,7 +4131,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4144,7 +4143,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4163,13 +4162,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4177,7 +4176,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4185,7 +4184,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4197,7 +4196,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4216,13 +4215,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4230,7 +4229,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4238,7 +4237,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4250,7 +4249,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4269,13 +4268,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4283,7 +4282,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4291,7 +4290,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4303,7 +4302,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4322,13 +4321,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4336,7 +4335,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4344,7 +4343,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4356,7 +4355,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4375,13 +4374,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4389,7 +4388,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4397,7 +4396,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4409,7 +4408,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4428,13 +4427,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4442,7 +4441,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4450,7 +4449,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4462,7 +4461,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4481,13 +4480,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4495,7 +4494,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4503,7 +4502,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4515,7 +4514,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4534,13 +4533,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4548,7 +4547,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4556,7 +4555,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4568,7 +4567,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4587,13 +4586,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4601,7 +4600,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4609,7 +4608,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4621,7 +4620,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4640,13 +4639,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     QI opval = GET_H_SR (FLD (f_operand2));
     SETMEMQI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4654,7 +4653,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4662,7 +4661,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     QI opval = GET_H_SR (FLD (f_operand2));
     SETMEMQI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4674,7 +4673,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4693,13 +4692,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     QI opval = GET_H_SR (FLD (f_operand2));
     SETMEMQI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4707,7 +4706,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4715,7 +4714,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     QI opval = GET_H_SR (FLD (f_operand2));
     SETMEMQI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4727,7 +4726,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4746,13 +4745,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     HI opval = GET_H_SR (FLD (f_operand2));
     SETMEMHI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4760,7 +4759,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4768,7 +4767,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     HI opval = GET_H_SR (FLD (f_operand2));
     SETMEMHI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4780,7 +4779,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4799,13 +4798,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4813,7 +4812,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -4821,7 +4820,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = GET_H_SR (FLD (f_operand2));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -4833,7 +4832,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4846,12 +4845,12 @@ cgen_rtx_error (current_cpu, "write from unimplemented special register");
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -4874,18 +4873,18 @@ cgen_rtx_error (current_cpu, "write from unimplemented special register");
   {
     SI opval = GET_H_SUPR (FLD (f_operand2));
     SET_H_GR (FLD (f_operand1), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -4907,18 +4906,18 @@ cgen_rtx_error (current_cpu, "write from unimplemented special register");
   {
     SI opval = GET_H_GR (FLD (f_operand1));
     SET_H_SUPR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "supr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "supr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -4954,7 +4953,7 @@ if (GESI (FLD (f_operand2), 0)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -4967,7 +4966,7 @@ if (GESI (FLD (f_operand2), 1)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -4980,7 +4979,7 @@ if (GESI (FLD (f_operand2), 2)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -4993,7 +4992,7 @@ if (GESI (FLD (f_operand2), 3)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5006,7 +5005,7 @@ if (GESI (FLD (f_operand2), 4)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5019,7 +5018,7 @@ if (GESI (FLD (f_operand2), 5)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5032,7 +5031,7 @@ if (GESI (FLD (f_operand2), 6)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5045,7 +5044,7 @@ if (GESI (FLD (f_operand2), 7)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5058,7 +5057,7 @@ if (GESI (FLD (f_operand2), 8)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5071,7 +5070,7 @@ if (GESI (FLD (f_operand2), 9)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5084,7 +5083,7 @@ if (GESI (FLD (f_operand2), 10)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5097,7 +5096,7 @@ if (GESI (FLD (f_operand2), 11)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5110,7 +5109,7 @@ if (GESI (FLD (f_operand2), 12)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5123,7 +5122,7 @@ if (GESI (FLD (f_operand2), 13)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5136,7 +5135,7 @@ if (GESI (FLD (f_operand2), 14)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5149,7 +5148,7 @@ if (GESI (FLD (f_operand2), 15)) {
     SI opval = tmp_tmp;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5160,19 +5159,19 @@ if (NEBI (tmp_postinc, 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -5209,7 +5208,7 @@ if (GESI (FLD (f_operand2), 0)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 0), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5222,7 +5221,7 @@ if (GESI (FLD (f_operand2), 1)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 1), opval);
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5235,7 +5234,7 @@ if (GESI (FLD (f_operand2), 2)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 2), opval);
     written |= (1 << 14);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5248,7 +5247,7 @@ if (GESI (FLD (f_operand2), 3)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 3), opval);
     written |= (1 << 15);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5261,7 +5260,7 @@ if (GESI (FLD (f_operand2), 4)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 4), opval);
     written |= (1 << 16);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5274,7 +5273,7 @@ if (GESI (FLD (f_operand2), 5)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 5), opval);
     written |= (1 << 17);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5287,7 +5286,7 @@ if (GESI (FLD (f_operand2), 6)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 6), opval);
     written |= (1 << 18);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5300,7 +5299,7 @@ if (GESI (FLD (f_operand2), 7)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 7), opval);
     written |= (1 << 19);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5313,7 +5312,7 @@ if (GESI (FLD (f_operand2), 8)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 8), opval);
     written |= (1 << 20);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5326,7 +5325,7 @@ if (GESI (FLD (f_operand2), 9)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 9), opval);
     written |= (1 << 21);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5339,7 +5338,7 @@ if (GESI (FLD (f_operand2), 10)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 10), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5352,7 +5351,7 @@ if (GESI (FLD (f_operand2), 11)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 11), opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5365,7 +5364,7 @@ if (GESI (FLD (f_operand2), 12)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 12), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5378,7 +5377,7 @@ if (GESI (FLD (f_operand2), 13)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 13), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5391,7 +5390,7 @@ if (GESI (FLD (f_operand2), 14)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 14), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5404,7 +5403,7 @@ if (GESI (FLD (f_operand2), 15)) {
     SI opval = tmp_tmp;
     SET_H_GR (((UINT) 15), opval);
     written |= (1 << 13);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   tmp_addr = ADDSI (tmp_addr, 4);
 }
@@ -5415,19 +5414,19 @@ if (NEBI (tmp_postinc, 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -5461,40 +5460,40 @@ if (NEBI (tmp_postinc, 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), ORIF (ANDIF (LTQI (tmp_tmpopd, 0), GEQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTQI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (GEQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -5528,40 +5527,40 @@ if (NEBI (tmp_postinc, 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), ORIF (ANDIF (LTHI (tmp_tmpopd, 0), GEHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTHI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (GEHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -5592,39 +5591,39 @@ if (NEBI (tmp_postinc, 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -5663,7 +5662,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -5677,40 +5676,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), ORIF (ANDIF (LTQI (tmp_tmpopd, 0), GEQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTQI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (GEQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -5750,7 +5749,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -5764,40 +5763,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), ORIF (ANDIF (LTHI (tmp_tmpopd, 0), GEHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTHI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (GEHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -5837,7 +5836,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -5848,39 +5847,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -5915,40 +5914,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), ORIF (ANDIF (LTQI (tmp_tmpopd, 0), GEQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTQI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (GEQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -5982,40 +5981,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), ORIF (ANDIF (LTHI (tmp_tmpopd, 0), GEHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTHI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (GEHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -6046,39 +6045,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -6109,39 +6108,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -6172,39 +6171,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -6243,7 +6242,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -6254,39 +6253,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -6326,7 +6325,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -6337,39 +6336,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -6401,39 +6400,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -6464,39 +6463,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -6527,39 +6526,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -6590,39 +6589,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -6661,7 +6660,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -6672,39 +6671,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -6744,7 +6743,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -6755,39 +6754,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -6819,39 +6818,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -6882,39 +6881,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -6948,40 +6947,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTQI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -7015,40 +7014,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTHI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -7079,39 +7078,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -7150,7 +7149,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7164,40 +7163,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTQI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -7237,7 +7236,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 12);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7251,40 +7250,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTHI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -7324,7 +7323,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7335,39 +7334,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -7402,40 +7401,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTQI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -7469,40 +7468,40 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTHI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -7533,39 +7532,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -7596,39 +7595,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -7659,39 +7658,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -7730,7 +7729,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7741,39 +7740,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -7813,7 +7812,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -7824,39 +7823,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -7888,39 +7887,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -7951,39 +7950,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8014,39 +8013,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8077,39 +8076,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8148,7 +8147,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -8159,39 +8158,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8231,7 +8230,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -8242,39 +8241,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8306,39 +8305,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8369,39 +8368,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8434,39 +8433,39 @@ CPU (h_xbit) = 1;
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8508,7 +8507,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -8519,39 +8518,39 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8586,39 +8585,39 @@ CPU (h_xbit) = 1;
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8642,18 +8641,18 @@ CPU (h_xbit) = 1;
   {
     SI opval = FLD (i_const32_pcrel);
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8675,18 +8674,18 @@ CPU (h_xbit) = 1;
   {
     SI opval = FLD (i_qo);
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8708,18 +8707,18 @@ CPU (h_xbit) = 1;
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 1));
     SET_H_GR (FLD (f_operand1), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8741,18 +8740,18 @@ CPU (h_xbit) = 1;
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 2));
     SET_H_GR (FLD (f_operand1), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8774,18 +8773,18 @@ CPU (h_xbit) = 1;
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 4));
     SET_H_GR (FLD (f_operand1), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8818,40 +8817,40 @@ CPU (h_xbit) = 1;
   {
     SI opval = ORSI (ANDSI (tmp_newval, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTQI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8885,40 +8884,40 @@ CPU (h_xbit) = 1;
   {
     SI opval = ORSI (ANDSI (tmp_newval, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTHI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -8949,39 +8948,39 @@ CPU (h_xbit) = 1;
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -9017,7 +9016,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -9036,33 +9035,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), ORIF (ANDIF (GEQI (tmp_tmpopd, 0), LTQI (tmp_newval, 0)), ANDIF (LTQI (tmp_tmpops, 0), LTQI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTQI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEQI (tmp_tmpops, 0), LTQI (tmp_tmpopd, 0)), GEQI (tmp_newval, 0)), ANDIF (ANDIF (LTQI (tmp_tmpops, 0), GEQI (tmp_tmpopd, 0)), LTQI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -9100,7 +9099,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -9119,33 +9118,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), ORIF (ANDIF (GEHI (tmp_tmpopd, 0), LTHI (tmp_newval, 0)), ANDIF (LTHI (tmp_tmpops, 0), LTHI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTHI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GEHI (tmp_tmpops, 0), LTHI (tmp_tmpopd, 0)), GEHI (tmp_newval, 0)), ANDIF (ANDIF (LTHI (tmp_tmpops, 0), GEHI (tmp_tmpopd, 0)), LTHI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -9183,7 +9182,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -9202,33 +9201,33 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), ORIF (ANDIF (GESI (tmp_tmpopd, 0), LTSI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_newval, 0))));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (GESI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -9264,13 +9263,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     QI opval = tmp_tmpd;
     SETMEMQI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -9278,7 +9277,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -9286,7 +9285,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     QI opval = tmp_tmpd;
     SETMEMQI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -9298,7 +9297,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -9307,12 +9306,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -9346,13 +9345,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     HI opval = tmp_tmpd;
     SETMEMHI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -9360,7 +9359,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -9368,7 +9367,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     HI opval = tmp_tmpd;
     SETMEMHI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -9380,7 +9379,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -9389,12 +9388,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -9428,13 +9427,13 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = tmp_tmpd;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     BI opval = CPU (h_pbit);
     CPU (h_cbit) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -9442,7 +9441,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 } else {
@@ -9450,7 +9449,7 @@ if (EQBI (CPU (h_pbit), 0)) {
     SI opval = tmp_tmpd;
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 if (NEBI (tmp_postinc, 0)) {
@@ -9462,7 +9461,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -9471,12 +9470,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -9505,44 +9504,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = TRUNCDISI (tmp_tmpr);
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32));
     SET_H_SR (((UINT) 7), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = ANDIF (GET_H_V32_V32 (), CPU (h_cbit));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTDI (tmp_tmpr, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = NEDI (tmp_tmpr, EXTSIDI (TRUNCDISI (tmp_tmpr)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -9571,44 +9570,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = TRUNCDISI (tmp_tmpr);
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32));
     SET_H_SR (((UINT) 7), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = ANDIF (GET_H_V32_V32 (), CPU (h_cbit));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTDI (tmp_tmpr, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = NEDI (tmp_tmpr, EXTSIDI (TRUNCDISI (tmp_tmpr)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -9637,44 +9636,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = TRUNCDISI (tmp_tmpr);
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32));
     SET_H_SR (((UINT) 7), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = ANDIF (GET_H_V32_V32 (), CPU (h_cbit));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTDI (tmp_tmpr, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = NEDI (tmp_tmpr, EXTSIDI (TRUNCDISI (tmp_tmpr)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -9703,44 +9702,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = TRUNCDISI (tmp_tmpr);
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32));
     SET_H_SR (((UINT) 7), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = ANDIF (GET_H_V32_V32 (), CPU (h_cbit));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTDI (tmp_tmpr, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = NEDI (tmp_tmpr, ZEXTSIDI (TRUNCDISI (tmp_tmpr)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -9769,44 +9768,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = TRUNCDISI (tmp_tmpr);
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32));
     SET_H_SR (((UINT) 7), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = ANDIF (GET_H_V32_V32 (), CPU (h_cbit));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTDI (tmp_tmpr, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = NEDI (tmp_tmpr, ZEXTSIDI (TRUNCDISI (tmp_tmpr)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -9835,44 +9834,44 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = TRUNCDISI (tmp_tmpr);
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = TRUNCDISI (SRLDI (tmp_tmpr, 32));
     SET_H_SR (((UINT) 7), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 {
   {
     BI opval = ANDIF (GET_H_V32_V32 (), CPU (h_cbit));
     CPU (h_cbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
   {
     BI opval = LTDI (tmp_tmpr, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQDI (tmp_tmpr, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = NEDI (tmp_tmpr, ZEXTSIDI (TRUNCDISI (tmp_tmpr)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -9906,39 +9905,39 @@ CPU (h_zbit) = 1;
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand1), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = ORIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), ORIF (ANDIF (LTSI (tmp_tmpopd, 0), GESI (tmp_newval, 0)), ANDIF (LTSI (tmp_tmpops, 0), GESI (tmp_newval, 0))));
     CPU (h_rbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "rbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "rbit", 'x', opval);
   }
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ORIF (CPU (h_zbit), NOTBI (CPU (h_xbit))));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
   {
     BI opval = ORIF (ANDIF (ANDIF (LTSI (tmp_tmpops, 0), LTSI (tmp_tmpopd, 0)), GESI (tmp_newval, 0)), ANDIF (ANDIF (GESI (tmp_tmpops, 0), GESI (tmp_tmpopd, 0)), LTSI (tmp_newval, 0)));
     CPU (h_vbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -9968,18 +9967,18 @@ CPU (h_zbit) = 1;
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -9987,12 +9986,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10017,18 +10016,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10036,12 +10035,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10069,19 +10068,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTQI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10089,12 +10088,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10122,19 +10121,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTHI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10142,12 +10141,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10172,18 +10171,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10191,12 +10190,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10232,7 +10231,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -10243,19 +10242,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTQI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10263,12 +10262,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10305,7 +10304,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -10316,19 +10315,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTHI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10336,12 +10335,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10378,7 +10377,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -10386,18 +10385,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_tmpd;
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10405,12 +10404,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10439,19 +10438,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTQI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10459,12 +10458,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10492,19 +10491,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTHI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10512,12 +10511,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10542,18 +10541,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10561,12 +10560,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10591,18 +10590,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10610,12 +10609,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10643,19 +10642,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTQI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10663,12 +10662,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10696,19 +10695,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTHI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10716,12 +10715,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10746,18 +10745,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10765,12 +10764,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10806,7 +10805,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -10817,19 +10816,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTQI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10837,12 +10836,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10879,7 +10878,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -10890,19 +10889,19 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTHI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10910,12 +10909,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -10952,7 +10951,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -10960,18 +10959,18 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = tmp_tmpd;
     SET_H_GR (((ANDIF (GET_H_INSN_PREFIXED_P (), NOTSI (FLD (f_memmode)))) ? (FLD (f_operand1)) : (FLD (f_operand2))), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -10979,12 +10978,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11013,19 +11012,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTQI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11033,12 +11032,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11066,19 +11065,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTHI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11086,12 +11085,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11116,18 +11115,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11135,12 +11134,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11165,18 +11164,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11184,12 +11183,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11214,18 +11213,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11233,12 +11232,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11366,18 +11365,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand1), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11385,12 +11384,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11422,19 +11421,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTQI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11442,12 +11441,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11479,19 +11478,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTHI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11499,12 +11498,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11533,18 +11532,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11552,12 +11551,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11582,18 +11581,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11601,12 +11600,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11636,19 +11635,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTQI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11656,12 +11655,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11691,19 +11690,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTHI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11711,12 +11710,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11743,18 +11742,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11762,12 +11761,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11792,18 +11791,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11811,12 +11810,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11846,19 +11845,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 255), ANDSI (tmp_oldregval, 0xffffff00));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTQI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQQI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11866,12 +11865,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11901,19 +11900,19 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ORSI (ANDSI (tmp_tmpd, 65535), ANDSI (tmp_oldregval, 0xffff0000));
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 {
   {
     BI opval = LTHI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQHI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11921,12 +11920,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -11953,18 +11952,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -11972,12 +11971,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -12002,18 +12001,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -12021,12 +12020,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -12053,12 +12052,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -12066,12 +12065,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -12097,12 +12096,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -12110,12 +12109,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -12142,7 +12141,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 0)), 0)) {
     BI opval = 1;
     CPU (h_cbit) = opval;
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 if (NESI (ANDSI (tmp_tmp, SLLSI (1, 1)), 0)) {
@@ -12150,7 +12149,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 1)), 0)) {
     BI opval = 1;
     CPU (h_vbit) = opval;
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 }
 if (NESI (ANDSI (tmp_tmp, SLLSI (1, 2)), 0)) {
@@ -12158,7 +12157,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 2)), 0)) {
     BI opval = 1;
     CPU (h_zbit) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 }
 if (NESI (ANDSI (tmp_tmp, SLLSI (1, 3)), 0)) {
@@ -12166,7 +12165,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 3)), 0)) {
     BI opval = 1;
     CPU (h_nbit) = opval;
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
 }
 if (NESI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) {
@@ -12174,7 +12173,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) {
     BI opval = 1;
     CPU (h_xbit) = opval;
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
 }
 if (NESI (ANDSI (tmp_tmp, SLLSI (1, 5)), 0)) {
@@ -12182,7 +12181,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 5)), 0)) {
     BI opval = 1;
     SET_H_IBIT (opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "ibit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "ibit", 'x', opval);
   }
 }
 if (NESI (ANDSI (tmp_tmp, SLLSI (1, 6)), 0)) {
@@ -12190,7 +12189,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 6)), 0)) {
     BI opval = 1;
     SET_H_UBIT (opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "ubit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "ubit", 'x', opval);
   }
 }
 if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) {
@@ -12198,20 +12197,20 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) {
     BI opval = 1;
     CPU (h_pbit) = opval;
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "pbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pbit", 'x', opval);
   }
 }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 if (EQSI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
 }
 }
@@ -12238,7 +12237,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 0)), 0)) {
     BI opval = 0;
     CPU (h_cbit) = opval;
     written |= (1 << 1);
-    TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "cbit", 'x', opval);
   }
 }
 if (NESI (ANDSI (tmp_tmp, SLLSI (1, 1)), 0)) {
@@ -12246,7 +12245,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 1)), 0)) {
     BI opval = 0;
     CPU (h_vbit) = opval;
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbit", 'x', opval);
   }
 }
 if (NESI (ANDSI (tmp_tmp, SLLSI (1, 2)), 0)) {
@@ -12254,7 +12253,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 2)), 0)) {
     BI opval = 0;
     CPU (h_zbit) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 }
 if (NESI (ANDSI (tmp_tmp, SLLSI (1, 3)), 0)) {
@@ -12262,7 +12261,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 3)), 0)) {
     BI opval = 0;
     CPU (h_nbit) = opval;
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
 }
 if (NESI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) {
@@ -12270,7 +12269,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 4)), 0)) {
     BI opval = 0;
     CPU (h_xbit) = opval;
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
 }
 if (NESI (ANDSI (tmp_tmp, SLLSI (1, 5)), 0)) {
@@ -12278,7 +12277,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 5)), 0)) {
     BI opval = 0;
     SET_H_IBIT (opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "ibit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "ibit", 'x', opval);
   }
 }
 if (NESI (ANDSI (tmp_tmp, SLLSI (1, 6)), 0)) {
@@ -12286,7 +12285,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 6)), 0)) {
     BI opval = 0;
     SET_H_UBIT (opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "ubit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "ubit", 'x', opval);
   }
 }
 if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) {
@@ -12294,7 +12293,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) {
     BI opval = 0;
     CPU (h_pbit) = opval;
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "pbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pbit", 'x', opval);
   }
 }
 {
@@ -12302,12 +12301,12 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) {
     BI opval = 0;
     CPU (h_xbit) = opval;
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -12340,7 +12339,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) {
   {
     SI opval = ORSI (ORSI (tmp_samebits, tmp_shiftbits), ((ANDBI (CPU (h_rbit), NOTBI (tmp_p1))) ? (0) : (128)));
     SET_H_SR (((UINT) 13), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 }
 
@@ -12365,7 +12364,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) {
   {
     SI opval = ORSI (ANDSI (tmp_savemask, tmp_oldccs), ANDSI (INVSI (tmp_savemask), SLLSI (tmp_oldccs, 10)));
     SET_H_SR (((UINT) 13), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 }
 
@@ -12377,7 +12376,7 @@ if (NESI (ANDSI (tmp_tmp, SLLSI (1, 7)), 0)) {
 {
   SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   vpc = SEM_NEXT_VPC (sem_arg, pc, 2);
@@ -12412,13 +12411,13 @@ crisv32f_rfg_handler (current_cpu, pc);
   {
     SI opval = ORSI (ORSI (tmp_samebits, tmp_shiftbits), ((ANDBI (CPU (h_rbit), NOTBI (tmp_p1))) ? (0) : (128)));
     SET_H_SR (((UINT) 13), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 }
   {
     BI opval = 1;
     SET_H_MBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval);
   }
 }
 
@@ -12430,7 +12429,7 @@ crisv32f_rfg_handler (current_cpu, pc);
 {
   SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc);
   ARGBUF *abuf = SEM_ARGBUF (sem_arg);
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   int UNUSED written = 0;
   IADDR UNUSED pc = abuf->addr;
   SEM_BRANCH_INIT
@@ -12439,7 +12438,7 @@ crisv32f_rfg_handler (current_cpu, pc);
   {
     USI opval = crisv32f_halt_handler (current_cpu, pc);
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 
   SEM_BRANCH_FINI (vpc);
@@ -12516,12 +12515,12 @@ crisv32f_branch_taken (current_cpu, pc, FLD (i_o_pcrel), tmp_truthval);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 if (tmp_truthval) {
@@ -12530,7 +12529,7 @@ if (tmp_truthval) {
     USI opval = FLD (i_o_pcrel);
     SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -12557,19 +12556,19 @@ if (tmp_truthval) {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 {
   {
     USI opval = FLD (i_o_pcrel);
     SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -12648,12 +12647,12 @@ crisv32f_branch_taken (current_cpu, pc, FLD (i_o_word_pcrel), tmp_truthval);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 if (tmp_truthval) {
@@ -12662,7 +12661,7 @@ if (tmp_truthval) {
     USI opval = FLD (i_o_word_pcrel);
     SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -12689,19 +12688,19 @@ if (tmp_truthval) {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 {
   {
     USI opval = FLD (i_o_word_pcrel);
     SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -12726,12 +12725,12 @@ if (tmp_truthval) {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 if (ANDIF (EQSI (FLD (f_operand1), 1), EQSI (FLD (f_operand2), 11))) {
@@ -12742,12 +12741,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc);
   {
     SI opval = ADDSI (pc, 4);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
   {
     USI opval = GET_H_GR (FLD (f_operand1));
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -12773,12 +12772,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 {
@@ -12786,12 +12785,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc);
   {
     SI opval = ADDSI (pc, 8);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
   {
     USI opval = FLD (f_indir_pc__dword);
     SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -12817,19 +12816,19 @@ cris_flush_simulator_decode_cache (current_cpu, pc);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 {
   {
     USI opval = GET_H_SR (FLD (f_operand2));
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -12854,12 +12853,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 {
@@ -12867,12 +12866,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc);
   {
     SI opval = ADDSI (pc, 8);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
   {
     USI opval = FLD (i_const32_pcrel);
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -12898,12 +12897,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 {
@@ -12911,12 +12910,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc);
   {
     SI opval = ADDSI (pc, 8);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
   {
     USI opval = GET_H_GR (FLD (f_operand1));
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -12942,12 +12941,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 {
@@ -12955,12 +12954,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc);
   {
     SI opval = ADDSI (pc, 12);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
   {
     USI opval = FLD (f_indir_pc__dword);
     SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -12986,12 +12985,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 {
@@ -12999,12 +12998,12 @@ cris_flush_simulator_decode_cache (current_cpu, pc);
   {
     SI opval = ADDSI (pc, 12);
     SET_H_SR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
   {
     USI opval = FLD (i_const32_pcrel);
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 }
@@ -13030,18 +13029,18 @@ cris_flush_simulator_decode_cache (current_cpu, pc);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
   {
     USI opval = crisv32f_break_handler (current_cpu, FLD (f_u4), pc);
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 }
 
@@ -13069,18 +13068,18 @@ cris_flush_simulator_decode_cache (current_cpu, pc);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -13088,12 +13087,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -13122,18 +13121,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -13141,12 +13140,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -13175,18 +13174,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -13194,12 +13193,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -13228,18 +13227,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -13247,12 +13246,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -13281,18 +13280,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -13300,12 +13299,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -13334,18 +13333,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = tmp_newval;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_newval, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_newval, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -13353,12 +13352,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -13434,18 +13433,18 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ZEXTBISI (tmp_truthval);
     SET_H_GR (FLD (f_operand1), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -13665,18 +13664,18 @@ if (GESI (tmp_tmp, 0)) {
   {
     SI opval = tmp_tmpd;
     SET_H_GR (FLD (f_operand2), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
     BI opval = LTSI (tmp_tmpd, 0);
     CPU (h_nbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "nbit", 'x', opval);
   }
   {
     BI opval = ANDIF (EQSI (tmp_tmpd, 0), ((CPU (h_xbit)) ? (CPU (h_zbit)) : (1)));
     CPU (h_zbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "zbit", 'x', opval);
   }
 SET_H_CBIT_MOVE (0);
 SET_H_VBIT_MOVE (0);
@@ -13684,12 +13683,12 @@ SET_H_VBIT_MOVE (0);
   {
     BI opval = 0;
     CPU (h_xbit) = opval;
-    TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "xbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 }
@@ -13712,12 +13711,12 @@ SET_H_VBIT_MOVE (0);
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), FLD (f_s8));
     SET_H_PREFIXREG_V32 (opval);
-    TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
   }
   {
     BI opval = 1;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 
@@ -13751,7 +13750,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -13759,12 +13758,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), EXTQISI (tmp_tmps));
     SET_H_PREFIXREG_V32 (opval);
-    TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
   }
   {
     BI opval = 1;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 
@@ -13799,7 +13798,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -13807,12 +13806,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), EXTHISI (tmp_tmps));
     SET_H_PREFIXREG_V32 (opval);
-    TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
   }
   {
     BI opval = 1;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 
@@ -13847,7 +13846,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
     SI opval = tmp_addr;
     SET_H_GR (FLD (f_operand1), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -13855,12 +13854,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), tmp_tmps);
     SET_H_PREFIXREG_V32 (opval);
-    TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
   }
   {
     BI opval = 1;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 
@@ -13882,12 +13881,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), EXTQISI (TRUNCSIQI (FLD (f_indir_pc__byte))));
     SET_H_PREFIXREG_V32 (opval);
-    TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
   }
   {
     BI opval = 1;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 
@@ -13908,12 +13907,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), EXTHISI (TRUNCSIHI (FLD (f_indir_pc__word))));
     SET_H_PREFIXREG_V32 (opval);
-    TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
   }
   {
     BI opval = 1;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 
@@ -13934,12 +13933,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_operand2)), FLD (f_indir_pc__dword));
     SET_H_PREFIXREG_V32 (opval);
-    TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
   }
   {
     BI opval = 1;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 
@@ -13960,12 +13959,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 1));
     SET_H_PREFIXREG_V32 (opval);
-    TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
   }
   {
     BI opval = 1;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 
@@ -13986,12 +13985,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 2));
     SET_H_PREFIXREG_V32 (opval);
-    TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
   }
   {
     BI opval = 1;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 
@@ -14012,12 +14011,12 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     SI opval = ADDSI (GET_H_GR (FLD (f_operand1)), MULSI (GET_H_GR (FLD (f_operand2)), 4));
     SET_H_PREFIXREG_V32 (opval);
-    TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "prefixreg", 'x', opval);
   }
   {
     BI opval = 1;
     SET_H_INSN_PREFIXED_P (opval);
-    TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "insn-prefixed-p", 'x', opval);
   }
 }
 
@@ -14038,7 +14037,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     USI opval = crisv32f_fidxi_handler (current_cpu, pc, GET_H_GR (FLD (f_operand1)));
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 
   SEM_BRANCH_FINI (vpc);
@@ -14059,7 +14058,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     USI opval = crisv32f_ftagi_handler (current_cpu, pc, GET_H_GR (FLD (f_operand1)));
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 
   SEM_BRANCH_FINI (vpc);
@@ -14080,7 +14079,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     USI opval = crisv32f_fidxd_handler (current_cpu, pc, GET_H_GR (FLD (f_operand1)));
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 
   SEM_BRANCH_FINI (vpc);
@@ -14101,7 +14100,7 @@ if (EQBI (GET_H_INSN_PREFIXED_P (), 0)) {
   {
     USI opval = crisv32f_ftagd_handler (current_cpu, pc, GET_H_GR (FLD (f_operand1)));
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
   }
 
   SEM_BRANCH_FINI (vpc);