X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fsh64%2Fsem-compact-switch.c;h=ab6cbef3589ce8219650a5cb4c2bd91a0c910e2e;hb=37d5ab199b072e3cf1e8bf2a9262767c4737d256;hp=75fd7a9c3a03f71f0cdb1fe1272f240f40bf9d7e;hpb=c5a570810022466eaa5e077cd1b8aa00d74706f1;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/sh64/sem-compact-switch.c b/sim/sh64/sem-compact-switch.c
index 75fd7a9c3a..ab6cbef358 100644
--- a/sim/sh64/sem-compact-switch.c
+++ b/sim/sh64/sem-compact-switch.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2010, 2012 Free Software Foundation, Inc.
+Copyright 1996-2019 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
@@ -17,8 +17,7 @@ This file is part of the GNU simulators.
    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.
+   with this program; if not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -252,13 +251,13 @@ This file is part of the GNU simulators.
 
 /* 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
@@ -443,7 +442,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -462,7 +461,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), EXTQISI (ANDQI (FLD (f_imm8), 255)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -484,12 +483,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = ADDCSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     BI opval = tmp_flag;
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -512,12 +511,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     BI opval = tmp_t;
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -537,7 +536,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     DI opval = ANDDI (GET_H_GR (FLD (f_rm)), GET_H_GR (FLD (f_rn)));
     SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
   }
 
 #undef FLD
@@ -556,7 +555,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = ANDSI (GET_H_GRC (((UINT) 0)), ZEXTSIDI (FLD (f_imm8)));
     SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -580,7 +579,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     UQI opval = tmp_data;
     SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 
@@ -603,7 +602,7 @@ if (NOTBI (GET_H_TBIT ())) {
     UDI opval = FLD (i_disp8);
     SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 }
 
@@ -629,7 +628,7 @@ if (NOTBI (GET_H_TBIT ())) {
     UDI opval = ADDDI (pc, 2);
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 ((void) 0); /*nop*/
 {
@@ -637,7 +636,7 @@ if (NOTBI (GET_H_TBIT ())) {
     UDI opval = FLD (i_disp8);
     SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 }
 }
