2001-03-05 Dave Brolley <brolley@

        * arch.c: Regenerate.
        * arch.h: Regenerate.
        * cpu.c: Regenerate.
        * cpu.h: Regenerate.
        * cpuall.h: Regenerate.
        * decode.c: Regenerate.
        * decode.h: Regenerate.
        * model.c: Regenerate.
        * sem-switch.c: Regenerate.
        * sem.c: Regenerate.

1 files changed, 147 insertions, 143 deletions

diff --git a/sim/fr30/sem-switch.c b/sim/fr30/sem-switch.c
index d6340c0513..7dc7f7fd83 100644
--- a/sim/fr30/sem-switch.c
+++ b/sim/fr30/sem-switch.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of the GNU Simulators.
 
@@ -233,7 +233,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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
 
 {
 
@@ -425,7 +429,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = ADDSI (* FLD (i_Ri), * FLD (i_Rj));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
@@ -468,7 +472,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = ADDSI (* FLD (i_Ri), FLD (f_u4));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
@@ -511,7 +515,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = ADDSI (* FLD (i_Ri), FLD (f_m4));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
@@ -556,7 +560,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = tmp_tmp;
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
@@ -588,7 +592,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = ADDSI (* FLD (i_Ri), * FLD (i_Rj));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -607,7 +611,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = ADDSI (* FLD (i_Ri), FLD (f_u4));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -626,7 +630,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = ADDSI (* FLD (i_Ri), FLD (f_m4));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -656,7 +660,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = SUBSI (* FLD (i_Ri), * FLD (i_Rj));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
@@ -701,7 +705,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = tmp_tmp;
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
@@ -733,7 +737,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = SUBSI (* FLD (i_Ri), * FLD (i_Rj));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -873,7 +877,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = ANDSI (* FLD (i_Ri), * FLD (i_Rj));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
@@ -906,7 +910,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = ORSI (* FLD (i_Ri), * FLD (i_Rj));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
@@ -939,7 +943,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = XORSI (* FLD (i_Ri), * FLD (i_Rj));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
@@ -1459,12 +1463,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = TRUNCDISI (tmp_tmp);
     SET_H_DR (((UINT) 5), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
   {
     SI opval = TRUNCDISI (SRLDI (tmp_tmp, 32));
     SET_H_DR (((UINT) 4), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
   {
     BI opval = LTSI (GET_H_DR (((UINT) 5)), 0);
@@ -1502,12 +1506,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = TRUNCDISI (tmp_tmp);
     SET_H_DR (((UINT) 5), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
   {
     SI opval = TRUNCDISI (SRLDI (tmp_tmp, 32));
     SET_H_DR (((UINT) 4), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
   {
     BI opval = LTSI (GET_H_DR (((UINT) 4)), 0);
@@ -1543,7 +1547,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = MULHI (TRUNCSIHI (* FLD (i_Rj)), TRUNCSIHI (* FLD (i_Ri)));
     SET_H_DR (((UINT) 5), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
   {
     BI opval = LTSI (GET_H_DR (((UINT) 5)), 0);
@@ -1574,7 +1578,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
   {
     SI opval = MULSI (ANDSI (* FLD (i_Rj), 65535), ANDSI (* FLD (i_Ri), 65535));
     SET_H_DR (((UINT) 5), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
   {
     BI opval = LTSI (GET_H_DR (((UINT) 5)), 0);
@@ -1617,14 +1621,14 @@ if (NEBI (CPU (h_d0bit), 0)) {
     SI opval = 0xffffffff;
     SET_H_DR (((UINT) 4), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
 } else {
   {
     SI opval = 0;
     SET_H_DR (((UINT) 4), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
 }
 }
@@ -1657,7 +1661,7 @@ if (NEBI (CPU (h_d0bit), 0)) {
   {
     SI opval = 0;
     SET_H_DR (((UINT) 4), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
 }
 
@@ -1679,19 +1683,19 @@ if (NEBI (CPU (h_d0bit), 0)) {
   {
     SI opval = SLLSI (GET_H_DR (((UINT) 4)), 1);
     SET_H_DR (((UINT) 4), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
 if (LTSI (GET_H_DR (((UINT) 5)), 0)) {
   {
     SI opval = ADDSI (GET_H_DR (((UINT) 4)), 1);
     SET_H_DR (((UINT) 4), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
 }
   {
     SI opval = SLLSI (GET_H_DR (((UINT) 5)), 1);
     SET_H_DR (((UINT) 5), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
 if (EQBI (CPU (h_d1bit), 1)) {
 {
@@ -1719,12 +1723,12 @@ if (NOTBI (XORBI (XORBI (CPU (h_d0bit), CPU (h_d1bit)), CPU (h_cbit)))) {
   {
     SI opval = tmp_tmp;
     SET_H_DR (((UINT) 4), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
   {
     SI opval = ORSI (GET_H_DR (((UINT) 5)), 1);
     SET_H_DR (((UINT) 5), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
 }
 }
@@ -1784,7 +1788,7 @@ if (EQSI (tmp_tmp, 0)) {
     SI opval = 0;
     SET_H_DR (((UINT) 4), opval);
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "dr-4", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
 }
 } else {
@@ -1816,7 +1820,7 @@ if (EQBI (CPU (h_zbit), 1)) {
     SI opval = ADDSI (GET_H_DR (((UINT) 5)), 1);
     SET_H_DR (((UINT) 5), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
 }
 
@@ -1839,7 +1843,7 @@ if (EQBI (CPU (h_d1bit), 1)) {
     SI opval = NEGSI (GET_H_DR (((UINT) 5)));
     SET_H_DR (((UINT) 5), opval);
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "dr-5", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
 }
 
@@ -1872,7 +1876,7 @@ if (NESI (tmp_shift, 0)) {
     SI opval = SLLSI (* FLD (i_Ri), tmp_shift);
     * FLD (i_Ri) = opval;
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 } else {
@@ -1924,7 +1928,7 @@ if (NESI (tmp_shift, 0)) {
     SI opval = SLLSI (* FLD (i_Ri), tmp_shift);
     * FLD (i_Ri) = opval;
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 } else {
@@ -1976,7 +1980,7 @@ if (NESI (tmp_shift, 0)) {
     SI opval = SLLSI (* FLD (i_Ri), tmp_shift);
     * FLD (i_Ri) = opval;
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 } else {
@@ -2028,7 +2032,7 @@ if (NESI (tmp_shift, 0)) {
     SI opval = SRLSI (* FLD (i_Ri), tmp_shift);
     * FLD (i_Ri) = opval;
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 } else {
@@ -2080,7 +2084,7 @@ if (NESI (tmp_shift, 0)) {
     SI opval = SRLSI (* FLD (i_Ri), tmp_shift);
     * FLD (i_Ri) = opval;
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 } else {
@@ -2132,7 +2136,7 @@ if (NESI (tmp_shift, 0)) {
     SI opval = SRLSI (* FLD (i_Ri), tmp_shift);
     * FLD (i_Ri) = opval;
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 } else {
@@ -2184,7 +2188,7 @@ if (NESI (tmp_shift, 0)) {
     SI opval = SRASI (* FLD (i_Ri), tmp_shift);
     * FLD (i_Ri) = opval;
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 } else {
@@ -2236,7 +2240,7 @@ if (NESI (tmp_shift, 0)) {
     SI opval = SRASI (* FLD (i_Ri), tmp_shift);
     * FLD (i_Ri) = opval;
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 } else {
@@ -2288,7 +2292,7 @@ if (NESI (tmp_shift, 0)) {
     SI opval = SRASI (* FLD (i_Ri), tmp_shift);
     * FLD (i_Ri) = opval;
     written |= (1 << 2);
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 } else {
@@ -2328,7 +2332,7 @@ if (NESI (tmp_shift, 0)) {
   {
     SI opval = FLD (f_i8);
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2347,7 +2351,7 @@ if (NESI (tmp_shift, 0)) {
   {
     SI opval = FLD (f_i20);
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2366,7 +2370,7 @@ if (NESI (tmp_shift, 0)) {
   {
     SI opval = FLD (f_i32);
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2385,7 +2389,7 @@ if (NESI (tmp_shift, 0)) {
   {
     SI opval = GETMEMSI (current_cpu, pc, * FLD (i_Rj));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2404,7 +2408,7 @@ if (NESI (tmp_shift, 0)) {
   {
     SI opval = GETMEMUHI (current_cpu, pc, * FLD (i_Rj));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2423,7 +2427,7 @@ if (NESI (tmp_shift, 0)) {
   {
     SI opval = GETMEMUQI (current_cpu, pc, * FLD (i_Rj));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2442,7 +2446,7 @@ if (NESI (tmp_shift, 0)) {
   {
     SI opval = GETMEMSI (current_cpu, pc, ADDSI (* FLD (i_Rj), CPU (h_gr[((UINT) 13)])));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2461,7 +2465,7 @@ if (NESI (tmp_shift, 0)) {
   {
     SI opval = GETMEMUHI (current_cpu, pc, ADDSI (* FLD (i_Rj), CPU (h_gr[((UINT) 13)])));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2480,7 +2484,7 @@ if (NESI (tmp_shift, 0)) {
   {
     SI opval = GETMEMUQI (current_cpu, pc, ADDSI (* FLD (i_Rj), CPU (h_gr[((UINT) 13)])));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2499,7 +2503,7 @@ if (NESI (tmp_shift, 0)) {
   {
     SI opval = GETMEMSI (current_cpu, pc, ADDSI (FLD (f_disp10), CPU (h_gr[((UINT) 14)])));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2518,7 +2522,7 @@ if (NESI (tmp_shift, 0)) {
   {
     SI opval = GETMEMUHI (current_cpu, pc, ADDSI (FLD (f_disp9), CPU (h_gr[((UINT) 14)])));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2537,7 +2541,7 @@ if (NESI (tmp_shift, 0)) {
   {
     SI opval = GETMEMUQI (current_cpu, pc, ADDSI (FLD (f_disp8), CPU (h_gr[((UINT) 14)])));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2556,7 +2560,7 @@ if (NESI (tmp_shift, 0)) {
   {
     SI opval = GETMEMSI (current_cpu, pc, ADDSI (FLD (f_udisp6), CPU (h_gr[((UINT) 15)])));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2576,14 +2580,14 @@ if (NESI (tmp_shift, 0)) {
   {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 if (NESI (FLD (f_Ri), 15)) {
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -2608,12 +2612,12 @@ if (NESI (FLD (f_Ri), 15)) {
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = tmp_tmp;
     SET_H_DR (FLD (f_Rs2), opval);
-    TRACE_RESULT (current_cpu, abuf, "Rs2", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
 }
 
@@ -2639,7 +2643,7 @@ if (NESI (FLD (f_Ri), 15)) {
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -2852,7 +2856,7 @@ if (NESI (FLD (f_Ri), 15)) {
   {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = tmp_tmp;
@@ -2880,7 +2884,7 @@ if (NESI (FLD (f_Ri), 15)) {
   {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = tmp_tmp;
@@ -2906,7 +2910,7 @@ if (NESI (FLD (f_Ri), 15)) {
   {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = GET_H_PS ();
@@ -2931,7 +2935,7 @@ if (NESI (FLD (f_Ri), 15)) {
   {
     SI opval = * FLD (i_Rj);
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2950,7 +2954,7 @@ if (NESI (FLD (f_Ri), 15)) {
   {
     SI opval = GET_H_DR (FLD (f_Rs1));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2969,7 +2973,7 @@ if (NESI (FLD (f_Ri), 15)) {
   {
     SI opval = GET_H_PS ();
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -2988,7 +2992,7 @@ if (NESI (FLD (f_Ri), 15)) {
   {
     SI opval = * FLD (i_Ri);
     SET_H_DR (FLD (f_Rs1), opval);
-    TRACE_RESULT (current_cpu, abuf, "Rs1", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
 
 #undef FLD
@@ -3072,7 +3076,7 @@ if (NESI (FLD (f_Ri), 15)) {
   {
     SI opval = ADDSI (pc, 2);
     SET_H_DR (((UINT) 1), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-1", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
   {
     USI opval = * FLD (i_Ri);
@@ -3101,7 +3105,7 @@ if (NESI (FLD (f_Ri), 15)) {
   {
     SI opval = ADDSI (pc, 4);
     SET_H_DR (((UINT) 1), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-1", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
   {
     USI opval = * FLD (i_Ri);
@@ -3130,7 +3134,7 @@ if (NESI (FLD (f_Ri), 15)) {
   {
     SI opval = ADDSI (pc, 2);
     SET_H_DR (((UINT) 1), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-1", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
   {
     USI opval = FLD (i_label12);
@@ -3159,7 +3163,7 @@ if (NESI (FLD (f_Ri), 15)) {
   {
     SI opval = ADDSI (pc, 4);
     SET_H_DR (((UINT) 1), opval);
-    TRACE_RESULT (current_cpu, abuf, "dr-1", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
   {
     USI opval = FLD (i_label12);
@@ -3292,7 +3296,7 @@ if (EQBI (GET_H_SBIT (), 0)) {
     SI opval = ADDSI (GET_H_DR (((UINT) 2)), 4);
     SET_H_DR (((UINT) 2), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "dr-2", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
   {
     SI opval = GETMEMSI (current_cpu, pc, GET_H_DR (((UINT) 2)));
@@ -3304,7 +3308,7 @@ if (EQBI (GET_H_SBIT (), 0)) {
     SI opval = ADDSI (GET_H_DR (((UINT) 2)), 4);
     SET_H_DR (((UINT) 2), opval);
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "dr-2", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
 }
 } else {
@@ -3319,7 +3323,7 @@ if (EQBI (GET_H_SBIT (), 0)) {
     SI opval = ADDSI (GET_H_DR (((UINT) 3)), 4);
     SET_H_DR (((UINT) 3), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "dr-3", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
   {
     SI opval = GETMEMSI (current_cpu, pc, GET_H_DR (((UINT) 3)));
@@ -3331,7 +3335,7 @@ if (EQBI (GET_H_SBIT (), 0)) {
     SI opval = ADDSI (GET_H_DR (((UINT) 3)), 4);
     SET_H_DR (((UINT) 3), opval);
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "dr-3", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
   }
 }
 }
@@ -4221,7 +4225,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 13)]), 4);
     CPU (h_gr[((UINT) 13)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -4247,7 +4251,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 13)]), 2);
     CPU (h_gr[((UINT) 13)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -4273,7 +4277,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 13)]), 1);
     CPU (h_gr[((UINT) 13)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -4299,7 +4303,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -4319,7 +4323,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = GETMEMSI (current_cpu, pc, FLD (f_dir10));
     CPU (h_gr[((UINT) 13)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -4338,7 +4342,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = GETMEMHI (current_cpu, pc, FLD (f_dir9));
     CPU (h_gr[((UINT) 13)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -4357,7 +4361,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = GETMEMQI (current_cpu, pc, FLD (f_dir8));
     CPU (h_gr[((UINT) 13)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -4382,7 +4386,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 13)]), 4);
     CPU (h_gr[((UINT) 13)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -4408,7 +4412,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 13)]), 2);
     CPU (h_gr[((UINT) 13)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -4434,7 +4438,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 13)]), 1);
     CPU (h_gr[((UINT) 13)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -4455,7 +4459,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = GETMEMSI (current_cpu, pc, FLD (f_dir10));
@@ -4480,7 +4484,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = ADDSI (* FLD (i_Ri), 4);
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -4499,7 +4503,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = ADDSI (* FLD (i_Ri), 4);
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -4650,7 +4654,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), FLD (f_s10));
     CPU (h_gr[((UINT) 15)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -4669,7 +4673,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = EXTQISI (ANDQI (* FLD (i_Ri), 255));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -4688,7 +4692,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = ZEXTQISI (ANDQI (* FLD (i_Ri), 255));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -4707,7 +4711,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = EXTHISI (ANDHI (* FLD (i_Ri), 65535));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -4726,7 +4730,7 @@ if (NOTBI (ORBI (CPU (h_cbit), CPU (h_zbit)))) {
   {
     SI opval = ZEXTHISI (ANDHI (* FLD (i_Ri), 65535));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 
 #undef FLD
@@ -4749,13 +4753,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 1)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 0)]) = opval;
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "gr-0", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4765,13 +4769,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 2)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 1)]) = opval;
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr-1", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4781,13 +4785,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 4)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 2)]) = opval;
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr-2", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4797,13 +4801,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 8)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 3)]) = opval;
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr-3", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4813,13 +4817,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 16)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 4)]) = opval;
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr-4", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4829,13 +4833,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 32)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 5)]) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr-5", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4845,13 +4849,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 64)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 6)]) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr-6", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4861,13 +4865,13 @@ if (ANDSI (FLD (f_reglist_low_ld), 128)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 7)]) = opval;
     written |= (1 << 11);
-    TRACE_RESULT (current_cpu, abuf, "gr-7", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4894,13 +4898,13 @@ if (ANDSI (FLD (f_reglist_hi_ld), 1)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 8)]) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr-8", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4910,13 +4914,13 @@ if (ANDSI (FLD (f_reglist_hi_ld), 2)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 9)]) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr-9", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4926,13 +4930,13 @@ if (ANDSI (FLD (f_reglist_hi_ld), 4)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 10)]) = opval;
     written |= (1 << 3);
-    TRACE_RESULT (current_cpu, abuf, "gr-10", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4942,13 +4946,13 @@ if (ANDSI (FLD (f_reglist_hi_ld), 8)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 11)]) = opval;
     written |= (1 << 4);
-    TRACE_RESULT (current_cpu, abuf, "gr-11", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4958,13 +4962,13 @@ if (ANDSI (FLD (f_reglist_hi_ld), 16)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 12)]) = opval;
     written |= (1 << 5);
-    TRACE_RESULT (current_cpu, abuf, "gr-12", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4974,13 +4978,13 @@ if (ANDSI (FLD (f_reglist_hi_ld), 32)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 13)]) = opval;
     written |= (1 << 6);
-    TRACE_RESULT (current_cpu, abuf, "gr-13", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -4990,13 +4994,13 @@ if (ANDSI (FLD (f_reglist_hi_ld), 64)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 14)]) = opval;
     written |= (1 << 7);
-    TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -5005,7 +5009,7 @@ if (ANDSI (FLD (f_reglist_hi_ld), 128)) {
     SI opval = GETMEMSI (current_cpu, pc, CPU (h_gr[((UINT) 15)]));
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 8);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 }
@@ -5031,7 +5035,7 @@ if (ANDSI (FLD (f_reglist_low_st), 1)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 7)]);
@@ -5047,7 +5051,7 @@ if (ANDSI (FLD (f_reglist_low_st), 2)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 6)]);
@@ -5063,7 +5067,7 @@ if (ANDSI (FLD (f_reglist_low_st), 4)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 5)]);
@@ -5079,7 +5083,7 @@ if (ANDSI (FLD (f_reglist_low_st), 8)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 4)]);
@@ -5095,7 +5099,7 @@ if (ANDSI (FLD (f_reglist_low_st), 16)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 3)]);
@@ -5111,7 +5115,7 @@ if (ANDSI (FLD (f_reglist_low_st), 32)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 2)]);
@@ -5127,7 +5131,7 @@ if (ANDSI (FLD (f_reglist_low_st), 64)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 1)]);
@@ -5143,7 +5147,7 @@ if (ANDSI (FLD (f_reglist_low_st), 128)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 10);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 0)]);
@@ -5178,7 +5182,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 1)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = tmp_save_r15;
@@ -5194,7 +5198,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 2)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 14)]);
@@ -5210,7 +5214,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 4)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 13)]);
@@ -5226,7 +5230,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 8)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 12)]);
@@ -5242,7 +5246,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 16)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 11)]);
@@ -5258,7 +5262,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 32)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 10)]);
@@ -5274,7 +5278,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 64)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 9)]);
@@ -5290,7 +5294,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 128)) {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
     written |= (1 << 9);
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = CPU (h_gr[((UINT) 8)]);
@@ -5327,12 +5331,12 @@ if (ANDSI (FLD (f_reglist_hi_st), 128)) {
   {
     SI opval = tmp_tmp;
     CPU (h_gr[((UINT) 14)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = SUBSI (CPU (h_gr[((UINT) 15)]), FLD (f_u10));
     CPU (h_gr[((UINT) 15)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -5353,12 +5357,12 @@ if (ANDSI (FLD (f_reglist_hi_st), 128)) {
   {
     SI opval = ADDSI (CPU (h_gr[((UINT) 14)]), 4);
     CPU (h_gr[((UINT) 15)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-15", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     SI opval = GETMEMSI (current_cpu, pc, SUBSI (CPU (h_gr[((UINT) 15)]), 4));
     CPU (h_gr[((UINT) 14)]) = opval;
-    TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 }
 
@@ -5381,7 +5385,7 @@ if (ANDSI (FLD (f_reglist_hi_st), 128)) {
   {
     SI opval = GETMEMUQI (current_cpu, pc, * FLD (i_Rj));
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
     UQI opval = tmp_tmp;