* cpu.h,decode.c,decode.h,extract.c,sem.c,sem-switch.c: Regenerate.

	* cpux.h,decodex.c,decodex.h,readx.c,semx.c: Regenerate.
Main change is to remove ordinal from format names.

1 files changed, 383 insertions, 396 deletions

diff --git a/sim/m32r/readx.c b/sim/m32r/readx.c
index b6ce820..0740a2f 100644
--- a/sim/m32r/readx.c
+++ b/sim/m32r/readx.c
@@ -33,125 +33,125 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
   static void *labels[] = {
     && case_read_READ_ILLEGAL,
-    && case_read_READ_FMT_0_ADD,
-    && case_read_READ_FMT_1_ADD3,
-    && case_read_READ_FMT_0_ADD,
-    && case_read_READ_FMT_2_AND3,
-    && case_read_READ_FMT_0_ADD,
-    && case_read_READ_FMT_3_OR3,
-    && case_read_READ_FMT_0_ADD,
-    && case_read_READ_FMT_2_AND3,
-    && case_read_READ_FMT_4_ADDI,
-    && case_read_READ_FMT_5_ADDV,
-    && case_read_READ_FMT_6_ADDV3,
-    && case_read_READ_FMT_7_ADDX,
-    && case_read_READ_FMT_8_BC8,
-    && case_read_READ_FMT_9_BC24,
-    && case_read_READ_FMT_10_BEQ,
-    && case_read_READ_FMT_11_BEQZ,
-    && case_read_READ_FMT_11_BEQZ,
-    && case_read_READ_FMT_11_BEQZ,
-    && case_read_READ_FMT_11_BEQZ,
-    && case_read_READ_FMT_11_BEQZ,
-    && case_read_READ_FMT_11_BEQZ,
-    && case_read_READ_FMT_12_BL8,
-    && case_read_READ_FMT_13_BL24,
-    && case_read_READ_FMT_14_BCL8,
-    && case_read_READ_FMT_15_BCL24,
-    && case_read_READ_FMT_8_BC8,
-    && case_read_READ_FMT_9_BC24,
-    && case_read_READ_FMT_10_BEQ,
-    && case_read_READ_FMT_16_BRA8,
-    && case_read_READ_FMT_17_BRA24,
-    && case_read_READ_FMT_14_BCL8,
-    && case_read_READ_FMT_15_BCL24,
-    && case_read_READ_FMT_18_CMP,
-    && case_read_READ_FMT_19_CMPI,
-    && case_read_READ_FMT_18_CMP,
-    && case_read_READ_FMT_20_CMPUI,
-    && case_read_READ_FMT_18_CMP,
-    && case_read_READ_FMT_21_CMPZ,
-    && case_read_READ_FMT_22_DIV,
-    && case_read_READ_FMT_22_DIV,
-    && case_read_READ_FMT_22_DIV,
-    && case_read_READ_FMT_22_DIV,
-    && case_read_READ_FMT_22_DIV,
-    && case_read_READ_FMT_23_JC,
-    && case_read_READ_FMT_23_JC,
-    && case_read_READ_FMT_24_JL,
-    && case_read_READ_FMT_25_JMP,
-    && case_read_READ_FMT_26_LD,
-    && case_read_READ_FMT_27_LD_D,
-    && case_read_READ_FMT_28_LDB,
-    && case_read_READ_FMT_29_LDB_D,
-    && case_read_READ_FMT_30_LDH,
-    && case_read_READ_FMT_31_LDH_D,
-    && case_read_READ_FMT_28_LDB,
-    && case_read_READ_FMT_29_LDB_D,
-    && case_read_READ_FMT_30_LDH,
-    && case_read_READ_FMT_31_LDH_D,
-    && case_read_READ_FMT_32_LD_PLUS,
-    && case_read_READ_FMT_33_LD24,
-    && case_read_READ_FMT_34_LDI8,
-    && case_read_READ_FMT_35_LDI16,
-    && case_read_READ_FMT_36_LOCK,
-    && case_read_READ_FMT_37_MACHI_A,
-    && case_read_READ_FMT_37_MACHI_A,
-    && case_read_READ_FMT_38_MACWHI,
-    && case_read_READ_FMT_38_MACWHI,
-    && case_read_READ_FMT_0_ADD,
-    && case_read_READ_FMT_39_MULHI_A,
-    && case_read_READ_FMT_39_MULHI_A,
-    && case_read_READ_FMT_40_MULWHI,
-    && case_read_READ_FMT_40_MULWHI,
-    && case_read_READ_FMT_41_MV,
-    && case_read_READ_FMT_42_MVFACHI_A,
-    && case_read_READ_FMT_42_MVFACHI_A,
-    && case_read_READ_FMT_42_MVFACHI_A,
-    && case_read_READ_FMT_43_MVFC,
-    && case_read_READ_FMT_44_MVTACHI_A,
-    && case_read_READ_FMT_44_MVTACHI_A,
-    && case_read_READ_FMT_45_MVTC,
-    && case_read_READ_FMT_41_MV,
-    && case_read_READ_FMT_46_NOP,
-    && case_read_READ_FMT_41_MV,
-    && case_read_READ_FMT_47_RAC_DSI,
-    && case_read_READ_FMT_47_RAC_DSI,
-    && case_read_READ_FMT_48_RTE,
-    && case_read_READ_FMT_49_SETH,
-    && case_read_READ_FMT_0_ADD,
-    && case_read_READ_FMT_50_SLL3,
-    && case_read_READ_FMT_51_SLLI,
-    && case_read_READ_FMT_0_ADD,
-    && case_read_READ_FMT_50_SLL3,
-    && case_read_READ_FMT_51_SLLI,
-    && case_read_READ_FMT_0_ADD,
-    && case_read_READ_FMT_50_SLL3,
-    && case_read_READ_FMT_51_SLLI,
-    && case_read_READ_FMT_52_ST,
-    && case_read_READ_FMT_53_ST_D,
-    && case_read_READ_FMT_54_STB,
-    && case_read_READ_FMT_55_STB_D,
-    && case_read_READ_FMT_56_STH,
-    && case_read_READ_FMT_57_STH_D,
-    && case_read_READ_FMT_58_ST_PLUS,
-    && case_read_READ_FMT_58_ST_PLUS,
-    && case_read_READ_FMT_0_ADD,
-    && case_read_READ_FMT_5_ADDV,
-    && case_read_READ_FMT_7_ADDX,
-    && case_read_READ_FMT_59_TRAP,
-    && case_read_READ_FMT_60_UNLOCK,
-    && case_read_READ_FMT_61_SATB,
-    && case_read_READ_FMT_61_SATB,
-    && case_read_READ_FMT_62_SAT,
-    && case_read_READ_FMT_21_CMPZ,
-    && case_read_READ_FMT_63_SADD,
-    && case_read_READ_FMT_64_MACWU1,
-    && case_read_READ_FMT_38_MACWHI,
-    && case_read_READ_FMT_65_MULWU1,
-    && case_read_READ_FMT_64_MACWU1,
-    && case_read_READ_FMT_66_SC,
-    && case_read_READ_FMT_66_SC,
+    && case_read_READ_FMT_ADD,
+    && case_read_READ_FMT_ADD3,
+    && case_read_READ_FMT_ADD,
+    && case_read_READ_FMT_AND3,
+    && case_read_READ_FMT_ADD,
+    && case_read_READ_FMT_OR3,
+    && case_read_READ_FMT_ADD,
+    && case_read_READ_FMT_AND3,
+    && case_read_READ_FMT_ADDI,
+    && case_read_READ_FMT_ADDV,
+    && case_read_READ_FMT_ADDV3,
+    && case_read_READ_FMT_ADDX,
+    && case_read_READ_FMT_BC8,
+    && case_read_READ_FMT_BC24,
+    && case_read_READ_FMT_BEQ,
+    && case_read_READ_FMT_BEQZ,
+    && case_read_READ_FMT_BEQZ,
+    && case_read_READ_FMT_BEQZ,
+    && case_read_READ_FMT_BEQZ,
+    && case_read_READ_FMT_BEQZ,
+    && case_read_READ_FMT_BEQZ,
+    && case_read_READ_FMT_BL8,
+    && case_read_READ_FMT_BL24,
+    && case_read_READ_FMT_BCL8,
+    && case_read_READ_FMT_BCL24,
+    && case_read_READ_FMT_BC8,
+    && case_read_READ_FMT_BC24,
+    && case_read_READ_FMT_BEQ,
+    && case_read_READ_FMT_BRA8,
+    && case_read_READ_FMT_BRA24,
+    && case_read_READ_FMT_BCL8,
+    && case_read_READ_FMT_BCL24,
+    && case_read_READ_FMT_CMP,
+    && case_read_READ_FMT_CMPI,
+    && case_read_READ_FMT_CMP,
+    && case_read_READ_FMT_CMPI,
+    && case_read_READ_FMT_CMP,
+    && case_read_READ_FMT_CMPZ,
+    && case_read_READ_FMT_DIV,
+    && case_read_READ_FMT_DIV,
+    && case_read_READ_FMT_DIV,
+    && case_read_READ_FMT_DIV,
+    && case_read_READ_FMT_DIV,
+    && case_read_READ_FMT_JC,
+    && case_read_READ_FMT_JC,
+    && case_read_READ_FMT_JL,
+    && case_read_READ_FMT_JMP,
+    && case_read_READ_FMT_LD,
+    && case_read_READ_FMT_LD_D,
+    && case_read_READ_FMT_LDB,
+    && case_read_READ_FMT_LDB_D,
+    && case_read_READ_FMT_LDH,
+    && case_read_READ_FMT_LDH_D,
+    && case_read_READ_FMT_LDB,
+    && case_read_READ_FMT_LDB_D,
+    && case_read_READ_FMT_LDH,
+    && case_read_READ_FMT_LDH_D,
+    && case_read_READ_FMT_LD_PLUS,
+    && case_read_READ_FMT_LD24,
+    && case_read_READ_FMT_LDI8,
+    && case_read_READ_FMT_LDI16,
+    && case_read_READ_FMT_LOCK,
+    && case_read_READ_FMT_MACHI_A,
+    && case_read_READ_FMT_MACHI_A,
+    && case_read_READ_FMT_MACWHI,
+    && case_read_READ_FMT_MACWHI,
+    && case_read_READ_FMT_ADD,
+    && case_read_READ_FMT_MULHI_A,
+    && case_read_READ_FMT_MULHI_A,
+    && case_read_READ_FMT_MULWHI,
+    && case_read_READ_FMT_MULWHI,
+    && case_read_READ_FMT_MV,
+    && case_read_READ_FMT_MVFACHI_A,
+    && case_read_READ_FMT_MVFACHI_A,
+    && case_read_READ_FMT_MVFACHI_A,
+    && case_read_READ_FMT_MVFC,
+    && case_read_READ_FMT_MVTACHI_A,
+    && case_read_READ_FMT_MVTACHI_A,
+    && case_read_READ_FMT_MVTC,
+    && case_read_READ_FMT_MV,
+    && case_read_READ_FMT_NOP,
+    && case_read_READ_FMT_MV,
+    && case_read_READ_FMT_RAC_DSI,
+    && case_read_READ_FMT_RAC_DSI,
+    && case_read_READ_FMT_RTE,
+    && case_read_READ_FMT_SETH,
+    && case_read_READ_FMT_ADD,
+    && case_read_READ_FMT_SLL3,
+    && case_read_READ_FMT_SLLI,
+    && case_read_READ_FMT_ADD,
+    && case_read_READ_FMT_SLL3,
+    && case_read_READ_FMT_SLLI,
+    && case_read_READ_FMT_ADD,
+    && case_read_READ_FMT_SLL3,
+    && case_read_READ_FMT_SLLI,
+    && case_read_READ_FMT_ST,
+    && case_read_READ_FMT_ST_D,
+    && case_read_READ_FMT_STB,
+    && case_read_READ_FMT_STB_D,
+    && case_read_READ_FMT_STH,
+    && case_read_READ_FMT_STH_D,
+    && case_read_READ_FMT_ST_PLUS,
+    && case_read_READ_FMT_ST_PLUS,
+    && case_read_READ_FMT_ADD,
+    && case_read_READ_FMT_ADDV,
+    && case_read_READ_FMT_ADDX,
+    && case_read_READ_FMT_TRAP,
+    && case_read_READ_FMT_UNLOCK,
+    && case_read_READ_FMT_SATB,
+    && case_read_READ_FMT_SATB,
+    && case_read_READ_FMT_SAT,
+    && case_read_READ_FMT_CMPZ,
+    && case_read_READ_FMT_SADD,
+    && case_read_READ_FMT_MACWU1,
+    && case_read_READ_FMT_MACWHI,
+    && case_read_READ_FMT_MULWU1,
+    && case_read_READ_FMT_MACWU1,
+    && case_read_READ_FMT_SC,
+    && case_read_READ_FMT_SC,
     0
   };
   extern DECODE *m32rx_decode_vars[];