@@ -663,14 +662,14 @@ if (NOTBI (GET_H_TBIT ())) {
   {
     UDI opval = ADDDI (pc, 2);
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 ((void) 0); /*nop*/
 {
   {
     UDI opval = FLD (i_disp12);
     SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 }
 }
@@ -694,14 +693,14 @@ if (NOTBI (GET_H_TBIT ())) {
   {
     UDI opval = ADDDI (pc, 2);
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 ((void) 0); /*nop*/
 {
   {
     UDI opval = ADDDI (EXTSIDI (GET_H_GRC (FLD (f_rn))), ADDDI (pc, 4));
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 }
 }
@@ -741,20 +740,20 @@ sh64_break (current_cpu, pc);
   {
     SI opval = ADDDI (pc, 4);
     SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
   }
 }
   {
     UDI opval = ADDDI (pc, 2);
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 ((void) 0); /*nop*/
 {
   {
     UDI opval = FLD (i_disp12);
     SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 }
 }
@@ -779,20 +778,20 @@ sh64_break (current_cpu, pc);
   {
     SI opval = ADDDI (pc, 4);
     SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
   }
 }
   {
     UDI opval = ADDDI (pc, 2);
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 ((void) 0); /*nop*/
 {
   {
     UDI opval = ADDDI (EXTSIDI (GET_H_GRC (FLD (f_rn))), ADDDI (pc, 4));
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 }
 }
@@ -817,7 +816,7 @@ if (GET_H_TBIT ()) {
     UDI opval = FLD (i_disp8);
     SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 }
 
@@ -843,7 +842,7 @@ if (GET_H_TBIT ()) {
     UDI opval = ADDDI (pc, 2);
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 ((void) 0); /*nop*/
 {
@@ -851,7 +850,7 @@ if (GET_H_TBIT ()) {
     UDI opval = FLD (i_disp8);
     SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 }
 }
@@ -876,12 +875,12 @@ if (GET_H_TBIT ()) {
   {
     SI opval = 0;
     SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
   }
   {
     SI opval = 0;
     SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
   }
 }
 
@@ -901,7 +900,7 @@ if (GET_H_TBIT ()) {
   {
     BI opval = 0;
     SET_H_SBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval);
   }
 
 #undef FLD
@@ -920,7 +919,7 @@ if (GET_H_TBIT ()) {
   {
     BI opval = 0;
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 
 #undef FLD
@@ -939,7 +938,7 @@ if (GET_H_TBIT ()) {
   {
     BI opval = EQSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn)));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 
 #undef FLD
@@ -958,7 +957,7 @@ if (GET_H_TBIT ()) {
   {
     BI opval = EQSI (GET_H_GRC (((UINT) 0)), EXTQISI (ANDQI (FLD (f_imm8), 255)));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 
 #undef FLD
@@ -977,7 +976,7 @@ if (GET_H_TBIT ()) {
   {
     BI opval = GESI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 
 #undef FLD
@@ -996,7 +995,7 @@ if (GET_H_TBIT ()) {
   {
     BI opval = GTSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 
 #undef FLD
@@ -1015,7 +1014,7 @@ if (GET_H_TBIT ()) {
   {
     BI opval = GTUSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 
 #undef FLD
@@ -1034,7 +1033,7 @@ if (GET_H_TBIT ()) {
   {
     BI opval = GEUSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 
 #undef FLD
@@ -1053,7 +1052,7 @@ if (GET_H_TBIT ()) {
   {
     BI opval = GTSI (GET_H_GRC (FLD (f_rn)), 0);
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 
 #undef FLD
@@ -1072,7 +1071,7 @@ if (GET_H_TBIT ()) {
   {
     BI opval = GESI (GET_H_GRC (FLD (f_rn)), 0);
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 
 #undef FLD
@@ -1099,7 +1098,7 @@ if (GET_H_TBIT ()) {
   {
     BI opval = ((GTUBI (tmp_t, 0)) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -1120,17 +1119,17 @@ if (GET_H_TBIT ()) {
   {
     BI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 31);
     SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
   }
   {
     BI opval = SRLSI (GET_H_GRC (FLD (f_rm)), 31);
     SET_H_MBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval);
   }
   {
     BI opval = ((EQSI (SRLSI (GET_H_GRC (FLD (f_rm)), 31), SRLSI (GET_H_GRC (FLD (f_rn)), 31))) ? (0) : (1));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -1151,17 +1150,17 @@ if (GET_H_TBIT ()) {
   {
     BI opval = 0;
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
   }
   {
     BI opval = 0;
     SET_H_MBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "mbit", 'x', opval);
   }
 }
 
@@ -1186,12 +1185,12 @@ if (GET_H_TBIT ()) {
   {
     BI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 31);
     SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
   }
   {
     SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), ZEXTBISI (GET_H_TBIT ()));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 if (NOTBI (tmp_oldq)) {
 if (NOTBI (GET_H_MBIT ())) {
@@ -1200,20 +1199,20 @@ if (NOTBI (GET_H_MBIT ())) {
   {
     SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   tmp_tmp1 = GTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0);
 if (NOTBI (GET_H_QBIT ())) {
   {
     BI opval = ((tmp_tmp1) ? (1) : (0));
     SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
   }
 } else {
   {
     BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0));
     SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
   }
 }
 }
@@ -1223,20 +1222,20 @@ if (NOTBI (GET_H_QBIT ())) {
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   tmp_tmp1 = LTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0);
 if (NOTBI (GET_H_QBIT ())) {
   {
     BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0));
     SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
   }
 } else {
   {
     BI opval = ((tmp_tmp1) ? (1) : (0));
     SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
   }
 }
 }
@@ -1248,20 +1247,20 @@ if (NOTBI (GET_H_MBIT ())) {
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   tmp_tmp1 = LTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0);
 if (NOTBI (GET_H_QBIT ())) {
   {
     BI opval = ((tmp_tmp1) ? (1) : (0));
     SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
   }
 } else {
   {
     BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0));
     SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
   }
 }
 }
@@ -1271,20 +1270,20 @@ if (NOTBI (GET_H_QBIT ())) {
   {
     SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   tmp_tmp1 = GTUSI (GET_H_GRC (FLD (f_rn)), tmp_tmp0);
 if (NOTBI (GET_H_QBIT ())) {
   {
     BI opval = ((EQQI (tmp_tmp1, 0)) ? (1) : (0));
     SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
   }
 } else {
   {
     BI opval = ((tmp_tmp1) ? (1) : (0));
     SET_H_QBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "qbit", 'x', opval);
   }
 }
 }
@@ -1293,7 +1292,7 @@ if (NOTBI (GET_H_QBIT ())) {
   {
     BI opval = ((EQBI (GET_H_QBIT (), GET_H_MBIT ())) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -1313,7 +1312,7 @@ if (NOTBI (GET_H_QBIT ())) {
   {
     SI opval = UDIVSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (((UINT) 0)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -1332,7 +1331,7 @@ if (NOTBI (GET_H_QBIT ())) {
   {
     SI opval = MULSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (((UINT) 0)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -1354,12 +1353,12 @@ if (NOTBI (GET_H_QBIT ())) {
   {
     SI opval = SUBWORDDISI (tmp_result, 0);
     SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
   }
   {
     SI opval = SUBWORDDISI (tmp_result, 1);
     SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
   }
 }
 
@@ -1382,12 +1381,12 @@ if (NOTBI (GET_H_QBIT ())) {
   {
     SI opval = SUBWORDDISI (tmp_result, 0);
     SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
   }
   {
     SI opval = SUBWORDDISI (tmp_result, 1);
     SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
   }
 }
 
@@ -1408,12 +1407,12 @@ if (NOTBI (GET_H_QBIT ())) {
   {
     SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 1);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     BI opval = EQSI (GET_H_GRC (FLD (f_rn)), 0);
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -1433,7 +1432,7 @@ if (NOTBI (GET_H_QBIT ())) {
   {
     SI opval = EXTQISI (SUBWORDSIQI (GET_H_GRC (FLD (f_rm)), 3));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -1452,7 +1451,7 @@ if (NOTBI (GET_H_QBIT ())) {
   {
     SI opval = EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -1471,7 +1470,7 @@ if (NOTBI (GET_H_QBIT ())) {
   {
     SI opval = ZEXTQISI (SUBWORDSIQI (GET_H_GRC (FLD (f_rm)), 3));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -1490,7 +1489,7 @@ if (NOTBI (GET_H_QBIT ())) {
   {
     SI opval = ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -1511,14 +1510,14 @@ if (GET_H_PRBIT ()) {
     DF opval = sh64_fabsd (current_cpu, GET_H_FSD (FLD (f_rn)));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 } else {
   {
     DF opval = sh64_fabss (current_cpu, GET_H_FSD (FLD (f_rn)));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 }
 
@@ -1541,14 +1540,14 @@ if (GET_H_PRBIT ()) {
     DF opval = sh64_faddd (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn)));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 } else {
   {
     DF opval = sh64_fadds (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn)));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 }
 
@@ -1571,14 +1570,14 @@ if (GET_H_PRBIT ()) {
     BI opval = sh64_fcmpeqd (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn)));
     SET_H_TBIT (opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 } else {
   {
     BI opval = sh64_fcmpeqs (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn)));
     SET_H_TBIT (opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -1601,14 +1600,14 @@ if (GET_H_PRBIT ()) {
     BI opval = sh64_fcmpgtd (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm)));
     SET_H_TBIT (opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 } else {
   {
     BI opval = sh64_fcmpgts (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm)));
     SET_H_TBIT (opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -1629,7 +1628,7 @@ if (GET_H_PRBIT ()) {
   {
     SF opval = sh64_fcnvds (current_cpu, GET_H_DRC (FLD (f_dn)));
     CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
 #undef FLD
@@ -1648,7 +1647,7 @@ if (GET_H_PRBIT ()) {
   {
     DF opval = sh64_fcnvsd (current_cpu, CPU (h_fr[((UINT) 32)]));
     SET_H_DRC (FLD (f_dn), opval);
-    TRACE_RESULT (current_cpu, abuf, "drc", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "drc", 'f', opval);
   }
 
 #undef FLD
@@ -1669,14 +1668,14 @@ if (GET_H_PRBIT ()) {
     DF opval = sh64_fdivd (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm)));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 } else {
   {
     DF opval = sh64_fdivs (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm)));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 }
 
@@ -1712,7 +1711,7 @@ sh64_fipr (current_cpu, FLD (f_vm), FLD (f_vn));
   {
     SF opval = GET_H_FRC (FLD (f_rn));
     CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
 #undef FLD
@@ -1731,7 +1730,7 @@ sh64_fipr (current_cpu, FLD (f_vm), FLD (f_vn));
   {
     SF opval = sh64_fldi0 (current_cpu);
     SET_H_FRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval);
   }
 
 #undef FLD
@@ -1750,7 +1749,7 @@ sh64_fipr (current_cpu, FLD (f_vm), FLD (f_vn));
   {
     SF opval = sh64_fldi1 (current_cpu);
     SET_H_FRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval);
   }
 
 #undef FLD
@@ -1771,14 +1770,14 @@ if (GET_H_PRBIT ()) {
     DF opval = sh64_floatld (current_cpu, CPU (h_fr[((UINT) 32)]));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 } else {
   {
     DF opval = sh64_floatls (current_cpu, CPU (h_fr[((UINT) 32)]));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 }
 
@@ -1799,7 +1798,7 @@ if (GET_H_PRBIT ()) {
   {
     SF opval = sh64_fmacs (current_cpu, GET_H_FRC (((UINT) 0)), GET_H_FRC (FLD (f_rm)), GET_H_FRC (FLD (f_rn)));
     SET_H_FRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval);
   }
 
 #undef FLD
@@ -1818,7 +1817,7 @@ if (GET_H_PRBIT ()) {
   {
     DF opval = GET_H_FMOV (FLD (f_rm));
     SET_H_FMOV (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval);
   }
 
 #undef FLD
@@ -1839,14 +1838,14 @@ if (NOTBI (GET_H_SZBIT ())) {
     DF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
     SET_H_FMOV (FLD (f_rn), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval);
   }
 } else {
   {
     DF opval = GETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
     SET_H_FMOV (FLD (f_rn), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval);
   }
 }
 
@@ -1870,13 +1869,13 @@ if (NOTBI (GET_H_SZBIT ())) {
     DF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
     SET_H_FMOV (FLD (f_rn), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval);
   }
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4);
     SET_H_GRC (FLD (f_rm), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 } else {
@@ -1885,13 +1884,13 @@ if (NOTBI (GET_H_SZBIT ())) {
     DF opval = GETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
     SET_H_FMOV (FLD (f_rn), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval);
   }
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 8);
     SET_H_GRC (FLD (f_rm), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 }
@@ -1915,14 +1914,14 @@ if (NOTBI (GET_H_SZBIT ())) {
     DF opval = GETMEMSF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))));
     SET_H_FMOV (FLD (f_rn), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval);
   }
 } else {
   {
     DF opval = GETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))));
     SET_H_FMOV (FLD (f_rn), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fmov", 'f', opval);
   }
 }
 
@@ -1945,14 +1944,14 @@ if (NOTBI (GET_H_SZBIT ())) {
     SF opval = GET_H_FMOV (FLD (f_rm));
     SETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
   }
 } else {
   {
     DF opval = GET_H_FMOV (FLD (f_rm));
     SETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
   }
 }
 
@@ -1976,13 +1975,13 @@ if (NOTBI (GET_H_SZBIT ())) {
     SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 4);
     SET_H_GRC (FLD (f_rn), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     SF opval = GET_H_FMOV (FLD (f_rm));
     SETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
   }
 }
 } else {
@@ -1991,13 +1990,13 @@ if (NOTBI (GET_H_SZBIT ())) {
     SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), 8);
     SET_H_GRC (FLD (f_rn), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     DF opval = GET_H_FMOV (FLD (f_rm));
     SETMEMDF (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
   }
 }
 }
@@ -2021,14 +2020,14 @@ if (NOTBI (GET_H_SZBIT ())) {
     SF opval = GET_H_FMOV (FLD (f_rm));
     SETMEMSF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
   }
 } else {
   {
     DF opval = GET_H_FMOV (FLD (f_rm));
     SETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
   }
 }
 
@@ -2049,7 +2048,7 @@ if (NOTBI (GET_H_SZBIT ())) {
   {
     DF opval = GETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm12x8)));
     SET_H_DRC (FLD (f_dn), opval);
-    TRACE_RESULT (current_cpu, abuf, "drc", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "drc", 'f', opval);
   }
 
 #undef FLD
@@ -2068,7 +2067,7 @@ if (NOTBI (GET_H_SZBIT ())) {
   {
     DF opval = GET_H_DRC (FLD (f_dm));
     SETMEMDF (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rn)), FLD (f_imm12x8)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
   }
 
 #undef FLD
@@ -2089,14 +2088,14 @@ if (GET_H_PRBIT ()) {
     DF opval = sh64_fmuld (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn)));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 } else {
   {
     DF opval = sh64_fmuls (current_cpu, GET_H_FSD (FLD (f_rm)), GET_H_FSD (FLD (f_rn)));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 }
 
@@ -2119,14 +2118,14 @@ if (GET_H_PRBIT ()) {
     DF opval = sh64_fnegd (current_cpu, GET_H_FSD (FLD (f_rn)));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 } else {
   {
     DF opval = sh64_fnegs (current_cpu, GET_H_FSD (FLD (f_rn)));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 }
 
@@ -2147,7 +2146,7 @@ if (GET_H_PRBIT ()) {
   {
     BI opval = NOTBI (GET_H_FRBIT ());
     SET_H_FRBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "frbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "frbit", 'x', opval);
   }
 
 #undef FLD
@@ -2166,7 +2165,7 @@ if (GET_H_PRBIT ()) {
   {
     BI opval = NOTBI (GET_H_SZBIT ());
     SET_H_SZBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "szbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "szbit", 'x', opval);
   }
 
 #undef FLD
@@ -2187,14 +2186,14 @@ if (GET_H_PRBIT ()) {
     DF opval = sh64_fsqrtd (current_cpu, GET_H_FSD (FLD (f_rn)));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 } else {
   {
     DF opval = sh64_fsqrts (current_cpu, GET_H_FSD (FLD (f_rn)));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 }
 
@@ -2215,7 +2214,7 @@ if (GET_H_PRBIT ()) {
   {
     SF opval = CPU (h_fr[((UINT) 32)]);
     SET_H_FRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "frc", 'f', opval);
   }
 
 #undef FLD
@@ -2236,14 +2235,14 @@ if (GET_H_PRBIT ()) {
     DF opval = sh64_fsubd (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm)));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 } else {
   {
     DF opval = sh64_fsubs (current_cpu, GET_H_FSD (FLD (f_rn)), GET_H_FSD (FLD (f_rm)));
     SET_H_FSD (FLD (f_rn), opval);
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fsd", 'f', opval);
   }
 }
 
@@ -2264,7 +2263,7 @@ if (GET_H_PRBIT ()) {
   {
     SF opval = ((GET_H_PRBIT ()) ? (sh64_ftrcdl (current_cpu, GET_H_FSD (FLD (f_rn)))) : (sh64_ftrcsl (current_cpu, GET_H_FSD (FLD (f_rn)))));
     CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
 #undef FLD
@@ -2300,14 +2299,14 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     UDI opval = ADDDI (pc, 2);
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 ((void) 0); /*nop*/
 {
   {
     UDI opval = GET_H_GRC (FLD (f_rn));
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 }
 ((void) 0); /*nop*/
@@ -2333,20 +2332,20 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = ADDDI (pc, 4);
     SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
   }
 }
   {
     UDI opval = ADDDI (pc, 2);
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 ((void) 0); /*nop*/
 {
   {
     UDI opval = GET_H_GRC (FLD (f_rn));
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 }
 ((void) 0); /*nop*/
@@ -2369,7 +2368,7 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = GET_H_GRC (FLD (f_rn));
     SET_H_GBR (opval);
-    TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval);
   }
 
 #undef FLD
@@ -2388,7 +2387,7 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = GET_H_GRC (FLD (f_rn));
     SET_H_VBR (opval);
-    TRACE_RESULT (current_cpu, abuf, "vbr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbr", 'x', opval);
   }
 
 #undef FLD
@@ -2407,7 +2406,7 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = GET_H_GRC (FLD (f_rn));
     CPU (h_sr) = opval;
-    TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
   }
 
 #undef FLD
@@ -2427,12 +2426,12 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
     SET_H_GBR (opval);
-    TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gbr", 'x', opval);
   }
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -2453,12 +2452,12 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
     SET_H_VBR (opval);
-    TRACE_RESULT (current_cpu, abuf, "vbr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "vbr", 'x', opval);
   }
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -2478,7 +2477,7 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = GET_H_GRC (FLD (f_rn));
     CPU (h_fpscr) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval);
   }
 
 #undef FLD
@@ -2498,12 +2497,12 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
     CPU (h_fpscr) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fpscr", 'x', opval);
   }
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -2523,7 +2522,7 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SF opval = SUBWORDSISF (GET_H_GRC (FLD (f_rn)));
     CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 
 #undef FLD
@@ -2543,12 +2542,12 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SF opval = GETMEMSF (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
     CPU (h_fr[((UINT) 32)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -2568,7 +2567,7 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = GET_H_GRC (FLD (f_rn));
     SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
   }
 
 #undef FLD
@@ -2588,12 +2587,12 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
     SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
   }
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -2613,7 +2612,7 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = GET_H_GRC (FLD (f_rn));
     SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
   }
 
 #undef FLD
@@ -2633,12 +2632,12 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
     SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
   }
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -2658,7 +2657,7 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = GET_H_GRC (FLD (f_rn));
     SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
   }
 
 #undef FLD
@@ -2678,12 +2677,12 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
     SET_H_PR (opval);
-    TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pr", 'x', opval);
   }
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -2710,20 +2709,20 @@ sh64_ftrv (current_cpu, FLD (f_vn));
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 if (EQSI (FLD (f_rn), FLD (f_rm))) {
 {
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4);
     SET_H_GRC (FLD (f_rm), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 }
@@ -2732,7 +2731,7 @@ if (EQSI (FLD (f_rn), FLD (f_rm))) {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4);
     SET_H_GRC (FLD (f_rm), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   tmp_tmpry = MULDI (ZEXTSIDI (tmp_x), ZEXTSIDI (tmp_y));
   tmp_mac = ORDI (SLLDI (ZEXTSIDI (GET_H_MACH ()), 32), ZEXTSIDI (GET_H_MACL ()));
@@ -2756,12 +2755,12 @@ if (LTDI (tmp_result, tmp_min)) {
   {
     SI opval = SUBWORDDISI (tmp_result, 0);
     SET_H_MACH (opval);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
   }
   {
     SI opval = SUBWORDDISI (tmp_result, 1);
     SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
   }
 }
 }
@@ -2790,20 +2789,20 @@ if (LTDI (tmp_result, tmp_min)) {
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 2);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 if (EQSI (FLD (f_rn), FLD (f_rm))) {
 {
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 2);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2);
     SET_H_GRC (FLD (f_rm), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 }
@@ -2812,7 +2811,7 @@ if (EQSI (FLD (f_rn), FLD (f_rm))) {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2);
     SET_H_GRC (FLD (f_rm), opval);
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   tmp_tmpry = MULSI (ZEXTHISI (tmp_x), ZEXTHISI (tmp_y));
 if (GET_H_SBIT ()) {
@@ -2822,14 +2821,14 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) {
     SI opval = 1;
     SET_H_MACH (opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
   }
 }
   {
     SI opval = ADDSI (tmp_tmpry, GET_H_MACL ());
     SET_H_MACL (opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
   }
 }
 } else {
@@ -2840,13 +2839,13 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) {
     SI opval = SUBWORDDISI (tmp_result, 0);
     SET_H_MACH (opval);
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "mach", 'x', opval);
   }
   {
     SI opval = SUBWORDDISI (tmp_result, 1);
     SET_H_MACL (opval);
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
   }
 }
 }
@@ -2869,7 +2868,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) {
   {
     DI opval = GET_H_GR (FLD (f_rm));
     SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
   }
 
 #undef FLD
@@ -2888,7 +2887,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) {
   {
     SI opval = EXTQIDI (ANDQI (FLD (f_imm8), 255));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -2907,7 +2906,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) {
   {
     SI opval = FLD (f_imm20);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -2926,7 +2925,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) {
   {
     UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3);
     SETMEMUQI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 
 #undef FLD
@@ -2948,12 +2947,12 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) {
   {
     UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3);
     SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     SI opval = tmp_addr;
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -2973,7 +2972,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) {
   {
     UQI opval = SUBWORDSIUQI (GET_H_GRC (FLD (f_rm)), 3);
     SETMEMUQI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 
 #undef FLD
@@ -2995,7 +2994,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) {
   {
     UQI opval = SUBWORDSIUQI (GET_H_GRC (((UINT) 0)), 3);
     SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 
@@ -3018,7 +3017,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) {
   {
     UQI opval = SUBWORDSIUQI (GET_H_GRC (((UINT) 0)), 3);
     SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 
@@ -3038,7 +3037,7 @@ if (ADDOFSI (tmp_tmpry, GET_H_MACL (), 0)) {
   {
     SI opval = EXTQISI (GETMEMQI (current_cpu, pc, GET_H_GRC (FLD (f_rm))));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3062,20 +3061,20 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
     SI opval = EXTQISI (tmp_data);
     SET_H_GRC (FLD (f_rm), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 } else {
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 1);
     SET_H_GRC (FLD (f_rm), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
   {
     SI opval = EXTQISI (tmp_data);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -3096,7 +3095,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm)))));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3115,7 +3114,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8))));
     SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3134,7 +3133,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4))));
     SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3153,7 +3152,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GET_H_GRC (FLD (f_rm));
     SETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 
 #undef FLD
@@ -3175,12 +3174,12 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GET_H_GRC (FLD (f_rm));
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     SI opval = tmp_addr;
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -3200,7 +3199,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GET_H_GRC (FLD (f_rm));
     SETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 
 #undef FLD
@@ -3219,7 +3218,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GET_H_GRC (((UINT) 0));
     SETMEMSI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x4)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 
 #undef FLD
