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.

11 files changed, 336 insertions, 580 deletions

diff --git a/sim/fr30/ChangeLog b/sim/fr30/ChangeLog
index bc3a8c9..a8ea840 100644
--- a/sim/fr30/ChangeLog
+++ b/sim/fr30/ChangeLog
@@ -1,3 +1,16 @@
+2001-03-05  Dave Brolley  <brolley@redhat.com>
+
+	* 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.
+
 2001-01-12  Frank Ch. Eigler  <fche@redhat.com>
 
 	* configure: Regenerated with sim_scache fix.
diff --git a/sim/fr30/arch.c b/sim/fr30/arch.c
index 55eea0d..a8404d8 100644
--- a/sim/fr30/arch.c
+++ b/sim/fr30/arch.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.
 
diff --git a/sim/fr30/arch.h b/sim/fr30/arch.h
index ffc516e..dc92099 100644
--- a/sim/fr30/arch.h
+++ b/sim/fr30/arch.h
@@ -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.
 
diff --git a/sim/fr30/cpu.c b/sim/fr30/cpu.c
index fb94688..374bcc8 100644
--- a/sim/fr30/cpu.c
+++ b/sim/fr30/cpu.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.
 
diff --git a/sim/fr30/cpu.h b/sim/fr30/cpu.h
index ac1af48..7a7ee46 100644
--- a/sim/fr30/cpu.h
+++ b/sim/fr30/cpu.h
@@ -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.
 
diff --git a/sim/fr30/cpuall.h b/sim/fr30/cpuall.h
index f0ebb90..59646cf 100644
--- a/sim/fr30/cpuall.h
+++ b/sim/fr30/cpuall.h
@@ -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.
 
diff --git a/sim/fr30/decode.c b/sim/fr30/decode.c
index 407bd93..ff01ce5 100644
--- a/sim/fr30/decode.c
+++ b/sim/fr30/decode.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.
 