@@ -175,11 +175,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_0_ADD) : /* e.g. add $dr,$sr */
+    CASE (read, READ_FMT_ADD) : /* e.g. add $dr,$sr */
     {
-#define OPRND(f) par_exec->operands.fmt_0_add.f
-  EXTRACT_FMT_0_ADD_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_0_ADD_CODE
+#define OPRND(f) par_exec->operands.fmt_add.f
+  EXTRACT_FMT_ADD_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_ADD_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (dr) = CPU (h_gr[f_r1]);
@@ -188,11 +188,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_1_ADD3) : /* e.g. add3 $dr,$sr,$hash$slo16 */
+    CASE (read, READ_FMT_ADD3) : /* e.g. add3 $dr,$sr,$hash$slo16 */
     {
-#define OPRND(f) par_exec->operands.fmt_1_add3.f
-  EXTRACT_FMT_1_ADD3_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
-  EXTRACT_FMT_1_ADD3_CODE
+#define OPRND(f) par_exec->operands.fmt_add3.f
+  EXTRACT_FMT_ADD3_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
+  EXTRACT_FMT_ADD3_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (slo16) = f_simm16;
@@ -201,11 +201,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_2_AND3) : /* e.g. and3 $dr,$sr,$uimm16 */
+    CASE (read, READ_FMT_AND3) : /* e.g. and3 $dr,$sr,$uimm16 */
     {
-#define OPRND(f) par_exec->operands.fmt_2_and3.f
-  EXTRACT_FMT_2_AND3_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */
-  EXTRACT_FMT_2_AND3_CODE
+#define OPRND(f) par_exec->operands.fmt_and3.f
+  EXTRACT_FMT_AND3_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */
+  EXTRACT_FMT_AND3_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (sr) = CPU (h_gr[f_r2]);
@@ -214,11 +214,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_3_OR3) : /* e.g. or3 $dr,$sr,$hash$ulo16 */
+    CASE (read, READ_FMT_OR3) : /* e.g. or3 $dr,$sr,$hash$ulo16 */
     {
-#define OPRND(f) par_exec->operands.fmt_3_or3.f
-  EXTRACT_FMT_3_OR3_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */
-  EXTRACT_FMT_3_OR3_CODE
+#define OPRND(f) par_exec->operands.fmt_or3.f
+  EXTRACT_FMT_OR3_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */
+  EXTRACT_FMT_OR3_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (sr) = CPU (h_gr[f_r2]);
@@ -227,11 +227,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_4_ADDI) : /* e.g. addi $dr,$simm8 */
+    CASE (read, READ_FMT_ADDI) : /* e.g. addi $dr,$simm8 */
     {
-#define OPRND(f) par_exec->operands.fmt_4_addi.f
-  EXTRACT_FMT_4_ADDI_VARS /* f-op1 f-r1 f-simm8 */
-  EXTRACT_FMT_4_ADDI_CODE
+#define OPRND(f) par_exec->operands.fmt_addi.f
+  EXTRACT_FMT_ADDI_VARS /* f-op1 f-r1 f-simm8 */
+  EXTRACT_FMT_ADDI_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (dr) = CPU (h_gr[f_r1]);
@@ -240,11 +240,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_5_ADDV) : /* e.g. addv $dr,$sr */
+    CASE (read, READ_FMT_ADDV) : /* e.g. addv $dr,$sr */
     {
-#define OPRND(f) par_exec->operands.fmt_5_addv.f
-  EXTRACT_FMT_5_ADDV_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_5_ADDV_CODE
+#define OPRND(f) par_exec->operands.fmt_addv.f
+  EXTRACT_FMT_ADDV_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_ADDV_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (dr) = CPU (h_gr[f_r1]);
@@ -253,11 +253,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_6_ADDV3) : /* e.g. addv3 $dr,$sr,$simm16 */
+    CASE (read, READ_FMT_ADDV3) : /* e.g. addv3 $dr,$sr,$simm16 */
     {
-#define OPRND(f) par_exec->operands.fmt_6_addv3.f
-  EXTRACT_FMT_6_ADDV3_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
-  EXTRACT_FMT_6_ADDV3_CODE
+#define OPRND(f) par_exec->operands.fmt_addv3.f
+  EXTRACT_FMT_ADDV3_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
+  EXTRACT_FMT_ADDV3_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (simm16) = f_simm16;
@@ -266,11 +266,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_7_ADDX) : /* e.g. addx $dr,$sr */
+    CASE (read, READ_FMT_ADDX) : /* e.g. addx $dr,$sr */
     {
-#define OPRND(f) par_exec->operands.fmt_7_addx.f
-  EXTRACT_FMT_7_ADDX_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_7_ADDX_CODE
+#define OPRND(f) par_exec->operands.fmt_addx.f
+  EXTRACT_FMT_ADDX_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_ADDX_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (condbit) = CPU (h_cond);
@@ -280,11 +280,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_8_BC8) : /* e.g. bc $disp8 */
+    CASE (read, READ_FMT_BC8) : /* e.g. bc $disp8 */
     {
-#define OPRND(f) par_exec->operands.fmt_8_bc8.f
-  EXTRACT_FMT_8_BC8_VARS /* f-op1 f-r1 f-disp8 */
-  EXTRACT_FMT_8_BC8_CODE
+#define OPRND(f) par_exec->operands.fmt_bc8.f
+  EXTRACT_FMT_BC8_VARS /* f-op1 f-r1 f-disp8 */
+  EXTRACT_FMT_BC8_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (condbit) = CPU (h_cond);
@@ -293,11 +293,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_9_BC24) : /* e.g. bc $disp24 */
+    CASE (read, READ_FMT_BC24) : /* e.g. bc $disp24 */
     {
-#define OPRND(f) par_exec->operands.fmt_9_bc24.f
-  EXTRACT_FMT_9_BC24_VARS /* f-op1 f-r1 f-disp24 */
-  EXTRACT_FMT_9_BC24_CODE
+#define OPRND(f) par_exec->operands.fmt_bc24.f
+  EXTRACT_FMT_BC24_VARS /* f-op1 f-r1 f-disp24 */
+  EXTRACT_FMT_BC24_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (condbit) = CPU (h_cond);
@@ -306,11 +306,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_10_BEQ) : /* e.g. beq $src1,$src2,$disp16 */
+    CASE (read, READ_FMT_BEQ) : /* e.g. beq $src1,$src2,$disp16 */
     {
-#define OPRND(f) par_exec->operands.fmt_10_beq.f
-  EXTRACT_FMT_10_BEQ_VARS /* f-op1 f-r1 f-op2 f-r2 f-disp16 */
-  EXTRACT_FMT_10_BEQ_CODE
+#define OPRND(f) par_exec->operands.fmt_beq.f
+  EXTRACT_FMT_BEQ_VARS /* f-op1 f-r1 f-op2 f-r2 f-disp16 */
+  EXTRACT_FMT_BEQ_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (disp16) = pc + f_disp16;
@@ -320,11 +320,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_11_BEQZ) : /* e.g. beqz $src2,$disp16 */
+    CASE (read, READ_FMT_BEQZ) : /* e.g. beqz $src2,$disp16 */
     {
-#define OPRND(f) par_exec->operands.fmt_11_beqz.f
-  EXTRACT_FMT_11_BEQZ_VARS /* f-op1 f-r1 f-op2 f-r2 f-disp16 */
-  EXTRACT_FMT_11_BEQZ_CODE
+#define OPRND(f) par_exec->operands.fmt_beqz.f
+  EXTRACT_FMT_BEQZ_VARS /* f-op1 f-r1 f-op2 f-r2 f-disp16 */
+  EXTRACT_FMT_BEQZ_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (disp16) = pc + f_disp16;
@@ -333,11 +333,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_12_BL8) : /* e.g. bl $disp8 */
+    CASE (read, READ_FMT_BL8) : /* e.g. bl $disp8 */
     {
-#define OPRND(f) par_exec->operands.fmt_12_bl8.f
-  EXTRACT_FMT_12_BL8_VARS /* f-op1 f-r1 f-disp8 */
-  EXTRACT_FMT_12_BL8_CODE
+#define OPRND(f) par_exec->operands.fmt_bl8.f
+  EXTRACT_FMT_BL8_VARS /* f-op1 f-r1 f-disp8 */
+  EXTRACT_FMT_BL8_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       RECORD_IADDR (OPRND (disp8), (pc & -4L) + f_disp8);
@@ -346,11 +346,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_13_BL24) : /* e.g. bl $disp24 */
+    CASE (read, READ_FMT_BL24) : /* e.g. bl $disp24 */
     {
-#define OPRND(f) par_exec->operands.fmt_13_bl24.f
-  EXTRACT_FMT_13_BL24_VARS /* f-op1 f-r1 f-disp24 */
-  EXTRACT_FMT_13_BL24_CODE
+#define OPRND(f) par_exec->operands.fmt_bl24.f
+  EXTRACT_FMT_BL24_VARS /* f-op1 f-r1 f-disp24 */
+  EXTRACT_FMT_BL24_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (disp24) = pc + f_disp24;
@@ -359,11 +359,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_14_BCL8) : /* e.g. bcl $disp8 */
+    CASE (read, READ_FMT_BCL8) : /* e.g. bcl $disp8 */
     {
-#define OPRND(f) par_exec->operands.fmt_14_bcl8.f
-  EXTRACT_FMT_14_BCL8_VARS /* f-op1 f-r1 f-disp8 */
-  EXTRACT_FMT_14_BCL8_CODE
+#define OPRND(f) par_exec->operands.fmt_bcl8.f
+  EXTRACT_FMT_BCL8_VARS /* f-op1 f-r1 f-disp8 */
+  EXTRACT_FMT_BCL8_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (condbit) = CPU (h_cond);
@@ -373,11 +373,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_15_BCL24) : /* e.g. bcl $disp24 */
+    CASE (read, READ_FMT_BCL24) : /* e.g. bcl $disp24 */
     {
-#define OPRND(f) par_exec->operands.fmt_15_bcl24.f
-  EXTRACT_FMT_15_BCL24_VARS /* f-op1 f-r1 f-disp24 */
-  EXTRACT_FMT_15_BCL24_CODE
+#define OPRND(f) par_exec->operands.fmt_bcl24.f
+  EXTRACT_FMT_BCL24_VARS /* f-op1 f-r1 f-disp24 */
+  EXTRACT_FMT_BCL24_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (condbit) = CPU (h_cond);
@@ -387,11 +387,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_16_BRA8) : /* e.g. bra $disp8 */
+    CASE (read, READ_FMT_BRA8) : /* e.g. bra $disp8 */
     {
-#define OPRND(f) par_exec->operands.fmt_16_bra8.f
-  EXTRACT_FMT_16_BRA8_VARS /* f-op1 f-r1 f-disp8 */
-  EXTRACT_FMT_16_BRA8_CODE
+#define OPRND(f) par_exec->operands.fmt_bra8.f
+  EXTRACT_FMT_BRA8_VARS /* f-op1 f-r1 f-disp8 */
+  EXTRACT_FMT_BRA8_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       RECORD_IADDR (OPRND (disp8), (pc & -4L) + f_disp8);
@@ -399,11 +399,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_17_BRA24) : /* e.g. bra $disp24 */
+    CASE (read, READ_FMT_BRA24) : /* e.g. bra $disp24 */
     {
-#define OPRND(f) par_exec->operands.fmt_17_bra24.f
-  EXTRACT_FMT_17_BRA24_VARS /* f-op1 f-r1 f-disp24 */
-  EXTRACT_FMT_17_BRA24_CODE
+#define OPRND(f) par_exec->operands.fmt_bra24.f
+  EXTRACT_FMT_BRA24_VARS /* f-op1 f-r1 f-disp24 */
+  EXTRACT_FMT_BRA24_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (disp24) = pc + f_disp24;
@@ -411,11 +411,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_18_CMP) : /* e.g. cmp $src1,$src2 */
+    CASE (read, READ_FMT_CMP) : /* e.g. cmp $src1,$src2 */
     {
-#define OPRND(f) par_exec->operands.fmt_18_cmp.f
-  EXTRACT_FMT_18_CMP_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_18_CMP_CODE
+#define OPRND(f) par_exec->operands.fmt_cmp.f
+  EXTRACT_FMT_CMP_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_CMP_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (src1) = CPU (h_gr[f_r1]);
@@ -424,11 +424,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_19_CMPI) : /* e.g. cmpi $src2,$simm16 */
+    CASE (read, READ_FMT_CMPI) : /* e.g. cmpi $src2,$simm16 */
     {
-#define OPRND(f) par_exec->operands.fmt_19_cmpi.f
-  EXTRACT_FMT_19_CMPI_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
-  EXTRACT_FMT_19_CMPI_CODE
+#define OPRND(f) par_exec->operands.fmt_cmpi.f
+  EXTRACT_FMT_CMPI_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
+  EXTRACT_FMT_CMPI_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (simm16) = f_simm16;
@@ -437,24 +437,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_20_CMPUI) : /* e.g. cmpui $src2,$uimm16 */
+    CASE (read, READ_FMT_CMPZ) : /* e.g. cmpz $src2 */
     {
-#define OPRND(f) par_exec->operands.fmt_20_cmpui.f
-  EXTRACT_FMT_20_CMPUI_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */
-  EXTRACT_FMT_20_CMPUI_CODE
-
-      /* Fetch the input operands for the semantic handler.  */
-      OPRND (src2) = CPU (h_gr[f_r2]);
-      OPRND (uimm16) = f_uimm16;
-#undef OPRND
-    }
-    BREAK (read);
-
-    CASE (read, READ_FMT_21_CMPZ) : /* e.g. cmpz $src2 */
-    {
-#define OPRND(f) par_exec->operands.fmt_21_cmpz.f
-  EXTRACT_FMT_21_CMPZ_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_21_CMPZ_CODE
+#define OPRND(f) par_exec->operands.fmt_cmpz.f
+  EXTRACT_FMT_CMPZ_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_CMPZ_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (src2) = CPU (h_gr[f_r2]);
@@ -462,11 +449,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_22_DIV) : /* e.g. div $dr,$sr */
+    CASE (read, READ_FMT_DIV) : /* e.g. div $dr,$sr */
     {
-#define OPRND(f) par_exec->operands.fmt_22_div.f
-  EXTRACT_FMT_22_DIV_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
-  EXTRACT_FMT_22_DIV_CODE
+#define OPRND(f) par_exec->operands.fmt_div.f
+  EXTRACT_FMT_DIV_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
+  EXTRACT_FMT_DIV_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (dr) = CPU (h_gr[f_r1]);
@@ -475,11 +462,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_23_JC) : /* e.g. jc $sr */
+    CASE (read, READ_FMT_JC) : /* e.g. jc $sr */
     {
-#define OPRND(f) par_exec->operands.fmt_23_jc.f
-  EXTRACT_FMT_23_JC_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_23_JC_CODE
+#define OPRND(f) par_exec->operands.fmt_jc.f
+  EXTRACT_FMT_JC_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_JC_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (condbit) = CPU (h_cond);
@@ -488,11 +475,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_24_JL) : /* e.g. jl $sr */
+    CASE (read, READ_FMT_JL) : /* e.g. jl $sr */
     {
-#define OPRND(f) par_exec->operands.fmt_24_jl.f
-  EXTRACT_FMT_24_JL_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_24_JL_CODE
+#define OPRND(f) par_exec->operands.fmt_jl.f
+  EXTRACT_FMT_JL_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_JL_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (pc) = CPU (h_pc);
@@ -501,11 +488,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_25_JMP) : /* e.g. jmp $sr */
+    CASE (read, READ_FMT_JMP) : /* e.g. jmp $sr */
     {
-#define OPRND(f) par_exec->operands.fmt_25_jmp.f
-  EXTRACT_FMT_25_JMP_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_25_JMP_CODE
+#define OPRND(f) par_exec->operands.fmt_jmp.f
+  EXTRACT_FMT_JMP_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_JMP_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (sr) = CPU (h_gr[f_r2]);
@@ -513,11 +500,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_26_LD) : /* e.g. ld $dr,@$sr */
+    CASE (read, READ_FMT_LD) : /* e.g. ld $dr,@$sr */
     {
-#define OPRND(f) par_exec->operands.fmt_26_ld.f
-  EXTRACT_FMT_26_LD_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_26_LD_CODE
+#define OPRND(f) par_exec->operands.fmt_ld.f
+  EXTRACT_FMT_LD_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_LD_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (h_memory_sr) = GETMEMSI (current_cpu, CPU (h_gr[f_r2]));
@@ -526,11 +513,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_27_LD_D) : /* e.g. ld $dr,@($slo16,$sr) */
+    CASE (read, READ_FMT_LD_D) : /* e.g. ld $dr,@($slo16,$sr) */
     {
-#define OPRND(f) par_exec->operands.fmt_27_ld_d.f
-  EXTRACT_FMT_27_LD_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
-  EXTRACT_FMT_27_LD_D_CODE
+#define OPRND(f) par_exec->operands.fmt_ld_d.f
+  EXTRACT_FMT_LD_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
+  EXTRACT_FMT_LD_D_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (h_memory_add_WI_sr_slo16) = GETMEMSI (current_cpu, ADDSI (CPU (h_gr[f_r2]), f_simm16));
@@ -540,11 +527,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_28_LDB) : /* e.g. ldb $dr,@$sr */
+    CASE (read, READ_FMT_LDB) : /* e.g. ldb $dr,@$sr */
     {
-#define OPRND(f) par_exec->operands.fmt_28_ldb.f
-  EXTRACT_FMT_28_LDB_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_28_LDB_CODE
+#define OPRND(f) par_exec->operands.fmt_ldb.f
+  EXTRACT_FMT_LDB_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_LDB_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (h_memory_sr) = GETMEMQI (current_cpu, CPU (h_gr[f_r2]));
@@ -553,11 +540,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_29_LDB_D) : /* e.g. ldb $dr,@($slo16,$sr) */
+    CASE (read, READ_FMT_LDB_D) : /* e.g. ldb $dr,@($slo16,$sr) */
     {
-#define OPRND(f) par_exec->operands.fmt_29_ldb_d.f
-  EXTRACT_FMT_29_LDB_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
-  EXTRACT_FMT_29_LDB_D_CODE
+#define OPRND(f) par_exec->operands.fmt_ldb_d.f
+  EXTRACT_FMT_LDB_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
+  EXTRACT_FMT_LDB_D_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (h_memory_add_WI_sr_slo16) = GETMEMQI (current_cpu, ADDSI (CPU (h_gr[f_r2]), f_simm16));
@@ -567,11 +554,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_30_LDH) : /* e.g. ldh $dr,@$sr */
+    CASE (read, READ_FMT_LDH) : /* e.g. ldh $dr,@$sr */
     {
-#define OPRND(f) par_exec->operands.fmt_30_ldh.f
-  EXTRACT_FMT_30_LDH_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_30_LDH_CODE
+#define OPRND(f) par_exec->operands.fmt_ldh.f
+  EXTRACT_FMT_LDH_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_LDH_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (h_memory_sr) = GETMEMHI (current_cpu, CPU (h_gr[f_r2]));
@@ -580,11 +567,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_31_LDH_D) : /* e.g. ldh $dr,@($slo16,$sr) */
+    CASE (read, READ_FMT_LDH_D) : /* e.g. ldh $dr,@($slo16,$sr) */
     {
-#define OPRND(f) par_exec->operands.fmt_31_ldh_d.f
-  EXTRACT_FMT_31_LDH_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
-  EXTRACT_FMT_31_LDH_D_CODE
+#define OPRND(f) par_exec->operands.fmt_ldh_d.f
+  EXTRACT_FMT_LDH_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
+  EXTRACT_FMT_LDH_D_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (h_memory_add_WI_sr_slo16) = GETMEMHI (current_cpu, ADDSI (CPU (h_gr[f_r2]), f_simm16));
@@ -594,11 +581,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_32_LD_PLUS) : /* e.g. ld $dr,@$sr+ */
+    CASE (read, READ_FMT_LD_PLUS) : /* e.g. ld $dr,@$sr+ */
     {
-#define OPRND(f) par_exec->operands.fmt_32_ld_plus.f
-  EXTRACT_FMT_32_LD_PLUS_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_32_LD_PLUS_CODE
+#define OPRND(f) par_exec->operands.fmt_ld_plus.f
+  EXTRACT_FMT_LD_PLUS_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_LD_PLUS_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (h_memory_sr) = GETMEMSI (current_cpu, CPU (h_gr[f_r2]));
@@ -607,11 +594,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_33_LD24) : /* e.g. ld24 $dr,$uimm24 */
+    CASE (read, READ_FMT_LD24) : /* e.g. ld24 $dr,$uimm24 */
     {
-#define OPRND(f) par_exec->operands.fmt_33_ld24.f
-  EXTRACT_FMT_33_LD24_VARS /* f-op1 f-r1 f-uimm24 */
-  EXTRACT_FMT_33_LD24_CODE
+#define OPRND(f) par_exec->operands.fmt_ld24.f
+  EXTRACT_FMT_LD24_VARS /* f-op1 f-r1 f-uimm24 */
+  EXTRACT_FMT_LD24_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (uimm24) = f_uimm24;
@@ -619,11 +606,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_34_LDI8) : /* e.g. ldi $dr,$simm8 */
+    CASE (read, READ_FMT_LDI8) : /* e.g. ldi $dr,$simm8 */
     {
-#define OPRND(f) par_exec->operands.fmt_34_ldi8.f
-  EXTRACT_FMT_34_LDI8_VARS /* f-op1 f-r1 f-simm8 */
-  EXTRACT_FMT_34_LDI8_CODE
+#define OPRND(f) par_exec->operands.fmt_ldi8.f
+  EXTRACT_FMT_LDI8_VARS /* f-op1 f-r1 f-simm8 */
+  EXTRACT_FMT_LDI8_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (simm8) = f_simm8;
@@ -631,11 +618,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_35_LDI16) : /* e.g. ldi $dr,$hash$slo16 */
+    CASE (read, READ_FMT_LDI16) : /* e.g. ldi $dr,$hash$slo16 */
     {
-#define OPRND(f) par_exec->operands.fmt_35_ldi16.f
-  EXTRACT_FMT_35_LDI16_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
-  EXTRACT_FMT_35_LDI16_CODE
+#define OPRND(f) par_exec->operands.fmt_ldi16.f
+  EXTRACT_FMT_LDI16_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
+  EXTRACT_FMT_LDI16_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (slo16) = f_simm16;
@@ -643,11 +630,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_36_LOCK) : /* e.g. lock $dr,@$sr */
+    CASE (read, READ_FMT_LOCK) : /* e.g. lock $dr,@$sr */
     {
-#define OPRND(f) par_exec->operands.fmt_36_lock.f
-  EXTRACT_FMT_36_LOCK_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_36_LOCK_CODE
+#define OPRND(f) par_exec->operands.fmt_lock.f
+  EXTRACT_FMT_LOCK_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_LOCK_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (h_memory_sr) = GETMEMSI (current_cpu, CPU (h_gr[f_r2]));
@@ -656,11 +643,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_37_MACHI_A) : /* e.g. machi $src1,$src2,$acc */
+    CASE (read, READ_FMT_MACHI_A) : /* e.g. machi $src1,$src2,$acc */
     {
-#define OPRND(f) par_exec->operands.fmt_37_machi_a.f
-  EXTRACT_FMT_37_MACHI_A_VARS /* f-op1 f-r1 f-acc f-op23 f-r2 */
-  EXTRACT_FMT_37_MACHI_A_CODE
+#define OPRND(f) par_exec->operands.fmt_machi_a.f
+  EXTRACT_FMT_MACHI_A_VARS /* f-op1 f-r1 f-acc f-op23 f-r2 */
+  EXTRACT_FMT_MACHI_A_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (acc) = m32rx_h_accums_get (current_cpu, f_acc);
@@ -670,11 +657,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_38_MACWHI) : /* e.g. macwhi $src1,$src2 */
+    CASE (read, READ_FMT_MACWHI) : /* e.g. macwhi $src1,$src2 */
     {
-#define OPRND(f) par_exec->operands.fmt_38_macwhi.f
-  EXTRACT_FMT_38_MACWHI_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_38_MACWHI_CODE
+#define OPRND(f) par_exec->operands.fmt_macwhi.f
+  EXTRACT_FMT_MACWHI_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_MACWHI_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (accum) = CPU (h_accum);
@@ -684,11 +671,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_39_MULHI_A) : /* e.g. mulhi $src1,$src2,$acc */
+    CASE (read, READ_FMT_MULHI_A) : /* e.g. mulhi $src1,$src2,$acc */
     {
-#define OPRND(f) par_exec->operands.fmt_39_mulhi_a.f
-  EXTRACT_FMT_39_MULHI_A_VARS /* f-op1 f-r1 f-acc f-op23 f-r2 */
-  EXTRACT_FMT_39_MULHI_A_CODE
+#define OPRND(f) par_exec->operands.fmt_mulhi_a.f
+  EXTRACT_FMT_MULHI_A_VARS /* f-op1 f-r1 f-acc f-op23 f-r2 */
+  EXTRACT_FMT_MULHI_A_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (src1) = CPU (h_gr[f_r1]);
@@ -697,11 +684,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_40_MULWHI) : /* e.g. mulwhi $src1,$src2 */
+    CASE (read, READ_FMT_MULWHI) : /* e.g. mulwhi $src1,$src2 */
     {
-#define OPRND(f) par_exec->operands.fmt_40_mulwhi.f
-  EXTRACT_FMT_40_MULWHI_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_40_MULWHI_CODE
+#define OPRND(f) par_exec->operands.fmt_mulwhi.f
+  EXTRACT_FMT_MULWHI_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_MULWHI_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (src1) = CPU (h_gr[f_r1]);
@@ -710,11 +697,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_41_MV) : /* e.g. mv $dr,$sr */
+    CASE (read, READ_FMT_MV) : /* e.g. mv $dr,$sr */
     {
-#define OPRND(f) par_exec->operands.fmt_41_mv.f
-  EXTRACT_FMT_41_MV_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_41_MV_CODE
+#define OPRND(f) par_exec->operands.fmt_mv.f
+  EXTRACT_FMT_MV_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_MV_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (sr) = CPU (h_gr[f_r2]);
@@ -722,11 +709,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_42_MVFACHI_A) : /* e.g. mvfachi $dr,$accs */
+    CASE (read, READ_FMT_MVFACHI_A) : /* e.g. mvfachi $dr,$accs */
     {
-#define OPRND(f) par_exec->operands.fmt_42_mvfachi_a.f
-  EXTRACT_FMT_42_MVFACHI_A_VARS /* f-op1 f-r1 f-op2 f-accs f-op3 */
-  EXTRACT_FMT_42_MVFACHI_A_CODE
+#define OPRND(f) par_exec->operands.fmt_mvfachi_a.f
+  EXTRACT_FMT_MVFACHI_A_VARS /* f-op1 f-r1 f-op2 f-accs f-op3 */
+  EXTRACT_FMT_MVFACHI_A_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (accs) = m32rx_h_accums_get (current_cpu, f_accs);
@@ -734,11 +721,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_43_MVFC) : /* e.g. mvfc $dr,$scr */
+    CASE (read, READ_FMT_MVFC) : /* e.g. mvfc $dr,$scr */
     {
-#define OPRND(f) par_exec->operands.fmt_43_mvfc.f
-  EXTRACT_FMT_43_MVFC_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_43_MVFC_CODE
+#define OPRND(f) par_exec->operands.fmt_mvfc.f
+  EXTRACT_FMT_MVFC_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_MVFC_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (scr) = m32rx_h_cr_get (current_cpu, f_r2);
@@ -746,11 +733,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_44_MVTACHI_A) : /* e.g. mvtachi $src1,$accs */
+    CASE (read, READ_FMT_MVTACHI_A) : /* e.g. mvtachi $src1,$accs */
     {
-#define OPRND(f) par_exec->operands.fmt_44_mvtachi_a.f
-  EXTRACT_FMT_44_MVTACHI_A_VARS /* f-op1 f-r1 f-op2 f-accs f-op3 */
-  EXTRACT_FMT_44_MVTACHI_A_CODE
+#define OPRND(f) par_exec->operands.fmt_mvtachi_a.f
+  EXTRACT_FMT_MVTACHI_A_VARS /* f-op1 f-r1 f-op2 f-accs f-op3 */
+  EXTRACT_FMT_MVTACHI_A_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (accs) = m32rx_h_accums_get (current_cpu, f_accs);
@@ -759,11 +746,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_45_MVTC) : /* e.g. mvtc $sr,$dcr */
+    CASE (read, READ_FMT_MVTC) : /* e.g. mvtc $sr,$dcr */
     {
-#define OPRND(f) par_exec->operands.fmt_45_mvtc.f
-  EXTRACT_FMT_45_MVTC_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_45_MVTC_CODE
+#define OPRND(f) par_exec->operands.fmt_mvtc.f
+  EXTRACT_FMT_MVTC_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_MVTC_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (sr) = CPU (h_gr[f_r2]);
@@ -771,22 +758,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_46_NOP) : /* e.g. nop */
+    CASE (read, READ_FMT_NOP) : /* e.g. nop */
     {
-#define OPRND(f) par_exec->operands.fmt_46_nop.f
-  EXTRACT_FMT_46_NOP_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_46_NOP_CODE
+#define OPRND(f) par_exec->operands.fmt_nop.f
+  EXTRACT_FMT_NOP_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_NOP_CODE
 
       /* Fetch the input operands for the semantic handler.  */
 #undef OPRND
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_47_RAC_DSI) : /* e.g. rac $accd,$accs,$imm1 */
+    CASE (read, READ_FMT_RAC_DSI) : /* e.g. rac $accd,$accs,$imm1 */
     {
-#define OPRND(f) par_exec->operands.fmt_47_rac_dsi.f
-  EXTRACT_FMT_47_RAC_DSI_VARS /* f-op1 f-accd f-bits67 f-op2 f-accs f-bit14 f-imm1 */
-  EXTRACT_FMT_47_RAC_DSI_CODE
+#define OPRND(f) par_exec->operands.fmt_rac_dsi.f
+  EXTRACT_FMT_RAC_DSI_VARS /* f-op1 f-accd f-bits67 f-op2 f-accs f-bit14 f-imm1 */
+  EXTRACT_FMT_RAC_DSI_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (accs) = m32rx_h_accums_get (current_cpu, f_accs);
@@ -795,11 +782,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_48_RTE) : /* e.g. rte */
+    CASE (read, READ_FMT_RTE) : /* e.g. rte */
     {
-#define OPRND(f) par_exec->operands.fmt_48_rte.f
-  EXTRACT_FMT_48_RTE_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_48_RTE_CODE
+#define OPRND(f) par_exec->operands.fmt_rte.f
+  EXTRACT_FMT_RTE_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_RTE_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (h_bcond_0) = CPU (h_bcond);
@@ -810,11 +797,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_49_SETH) : /* e.g. seth $dr,$hash$hi16 */
+    CASE (read, READ_FMT_SETH) : /* e.g. seth $dr,$hash$hi16 */
     {
-#define OPRND(f) par_exec->operands.fmt_49_seth.f
-  EXTRACT_FMT_49_SETH_VARS /* f-op1 f-r1 f-op2 f-r2 f-hi16 */
-  EXTRACT_FMT_49_SETH_CODE
+#define OPRND(f) par_exec->operands.fmt_seth.f
+  EXTRACT_FMT_SETH_VARS /* f-op1 f-r1 f-op2 f-r2 f-hi16 */
+  EXTRACT_FMT_SETH_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (hi16) = f_hi16;
@@ -822,11 +809,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_50_SLL3) : /* e.g. sll3 $dr,$sr,$simm16 */
+    CASE (read, READ_FMT_SLL3) : /* e.g. sll3 $dr,$sr,$simm16 */
     {
-#define OPRND(f) par_exec->operands.fmt_50_sll3.f
-  EXTRACT_FMT_50_SLL3_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
-  EXTRACT_FMT_50_SLL3_CODE
+#define OPRND(f) par_exec->operands.fmt_sll3.f
+  EXTRACT_FMT_SLL3_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
+  EXTRACT_FMT_SLL3_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (simm16) = f_simm16;
@@ -835,11 +822,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_51_SLLI) : /* e.g. slli $dr,$uimm5 */
+    CASE (read, READ_FMT_SLLI) : /* e.g. slli $dr,$uimm5 */
     {
-#define OPRND(f) par_exec->operands.fmt_51_slli.f
-  EXTRACT_FMT_51_SLLI_VARS /* f-op1 f-r1 f-shift-op2 f-uimm5 */
-  EXTRACT_FMT_51_SLLI_CODE
+#define OPRND(f) par_exec->operands.fmt_slli.f
+  EXTRACT_FMT_SLLI_VARS /* f-op1 f-r1 f-shift-op2 f-uimm5 */
+  EXTRACT_FMT_SLLI_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (dr) = CPU (h_gr[f_r1]);
@@ -848,11 +835,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_52_ST) : /* e.g. st $src1,@$src2 */
+    CASE (read, READ_FMT_ST) : /* e.g. st $src1,@$src2 */
     {
-#define OPRND(f) par_exec->operands.fmt_52_st.f
-  EXTRACT_FMT_52_ST_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_52_ST_CODE
+#define OPRND(f) par_exec->operands.fmt_st.f
+  EXTRACT_FMT_ST_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_ST_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (src1) = CPU (h_gr[f_r1]);
@@ -861,11 +848,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_53_ST_D) : /* e.g. st $src1,@($slo16,$src2) */
+    CASE (read, READ_FMT_ST_D) : /* e.g. st $src1,@($slo16,$src2) */
     {
-#define OPRND(f) par_exec->operands.fmt_53_st_d.f
-  EXTRACT_FMT_53_ST_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
-  EXTRACT_FMT_53_ST_D_CODE
+#define OPRND(f) par_exec->operands.fmt_st_d.f
+  EXTRACT_FMT_ST_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
+  EXTRACT_FMT_ST_D_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (slo16) = f_simm16;
@@ -875,11 +862,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_54_STB) : /* e.g. stb $src1,@$src2 */
+    CASE (read, READ_FMT_STB) : /* e.g. stb $src1,@$src2 */
     {
-#define OPRND(f) par_exec->operands.fmt_54_stb.f
-  EXTRACT_FMT_54_STB_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_54_STB_CODE
+#define OPRND(f) par_exec->operands.fmt_stb.f
+  EXTRACT_FMT_STB_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_STB_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (src1) = CPU (h_gr[f_r1]);
@@ -888,11 +875,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_55_STB_D) : /* e.g. stb $src1,@($slo16,$src2) */
+    CASE (read, READ_FMT_STB_D) : /* e.g. stb $src1,@($slo16,$src2) */
     {
-#define OPRND(f) par_exec->operands.fmt_55_stb_d.f
-  EXTRACT_FMT_55_STB_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
-  EXTRACT_FMT_55_STB_D_CODE
+#define OPRND(f) par_exec->operands.fmt_stb_d.f
+  EXTRACT_FMT_STB_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
+  EXTRACT_FMT_STB_D_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (slo16) = f_simm16;
@@ -902,11 +889,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_56_STH) : /* e.g. sth $src1,@$src2 */
+    CASE (read, READ_FMT_STH) : /* e.g. sth $src1,@$src2 */
     {
-#define OPRND(f) par_exec->operands.fmt_56_sth.f
-  EXTRACT_FMT_56_STH_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_56_STH_CODE
+#define OPRND(f) par_exec->operands.fmt_sth.f
+  EXTRACT_FMT_STH_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_STH_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (src1) = CPU (h_gr[f_r1]);
@@ -915,11 +902,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_57_STH_D) : /* e.g. sth $src1,@($slo16,$src2) */
+    CASE (read, READ_FMT_STH_D) : /* e.g. sth $src1,@($slo16,$src2) */
     {
-#define OPRND(f) par_exec->operands.fmt_57_sth_d.f
-  EXTRACT_FMT_57_STH_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
-  EXTRACT_FMT_57_STH_D_CODE
+#define OPRND(f) par_exec->operands.fmt_sth_d.f
+  EXTRACT_FMT_STH_D_VARS /* f-op1 f-r1 f-op2 f-r2 f-simm16 */
+  EXTRACT_FMT_STH_D_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (slo16) = f_simm16;
@@ -929,11 +916,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_58_ST_PLUS) : /* e.g. st $src1,@+$src2 */
+    CASE (read, READ_FMT_ST_PLUS) : /* e.g. st $src1,@+$src2 */
     {
-#define OPRND(f) par_exec->operands.fmt_58_st_plus.f
-  EXTRACT_FMT_58_ST_PLUS_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_58_ST_PLUS_CODE
+#define OPRND(f) par_exec->operands.fmt_st_plus.f
+  EXTRACT_FMT_ST_PLUS_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_ST_PLUS_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (src1) = CPU (h_gr[f_r1]);
@@ -942,11 +929,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_59_TRAP) : /* e.g. trap $uimm4 */
+    CASE (read, READ_FMT_TRAP) : /* e.g. trap $uimm4 */
     {
-#define OPRND(f) par_exec->operands.fmt_59_trap.f
-  EXTRACT_FMT_59_TRAP_VARS /* f-op1 f-r1 f-op2 f-uimm4 */
-  EXTRACT_FMT_59_TRAP_CODE
+#define OPRND(f) par_exec->operands.fmt_trap.f
+  EXTRACT_FMT_TRAP_VARS /* f-op1 f-r1 f-op2 f-uimm4 */
+  EXTRACT_FMT_TRAP_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (pc) = CPU (h_pc);
@@ -956,11 +943,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_60_UNLOCK) : /* e.g. unlock $src1,@$src2 */
+    CASE (read, READ_FMT_UNLOCK) : /* e.g. unlock $src1,@$src2 */
     {
-#define OPRND(f) par_exec->operands.fmt_60_unlock.f
-  EXTRACT_FMT_60_UNLOCK_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_60_UNLOCK_CODE
+#define OPRND(f) par_exec->operands.fmt_unlock.f
+  EXTRACT_FMT_UNLOCK_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_UNLOCK_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (h_lock_0) = CPU (h_lock);
@@ -970,11 +957,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_61_SATB) : /* e.g. satb $dr,$sr */
+    CASE (read, READ_FMT_SATB) : /* e.g. satb $dr,$sr */
     {
-#define OPRND(f) par_exec->operands.fmt_61_satb.f
-  EXTRACT_FMT_61_SATB_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */
-  EXTRACT_FMT_61_SATB_CODE
+#define OPRND(f) par_exec->operands.fmt_satb.f
+  EXTRACT_FMT_SATB_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */
+  EXTRACT_FMT_SATB_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (sr) = CPU (h_gr[f_r2]);
@@ -982,11 +969,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_62_SAT) : /* e.g. sat $dr,$sr */
+    CASE (read, READ_FMT_SAT) : /* e.g. sat $dr,$sr */
     {
-#define OPRND(f) par_exec->operands.fmt_62_sat.f
-  EXTRACT_FMT_62_SAT_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */
-  EXTRACT_FMT_62_SAT_CODE
+#define OPRND(f) par_exec->operands.fmt_sat.f
+  EXTRACT_FMT_SAT_VARS /* f-op1 f-r1 f-op2 f-r2 f-uimm16 */
+  EXTRACT_FMT_SAT_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (condbit) = CPU (h_cond);
@@ -995,11 +982,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_63_SADD) : /* e.g. sadd */
+    CASE (read, READ_FMT_SADD) : /* e.g. sadd */
     {
-#define OPRND(f) par_exec->operands.fmt_63_sadd.f
-  EXTRACT_FMT_63_SADD_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_63_SADD_CODE
+#define OPRND(f) par_exec->operands.fmt_sadd.f
+  EXTRACT_FMT_SADD_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_SADD_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (h_accums_0) = m32rx_h_accums_get (current_cpu, 0);
@@ -1008,11 +995,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_64_MACWU1) : /* e.g. macwu1 $src1,$src2 */
+    CASE (read, READ_FMT_MACWU1) : /* e.g. macwu1 $src1,$src2 */
     {
-#define OPRND(f) par_exec->operands.fmt_64_macwu1.f
-  EXTRACT_FMT_64_MACWU1_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_64_MACWU1_CODE
+#define OPRND(f) par_exec->operands.fmt_macwu1.f
+  EXTRACT_FMT_MACWU1_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_MACWU1_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (h_accums_1) = m32rx_h_accums_get (current_cpu, 1);
@@ -1022,11 +1009,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_65_MULWU1) : /* e.g. mulwu1 $src1,$src2 */
+    CASE (read, READ_FMT_MULWU1) : /* e.g. mulwu1 $src1,$src2 */
     {
-#define OPRND(f) par_exec->operands.fmt_65_mulwu1.f
-  EXTRACT_FMT_65_MULWU1_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_65_MULWU1_CODE
+#define OPRND(f) par_exec->operands.fmt_mulwu1.f
+  EXTRACT_FMT_MULWU1_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_MULWU1_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (src1) = CPU (h_gr[f_r1]);
@@ -1035,11 +1022,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     }
     BREAK (read);
 
-    CASE (read, READ_FMT_66_SC) : /* e.g. sc */
+    CASE (read, READ_FMT_SC) : /* e.g. sc */
     {
-#define OPRND(f) par_exec->operands.fmt_66_sc.f
-  EXTRACT_FMT_66_SC_VARS /* f-op1 f-r1 f-op2 f-r2 */
-  EXTRACT_FMT_66_SC_CODE
+#define OPRND(f) par_exec->operands.fmt_sc.f
+  EXTRACT_FMT_SC_VARS /* f-op1 f-r1 f-op2 f-r2 */
+  EXTRACT_FMT_SC_CODE
 
       /* Fetch the input operands for the semantic handler.  */
       OPRND (condbit) = CPU (h_cond);