@@ -3238,7 +3237,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GET_H_GRC (FLD (f_rm));
     SETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rn)), FLD (f_imm4x4)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 
 #undef FLD
@@ -3257,7 +3256,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3277,21 +3276,21 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rm)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GET_H_GRC (FLD (f_rn));
     SET_H_GRC (FLD (f_rm), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 } else {
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 4);
     SET_H_GRC (FLD (f_rm), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 }
@@ -3313,7 +3312,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm))));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3332,7 +3331,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x4)));
     SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3351,7 +3350,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GETMEMSI (current_cpu, pc, ADDSI (FLD (f_imm8x4), ANDDI (ADDDI (pc, 4), INVSI (3))));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3370,7 +3369,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4x4)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3389,7 +3388,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm12x4)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3408,7 +3407,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GET_H_GRC (FLD (f_rm));
     SETMEMSI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rn)), FLD (f_imm12x4)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 
 #undef FLD
@@ -3427,7 +3426,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1);
     SETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 
 #undef FLD
@@ -3449,12 +3448,12 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1);
     SETMEMHI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     SI opval = tmp_addr;
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -3474,7 +3473,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     HI opval = SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1);
     SETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rn))), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 
 #undef FLD
@@ -3493,7 +3492,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     HI opval = SUBWORDSIHI (GET_H_GRC (((UINT) 0)), 1);
     SETMEMHI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x2)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 
 #undef FLD