@@ -282,69 +282,31 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
 {
   /* Result of decoder.  */
   FR30BF_INSN_TYPE itype;
+  CGEN_INSN_INT insn = base_insn;
 
   {
-    CGEN_INSN_INT insn = base_insn;
 
     {
       unsigned int val = (((insn >> 8) & (255 << 0)));
       switch (val)
       {
-      case 0 : itype = FR30BF_INSN_LDR13; goto extract_sfmt_ldr13;
-      case 1 : itype = FR30BF_INSN_LDR13UH; goto extract_sfmt_ldr13;
-      case 2 : itype = FR30BF_INSN_LDR13UB; goto extract_sfmt_ldr13;
-      case 3 : itype = FR30BF_INSN_LDR15; goto extract_sfmt_ldr15;
-      case 4 : itype = FR30BF_INSN_LD; goto extract_sfmt_ld;
-      case 5 : itype = FR30BF_INSN_LDUH; goto extract_sfmt_ld;
-      case 6 : itype = FR30BF_INSN_LDUB; goto extract_sfmt_ld;
-      case 7 :
+      case 0 : itype = FR30BF_INSN_LDR13; goto extract_sfmt_ldr13;      case 1 : itype = FR30BF_INSN_LDR13UH; goto extract_sfmt_ldr13;      case 2 : itype = FR30BF_INSN_LDR13UB; goto extract_sfmt_ldr13;      case 3 : itype = FR30BF_INSN_LDR15; goto extract_sfmt_ldr15;      case 4 : itype = FR30BF_INSN_LD; goto extract_sfmt_ld;      case 5 : itype = FR30BF_INSN_LDUH; goto extract_sfmt_ld;      case 6 : itype = FR30BF_INSN_LDUB; goto extract_sfmt_ld;      case 7 :
         {
-          unsigned int val = (((insn >> 4) & (15 << 0)));
+          unsigned int val = (((insn >> 6) & (1 << 1)) | ((insn >> 4) & (1 << 0)));
           switch (val)
           {
-          case 0 : itype = FR30BF_INSN_LDR15GR; goto extract_sfmt_ldr15gr;
-          case 1 : itype = FR30BF_INSN_MOV2PS; goto extract_sfmt_mov2ps;
-          case 8 : itype = FR30BF_INSN_LDR15DR; goto extract_sfmt_ldr15dr;
-          case 9 : itype = FR30BF_INSN_LDR15PS; goto extract_sfmt_ldr15ps;
-          default : itype = FR30BF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FR30BF_INSN_LDR15GR; goto extract_sfmt_ldr15gr;          case 1 : itype = FR30BF_INSN_MOV2PS; goto extract_sfmt_mov2ps;          case 2 : itype = FR30BF_INSN_LDR15DR; goto extract_sfmt_ldr15dr;          case 3 : itype = FR30BF_INSN_LDR15PS; goto extract_sfmt_ldr15ps;          default : itype = FR30BF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 8 : itype = FR30BF_INSN_DMOV2R13; goto extract_sfmt_dmov2r13;
-      case 9 : itype = FR30BF_INSN_DMOV2R13H; goto extract_sfmt_dmov2r13h;
-      case 10 : itype = FR30BF_INSN_DMOV2R13B; goto extract_sfmt_dmov2r13b;
-      case 11 : itype = FR30BF_INSN_DMOV2R15PD; goto extract_sfmt_dmov2r15pd;
-      case 12 : itype = FR30BF_INSN_DMOV2R13PI; goto extract_sfmt_dmov2r13pi;
-      case 13 : itype = FR30BF_INSN_DMOV2R13PIH; goto extract_sfmt_dmov2r13pih;
-      case 14 : itype = FR30BF_INSN_DMOV2R13PIB; goto extract_sfmt_dmov2r13pib;
-      case 15 : itype = FR30BF_INSN_ENTER; goto extract_sfmt_enter;
-      case 16 : itype = FR30BF_INSN_STR13; goto extract_sfmt_str13;
-      case 17 : itype = FR30BF_INSN_STR13H; goto extract_sfmt_str13;
-      case 18 : itype = FR30BF_INSN_STR13B; goto extract_sfmt_str13;
-      case 19 : itype = FR30BF_INSN_STR15; goto extract_sfmt_str15;
-      case 20 : itype = FR30BF_INSN_ST; goto extract_sfmt_st;
-      case 21 : itype = FR30BF_INSN_STH; goto extract_sfmt_st;
-      case 22 : itype = FR30BF_INSN_STB; goto extract_sfmt_st;
-      case 23 :
+      case 8 : itype = FR30BF_INSN_DMOV2R13; goto extract_sfmt_dmov2r13;      case 9 : itype = FR30BF_INSN_DMOV2R13H; goto extract_sfmt_dmov2r13h;      case 10 : itype = FR30BF_INSN_DMOV2R13B; goto extract_sfmt_dmov2r13b;      case 11 : itype = FR30BF_INSN_DMOV2R15PD; goto extract_sfmt_dmov2r15pd;      case 12 : itype = FR30BF_INSN_DMOV2R13PI; goto extract_sfmt_dmov2r13pi;      case 13 : itype = FR30BF_INSN_DMOV2R13PIH; goto extract_sfmt_dmov2r13pih;      case 14 : itype = FR30BF_INSN_DMOV2R13PIB; goto extract_sfmt_dmov2r13pib;      case 15 : itype = FR30BF_INSN_ENTER; goto extract_sfmt_enter;      case 16 : itype = FR30BF_INSN_STR13; goto extract_sfmt_str13;      case 17 : itype = FR30BF_INSN_STR13H; goto extract_sfmt_str13;      case 18 : itype = FR30BF_INSN_STR13B; goto extract_sfmt_str13;      case 19 : itype = FR30BF_INSN_STR15; goto extract_sfmt_str15;      case 20 : itype = FR30BF_INSN_ST; goto extract_sfmt_st;      case 21 : itype = FR30BF_INSN_STH; goto extract_sfmt_st;      case 22 : itype = FR30BF_INSN_STB; goto extract_sfmt_st;      case 23 :
         {
-          unsigned int val = (((insn >> 4) & (15 << 0)));
+          unsigned int val = (((insn >> 6) & (1 << 1)) | ((insn >> 4) & (1 << 0)));
           switch (val)
           {
-          case 0 : itype = FR30BF_INSN_STR15GR; goto extract_sfmt_str15gr;
-          case 1 : itype = FR30BF_INSN_MOVPS; goto extract_sfmt_movps;
-          case 8 : itype = FR30BF_INSN_STR15DR; goto extract_sfmt_str15dr;
-          case 9 : itype = FR30BF_INSN_STR15PS; goto extract_sfmt_str15ps;
-          default : itype = FR30BF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FR30BF_INSN_STR15GR; goto extract_sfmt_str15gr;          case 1 : itype = FR30BF_INSN_MOVPS; goto extract_sfmt_movps;          case 2 : itype = FR30BF_INSN_STR15DR; goto extract_sfmt_str15dr;          case 3 : itype = FR30BF_INSN_STR15PS; goto extract_sfmt_str15ps;          default : itype = FR30BF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 24 : itype = FR30BF_INSN_DMOVR13; goto extract_sfmt_dmovr13;
-      case 25 : itype = FR30BF_INSN_DMOVR13H; goto extract_sfmt_dmovr13h;
-      case 26 : itype = FR30BF_INSN_DMOVR13B; goto extract_sfmt_dmovr13b;
-      case 27 : itype = FR30BF_INSN_DMOVR15PI; goto extract_sfmt_dmovr15pi;
-      case 28 : itype = FR30BF_INSN_DMOVR13PI; goto extract_sfmt_dmovr13pi;
-      case 29 : itype = FR30BF_INSN_DMOVR13PIH; goto extract_sfmt_dmovr13pih;
-      case 30 : itype = FR30BF_INSN_DMOVR13PIB; goto extract_sfmt_dmovr13pib;
-      case 31 : itype = FR30BF_INSN_INT; goto extract_sfmt_int;
-      case 32 : /* fall through */
+      case 24 : itype = FR30BF_INSN_DMOVR13; goto extract_sfmt_dmovr13;      case 25 : itype = FR30BF_INSN_DMOVR13H; goto extract_sfmt_dmovr13h;      case 26 : itype = FR30BF_INSN_DMOVR13B; goto extract_sfmt_dmovr13b;      case 27 : itype = FR30BF_INSN_DMOVR15PI; goto extract_sfmt_dmovr15pi;      case 28 : itype = FR30BF_INSN_DMOVR13PI; goto extract_sfmt_dmovr13pi;      case 29 : itype = FR30BF_INSN_DMOVR13PIH; goto extract_sfmt_dmovr13pih;      case 30 : itype = FR30BF_INSN_DMOVR13PIB; goto extract_sfmt_dmovr13pib;      case 31 : itype = FR30BF_INSN_INT; goto extract_sfmt_int;      case 32 : /* fall through */
       case 33 : /* fall through */
       case 34 : /* fall through */
       case 35 : /* fall through */
@@ -359,8 +321,7 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
       case 44 : /* fall through */
       case 45 : /* fall through */
       case 46 : /* fall through */
-      case 47 : itype = FR30BF_INSN_LDR14; goto extract_sfmt_ldr14;
-      case 48 : /* fall through */
+      case 47 : itype = FR30BF_INSN_LDR14; goto extract_sfmt_ldr14;      case 48 : /* fall through */
       case 49 : /* fall through */
       case 50 : /* fall through */
       case 51 : /* fall through */
@@ -375,8 +336,7 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
       case 60 : /* fall through */
       case 61 : /* fall through */
       case 62 : /* fall through */
-      case 63 : itype = FR30BF_INSN_STR14; goto extract_sfmt_str14;
-      case 64 : /* fall through */
+      case 63 : itype = FR30BF_INSN_STR14; goto extract_sfmt_str14;      case 64 : /* fall through */
       case 65 : /* fall through */
       case 66 : /* fall through */
       case 67 : /* fall through */
@@ -391,8 +351,7 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
       case 76 : /* fall through */
       case 77 : /* fall through */
       case 78 : /* fall through */
-      case 79 : itype = FR30BF_INSN_LDR14UH; goto extract_sfmt_ldr14uh;
-      case 80 : /* fall through */
+      case 79 : itype = FR30BF_INSN_LDR14UH; goto extract_sfmt_ldr14uh;      case 80 : /* fall through */
       case 81 : /* fall through */
       case 82 : /* fall through */
       case 83 : /* fall through */
@@ -407,8 +366,7 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
       case 92 : /* fall through */
       case 93 : /* fall through */
       case 94 : /* fall through */
-      case 95 : itype = FR30BF_INSN_STR14H; goto extract_sfmt_str14h;
-      case 96 : /* fall through */
+      case 95 : itype = FR30BF_INSN_STR14H; goto extract_sfmt_str14h;      case 96 : /* fall through */
       case 97 : /* fall through */
       case 98 : /* fall through */
       case 99 : /* fall through */
@@ -423,8 +381,7 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
       case 108 : /* fall through */
       case 109 : /* fall through */
       case 110 : /* fall through */
-      case 111 : itype = FR30BF_INSN_LDR14UB; goto extract_sfmt_ldr14ub;
-      case 112 : /* fall through */
+      case 111 : itype = FR30BF_INSN_LDR14UB; goto extract_sfmt_ldr14ub;      case 112 : /* fall through */
       case 113 : /* fall through */
       case 114 : /* fall through */
       case 115 : /* fall through */
@@ -439,110 +396,23 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
       case 124 : /* fall through */
       case 125 : /* fall through */
       case 126 : /* fall through */
-      case 127 : itype = FR30BF_INSN_STR14B; goto extract_sfmt_str14b;
-      case 128 : itype = FR30BF_INSN_BANDL; goto extract_sfmt_bandl;
-      case 129 : itype = FR30BF_INSN_BANDH; goto extract_sfmt_bandl;
-      case 130 : itype = FR30BF_INSN_AND; goto extract_sfmt_and;
-      case 131 : itype = FR30BF_INSN_ANDCCR; goto extract_sfmt_andccr;
-      case 132 : itype = FR30BF_INSN_ANDM; goto extract_sfmt_andm;
-      case 133 : itype = FR30BF_INSN_ANDH; goto extract_sfmt_andh;
-      case 134 : itype = FR30BF_INSN_ANDB; goto extract_sfmt_andb;
-      case 135 : itype = FR30BF_INSN_STILM; goto extract_sfmt_stilm;
-      case 136 : itype = FR30BF_INSN_BTSTL; goto extract_sfmt_btstl;
-      case 137 : itype = FR30BF_INSN_BTSTH; goto extract_sfmt_btstl;
-      case 138 : itype = FR30BF_INSN_XCHB; goto extract_sfmt_xchb;
-      case 139 : itype = FR30BF_INSN_MOV; goto extract_sfmt_mov;
-      case 140 : itype = FR30BF_INSN_LDM0; goto extract_sfmt_ldm0;
-      case 141 : itype = FR30BF_INSN_LDM1; goto extract_sfmt_ldm1;
-      case 142 : itype = FR30BF_INSN_STM0; goto extract_sfmt_stm0;
-      case 143 : itype = FR30BF_INSN_STM1; goto extract_sfmt_stm1;
-      case 144 : itype = FR30BF_INSN_BORL; goto extract_sfmt_bandl;
-      case 145 : itype = FR30BF_INSN_BORH; goto extract_sfmt_bandl;
-      case 146 : itype = FR30BF_INSN_OR; goto extract_sfmt_and;
-      case 147 : itype = FR30BF_INSN_ORCCR; goto extract_sfmt_andccr;
-      case 148 : itype = FR30BF_INSN_ORM; goto extract_sfmt_andm;
-      case 149 : itype = FR30BF_INSN_ORH; goto extract_sfmt_andh;
-      case 150 : itype = FR30BF_INSN_ORB; goto extract_sfmt_andb;
-      case 151 :
+      case 127 : itype = FR30BF_INSN_STR14B; goto extract_sfmt_str14b;      case 128 : itype = FR30BF_INSN_BANDL; goto extract_sfmt_bandl;      case 129 : itype = FR30BF_INSN_BANDH; goto extract_sfmt_bandl;      case 130 : itype = FR30BF_INSN_AND; goto extract_sfmt_and;      case 131 : itype = FR30BF_INSN_ANDCCR; goto extract_sfmt_andccr;      case 132 : itype = FR30BF_INSN_ANDM; goto extract_sfmt_andm;      case 133 : itype = FR30BF_INSN_ANDH; goto extract_sfmt_andh;      case 134 : itype = FR30BF_INSN_ANDB; goto extract_sfmt_andb;      case 135 : itype = FR30BF_INSN_STILM; goto extract_sfmt_stilm;      case 136 : itype = FR30BF_INSN_BTSTL; goto extract_sfmt_btstl;      case 137 : itype = FR30BF_INSN_BTSTH; goto extract_sfmt_btstl;      case 138 : itype = FR30BF_INSN_XCHB; goto extract_sfmt_xchb;      case 139 : itype = FR30BF_INSN_MOV; goto extract_sfmt_mov;      case 140 : itype = FR30BF_INSN_LDM0; goto extract_sfmt_ldm0;      case 141 : itype = FR30BF_INSN_LDM1; goto extract_sfmt_ldm1;      case 142 : itype = FR30BF_INSN_STM0; goto extract_sfmt_stm0;      case 143 : itype = FR30BF_INSN_STM1; goto extract_sfmt_stm1;      case 144 : itype = FR30BF_INSN_BORL; goto extract_sfmt_bandl;      case 145 : itype = FR30BF_INSN_BORH; goto extract_sfmt_bandl;      case 146 : itype = FR30BF_INSN_OR; goto extract_sfmt_and;      case 147 : itype = FR30BF_INSN_ORCCR; goto extract_sfmt_andccr;      case 148 : itype = FR30BF_INSN_ORM; goto extract_sfmt_andm;      case 149 : itype = FR30BF_INSN_ORH; goto extract_sfmt_andh;      case 150 : itype = FR30BF_INSN_ORB; goto extract_sfmt_andb;      case 151 :
         {
           unsigned int val = (((insn >> 4) & (15 << 0)));
           switch (val)
           {
-          case 0 : itype = FR30BF_INSN_JMP; goto extract_sfmt_jmp;
-          case 1 : itype = FR30BF_INSN_CALLR; goto extract_sfmt_callr;
-          case 2 : itype = FR30BF_INSN_RET; goto extract_sfmt_ret;
-          case 3 : itype = FR30BF_INSN_RETI; goto extract_sfmt_reti;
-          case 4 : itype = FR30BF_INSN_DIV0S; goto extract_sfmt_div0s;
-          case 5 : itype = FR30BF_INSN_DIV0U; goto extract_sfmt_div0u;
-          case 6 : itype = FR30BF_INSN_DIV1; goto extract_sfmt_div1;
-          case 7 : itype = FR30BF_INSN_DIV2; goto extract_sfmt_div2;
-          case 8 : itype = FR30BF_INSN_EXTSB; goto extract_sfmt_extsb;
-          case 9 : itype = FR30BF_INSN_EXTUB; goto extract_sfmt_extub;
-          case 10 : itype = FR30BF_INSN_EXTSH; goto extract_sfmt_extsh;
-          case 11 : itype = FR30BF_INSN_EXTUH; goto extract_sfmt_extuh;
-          default : itype = FR30BF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FR30BF_INSN_JMP; goto extract_sfmt_jmp;          case 1 : itype = FR30BF_INSN_CALLR; goto extract_sfmt_callr;          case 2 : itype = FR30BF_INSN_RET; goto extract_sfmt_ret;          case 3 : itype = FR30BF_INSN_RETI; goto extract_sfmt_reti;          case 4 : itype = FR30BF_INSN_DIV0S; goto extract_sfmt_div0s;          case 5 : itype = FR30BF_INSN_DIV0U; goto extract_sfmt_div0u;          case 6 : itype = FR30BF_INSN_DIV1; goto extract_sfmt_div1;          case 7 : itype = FR30BF_INSN_DIV2; goto extract_sfmt_div2;          case 8 : itype = FR30BF_INSN_EXTSB; goto extract_sfmt_extsb;          case 9 : itype = FR30BF_INSN_EXTUB; goto extract_sfmt_extub;          case 10 : itype = FR30BF_INSN_EXTSH; goto extract_sfmt_extsh;          case 11 : itype = FR30BF_INSN_EXTUH; goto extract_sfmt_extuh;          default : itype = FR30BF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 152 : itype = FR30BF_INSN_BEORL; goto extract_sfmt_bandl;
-      case 153 : itype = FR30BF_INSN_BEORH; goto extract_sfmt_bandl;
-      case 154 : itype = FR30BF_INSN_EOR; goto extract_sfmt_and;
-      case 155 : itype = FR30BF_INSN_LDI20; goto extract_sfmt_ldi20;
-      case 156 : itype = FR30BF_INSN_EORM; goto extract_sfmt_andm;
-      case 157 : itype = FR30BF_INSN_EORH; goto extract_sfmt_andh;
-      case 158 : itype = FR30BF_INSN_EORB; goto extract_sfmt_andb;
-      case 159 :
+      case 152 : itype = FR30BF_INSN_BEORL; goto extract_sfmt_bandl;      case 153 : itype = FR30BF_INSN_BEORH; goto extract_sfmt_bandl;      case 154 : itype = FR30BF_INSN_EOR; goto extract_sfmt_and;      case 155 : itype = FR30BF_INSN_LDI20; goto extract_sfmt_ldi20;      case 156 : itype = FR30BF_INSN_EORM; goto extract_sfmt_andm;      case 157 : itype = FR30BF_INSN_EORH; goto extract_sfmt_andh;      case 158 : itype = FR30BF_INSN_EORB; goto extract_sfmt_andb;      case 159 :
         {
           unsigned int val = (((insn >> 4) & (15 << 0)));
           switch (val)
           {
-          case 0 : itype = FR30BF_INSN_JMPD; goto extract_sfmt_jmp;
-          case 1 : itype = FR30BF_INSN_CALLRD; goto extract_sfmt_callr;
-          case 2 : itype = FR30BF_INSN_RET_D; goto extract_sfmt_ret;
-          case 3 : itype = FR30BF_INSN_INTE; goto extract_sfmt_inte;
-          case 6 : itype = FR30BF_INSN_DIV3; goto extract_sfmt_div3;
-          case 7 : itype = FR30BF_INSN_DIV4S; goto extract_sfmt_div4s;
-          case 8 : itype = FR30BF_INSN_LDI32; goto extract_sfmt_ldi32;
-          case 9 : itype = FR30BF_INSN_LEAVE; goto extract_sfmt_leave;
-          case 10 : itype = FR30BF_INSN_NOP; goto extract_sfmt_bnod;
-          case 12 : itype = FR30BF_INSN_COPOP; goto extract_sfmt_copop;
-          case 13 : itype = FR30BF_INSN_COPLD; goto extract_sfmt_copop;
-          case 14 : itype = FR30BF_INSN_COPST; goto extract_sfmt_copop;
-          case 15 : itype = FR30BF_INSN_COPSV; goto extract_sfmt_copop;
-          default : itype = FR30BF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FR30BF_INSN_JMPD; goto extract_sfmt_jmp;          case 1 : itype = FR30BF_INSN_CALLRD; goto extract_sfmt_callr;          case 2 : itype = FR30BF_INSN_RET_D; goto extract_sfmt_ret;          case 3 : itype = FR30BF_INSN_INTE; goto extract_sfmt_inte;          case 6 : itype = FR30BF_INSN_DIV3; goto extract_sfmt_div3;          case 7 : itype = FR30BF_INSN_DIV4S; goto extract_sfmt_div4s;          case 8 : itype = FR30BF_INSN_LDI32; goto extract_sfmt_ldi32;          case 9 : itype = FR30BF_INSN_LEAVE; goto extract_sfmt_leave;          case 10 : itype = FR30BF_INSN_NOP; goto extract_sfmt_bnod;          case 12 : itype = FR30BF_INSN_COPOP; goto extract_sfmt_copop;          case 13 : itype = FR30BF_INSN_COPLD; goto extract_sfmt_copop;          case 14 : itype = FR30BF_INSN_COPST; goto extract_sfmt_copop;          case 15 : itype = FR30BF_INSN_COPSV; goto extract_sfmt_copop;          default : itype = FR30BF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 160 : itype = FR30BF_INSN_ADDNI; goto extract_sfmt_addni;
-      case 161 : itype = FR30BF_INSN_ADDN2; goto extract_sfmt_addn2;
-      case 162 : itype = FR30BF_INSN_ADDN; goto extract_sfmt_addn;
-      case 163 : itype = FR30BF_INSN_ADDSP; goto extract_sfmt_addsp;
-      case 164 : itype = FR30BF_INSN_ADDI; goto extract_sfmt_addi;
-      case 165 : itype = FR30BF_INSN_ADD2; goto extract_sfmt_add2;
-      case 166 : itype = FR30BF_INSN_ADD; goto extract_sfmt_add;
-      case 167 : itype = FR30BF_INSN_ADDC; goto extract_sfmt_addc;
-      case 168 : itype = FR30BF_INSN_CMPI; goto extract_sfmt_cmpi;
-      case 169 : itype = FR30BF_INSN_CMP2; goto extract_sfmt_cmp2;
-      case 170 : itype = FR30BF_INSN_CMP; goto extract_sfmt_cmp;
-      case 171 : itype = FR30BF_INSN_MULU; goto extract_sfmt_mulu;
-      case 172 : itype = FR30BF_INSN_SUB; goto extract_sfmt_add;
-      case 173 : itype = FR30BF_INSN_SUBC; goto extract_sfmt_addc;
-      case 174 : itype = FR30BF_INSN_SUBN; goto extract_sfmt_addn;
-      case 175 : itype = FR30BF_INSN_MUL; goto extract_sfmt_mul;
-      case 176 : itype = FR30BF_INSN_LSRI; goto extract_sfmt_lsli;
-      case 177 : itype = FR30BF_INSN_LSR2; goto extract_sfmt_lsli;
-      case 178 : itype = FR30BF_INSN_LSR; goto extract_sfmt_lsl;
-      case 179 : itype = FR30BF_INSN_MOV2DR; goto extract_sfmt_mov2dr;
-      case 180 : itype = FR30BF_INSN_LSLI; goto extract_sfmt_lsli;
-      case 181 : itype = FR30BF_INSN_LSL2; goto extract_sfmt_lsli;
-      case 182 : itype = FR30BF_INSN_LSL; goto extract_sfmt_lsl;
-      case 183 : itype = FR30BF_INSN_MOVDR; goto extract_sfmt_movdr;
-      case 184 : itype = FR30BF_INSN_ASRI; goto extract_sfmt_lsli;
-      case 185 : itype = FR30BF_INSN_ASR2; goto extract_sfmt_lsli;
-      case 186 : itype = FR30BF_INSN_ASR; goto extract_sfmt_lsl;
-      case 187 : itype = FR30BF_INSN_MULUH; goto extract_sfmt_mulh;
-      case 188 : itype = FR30BF_INSN_LDRES; goto extract_sfmt_ldres;
-      case 189 : itype = FR30BF_INSN_STRES; goto extract_sfmt_ldres;
-      case 191 : itype = FR30BF_INSN_MULH; goto extract_sfmt_mulh;
-      case 192 : /* fall through */
+      case 160 : itype = FR30BF_INSN_ADDNI; goto extract_sfmt_addni;      case 161 : itype = FR30BF_INSN_ADDN2; goto extract_sfmt_addn2;      case 162 : itype = FR30BF_INSN_ADDN; goto extract_sfmt_addn;      case 163 : itype = FR30BF_INSN_ADDSP; goto extract_sfmt_addsp;      case 164 : itype = FR30BF_INSN_ADDI; goto extract_sfmt_addi;      case 165 : itype = FR30BF_INSN_ADD2; goto extract_sfmt_add2;      case 166 : itype = FR30BF_INSN_ADD; goto extract_sfmt_add;      case 167 : itype = FR30BF_INSN_ADDC; goto extract_sfmt_addc;      case 168 : itype = FR30BF_INSN_CMPI; goto extract_sfmt_cmpi;      case 169 : itype = FR30BF_INSN_CMP2; goto extract_sfmt_cmp2;      case 170 : itype = FR30BF_INSN_CMP; goto extract_sfmt_cmp;      case 171 : itype = FR30BF_INSN_MULU; goto extract_sfmt_mulu;      case 172 : itype = FR30BF_INSN_SUB; goto extract_sfmt_add;      case 173 : itype = FR30BF_INSN_SUBC; goto extract_sfmt_addc;      case 174 : itype = FR30BF_INSN_SUBN; goto extract_sfmt_addn;      case 175 : itype = FR30BF_INSN_MUL; goto extract_sfmt_mul;      case 176 : itype = FR30BF_INSN_LSRI; goto extract_sfmt_lsli;      case 177 : itype = FR30BF_INSN_LSR2; goto extract_sfmt_lsli;      case 178 : itype = FR30BF_INSN_LSR; goto extract_sfmt_lsl;      case 179 : itype = FR30BF_INSN_MOV2DR; goto extract_sfmt_mov2dr;      case 180 : itype = FR30BF_INSN_LSLI; goto extract_sfmt_lsli;      case 181 : itype = FR30BF_INSN_LSL2; goto extract_sfmt_lsli;      case 182 : itype = FR30BF_INSN_LSL; goto extract_sfmt_lsl;      case 183 : itype = FR30BF_INSN_MOVDR; goto extract_sfmt_movdr;      case 184 : itype = FR30BF_INSN_ASRI; goto extract_sfmt_lsli;      case 185 : itype = FR30BF_INSN_ASR2; goto extract_sfmt_lsli;      case 186 : itype = FR30BF_INSN_ASR; goto extract_sfmt_lsl;      case 187 : itype = FR30BF_INSN_MULUH; goto extract_sfmt_mulh;      case 188 : itype = FR30BF_INSN_LDRES; goto extract_sfmt_ldres;      case 189 : itype = FR30BF_INSN_STRES; goto extract_sfmt_ldres;      case 191 : itype = FR30BF_INSN_MULH; goto extract_sfmt_mulh;      case 192 : /* fall through */
       case 193 : /* fall through */
       case 194 : /* fall through */
       case 195 : /* fall through */
@@ -557,56 +427,21 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
       case 204 : /* fall through */
       case 205 : /* fall through */
       case 206 : /* fall through */
-      case 207 : itype = FR30BF_INSN_LDI8; goto extract_sfmt_ldi8;
-      case 208 : /* fall through */
+      case 207 : itype = FR30BF_INSN_LDI8; goto extract_sfmt_ldi8;      case 208 : /* fall through */
       case 209 : /* fall through */
       case 210 : /* fall through */
       case 211 : /* fall through */
       case 212 : /* fall through */
       case 213 : /* fall through */
       case 214 : /* fall through */
-      case 215 : itype = FR30BF_INSN_CALL; goto extract_sfmt_call;
-      case 216 : /* fall through */
+      case 215 : itype = FR30BF_INSN_CALL; goto extract_sfmt_call;      case 216 : /* fall through */
       case 217 : /* fall through */
       case 218 : /* fall through */
       case 219 : /* fall through */
       case 220 : /* fall through */
       case 221 : /* fall through */
       case 222 : /* fall through */
-      case 223 : itype = FR30BF_INSN_CALLD; goto extract_sfmt_call;
-      case 224 : itype = FR30BF_INSN_BRA; goto extract_sfmt_brad;
-      case 225 : itype = FR30BF_INSN_BNO; goto extract_sfmt_bnod;
-      case 226 : itype = FR30BF_INSN_BEQ; goto extract_sfmt_beqd;
-      case 227 : itype = FR30BF_INSN_BNE; goto extract_sfmt_beqd;
-      case 228 : itype = FR30BF_INSN_BC; goto extract_sfmt_bcd;
-      case 229 : itype = FR30BF_INSN_BNC; goto extract_sfmt_bcd;
-      case 230 : itype = FR30BF_INSN_BN; goto extract_sfmt_bnd;
-      case 231 : itype = FR30BF_INSN_BP; goto extract_sfmt_bnd;
-      case 232 : itype = FR30BF_INSN_BV; goto extract_sfmt_bvd;
-      case 233 : itype = FR30BF_INSN_BNV; goto extract_sfmt_bvd;
-      case 234 : itype = FR30BF_INSN_BLT; goto extract_sfmt_bltd;
-      case 235 : itype = FR30BF_INSN_BGE; goto extract_sfmt_bltd;
-      case 236 : itype = FR30BF_INSN_BLE; goto extract_sfmt_bled;
-      case 237 : itype = FR30BF_INSN_BGT; goto extract_sfmt_bled;
-      case 238 : itype = FR30BF_INSN_BLS; goto extract_sfmt_blsd;
-      case 239 : itype = FR30BF_INSN_BHI; goto extract_sfmt_blsd;
-      case 240 : itype = FR30BF_INSN_BRAD; goto extract_sfmt_brad;
-      case 241 : itype = FR30BF_INSN_BNOD; goto extract_sfmt_bnod;
-      case 242 : itype = FR30BF_INSN_BEQD; goto extract_sfmt_beqd;
-      case 243 : itype = FR30BF_INSN_BNED; goto extract_sfmt_beqd;
-      case 244 : itype = FR30BF_INSN_BCD; goto extract_sfmt_bcd;
-      case 245 : itype = FR30BF_INSN_BNCD; goto extract_sfmt_bcd;
-      case 246 : itype = FR30BF_INSN_BND; goto extract_sfmt_bnd;
-      case 247 : itype = FR30BF_INSN_BPD; goto extract_sfmt_bnd;
-      case 248 : itype = FR30BF_INSN_BVD; goto extract_sfmt_bvd;
-      case 249 : itype = FR30BF_INSN_BNVD; goto extract_sfmt_bvd;
-      case 250 : itype = FR30BF_INSN_BLTD; goto extract_sfmt_bltd;
-      case 251 : itype = FR30BF_INSN_BGED; goto extract_sfmt_bltd;
-      case 252 : itype = FR30BF_INSN_BLED; goto extract_sfmt_bled;
-      case 253 : itype = FR30BF_INSN_BGTD; goto extract_sfmt_bled;
-      case 254 : itype = FR30BF_INSN_BLSD; goto extract_sfmt_blsd;
-      case 255 : itype = FR30BF_INSN_BHID; goto extract_sfmt_blsd;
-      default : itype = FR30BF_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 223 : itype = FR30BF_INSN_CALLD; goto extract_sfmt_call;      case 224 : itype = FR30BF_INSN_BRA; goto extract_sfmt_brad;      case 225 : itype = FR30BF_INSN_BNO; goto extract_sfmt_bnod;      case 226 : itype = FR30BF_INSN_BEQ; goto extract_sfmt_beqd;      case 227 : itype = FR30BF_INSN_BNE; goto extract_sfmt_beqd;      case 228 : itype = FR30BF_INSN_BC; goto extract_sfmt_bcd;      case 229 : itype = FR30BF_INSN_BNC; goto extract_sfmt_bcd;      case 230 : itype = FR30BF_INSN_BN; goto extract_sfmt_bnd;      case 231 : itype = FR30BF_INSN_BP; goto extract_sfmt_bnd;      case 232 : itype = FR30BF_INSN_BV; goto extract_sfmt_bvd;      case 233 : itype = FR30BF_INSN_BNV; goto extract_sfmt_bvd;      case 234 : itype = FR30BF_INSN_BLT; goto extract_sfmt_bltd;      case 235 : itype = FR30BF_INSN_BGE; goto extract_sfmt_bltd;      case 236 : itype = FR30BF_INSN_BLE; goto extract_sfmt_bled;      case 237 : itype = FR30BF_INSN_BGT; goto extract_sfmt_bled;      case 238 : itype = FR30BF_INSN_BLS; goto extract_sfmt_blsd;      case 239 : itype = FR30BF_INSN_BHI; goto extract_sfmt_blsd;      case 240 : itype = FR30BF_INSN_BRAD; goto extract_sfmt_brad;      case 241 : itype = FR30BF_INSN_BNOD; goto extract_sfmt_bnod;      case 242 : itype = FR30BF_INSN_BEQD; goto extract_sfmt_beqd;      case 243 : itype = FR30BF_INSN_BNED; goto extract_sfmt_beqd;      case 244 : itype = FR30BF_INSN_BCD; goto extract_sfmt_bcd;      case 245 : itype = FR30BF_INSN_BNCD; goto extract_sfmt_bcd;      case 246 : itype = FR30BF_INSN_BND; goto extract_sfmt_bnd;      case 247 : itype = FR30BF_INSN_BPD; goto extract_sfmt_bnd;      case 248 : itype = FR30BF_INSN_BVD; goto extract_sfmt_bvd;      case 249 : itype = FR30BF_INSN_BNVD; goto extract_sfmt_bvd;      case 250 : itype = FR30BF_INSN_BLTD; goto extract_sfmt_bltd;      case 251 : itype = FR30BF_INSN_BGED; goto extract_sfmt_bltd;      case 252 : itype = FR30BF_INSN_BLED; goto extract_sfmt_bled;      case 253 : itype = FR30BF_INSN_BGTD; goto extract_sfmt_bled;      case 254 : itype = FR30BF_INSN_BLSD; goto extract_sfmt_blsd;      case 255 : itype = FR30BF_INSN_BHID; goto extract_sfmt_blsd;      default : itype = FR30BF_INSN_X_INVALID; goto extract_sfmt_empty;
       }
     }
   }
@@ -616,7 +451,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_empty:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.fmt_empty.f
 
 
@@ -630,7 +464,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_add:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_add.f
     UINT f_Rj;
     UINT f_Ri;
@@ -661,7 +494,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_addi:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_addi.f
     UINT f_u4;
     UINT f_Ri;
@@ -690,7 +522,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_add2:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_add2.f
     SI f_m4;
     UINT f_Ri;
@@ -719,7 +550,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_addc:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_add.f
     UINT f_Rj;
     UINT f_Ri;
@@ -750,7 +580,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_addn:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_add.f
     UINT f_Rj;
     UINT f_Ri;
@@ -781,7 +610,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_addni:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_addi.f
     UINT f_u4;
     UINT f_Ri;
@@ -810,7 +638,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_addn2:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_add2.f
     SI f_m4;
     UINT f_Ri;
@@ -839,7 +666,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_cmp:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_str13.f
     UINT f_Rj;
     UINT f_Ri;
@@ -869,7 +695,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_cmpi:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_addi.f
     UINT f_u4;
     UINT f_Ri;
@@ -897,7 +722,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_cmp2:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_add2.f
     SI f_m4;
     UINT f_Ri;
@@ -925,7 +749,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_and:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_add.f
     UINT f_Rj;
     UINT f_Ri;
@@ -956,7 +779,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_andm:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_str13.f
     UINT f_Rj;
     UINT f_Ri;
@@ -986,7 +808,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_andh:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_str13.f
     UINT f_Rj;
     UINT f_Ri;
@@ -1016,7 +837,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_andb:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_str13.f
     UINT f_Rj;
     UINT f_Ri;
@@ -1046,7 +866,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_bandl:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_addi.f
     UINT f_u4;
     UINT f_Ri;
@@ -1074,7 +893,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_btstl:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_addi.f
     UINT f_u4;
     UINT f_Ri;
@@ -1102,7 +920,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_mul:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_str13.f
     UINT f_Rj;
     UINT f_Ri;
@@ -1132,7 +949,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_mulu:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_str13.f
     UINT f_Rj;
     UINT f_Ri;
@@ -1162,7 +978,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_mulh:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_str13.f
     UINT f_Rj;
     UINT f_Ri;
@@ -1192,7 +1007,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_div0s:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_mov2dr.f
     UINT f_Ri;
 
@@ -1217,7 +1031,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_div0u:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.fmt_empty.f
 
 
@@ -1231,7 +1044,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_div1:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_mov2dr.f
     UINT f_Ri;
 
@@ -1256,7 +1068,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_div2:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_mov2dr.f
     UINT f_Ri;
 
@@ -1281,7 +1092,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_div3:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.fmt_empty.f
 
 
@@ -1295,7 +1105,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_div4s:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.fmt_empty.f
 
 
@@ -1309,7 +1118,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_lsl:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_add.f
     UINT f_Rj;
     UINT f_Ri;
@@ -1340,7 +1148,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_lsli:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_addi.f
     UINT f_u4;
     UINT f_Ri;
@@ -1369,7 +1176,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ldi8:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldi8.f
     UINT f_i8;
     UINT f_Ri;
@@ -1397,7 +1203,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ldi20:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldi20.f
     UINT f_i20_16;
     UINT f_i20_4;
@@ -1434,7 +1239,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ldi32:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldi32.f
     UINT f_i32;
     UINT f_Ri;
@@ -1467,7 +1271,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ld:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldr13.f
     UINT f_Rj;
     UINT f_Ri;
@@ -1497,7 +1300,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ldr13:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldr13.f
     UINT f_Rj;
     UINT f_Ri;
@@ -1528,7 +1330,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ldr14:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldr14.f
     SI f_disp10;
     UINT f_Ri;
@@ -1557,7 +1358,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ldr14uh:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldr14uh.f
     SI f_disp9;
     UINT f_Ri;
@@ -1586,7 +1386,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ldr14ub:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldr14ub.f
     INT f_disp8;
     UINT f_Ri;
@@ -1615,7 +1414,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ldr15:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldr15.f
     USI f_udisp6;
     UINT f_Ri;
@@ -1644,7 +1442,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ldr15gr:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldr15gr.f
     UINT f_Ri;
 
@@ -1671,7 +1468,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ldr15dr:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldr15dr.f
     UINT f_Rs2;
 
@@ -1696,7 +1492,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ldr15ps:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_addsp.f
 
 
@@ -1718,7 +1513,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_st:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_str13.f
     UINT f_Rj;
     UINT f_Ri;
@@ -1748,7 +1542,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_str13:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_str13.f
     UINT f_Rj;
     UINT f_Ri;
@@ -1779,7 +1572,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_str14:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_str14.f
     SI f_disp10;
     UINT f_Ri;
@@ -1808,7 +1600,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_str14h:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_str14h.f
     SI f_disp9;
     UINT f_Ri;
@@ -1837,7 +1628,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_str14b:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_str14b.f
     INT f_disp8;
     UINT f_Ri;
@@ -1866,7 +1656,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_str15:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_str15.f
     USI f_udisp6;
     UINT f_Ri;
@@ -1895,7 +1684,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_str15gr:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_str15gr.f
     UINT f_Ri;
 
@@ -1922,7 +1710,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_str15dr:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldr15dr.f
     UINT f_Rs2;
 
@@ -1947,7 +1734,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_str15ps:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_addsp.f
 
 
@@ -1969,7 +1755,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_mov:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldr13.f
     UINT f_Rj;
     UINT f_Ri;
@@ -1999,7 +1784,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_movdr:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_movdr.f
     UINT f_Rs1;
     UINT f_Ri;
@@ -2027,7 +1811,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_movps:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_movdr.f
     UINT f_Ri;
 
@@ -2052,7 +1835,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_mov2dr:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_mov2dr.f
     UINT f_Rs1;
     UINT f_Ri;
@@ -2080,7 +1862,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_mov2ps:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_mov2dr.f
     UINT f_Ri;
 
@@ -2105,7 +1886,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_jmp:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_mov2dr.f
     UINT f_Ri;
 
@@ -2130,7 +1910,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_callr:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_mov2dr.f
     UINT f_Ri;
 
@@ -2155,7 +1934,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_call:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_call.f
     SI f_rel12;
 
@@ -2178,7 +1956,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ret:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.fmt_empty.f
 
 
@@ -2198,7 +1975,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_int:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_int.f
     UINT f_u8;
 
@@ -2221,7 +1997,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_inte:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.fmt_empty.f
 
 
@@ -2241,7 +2016,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_reti:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.fmt_empty.f
 
 
@@ -2261,7 +2035,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_brad:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_brad.f
     SI f_rel9;
 
@@ -2284,7 +2057,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_bnod:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.fmt_empty.f
 
 
@@ -2298,7 +2070,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_beqd:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_brad.f
     SI f_rel9;
 
@@ -2321,7 +2092,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_bcd:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_brad.f
     SI f_rel9;
 
@@ -2344,7 +2114,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_bnd:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_brad.f
     SI f_rel9;
 
@@ -2367,7 +2136,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_bvd:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_brad.f
     SI f_rel9;
 
@@ -2390,7 +2158,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_bltd:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_brad.f
     SI f_rel9;
 
@@ -2413,7 +2180,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_bled:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_brad.f
     SI f_rel9;
 
@@ -2436,7 +2202,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_blsd:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_brad.f
     SI f_rel9;
 
@@ -2459,7 +2224,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_dmovr13:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_dmovr13pi.f
     USI f_dir10;
 
@@ -2483,7 +2247,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_dmovr13h:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_dmovr13pih.f
     USI f_dir9;
 
@@ -2507,7 +2270,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_dmovr13b:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_dmovr13pib.f
     UINT f_dir8;
 
@@ -2531,7 +2293,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_dmovr13pi:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_dmovr13pi.f
     USI f_dir10;
 
@@ -2556,7 +2317,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_dmovr13pih:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_dmovr13pih.f
     USI f_dir9;
 
@@ -2581,7 +2341,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_dmovr13pib:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_dmovr13pib.f
     UINT f_dir8;
 
@@ -2606,7 +2365,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_dmovr15pi:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_dmovr15pi.f
     USI f_dir10;
 
@@ -2631,7 +2389,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_dmov2r13:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_dmovr13pi.f
     USI f_dir10;
 
@@ -2655,7 +2412,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_dmov2r13h:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_dmovr13pih.f
     USI f_dir9;
 
@@ -2679,7 +2435,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_dmov2r13b:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_dmovr13pib.f
     UINT f_dir8;
 
@@ -2703,7 +2458,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_dmov2r13pi:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_dmovr13pi.f
     USI f_dir10;
 
@@ -2728,7 +2482,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_dmov2r13pih:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_dmovr13pih.f
     USI f_dir9;
 
@@ -2753,7 +2506,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_dmov2r13pib:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_dmovr13pib.f
     UINT f_dir8;
 
@@ -2778,7 +2530,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_dmov2r15pd:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_dmovr15pi.f
     USI f_dir10;
 
@@ -2803,7 +2554,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ldres:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_add2.f
     UINT f_Ri;
 
@@ -2829,7 +2579,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_copop:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.fmt_empty.f
     /* Contents of trailing part of insn.  */
     UINT word_1;
@@ -2846,7 +2595,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_andccr:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_int.f
     UINT f_u8;
 
@@ -2863,7 +2611,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_stilm:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_int.f
     UINT f_u8;
 
@@ -2880,7 +2627,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_addsp:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_addsp.f
     SI f_s10;
 
@@ -2905,7 +2651,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_extsb:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_add2.f
     UINT f_Ri;
 
@@ -2931,7 +2676,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_extub:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_add2.f
     UINT f_Ri;
 
@@ -2957,7 +2701,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_extsh:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_add2.f
     UINT f_Ri;
 
@@ -2983,7 +2726,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_extuh:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_add2.f
     UINT f_Ri;
 
@@ -3009,7 +2751,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ldm0:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldm0.f
     UINT f_reglist_low_ld;
 
@@ -3042,7 +2783,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_ldm1:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_ldm1.f
     UINT f_reglist_hi_ld;
 
@@ -3074,7 +2814,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_stm0:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_stm0.f
     UINT f_reglist_low_st;
 
@@ -3107,7 +2846,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_stm1:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_stm1.f
     UINT f_reglist_hi_st;
 
@@ -3139,7 +2877,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_enter:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_enter.f
     USI f_u10;
 
@@ -3166,7 +2903,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_leave:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_enter.f
 
 
@@ -3190,7 +2926,6 @@ fr30bf_decode (SIM_CPU *current_cpu, IADDR pc,
  extract_sfmt_xchb:
   {
     const IDESC *idesc = &fr30bf_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
 #define FLD(f) abuf->fields.sfmt_add.f
     UINT f_Rj;
     UINT f_Ri;
diff --git a/sim/fr30/decode.h b/sim/fr30/decode.h
index eda9c55..4cc1ffb 100644
--- a/sim/fr30/decode.h
+++ b/sim/fr30/decode.h
@@ -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.
 
diff --git a/sim/fr30/model.c b/sim/fr30/model.c
index 59e6901..611d40f 100644
--- a/sim/fr30/model.c
+++ b/sim/fr30/model.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.
 
diff --git a/sim/fr30/sem-switch.c b/sim/fr30/sem-switch.c
index d6340c0..7dc7f7f 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;
diff --git a/sim/fr30/sem.c b/sim/fr30/sem.c
index f3a749b..fb5893c 100644
--- a/sim/fr30/sem.c
+++ b/sim/fr30/sem.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.
 
@@ -30,7 +30,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "cgen-ops.h"
 
 #undef GET_ATTR
+#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
 #define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_##attr)
+#else
+#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_/**/attr)
+#endif
 
 /* This is used so that we can compile two copies of the semantic code,
    one with full feature support and one without that runs fast(er).
@@ -222,7 +226,7 @@ SEM_FN_NAME (fr30bf,add) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 {
   {
@@ -267,7 +271,7 @@ SEM_FN_NAME (fr30bf,addi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 {
   {
@@ -312,7 +316,7 @@ SEM_FN_NAME (fr30bf,add2) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 {
   {
@@ -359,7 +363,7 @@ SEM_FN_NAME (fr30bf,addc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = tmp_tmp;
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
@@ -393,7 +397,7 @@ SEM_FN_NAME (fr30bf,addn) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -414,7 +418,7 @@ SEM_FN_NAME (fr30bf,addni) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -435,7 +439,7 @@ SEM_FN_NAME (fr30bf,addn2) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -467,7 +471,7 @@ SEM_FN_NAME (fr30bf,sub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 {
   {
@@ -514,7 +518,7 @@ SEM_FN_NAME (fr30bf,subc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     SI opval = tmp_tmp;
     * FLD (i_Ri) = opval;
-    TRACE_RESULT (current_cpu, abuf, "Ri", 'x', opval);
+    TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
 {
   {
@@ -548,7 +552,7 @@ SEM_FN_NAME (fr30bf,subn) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -696,7 +700,7 @@ SEM_FN_NAME (fr30bf,and) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 {
   {
@@ -731,7 +735,7 @@ SEM_FN_NAME (fr30bf,or) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 {
   {
@@ -766,7 +770,7 @@ SEM_FN_NAME (fr30bf,eor) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 {
   {
@@ -1322,12 +1326,12 @@ SEM_FN_NAME (fr30bf,mul) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
@@ -1367,12 +1371,12 @@ SEM_FN_NAME (fr30bf,mulu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
@@ -1410,7 +1414,7 @@ SEM_FN_NAME (fr30bf,mulh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
@@ -1443,7 +1447,7 @@ SEM_FN_NAME (fr30bf,muluh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
@@ -1488,14 +1492,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);
   }
 }
 }
@@ -1530,7 +1534,7 @@ SEM_FN_NAME (fr30bf,div0u) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 }
 
@@ -1554,19 +1558,19 @@ SEM_FN_NAME (fr30bf,div1) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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)) {
 {
@@ -1594,12 +1598,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);
   }
 }
 }
@@ -1661,7 +1665,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 {
@@ -1695,7 +1699,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);
   }
 }
 
@@ -1720,7 +1724,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);
   }
 }
 
@@ -1755,7 +1759,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 {
@@ -1809,7 +1813,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 {
@@ -1863,7 +1867,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 {
@@ -1917,7 +1921,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 {
@@ -1971,7 +1975,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 {
@@ -2025,7 +2029,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 {
@@ -2079,7 +2083,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 {
@@ -2133,7 +2137,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 {
@@ -2187,7 +2191,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 {
@@ -2229,7 +2233,7 @@ SEM_FN_NAME (fr30bf,ldi8) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2250,7 +2254,7 @@ SEM_FN_NAME (fr30bf,ldi20) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2271,7 +2275,7 @@ SEM_FN_NAME (fr30bf,ldi32) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2292,7 +2296,7 @@ SEM_FN_NAME (fr30bf,ld) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2313,7 +2317,7 @@ SEM_FN_NAME (fr30bf,lduh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2334,7 +2338,7 @@ SEM_FN_NAME (fr30bf,ldub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2355,7 +2359,7 @@ SEM_FN_NAME (fr30bf,ldr13) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2376,7 +2380,7 @@ SEM_FN_NAME (fr30bf,ldr13uh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2397,7 +2401,7 @@ SEM_FN_NAME (fr30bf,ldr13ub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2418,7 +2422,7 @@ SEM_FN_NAME (fr30bf,ldr14) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2439,7 +2443,7 @@ SEM_FN_NAME (fr30bf,ldr14uh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2460,7 +2464,7 @@ SEM_FN_NAME (fr30bf,ldr14ub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2481,7 +2485,7 @@ SEM_FN_NAME (fr30bf,ldr15) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2503,14 +2507,14 @@ SEM_FN_NAME (fr30bf,ldr15gr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 }
 }
@@ -2537,12 +2541,12 @@ SEM_FN_NAME (fr30bf,ldr15dr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 }
 
@@ -2570,7 +2574,7 @@ SEM_FN_NAME (fr30bf,ldr15ps) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 }
 
@@ -2805,7 +2809,7 @@ SEM_FN_NAME (fr30bf,str15gr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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;
@@ -2835,7 +2839,7 @@ SEM_FN_NAME (fr30bf,str15dr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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;
@@ -2863,7 +2867,7 @@ SEM_FN_NAME (fr30bf,str15ps) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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 ();
@@ -2890,7 +2894,7 @@ SEM_FN_NAME (fr30bf,mov) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2911,7 +2915,7 @@ SEM_FN_NAME (fr30bf,movdr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2932,7 +2936,7 @@ SEM_FN_NAME (fr30bf,movps) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -2953,7 +2957,7 @@ SEM_FN_NAME (fr30bf,mov2dr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -3045,7 +3049,7 @@ SEM_FN_NAME (fr30bf,callr) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
@@ -3076,7 +3080,7 @@ SEM_FN_NAME (fr30bf,callrd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
@@ -3107,7 +3111,7 @@ SEM_FN_NAME (fr30bf,call) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
@@ -3138,7 +3142,7 @@ SEM_FN_NAME (fr30bf,calld) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
@@ -3281,7 +3285,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)));
@@ -3293,7 +3297,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 {
@@ -3308,7 +3312,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)));
@@ -3320,7 +3324,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);
   }
 }
 }
@@ -4282,7 +4286,7 @@ SEM_FN_NAME (fr30bf,dmovr13pi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 }
 
@@ -4310,7 +4314,7 @@ SEM_FN_NAME (fr30bf,dmovr13pih) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 }
 
@@ -4338,7 +4342,7 @@ SEM_FN_NAME (fr30bf,dmovr13pib) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 }
 
@@ -4366,7 +4370,7 @@ SEM_FN_NAME (fr30bf,dmovr15pi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 }
 
@@ -4388,7 +4392,7 @@ SEM_FN_NAME (fr30bf,dmov2r13) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -4409,7 +4413,7 @@ SEM_FN_NAME (fr30bf,dmov2r13h) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -4430,7 +4434,7 @@ SEM_FN_NAME (fr30bf,dmov2r13b) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -4457,7 +4461,7 @@ SEM_FN_NAME (fr30bf,dmov2r13pi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 }
 
@@ -4485,7 +4489,7 @@ SEM_FN_NAME (fr30bf,dmov2r13pih) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 }
 
@@ -4513,7 +4517,7 @@ SEM_FN_NAME (fr30bf,dmov2r13pib) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 }
 
@@ -4536,7 +4540,7 @@ SEM_FN_NAME (fr30bf,dmov2r15pd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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));
@@ -4563,7 +4567,7 @@ SEM_FN_NAME (fr30bf,ldres) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -4584,7 +4588,7 @@ SEM_FN_NAME (fr30bf,stres) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -4753,7 +4757,7 @@ SEM_FN_NAME (fr30bf,addsp) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -4774,7 +4778,7 @@ SEM_FN_NAME (fr30bf,extsb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -4795,7 +4799,7 @@ SEM_FN_NAME (fr30bf,extub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -4816,7 +4820,7 @@ SEM_FN_NAME (fr30bf,extsh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -4837,7 +4841,7 @@ SEM_FN_NAME (fr30bf,extuh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 
   return vpc;
@@ -4862,13 +4866,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);
   }
 }
 }
@@ -4878,13 +4882,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);
   }
 }
 }
@@ -4894,13 +4898,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);
   }
 }
 }
@@ -4910,13 +4914,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);
   }
 }
 }
@@ -4926,13 +4930,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);
   }
 }
 }
@@ -4942,13 +4946,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);
   }
 }
 }
@@ -4958,13 +4962,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);
   }
 }
 }
@@ -4974,13 +4978,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);
   }
 }
 }
@@ -5009,13 +5013,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);
   }
 }
 }
@@ -5025,13 +5029,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);
   }
 }
 }
@@ -5041,13 +5045,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);
   }
 }
 }
@@ -5057,13 +5061,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);
   }
 }
 }
@@ -5073,13 +5077,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);
   }
 }
 }
@@ -5089,13 +5093,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);
   }
 }
 }
@@ -5105,13 +5109,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);
   }
 }
 }
@@ -5120,7 +5124,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);
   }
 }
 }
@@ -5148,7 +5152,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)]);
@@ -5164,7 +5168,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)]);
@@ -5180,7 +5184,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)]);
@@ -5196,7 +5200,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)]);
@@ -5212,7 +5216,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)]);
@@ -5228,7 +5232,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)]);
@@ -5244,7 +5248,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)]);
@@ -5260,7 +5264,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)]);
@@ -5297,7 +5301,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;
@@ -5313,7 +5317,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)]);
@@ -5329,7 +5333,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)]);
@@ -5345,7 +5349,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)]);
@@ -5361,7 +5365,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)]);
@@ -5377,7 +5381,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)]);
@@ -5393,7 +5397,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)]);
@@ -5409,7 +5413,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)]);
@@ -5448,12 +5452,12 @@ SEM_FN_NAME (fr30bf,enter) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 }
 
@@ -5476,12 +5480,12 @@ SEM_FN_NAME (fr30bf,leave) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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);
   }
 }
 
@@ -5506,7 +5510,7 @@ SEM_FN_NAME (fr30bf,xchb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   {
     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;