@@ -3512,7 +3511,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     HI opval = SUBWORDSIHI (GET_H_GRC (((UINT) 0)), 1);
     SETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4x2)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 
 #undef FLD
@@ -3531,7 +3530,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = EXTHISI (GETMEMHI (current_cpu, pc, GET_H_GRC (FLD (f_rm))));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3555,20 +3554,20 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
     SI opval = EXTHISI (tmp_data);
     SET_H_GRC (FLD (f_rm), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 } else {
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rm)), 2);
     SET_H_GRC (FLD (f_rm), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
   {
     SI opval = EXTHISI (tmp_data);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -3589,7 +3588,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (((UINT) 0)), GET_H_GRC (FLD (f_rm)))));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3608,7 +3607,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GBR (), FLD (f_imm8x2))));
     SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3627,7 +3626,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDDI (ADDDI (pc, 4), FLD (f_imm8x2))));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3646,7 +3645,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (GET_H_GRC (FLD (f_rm)), FLD (f_imm4x2))));
     SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3665,7 +3664,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = ADDDI (ANDDI (ADDDI (pc, 4), INVSI (3)), FLD (f_imm8x4));
     SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3684,7 +3683,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GET_H_GRC (((UINT) 0));
     SETMEMSI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 
 #undef FLD
@@ -3703,7 +3702,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GET_H_GRC (FLD (f_rn));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3722,7 +3721,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = ZEXTBISI (GET_H_TBIT ());
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3741,7 +3740,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = sh64_movua (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
     SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3761,12 +3760,12 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = sh64_movua (current_cpu, pc, GET_H_GRC (FLD (f_rn)));
     SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     SI opval = ADDSI (GET_H_GRC (FLD (f_rn)), 4);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -3786,7 +3785,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = MULSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn)));
     SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
   }
 
 #undef FLD
@@ -3805,7 +3804,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = MULSI (EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1)), EXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rn)), 1)));
     SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
   }
 
 #undef FLD
@@ -3824,7 +3823,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = MULSI (ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rm)), 1)), ZEXTHISI (SUBWORDSIHI (GET_H_GRC (FLD (f_rn)), 1)));
     SET_H_MACL (opval);
-    TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "macl", 'x', opval);
   }
 
 #undef FLD
@@ -3843,7 +3842,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = NEGSI (GET_H_GRC (FLD (f_rm)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -3865,12 +3864,12 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = SUBCSI (0, GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     BI opval = tmp_flag;
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -3905,7 +3904,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     DI opval = INVDI (GET_H_GR (FLD (f_rm)));
     SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
   }
 
 #undef FLD
@@ -3925,7 +3924,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GET_H_GRC (FLD (f_rn));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 ((void) 0); /*nop*/
 }
@@ -3947,7 +3946,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GET_H_GRC (FLD (f_rn));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 ((void) 0); /*nop*/
 }
@@ -3969,7 +3968,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = GET_H_GRC (FLD (f_rn));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 ((void) 0); /*nop*/
 }
@@ -3990,7 +3989,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     DI opval = ORDI (GET_H_GR (FLD (f_rm)), GET_H_GR (FLD (f_rn)));
     SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
   }
 
 #undef FLD
@@ -4009,7 +4008,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     SI opval = ORSI (GET_H_GRC (((UINT) 0)), ZEXTSIDI (FLD (f_imm8)));
     SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4033,7 +4032,7 @@ if (EQSI (FLD (f_rm), FLD (f_rn))) {
   {
     UQI opval = tmp_data;
     SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 
@@ -4071,12 +4070,12 @@ sh64_pref (current_cpu, GET_H_GRC (FLD (f_rn)));
   {
     SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), GET_H_TBIT ());
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     BI opval = ((tmp_temp) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -4101,12 +4100,12 @@ sh64_pref (current_cpu, GET_H_GRC (FLD (f_rn)));
   {
     SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rn)), 1), SLLSI (tmp_temp, 31));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     BI opval = ((tmp_lsbit) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -4129,12 +4128,12 @@ sh64_pref (current_cpu, GET_H_GRC (FLD (f_rn)));
   {
     SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rn)), 1), tmp_temp);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     BI opval = ((tmp_temp) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -4159,12 +4158,12 @@ sh64_pref (current_cpu, GET_H_GRC (FLD (f_rn)));
   {
     SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rn)), 1), SLLSI (tmp_temp, 31));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     BI opval = ((tmp_lsbit) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -4186,14 +4185,14 @@ sh64_pref (current_cpu, GET_H_GRC (FLD (f_rn)));
   {
     UDI opval = ADDDI (pc, 2);
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 ((void) 0); /*nop*/
 {
   {
     UDI opval = GET_H_PR ();
     SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
-    TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "pc", 'D', opval);
   }
 }
 ((void) 0); /*nop*/
@@ -4216,7 +4215,7 @@ sh64_pref (current_cpu, GET_H_GRC (FLD (f_rn)));
   {
     BI opval = 1;
     SET_H_SBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "sbit", 'x', opval);
   }
 
 #undef FLD
@@ -4235,7 +4234,7 @@ sh64_pref (current_cpu, GET_H_GRC (FLD (f_rn)));
   {
     BI opval = 1;
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 
 #undef FLD
@@ -4259,7 +4258,7 @@ if (GESI (GET_H_GRC (FLD (f_rm)), 0)) {
     SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), tmp_shamt);
     SET_H_GRC (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 } else {
 if (NESI (tmp_shamt, 0)) {
@@ -4267,7 +4266,7 @@ if (NESI (tmp_shamt, 0)) {
     SI opval = SRASI (GET_H_GRC (FLD (f_rn)), SUBSI (32, tmp_shamt));
     SET_H_GRC (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 } else {
 if (LTSI (GET_H_GRC (FLD (f_rn)), 0)) {
@@ -4275,14 +4274,14 @@ if (LTSI (GET_H_GRC (FLD (f_rn)), 0)) {
     SI opval = NEGSI (1);
     SET_H_GRC (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 } else {
   {
     SI opval = 0;
     SET_H_GRC (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 }
@@ -4309,12 +4308,12 @@ if (LTSI (GET_H_GRC (FLD (f_rn)), 0)) {
   {
     SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 1);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     BI opval = ((tmp_t) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -4337,12 +4336,12 @@ if (LTSI (GET_H_GRC (FLD (f_rn)), 0)) {
   {
     SI opval = SRASI (GET_H_GRC (FLD (f_rn)), 1);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     BI opval = ((tmp_t) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -4367,7 +4366,7 @@ if (GESI (GET_H_GRC (FLD (f_rm)), 0)) {
     SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), tmp_shamt);
     SET_H_GRC (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 } else {
 if (NESI (tmp_shamt, 0)) {
@@ -4375,14 +4374,14 @@ if (NESI (tmp_shamt, 0)) {
     SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), SUBSI (32, tmp_shamt));
     SET_H_GRC (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 } else {
   {
     SI opval = 0;
     SET_H_GRC (FLD (f_rn), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 }
@@ -4408,12 +4407,12 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 1);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     BI opval = ((tmp_t) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -4433,7 +4432,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 2);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4452,7 +4451,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 8);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4471,7 +4470,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = SLLSI (GET_H_GRC (FLD (f_rn)), 16);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4493,12 +4492,12 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 1);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     BI opval = ((tmp_t) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -4518,7 +4517,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 2);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4537,7 +4536,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 8);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4556,7 +4555,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = SRLSI (GET_H_GRC (FLD (f_rn)), 16);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4575,7 +4574,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = GET_H_GBR ();
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4594,7 +4593,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = GET_H_VBR ();
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4616,12 +4615,12 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = GET_H_GBR ();
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     SI opval = tmp_addr;
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -4644,12 +4643,12 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = GET_H_VBR ();
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     SI opval = tmp_addr;
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -4669,7 +4668,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = CPU (h_fpscr);
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4691,12 +4690,12 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = CPU (h_fpscr);
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     SI opval = tmp_addr;
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -4716,7 +4715,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = SUBWORDSFSI (CPU (h_fr[((UINT) 32)]));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4738,12 +4737,12 @@ if (NESI (tmp_shamt, 0)) {
   {
     SF opval = CPU (h_fr[((UINT) 32)]);
     SETMEMSF (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'f', opval);
   }
   {
     SI opval = tmp_addr;
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -4763,7 +4762,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = GET_H_MACH ();
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4785,12 +4784,12 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = GET_H_MACH ();
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     SI opval = tmp_addr;
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -4810,7 +4809,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = GET_H_MACL ();
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4832,12 +4831,12 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = GET_H_MACL ();
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     SI opval = tmp_addr;
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -4857,7 +4856,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = GET_H_PR ();
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4879,12 +4878,12 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = GET_H_PR ();
     SETMEMSI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
   {
     SI opval = tmp_addr;
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -4904,7 +4903,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -4926,12 +4925,12 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = SUBCSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)), GET_H_TBIT ());
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     BI opval = tmp_flag;
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -4954,12 +4953,12 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = SUBSI (GET_H_GRC (FLD (f_rn)), GET_H_GRC (FLD (f_rm)));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
   {
     BI opval = ((tmp_t) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -4986,7 +4985,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = ORSI (SLLSI (tmp_top_half, 16), ORSI (SLLSI (tmp_byte0, 8), tmp_byte1));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 }
 
@@ -5006,7 +5005,7 @@ if (NESI (tmp_shamt, 0)) {
   {
     SI opval = ORSI (SRLSI (GET_H_GRC (FLD (f_rm)), 16), SLLSI (GET_H_GRC (FLD (f_rm)), 16));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -5028,13 +5027,13 @@ if (NESI (tmp_shamt, 0)) {
   {
     BI opval = ((EQQI (tmp_byte, 0)) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
   tmp_byte = ORQI (tmp_byte, 128);
   {
     UQI opval = tmp_byte;
     SETMEMUQI (current_cpu, pc, GET_H_GRC (FLD (f_rn)), opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 
@@ -5069,7 +5068,7 @@ sh64_compact_trapa (current_cpu, FLD (f_imm8), pc);
   {
     BI opval = ((EQSI (ANDSI (GET_H_GRC (FLD (f_rm)), GET_H_GRC (FLD (f_rn))), 0)) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 
 #undef FLD
@@ -5088,7 +5087,7 @@ sh64_compact_trapa (current_cpu, FLD (f_imm8), pc);
   {
     BI opval = ((EQSI (ANDSI (GET_H_GRC (((UINT) 0)), ZEXTSISI (FLD (f_imm8))), 0)) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 
 #undef FLD
@@ -5110,7 +5109,7 @@ sh64_compact_trapa (current_cpu, FLD (f_imm8), pc);
   {
     BI opval = ((EQQI (ANDQI (GETMEMUQI (current_cpu, pc, tmp_addr), FLD (f_imm8)), 0)) ? (1) : (0));
     SET_H_TBIT (opval);
-    TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "tbit", 'x', opval);
   }
 }
 
@@ -5130,7 +5129,7 @@ sh64_compact_trapa (current_cpu, FLD (f_imm8), pc);
   {
     DI opval = XORDI (GET_H_GR (FLD (f_rn)), GET_H_GR (FLD (f_rm)));
     SET_H_GR (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "gr", 'D', opval);
   }
 
 #undef FLD
@@ -5149,7 +5148,7 @@ sh64_compact_trapa (current_cpu, FLD (f_imm8), pc);
   {
     SI opval = XORSI (GET_H_GRC (((UINT) 0)), ZEXTSIDI (FLD (f_imm8)));
     SET_H_GRC (((UINT) 0), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD
@@ -5173,7 +5172,7 @@ sh64_compact_trapa (current_cpu, FLD (f_imm8), pc);
   {
     UQI opval = tmp_data;
     SETMEMUQI (current_cpu, pc, tmp_addr, opval);
-    TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
   }
 }
 
@@ -5193,7 +5192,7 @@ sh64_compact_trapa (current_cpu, FLD (f_imm8), pc);
   {
     SI opval = ORSI (SLLSI (GET_H_GRC (FLD (f_rm)), 16), SRLSI (GET_H_GRC (FLD (f_rn)), 16));
     SET_H_GRC (FLD (f_rn), opval);
-    TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
+    CGEN_TRACE_RESULT (current_cpu, abuf, "grc", 'x', opval);
   }
 
 #undef FLD