* cris/arch.c: Regenerate.

* cris/arch.h: Regenerate. * cris/cpuall.h: Regenerate. * cris/cpuv10.c: Regenerate. * cris/cpuv10.h: Regenerate. * cris/cpuv32.c: Regenerate. * cris/cpuv32.h: Regenerate. * cris/cris-desc.c: Regenerate. * cris/cris-desc.h: Regenerate. * cris/cris-opc.h: Regenerate. * cris/decodev10.c: Regenerate. * cris/decodev10.h: Regenerate. * cris/decodev32.c: Regenerate. * cris/decodev32.h: Regenerate. * cris/modelv10.c: Regenerate. * cris/modelv32.c: Regenerate. * cris/semcrisv10f-switch.c: Regenerate. * cris/semcrisv32f-switch.c: Regenerate.
author: Doug Evans <dje@google.com> 2009-10-24 04:33:41 +0000
committer: Doug Evans <dje@google.com> 2009-10-24 04:33:41 +0000
commit: f09d60e19b823fd95f313d95449a933296ce6bc7 (patch)
tree: 93ca32e1b35b111644972ce66a89e25f00b54716
parent: ac1e9eca7030ead24000a8ab765b573ab0d38de2 (diff)
download: gdb-f09d60e19b823fd95f313d95449a933296ce6bc7.zip
gdb-f09d60e19b823fd95f313d95449a933296ce6bc7.tar.gz
gdb-f09d60e19b823fd95f313d95449a933296ce6bc7.tar.bz2
19 files changed, 643 insertions, 2202 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog
index ac60e87..72736f4 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,24 @@
+2009-10-23  Doug Evans  <dje@sebabeach.org>
+
+	* cris/arch.c: Regenerate.
+	* cris/arch.h: Regenerate.
+	* cris/cpuall.h: Regenerate.
+	* cris/cpuv10.c: Regenerate.
+	* cris/cpuv10.h: Regenerate.
+	* cris/cpuv32.c: Regenerate.
+	* cris/cpuv32.h: Regenerate.
+	* cris/cris-desc.c: Regenerate.
+	* cris/cris-desc.h: Regenerate.
+	* cris/cris-opc.h: Regenerate.
+	* cris/decodev10.c: Regenerate.
+	* cris/decodev10.h: Regenerate.
+	* cris/decodev32.c: Regenerate.
+	* cris/decodev32.h: Regenerate.
+	* cris/modelv10.c: Regenerate.
+	* cris/modelv32.c: Regenerate.
+	* cris/semcrisv10f-switch.c: Regenerate.
+	* cris/semcrisv32f-switch.c: Regenerate.
+
 2009-10-22  Tristan Gingold  <gingold@adacore.com>
 
 	* avr/interp.c (sim_stop): Return 1.
diff --git a/sim/cris/arch.c b/sim/cris/arch.c
index 8e0c680..8e360f2 100644
--- a/sim/cris/arch.c
+++ b/sim/cris/arch.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/cris/arch.h b/sim/cris/arch.h
index 36ee98b..7fefdcd 100644
--- a/sim/cris/arch.h
+++ b/sim/cris/arch.h
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/cris/cpuall.h b/sim/cris/cpuall.h
index d1607c1..fabbdb2 100644
--- a/sim/cris/cpuall.h
+++ b/sim/cris/cpuall.h
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/cris/cpuv10.c b/sim/cris/cpuv10.c
index 3e115ca..125b7e6 100644
--- a/sim/cris/cpuv10.c
+++ b/sim/cris/cpuv10.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/cris/cpuv10.h b/sim/cris/cpuv10.h
index 3700dd5..03a1be3 100644
--- a/sim/cris/cpuv10.h
+++ b/sim/cris/cpuv10.h
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
@@ -346,44 +346,44 @@ union sem_fields {
     INT f_s6;
     UINT f_operand2;
     unsigned char in_Rd;
-    unsigned char out_h_gr_SI_index_of__DFLT_Rd;
+    unsigned char out_h_gr_SI_index_of__INT_Rd;
   } sfmt_andq;
   struct { /*  */
     INT f_indir_pc__dword;
     UINT f_operand2;
     unsigned char in_Rd;
-    unsigned char out_h_gr_SI_index_of__DFLT_Rd;
+    unsigned char out_h_gr_SI_index_of__INT_Rd;
   } sfmt_addcdr;
   struct { /*  */
     INT f_indir_pc__word;
     UINT f_operand2;
     unsigned char in_Rd;
-    unsigned char out_h_gr_SI_index_of__DFLT_Rd;
+    unsigned char out_h_gr_SI_index_of__INT_Rd;
   } sfmt_addcwr;
   struct { /*  */
     INT f_indir_pc__byte;
     UINT f_operand2;
     unsigned char in_Rd;
-    unsigned char out_h_gr_SI_index_of__DFLT_Rd;
+    unsigned char out_h_gr_SI_index_of__INT_Rd;
   } sfmt_addcbr;
   struct { /*  */
     UINT f_operand1;
     UINT f_operand2;
     unsigned char in_Ps;
-    unsigned char out_h_gr_SI_index_of__DFLT_Rs;
+    unsigned char out_h_gr_SI_index_of__INT_Rs;
   } sfmt_move_spr_rv10;
   struct { /*  */
     UINT f_operand2;
     UINT f_u6;
     unsigned char in_Rd;
-    unsigned char out_h_gr_SI_index_of__DFLT_Rd;
+    unsigned char out_h_gr_SI_index_of__INT_Rd;
   } sfmt_addq;
   struct { /*  */
     UINT f_operand1;
     UINT f_operand2;
     unsigned char in_Rd;
     unsigned char in_Rs;
-    unsigned char out_h_gr_SI_index_of__DFLT_Rd;
+    unsigned char out_h_gr_SI_index_of__INT_Rd;
   } sfmt_add_b_r;
   struct { /*  */
     UINT f_operand1;
@@ -425,7 +425,7 @@ union sem_fields {
     unsigned char in_Rd;
     unsigned char in_Rs;
     unsigned char out_Rs;
-    unsigned char out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd;
+    unsigned char out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd;
   } sfmt_add_m_b_m;
   struct { /*  */
     UINT f_memmode;
diff --git a/sim/cris/cpuv32.c b/sim/cris/cpuv32.c
index e75aa76..d47c621 100644
--- a/sim/cris/cpuv32.c
+++ b/sim/cris/cpuv32.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/cris/cpuv32.h b/sim/cris/cpuv32.h
index da2dcfd..9c575f1 100644
--- a/sim/cris/cpuv32.h
+++ b/sim/cris/cpuv32.h
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
@@ -486,38 +486,38 @@ union sem_fields {
     INT f_s6;
     UINT f_operand2;
     unsigned char in_Rd;
-    unsigned char out_h_gr_SI_index_of__DFLT_Rd;
+    unsigned char out_h_gr_SI_index_of__INT_Rd;
   } sfmt_andq;
   struct { /*  */
     INT f_indir_pc__dword;
     UINT f_operand2;
     unsigned char in_Rd;
-    unsigned char out_h_gr_SI_index_of__DFLT_Rd;
+    unsigned char out_h_gr_SI_index_of__INT_Rd;
   } sfmt_addcdr;
   struct { /*  */
     INT f_indir_pc__word;
     UINT f_operand2;
     unsigned char in_Rd;
-    unsigned char out_h_gr_SI_index_of__DFLT_Rd;
+    unsigned char out_h_gr_SI_index_of__INT_Rd;
   } sfmt_addcwr;
   struct { /*  */
     INT f_indir_pc__byte;
     UINT f_operand2;
     unsigned char in_Rd;
-    unsigned char out_h_gr_SI_index_of__DFLT_Rd;
+    unsigned char out_h_gr_SI_index_of__INT_Rd;
   } sfmt_addcbr;
   struct { /*  */
     UINT f_operand2;
     UINT f_u6;
     unsigned char in_Rd;
-    unsigned char out_h_gr_SI_index_of__DFLT_Rd;
+    unsigned char out_h_gr_SI_index_of__INT_Rd;
   } sfmt_addq;
   struct { /*  */
     UINT f_operand1;
     UINT f_operand2;
     unsigned char in_Ps;
     unsigned char in_Rs;
-    unsigned char out_h_gr_SI_index_of__DFLT_Rs;
+    unsigned char out_h_gr_SI_index_of__INT_Rs;
   } sfmt_mcp;
   struct { /*  */
     UINT f_operand1;
@@ -558,7 +558,7 @@ union sem_fields {
     unsigned char in_Rd;
     unsigned char in_Rs;
     unsigned char out_Rs;
-    unsigned char out_h_gr_SI_index_of__DFLT_Rd;
+    unsigned char out_h_gr_SI_index_of__INT_Rd;
   } sfmt_addc_m;
   struct { /*  */
     UINT f_memmode;
@@ -567,7 +567,7 @@ union sem_fields {
     unsigned char in_Rd;
     unsigned char in_Rs;
     unsigned char out_Rs;
-    unsigned char out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd;
+    unsigned char out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd;
   } sfmt_add_m_b_m;
   struct { /*  */
     UINT f_memmode;
diff --git a/sim/cris/cris-desc.c b/sim/cris/cris-desc.c
index 1404f255a..d42ae76 100644
--- a/sim/cris/cris-desc.c
+++ b/sim/cris/cris-desc.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU Binutils and/or GDB, the GNU debugger.
 
diff --git a/sim/cris/cris-desc.h b/sim/cris/cris-desc.h
index 9c2708e..d8ee352 100644
--- a/sim/cris/cris-desc.h
+++ b/sim/cris/cris-desc.h
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU Binutils and/or GDB, the GNU debugger.
 
@@ -25,8 +25,6 @@ This file is part of the GNU Binutils and/or GDB, the GNU debugger.
 #ifndef CRIS_CPU_H
 #define CRIS_CPU_H
 
-#include "opcode/cgen-bitset.h"
-
 #define CGEN_ARCH cris
 
 /* Given symbol S, return cris_cgen_<S>.  */
diff --git a/sim/cris/cris-opc.h b/sim/cris/cris-opc.h
index b84d7f3..a33022f 100644
--- a/sim/cris/cris-opc.h
+++ b/sim/cris/cris-opc.h
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU Binutils and/or GDB, the GNU debugger.
 
diff --git a/sim/cris/decodev10.c b/sim/cris/decodev10.c
index a4ea8cd..362e8f0 100644
--- a/sim/cris/decodev10.c
+++ b/sim/cris/decodev10.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
@@ -175,7 +175,7 @@ static const struct insn_sem crisv10f_insn_sem[] =
   { CRIS_INSN_DSTEP, CRISV10F_INSN_DSTEP, CRISV10F_SFMT_DSTEP },
   { CRIS_INSN_ABS, CRISV10F_INSN_ABS, CRISV10F_SFMT_MOVS_B_R },
   { CRIS_INSN_AND_B_R, CRISV10F_INSN_AND_B_R, CRISV10F_SFMT_AND_B_R },
-  { CRIS_INSN_AND_W_R, CRISV10F_INSN_AND_W_R, CRISV10F_SFMT_AND_W_R },
+  { CRIS_INSN_AND_W_R, CRISV10F_INSN_AND_W_R, CRISV10F_SFMT_AND_B_R },
   { CRIS_INSN_AND_D_R, CRISV10F_INSN_AND_D_R, CRISV10F_SFMT_AND_D_R },
   { CRIS_INSN_AND_M_B_M, CRISV10F_INSN_AND_M_B_M, CRISV10F_SFMT_AND_M_B_M },
   { CRIS_INSN_AND_M_W_M, CRISV10F_INSN_AND_M_W_M, CRISV10F_SFMT_AND_M_W_M },
@@ -185,7 +185,7 @@ static const struct insn_sem crisv10f_insn_sem[] =
   { CRIS_INSN_ANDCDR, CRISV10F_INSN_ANDCDR, CRISV10F_SFMT_ANDCDR },
   { CRIS_INSN_ANDQ, CRISV10F_INSN_ANDQ, CRISV10F_SFMT_ANDQ },
   { CRIS_INSN_ORR_B_R, CRISV10F_INSN_ORR_B_R, CRISV10F_SFMT_AND_B_R },
-  { CRIS_INSN_ORR_W_R, CRISV10F_INSN_ORR_W_R, CRISV10F_SFMT_AND_W_R },
+  { CRIS_INSN_ORR_W_R, CRISV10F_INSN_ORR_W_R, CRISV10F_SFMT_AND_B_R },
   { CRIS_INSN_ORR_D_R, CRISV10F_INSN_ORR_D_R, CRISV10F_SFMT_AND_D_R },
   { CRIS_INSN_OR_M_B_M, CRISV10F_INSN_OR_M_B_M, CRISV10F_SFMT_AND_M_B_M },
   { CRIS_INSN_OR_M_W_M, CRISV10F_INSN_OR_M_W_M, CRISV10F_SFMT_AND_M_W_M },
@@ -196,8 +196,8 @@ static const struct insn_sem crisv10f_insn_sem[] =
   { CRIS_INSN_ORQ, CRISV10F_INSN_ORQ, CRISV10F_SFMT_ANDQ },
   { CRIS_INSN_XOR, CRISV10F_INSN_XOR, CRISV10F_SFMT_DSTEP },
   { CRIS_INSN_SWAP, CRISV10F_INSN_SWAP, CRISV10F_SFMT_SWAP },
-  { CRIS_INSN_ASRR_B_R, CRISV10F_INSN_ASRR_B_R, CRISV10F_SFMT_ASRR_B_R },
-  { CRIS_INSN_ASRR_W_R, CRISV10F_INSN_ASRR_W_R, CRISV10F_SFMT_ASRR_B_R },
+  { CRIS_INSN_ASRR_B_R, CRISV10F_INSN_ASRR_B_R, CRISV10F_SFMT_AND_B_R },
+  { CRIS_INSN_ASRR_W_R, CRISV10F_INSN_ASRR_W_R, CRISV10F_SFMT_AND_B_R },
   { CRIS_INSN_ASRR_D_R, CRISV10F_INSN_ASRR_D_R, CRISV10F_SFMT_AND_D_R },
   { CRIS_INSN_ASRQ, CRISV10F_INSN_ASRQ, CRISV10F_SFMT_ASRQ },
   { CRIS_INSN_LSRR_B_R, CRISV10F_INSN_LSRR_B_R, CRISV10F_SFMT_LSRR_B_R },
@@ -363,14 +363,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 15 :
-            if ((base_insn & 0xf00) == 0x0)
-              { itype = CRISV10F_INSN_BCC_B; goto extract_sfmt_bcc_b; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 14 :
-            if ((base_insn & 0xff00) == 0xe000)
-              { itype = CRISV10F_INSN_BA_B; goto extract_sfmt_ba_b; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 15 : itype = CRISV10F_INSN_BCC_B; goto extract_sfmt_bcc_b;
+          case 14 : itype = CRISV10F_INSN_BA_B; goto extract_sfmt_ba_b;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -408,143 +402,59 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xf00) == 0x100)
-              { itype = CRISV10F_INSN_ADDOQ; goto extract_sfmt_addoq; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xff00) == 0xf100)
-              { itype = CRISV10F_INSN_BDAPQPC; goto extract_sfmt_bdapqpc; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_ADDOQ; goto extract_sfmt_addoq;
+          case 15 : itype = CRISV10F_INSN_BDAPQPC; goto extract_sfmt_bdapqpc;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
       case 32 : /* fall through */
       case 33 : /* fall through */
       case 34 : /* fall through */
-      case 35 :
-        if ((base_insn & 0xfc0) == 0x200)
-          { itype = CRISV10F_INSN_ADDQ; goto extract_sfmt_addq; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 35 : itype = CRISV10F_INSN_ADDQ; goto extract_sfmt_addq;
       case 36 : /* fall through */
       case 37 : /* fall through */
       case 38 : /* fall through */
-      case 39 :
-        if ((base_insn & 0xfc0) == 0x240)
-          { itype = CRISV10F_INSN_MOVEQ; goto extract_sfmt_moveq; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 39 : itype = CRISV10F_INSN_MOVEQ; goto extract_sfmt_moveq;
       case 40 : /* fall through */
       case 41 : /* fall through */
       case 42 : /* fall through */
-      case 43 :
-        if ((base_insn & 0xfc0) == 0x280)
-          { itype = CRISV10F_INSN_SUBQ; goto extract_sfmt_addq; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 43 : itype = CRISV10F_INSN_SUBQ; goto extract_sfmt_addq;
       case 44 : /* fall through */
       case 45 : /* fall through */
       case 46 : /* fall through */
-      case 47 :
-        if ((base_insn & 0xfc0) == 0x2c0)
-          { itype = CRISV10F_INSN_CMPQ; goto extract_sfmt_cmpq; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 47 : itype = CRISV10F_INSN_CMPQ; goto extract_sfmt_cmpq;
       case 48 : /* fall through */
       case 49 : /* fall through */
       case 50 : /* fall through */
-      case 51 :
-        if ((base_insn & 0xfc0) == 0x300)
-          { itype = CRISV10F_INSN_ANDQ; goto extract_sfmt_andq; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 51 : itype = CRISV10F_INSN_ANDQ; goto extract_sfmt_andq;
       case 52 : /* fall through */
       case 53 : /* fall through */
       case 54 : /* fall through */
-      case 55 :
-        if ((base_insn & 0xfc0) == 0x340)
-          { itype = CRISV10F_INSN_ORQ; goto extract_sfmt_andq; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 55 : itype = CRISV10F_INSN_ORQ; goto extract_sfmt_andq;
       case 56 : /* fall through */
-      case 57 :
-        if ((base_insn & 0xfe0) == 0x380)
-          { itype = CRISV10F_INSN_BTSTQ; goto extract_sfmt_btstq; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 57 : itype = CRISV10F_INSN_BTSTQ; goto extract_sfmt_btstq;
       case 58 : /* fall through */
-      case 59 :
-        if ((base_insn & 0xfe0) == 0x3a0)
-          { itype = CRISV10F_INSN_ASRQ; goto extract_sfmt_asrq; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 59 : itype = CRISV10F_INSN_ASRQ; goto extract_sfmt_asrq;
       case 60 : /* fall through */
-      case 61 :
-        if ((base_insn & 0xfe0) == 0x3c0)
-          { itype = CRISV10F_INSN_LSLQ; goto extract_sfmt_asrq; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 61 : itype = CRISV10F_INSN_LSLQ; goto extract_sfmt_asrq;
       case 62 : /* fall through */
-      case 63 :
-        if ((base_insn & 0xfe0) == 0x3e0)
-          { itype = CRISV10F_INSN_LSRQ; goto extract_sfmt_asrq; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 64 :
-        if ((base_insn & 0xff0) == 0x400)
-          { itype = CRISV10F_INSN_ADDU_B_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 65 :
-        if ((base_insn & 0xff0) == 0x410)
-          { itype = CRISV10F_INSN_ADDU_W_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 66 :
-        if ((base_insn & 0xff0) == 0x420)
-          { itype = CRISV10F_INSN_ADDS_B_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 67 :
-        if ((base_insn & 0xff0) == 0x430)
-          { itype = CRISV10F_INSN_ADDS_W_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 68 :
-        if ((base_insn & 0xff0) == 0x440)
-          { itype = CRISV10F_INSN_MOVU_B_R; goto extract_sfmt_movs_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 69 :
-        if ((base_insn & 0xff0) == 0x450)
-          { itype = CRISV10F_INSN_MOVU_W_R; goto extract_sfmt_movs_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 70 :
-        if ((base_insn & 0xff0) == 0x460)
-          { itype = CRISV10F_INSN_MOVS_B_R; goto extract_sfmt_movs_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 71 :
-        if ((base_insn & 0xff0) == 0x470)
-          { itype = CRISV10F_INSN_MOVS_W_R; goto extract_sfmt_movs_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 72 :
-        if ((base_insn & 0xff0) == 0x480)
-          { itype = CRISV10F_INSN_SUBU_B_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 73 :
-        if ((base_insn & 0xff0) == 0x490)
-          { itype = CRISV10F_INSN_SUBU_W_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 74 :
-        if ((base_insn & 0xff0) == 0x4a0)
-          { itype = CRISV10F_INSN_SUBS_B_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 75 :
-        if ((base_insn & 0xff0) == 0x4b0)
-          { itype = CRISV10F_INSN_SUBS_W_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 76 :
-        if ((base_insn & 0xff0) == 0x4c0)
-          { itype = CRISV10F_INSN_LSLR_B_R; goto extract_sfmt_lsrr_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 77 :
-        if ((base_insn & 0xff0) == 0x4d0)
-          { itype = CRISV10F_INSN_LSLR_W_R; goto extract_sfmt_lsrr_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 78 :
-        if ((base_insn & 0xff0) == 0x4e0)
-          { itype = CRISV10F_INSN_LSLR_D_R; goto extract_sfmt_lsrr_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 79 :
-        if ((base_insn & 0xff0) == 0x4f0)
-          { itype = CRISV10F_INSN_BTST; goto extract_sfmt_btst; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 63 : itype = CRISV10F_INSN_LSRQ; goto extract_sfmt_asrq;
+      case 64 : itype = CRISV10F_INSN_ADDU_B_R; goto extract_sfmt_add_d_r;
+      case 65 : itype = CRISV10F_INSN_ADDU_W_R; goto extract_sfmt_add_d_r;
+      case 66 : itype = CRISV10F_INSN_ADDS_B_R; goto extract_sfmt_add_d_r;
+      case 67 : itype = CRISV10F_INSN_ADDS_W_R; goto extract_sfmt_add_d_r;
+      case 68 : itype = CRISV10F_INSN_MOVU_B_R; goto extract_sfmt_movs_b_r;
+      case 69 : itype = CRISV10F_INSN_MOVU_W_R; goto extract_sfmt_movs_b_r;
+      case 70 : itype = CRISV10F_INSN_MOVS_B_R; goto extract_sfmt_movs_b_r;
+      case 71 : itype = CRISV10F_INSN_MOVS_W_R; goto extract_sfmt_movs_b_r;
+      case 72 : itype = CRISV10F_INSN_SUBU_B_R; goto extract_sfmt_add_d_r;
+      case 73 : itype = CRISV10F_INSN_SUBU_W_R; goto extract_sfmt_add_d_r;
+      case 74 : itype = CRISV10F_INSN_SUBS_B_R; goto extract_sfmt_add_d_r;
+      case 75 : itype = CRISV10F_INSN_SUBS_W_R; goto extract_sfmt_add_d_r;
+      case 76 : itype = CRISV10F_INSN_LSLR_B_R; goto extract_sfmt_lsrr_b_r;
+      case 77 : itype = CRISV10F_INSN_LSLR_W_R; goto extract_sfmt_lsrr_b_r;
+      case 78 : itype = CRISV10F_INSN_LSLR_D_R; goto extract_sfmt_lsrr_d_r;
+      case 79 : itype = CRISV10F_INSN_BTST; goto extract_sfmt_btst;
       case 80 :
         {
           unsigned int val = (((insn >> 8) & (7 << 4)) | ((insn >> 0) & (15 << 0)));
@@ -676,41 +586,23 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 124 : /* fall through */
           case 125 : /* fall through */
           case 126 : /* fall through */
-          case 127 :
-            if ((base_insn & 0xff0) == 0x500)
-              { itype = CRISV10F_INSN_ADDI_B_R; goto extract_sfmt_addi_b_r; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 127 : itype = CRISV10F_INSN_ADDI_B_R; goto extract_sfmt_addi_b_r;
           case 15 :
             {
               unsigned int val = (((insn >> 15) & (1 << 0)));
               switch (val)
               {
-              case 0 :
-                if ((base_insn & 0xffff) == 0x50f)
-                  { itype = CRISV10F_INSN_NOP; goto extract_sfmt_nop; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((base_insn & 0xff0) == 0x500)
-                  { itype = CRISV10F_INSN_ADDI_B_R; goto extract_sfmt_addi_b_r; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 0 : itype = CRISV10F_INSN_NOP; goto extract_sfmt_nop;
+              case 1 : itype = CRISV10F_INSN_ADDI_B_R; goto extract_sfmt_addi_b_r;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 81 :
-        if ((base_insn & 0xff0) == 0x510)
-          { itype = CRISV10F_INSN_ADDI_W_R; goto extract_sfmt_addi_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 82 :
-        if ((base_insn & 0xff0) == 0x520)
-          { itype = CRISV10F_INSN_ADDI_D_R; goto extract_sfmt_addi_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 83 :
-        if ((base_insn & 0xff0) == 0x530)
-          { itype = CRISV10F_INSN_SCC; goto extract_sfmt_scc; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 81 : itype = CRISV10F_INSN_ADDI_W_R; goto extract_sfmt_addi_b_r;
+      case 82 : itype = CRISV10F_INSN_ADDI_D_R; goto extract_sfmt_addi_b_r;
+      case 83 : itype = CRISV10F_INSN_SCC; goto extract_sfmt_scc;
       case 84 :
         {
           unsigned int val = (((insn >> 0) & (15 << 0)));
@@ -730,14 +622,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xff0) == 0x540)
-              { itype = CRISV10F_INSN_ADDI_ACR_B_R; goto extract_sfmt_addi_acr_b_r; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0x54f)
-              { itype = CRISV10F_INSN_BIAP_PC_B_R; goto extract_sfmt_biap_pc_b_r; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_ADDI_ACR_B_R; goto extract_sfmt_addi_acr_b_r;
+          case 15 : itype = CRISV10F_INSN_BIAP_PC_B_R; goto extract_sfmt_biap_pc_b_r;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -760,14 +646,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xff0) == 0x550)
-              { itype = CRISV10F_INSN_ADDI_ACR_W_R; goto extract_sfmt_addi_acr_b_r; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0x55f)
-              { itype = CRISV10F_INSN_BIAP_PC_W_R; goto extract_sfmt_biap_pc_b_r; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_ADDI_ACR_W_R; goto extract_sfmt_addi_acr_b_r;
+          case 15 : itype = CRISV10F_INSN_BIAP_PC_W_R; goto extract_sfmt_biap_pc_b_r;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -790,73 +670,25 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xff0) == 0x560)
-              { itype = CRISV10F_INSN_ADDI_ACR_D_R; goto extract_sfmt_addi_acr_b_r; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0x56f)
-              { itype = CRISV10F_INSN_BIAP_PC_D_R; goto extract_sfmt_biap_pc_b_r; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_ADDI_ACR_D_R; goto extract_sfmt_addi_acr_b_r;
+          case 15 : itype = CRISV10F_INSN_BIAP_PC_D_R; goto extract_sfmt_biap_pc_b_r;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 88 :
-        if ((base_insn & 0xff0) == 0x580)
-          { itype = CRISV10F_INSN_NEG_B_R; goto extract_sfmt_neg_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 89 :
-        if ((base_insn & 0xff0) == 0x590)
-          { itype = CRISV10F_INSN_NEG_W_R; goto extract_sfmt_neg_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 90 :
-        if ((base_insn & 0xff0) == 0x5a0)
-          { itype = CRISV10F_INSN_NEG_D_R; goto extract_sfmt_neg_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 91 :
-        if ((base_insn & 0xff0) == 0x5b0)
-          { itype = CRISV10F_INSN_SETF; goto extract_sfmt_setf; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 92 :
-        if ((base_insn & 0xff0) == 0x5c0)
-          { itype = CRISV10F_INSN_BOUND_R_B_R; goto extract_sfmt_dstep; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 93 :
-        if ((base_insn & 0xff0) == 0x5d0)
-          { itype = CRISV10F_INSN_BOUND_R_W_R; goto extract_sfmt_dstep; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 94 :
-        if ((base_insn & 0xff0) == 0x5e0)
-          { itype = CRISV10F_INSN_BOUND_R_D_R; goto extract_sfmt_dstep; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 95 :
-        if ((base_insn & 0xff0) == 0x5f0)
-          { itype = CRISV10F_INSN_CLEARF; goto extract_sfmt_setf; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 96 :
-        if ((base_insn & 0xff0) == 0x600)
-          { itype = CRISV10F_INSN_ADD_B_R; goto extract_sfmt_add_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 97 :
-        if ((base_insn & 0xff0) == 0x610)
-          { itype = CRISV10F_INSN_ADD_W_R; goto extract_sfmt_add_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 98 :
-        if ((base_insn & 0xff0) == 0x620)
-          { itype = CRISV10F_INSN_ADD_D_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 99 :
-        if ((base_insn & 0xff0) == 0x630)
-          { itype = CRISV10F_INSN_MOVE_R_SPRV10; goto extract_sfmt_move_r_sprv10; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 100 :
-        if ((base_insn & 0xff0) == 0x640)
-          { itype = CRISV10F_INSN_MOVE_B_R; goto extract_sfmt_move_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 101 :
-        if ((base_insn & 0xff0) == 0x650)
-          { itype = CRISV10F_INSN_MOVE_W_R; goto extract_sfmt_move_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 88 : itype = CRISV10F_INSN_NEG_B_R; goto extract_sfmt_neg_b_r;
+      case 89 : itype = CRISV10F_INSN_NEG_W_R; goto extract_sfmt_neg_b_r;
+      case 90 : itype = CRISV10F_INSN_NEG_D_R; goto extract_sfmt_neg_d_r;
+      case 91 : itype = CRISV10F_INSN_SETF; goto extract_sfmt_setf;
+      case 92 : itype = CRISV10F_INSN_BOUND_R_B_R; goto extract_sfmt_dstep;
+      case 93 : itype = CRISV10F_INSN_BOUND_R_W_R; goto extract_sfmt_dstep;
+      case 94 : itype = CRISV10F_INSN_BOUND_R_D_R; goto extract_sfmt_dstep;
+      case 95 : itype = CRISV10F_INSN_CLEARF; goto extract_sfmt_setf;
+      case 96 : itype = CRISV10F_INSN_ADD_B_R; goto extract_sfmt_add_b_r;
+      case 97 : itype = CRISV10F_INSN_ADD_W_R; goto extract_sfmt_add_b_r;
+      case 98 : itype = CRISV10F_INSN_ADD_D_R; goto extract_sfmt_add_d_r;
+      case 99 : itype = CRISV10F_INSN_MOVE_R_SPRV10; goto extract_sfmt_move_r_sprv10;
+      case 100 : itype = CRISV10F_INSN_MOVE_B_R; goto extract_sfmt_move_b_r;
+      case 101 : itype = CRISV10F_INSN_MOVE_W_R; goto extract_sfmt_move_b_r;
       case 102 :
         {
           unsigned int val = (((insn >> 0) & (15 << 0)));
@@ -876,14 +708,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xff0) == 0x660)
-              { itype = CRISV10F_INSN_MOVE_D_R; goto extract_sfmt_move_d_r; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0x66f)
-              { itype = CRISV10F_INSN_MOVEPCR; goto extract_sfmt_movepcr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_MOVE_D_R; goto extract_sfmt_move_d_r;
+          case 15 : itype = CRISV10F_INSN_MOVEPCR; goto extract_sfmt_movepcr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -906,125 +732,38 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xff0) == 0x670)
-              { itype = CRISV10F_INSN_MOVE_SPR_RV10; goto extract_sfmt_move_spr_rv10; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0x67f)
-              { itype = CRISV10F_INSN_RET_TYPE; goto extract_sfmt_ret_type; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_MOVE_SPR_RV10; goto extract_sfmt_move_spr_rv10;
+          case 15 : itype = CRISV10F_INSN_RET_TYPE; goto extract_sfmt_ret_type;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 104 :
-        if ((base_insn & 0xff0) == 0x680)
-          { itype = CRISV10F_INSN_SUB_B_R; goto extract_sfmt_add_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 105 :
-        if ((base_insn & 0xff0) == 0x690)
-          { itype = CRISV10F_INSN_SUB_W_R; goto extract_sfmt_add_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 106 :
-        if ((base_insn & 0xff0) == 0x6a0)
-          { itype = CRISV10F_INSN_SUB_D_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 107 :
-        if ((base_insn & 0xff0) == 0x6b0)
-          { itype = CRISV10F_INSN_ABS; goto extract_sfmt_movs_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 108 :
-        if ((base_insn & 0xff0) == 0x6c0)
-          { itype = CRISV10F_INSN_CMP_R_B_R; goto extract_sfmt_cmp_r_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 109 :
-        if ((base_insn & 0xff0) == 0x6d0)
-          { itype = CRISV10F_INSN_CMP_R_W_R; goto extract_sfmt_cmp_r_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 110 :
-        if ((base_insn & 0xff0) == 0x6e0)
-          { itype = CRISV10F_INSN_CMP_R_D_R; goto extract_sfmt_cmp_r_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 111 :
-        if ((base_insn & 0xff0) == 0x6f0)
-          { itype = CRISV10F_INSN_DSTEP; goto extract_sfmt_dstep; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 112 :
-        if ((base_insn & 0xff0) == 0x700)
-          { itype = CRISV10F_INSN_AND_B_R; goto extract_sfmt_and_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 113 :
-        if ((base_insn & 0xff0) == 0x710)
-          { itype = CRISV10F_INSN_AND_W_R; goto extract_sfmt_and_w_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 114 :
-        if ((base_insn & 0xff0) == 0x720)
-          { itype = CRISV10F_INSN_AND_D_R; goto extract_sfmt_and_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 115 :
-        if ((base_insn & 0xff0) == 0x730)
-          { itype = CRISV10F_INSN_LZ; goto extract_sfmt_movs_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 116 :
-        if ((base_insn & 0xff0) == 0x740)
-          { itype = CRISV10F_INSN_ORR_B_R; goto extract_sfmt_and_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 117 :
-        if ((base_insn & 0xff0) == 0x750)
-          { itype = CRISV10F_INSN_ORR_W_R; goto extract_sfmt_and_w_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 118 :
-        if ((base_insn & 0xff0) == 0x760)
-          { itype = CRISV10F_INSN_ORR_D_R; goto extract_sfmt_and_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 119 :
-        if ((base_insn & 0xff0) == 0x770)
-          { itype = CRISV10F_INSN_SWAP; goto extract_sfmt_swap; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 120 :
-        if ((base_insn & 0xff0) == 0x780)
-          { itype = CRISV10F_INSN_ASRR_B_R; goto extract_sfmt_asrr_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 121 :
-        if ((base_insn & 0xff0) == 0x790)
-          { itype = CRISV10F_INSN_ASRR_W_R; goto extract_sfmt_asrr_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 122 :
-        if ((base_insn & 0xff0) == 0x7a0)
-          { itype = CRISV10F_INSN_ASRR_D_R; goto extract_sfmt_and_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 123 :
-        if ((base_insn & 0xff0) == 0x7b0)
-          { itype = CRISV10F_INSN_XOR; goto extract_sfmt_dstep; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 124 :
-        if ((base_insn & 0xff0) == 0x7c0)
-          { itype = CRISV10F_INSN_LSRR_B_R; goto extract_sfmt_lsrr_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 125 :
-        if ((base_insn & 0xff0) == 0x7d0)
-          { itype = CRISV10F_INSN_LSRR_W_R; goto extract_sfmt_lsrr_b_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 126 :
-        if ((base_insn & 0xff0) == 0x7e0)
-          { itype = CRISV10F_INSN_LSRR_D_R; goto extract_sfmt_lsrr_d_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 127 :
-        if ((base_insn & 0xff0) == 0x7f0)
-          { itype = CRISV10F_INSN_MSTEP; goto extract_sfmt_mstep; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 128 :
-        if ((base_insn & 0xbf0) == 0x800)
-          { itype = CRISV10F_INSN_ADDU_M_B_M; goto extract_sfmt_adds_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 129 :
-        if ((base_insn & 0xbf0) == 0x810)
-          { itype = CRISV10F_INSN_ADDU_M_W_M; goto extract_sfmt_adds_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 130 :
-        if ((base_insn & 0xbf0) == 0x820)
-          { itype = CRISV10F_INSN_ADDS_M_B_M; goto extract_sfmt_adds_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 104 : itype = CRISV10F_INSN_SUB_B_R; goto extract_sfmt_add_b_r;
+      case 105 : itype = CRISV10F_INSN_SUB_W_R; goto extract_sfmt_add_b_r;
+      case 106 : itype = CRISV10F_INSN_SUB_D_R; goto extract_sfmt_add_d_r;
+      case 107 : itype = CRISV10F_INSN_ABS; goto extract_sfmt_movs_b_r;
+      case 108 : itype = CRISV10F_INSN_CMP_R_B_R; goto extract_sfmt_cmp_r_b_r;
+      case 109 : itype = CRISV10F_INSN_CMP_R_W_R; goto extract_sfmt_cmp_r_b_r;
+      case 110 : itype = CRISV10F_INSN_CMP_R_D_R; goto extract_sfmt_cmp_r_b_r;
+      case 111 : itype = CRISV10F_INSN_DSTEP; goto extract_sfmt_dstep;
+      case 112 : itype = CRISV10F_INSN_AND_B_R; goto extract_sfmt_and_b_r;
+      case 113 : itype = CRISV10F_INSN_AND_W_R; goto extract_sfmt_and_b_r;
+      case 114 : itype = CRISV10F_INSN_AND_D_R; goto extract_sfmt_and_d_r;
+      case 115 : itype = CRISV10F_INSN_LZ; goto extract_sfmt_movs_b_r;
+      case 116 : itype = CRISV10F_INSN_ORR_B_R; goto extract_sfmt_and_b_r;
+      case 117 : itype = CRISV10F_INSN_ORR_W_R; goto extract_sfmt_and_b_r;
+      case 118 : itype = CRISV10F_INSN_ORR_D_R; goto extract_sfmt_and_d_r;
+      case 119 : itype = CRISV10F_INSN_SWAP; goto extract_sfmt_swap;
+      case 120 : itype = CRISV10F_INSN_ASRR_B_R; goto extract_sfmt_and_b_r;
+      case 121 : itype = CRISV10F_INSN_ASRR_W_R; goto extract_sfmt_and_b_r;
+      case 122 : itype = CRISV10F_INSN_ASRR_D_R; goto extract_sfmt_and_d_r;
+      case 123 : itype = CRISV10F_INSN_XOR; goto extract_sfmt_dstep;
+      case 124 : itype = CRISV10F_INSN_LSRR_B_R; goto extract_sfmt_lsrr_b_r;
+      case 125 : itype = CRISV10F_INSN_LSRR_W_R; goto extract_sfmt_lsrr_b_r;
+      case 126 : itype = CRISV10F_INSN_LSRR_D_R; goto extract_sfmt_lsrr_d_r;
+      case 127 : itype = CRISV10F_INSN_MSTEP; goto extract_sfmt_mstep;
+      case 128 : itype = CRISV10F_INSN_ADDU_M_B_M; goto extract_sfmt_adds_m_b_m;
+      case 129 : itype = CRISV10F_INSN_ADDU_M_W_M; goto extract_sfmt_adds_m_w_m;
+      case 130 : itype = CRISV10F_INSN_ADDS_M_B_M; goto extract_sfmt_adds_m_b_m;
       case 131 :
         {
           unsigned int val = (((insn >> 8) & (7 << 4)) | ((insn >> 0) & (15 << 0)));
@@ -1156,89 +895,35 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 123 : /* fall through */
           case 124 : /* fall through */
           case 125 : /* fall through */
-          case 126 :
-            if ((base_insn & 0xbf0) == 0x830)
-              { itype = CRISV10F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 126 : itype = CRISV10F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m;
           case 127 :
             {
               unsigned int val = (((insn >> 15) & (1 << 0)));
               switch (val)
               {
-              case 0 :
-                if ((base_insn & 0xbf0) == 0x830)
-                  { itype = CRISV10F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((base_insn & 0xffff) == 0xf83f)
-                  { itype = CRISV10F_INSN_ADDSPCPC; goto extract_sfmt_addspcpc; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 0 : itype = CRISV10F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m;
+              case 1 : itype = CRISV10F_INSN_ADDSPCPC; goto extract_sfmt_addspcpc;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 132 :
-        if ((base_insn & 0xbf0) == 0x840)
-          { itype = CRISV10F_INSN_MOVU_M_B_M; goto extract_sfmt_movs_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 133 :
-        if ((base_insn & 0xbf0) == 0x850)
-          { itype = CRISV10F_INSN_MOVU_M_W_M; goto extract_sfmt_movs_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 134 :
-        if ((base_insn & 0xbf0) == 0x860)
-          { itype = CRISV10F_INSN_MOVS_M_B_M; goto extract_sfmt_movs_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 135 :
-        if ((base_insn & 0xbf0) == 0x870)
-          { itype = CRISV10F_INSN_MOVS_M_W_M; goto extract_sfmt_movs_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 136 :
-        if ((base_insn & 0xbf0) == 0x880)
-          { itype = CRISV10F_INSN_SUBU_M_B_M; goto extract_sfmt_adds_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 137 :
-        if ((base_insn & 0xbf0) == 0x890)
-          { itype = CRISV10F_INSN_SUBU_M_W_M; goto extract_sfmt_adds_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 138 :
-        if ((base_insn & 0xbf0) == 0x8a0)
-          { itype = CRISV10F_INSN_SUBS_M_B_M; goto extract_sfmt_adds_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 139 :
-        if ((base_insn & 0xbf0) == 0x8b0)
-          { itype = CRISV10F_INSN_SUBS_M_W_M; goto extract_sfmt_adds_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 140 :
-        if ((base_insn & 0xbf0) == 0x8c0)
-          { itype = CRISV10F_INSN_CMPU_M_B_M; goto extract_sfmt_cmp_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 141 :
-        if ((base_insn & 0xbf0) == 0x8d0)
-          { itype = CRISV10F_INSN_CMPU_M_W_M; goto extract_sfmt_cmp_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 142 :
-        if ((base_insn & 0xbf0) == 0x8e0)
-          { itype = CRISV10F_INSN_CMPS_M_B_M; goto extract_sfmt_cmp_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 143 :
-        if ((base_insn & 0xbf0) == 0x8f0)
-          { itype = CRISV10F_INSN_CMPS_M_W_M; goto extract_sfmt_cmp_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 144 :
-        if ((base_insn & 0xff0) == 0x900)
-          { itype = CRISV10F_INSN_MULU_B; goto extract_sfmt_muls_b; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 145 :
-        if ((base_insn & 0xff0) == 0x910)
-          { itype = CRISV10F_INSN_MULU_W; goto extract_sfmt_muls_b; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 146 :
-        if ((base_insn & 0xff0) == 0x920)
-          { itype = CRISV10F_INSN_MULU_D; goto extract_sfmt_muls_b; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 132 : itype = CRISV10F_INSN_MOVU_M_B_M; goto extract_sfmt_movs_m_b_m;
+      case 133 : itype = CRISV10F_INSN_MOVU_M_W_M; goto extract_sfmt_movs_m_w_m;
+      case 134 : itype = CRISV10F_INSN_MOVS_M_B_M; goto extract_sfmt_movs_m_b_m;
+      case 135 : itype = CRISV10F_INSN_MOVS_M_W_M; goto extract_sfmt_movs_m_w_m;
+      case 136 : itype = CRISV10F_INSN_SUBU_M_B_M; goto extract_sfmt_adds_m_b_m;
+      case 137 : itype = CRISV10F_INSN_SUBU_M_W_M; goto extract_sfmt_adds_m_w_m;
+      case 138 : itype = CRISV10F_INSN_SUBS_M_B_M; goto extract_sfmt_adds_m_b_m;
+      case 139 : itype = CRISV10F_INSN_SUBS_M_W_M; goto extract_sfmt_adds_m_w_m;
+      case 140 : itype = CRISV10F_INSN_CMPU_M_B_M; goto extract_sfmt_cmp_m_b_m;
+      case 141 : itype = CRISV10F_INSN_CMPU_M_W_M; goto extract_sfmt_cmp_m_w_m;
+      case 142 : itype = CRISV10F_INSN_CMPS_M_B_M; goto extract_sfmt_cmp_m_b_m;
+      case 143 : itype = CRISV10F_INSN_CMPS_M_W_M; goto extract_sfmt_cmp_m_w_m;
+      case 144 : itype = CRISV10F_INSN_MULU_B; goto extract_sfmt_muls_b;
+      case 145 : itype = CRISV10F_INSN_MULU_W; goto extract_sfmt_muls_b;
+      case 146 : itype = CRISV10F_INSN_MULU_D; goto extract_sfmt_muls_b;
       case 147 :
         {
           unsigned int val = (((insn >> 12) & (15 << 0)));
@@ -1258,130 +943,43 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 15 :
-            if ((base_insn & 0xbf0) == 0x930)
-              { itype = CRISV10F_INSN_JUMP_M; goto extract_sfmt_jump_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 14 :
-            if ((base_insn & 0xfff0) == 0xe930)
-              { itype = CRISV10F_INSN_BREAK; goto extract_sfmt_break; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 15 : itype = CRISV10F_INSN_JUMP_M; goto extract_sfmt_jump_m;
+          case 14 : itype = CRISV10F_INSN_BREAK; goto extract_sfmt_break;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 148 :
-        if ((base_insn & 0xbf0) == 0x940)
-          { itype = CRISV10F_INSN_ADDO_M_B_M; goto extract_sfmt_addo_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 149 :
-        if ((base_insn & 0xbf0) == 0x950)
-          { itype = CRISV10F_INSN_ADDO_M_W_M; goto extract_sfmt_addo_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 150 :
-        if ((base_insn & 0xbf0) == 0x960)
-          { itype = CRISV10F_INSN_ADDO_M_D_M; goto extract_sfmt_addo_m_d_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 148 : itype = CRISV10F_INSN_ADDO_M_B_M; goto extract_sfmt_addo_m_b_m;
+      case 149 : itype = CRISV10F_INSN_ADDO_M_W_M; goto extract_sfmt_addo_m_w_m;
+      case 150 : itype = CRISV10F_INSN_ADDO_M_D_M; goto extract_sfmt_addo_m_d_m;
       case 151 :
         if ((base_insn & 0xfbf0) == 0x970)
           { itype = CRISV10F_INSN_DIP_M; goto extract_sfmt_dip_m; }
         itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 155 :
-        if ((base_insn & 0xff0) == 0x9b0)
-          { itype = CRISV10F_INSN_JUMP_R; goto extract_sfmt_jump_r; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 156 :
-        if ((base_insn & 0xbf0) == 0x9c0)
-          { itype = CRISV10F_INSN_BOUND_M_B_M; goto extract_sfmt_bound_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 157 :
-        if ((base_insn & 0xbf0) == 0x9d0)
-          { itype = CRISV10F_INSN_BOUND_M_W_M; goto extract_sfmt_bound_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 158 :
-        if ((base_insn & 0xbf0) == 0x9e0)
-          { itype = CRISV10F_INSN_BOUND_M_D_M; goto extract_sfmt_bound_m_d_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 160 :
-        if ((base_insn & 0xbf0) == 0xa00)
-          { itype = CRISV10F_INSN_ADD_M_B_M; goto extract_sfmt_add_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 161 :
-        if ((base_insn & 0xbf0) == 0xa10)
-          { itype = CRISV10F_INSN_ADD_M_W_M; goto extract_sfmt_add_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 162 :
-        if ((base_insn & 0xbf0) == 0xa20)
-          { itype = CRISV10F_INSN_ADD_M_D_M; goto extract_sfmt_add_m_d_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 163 :
-        if ((base_insn & 0xbf0) == 0xa30)
-          { itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 164 :
-        if ((base_insn & 0xbf0) == 0xa40)
-          { itype = CRISV10F_INSN_MOVE_M_B_M; goto extract_sfmt_move_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 165 :
-        if ((base_insn & 0xbf0) == 0xa50)
-          { itype = CRISV10F_INSN_MOVE_M_W_M; goto extract_sfmt_move_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 166 :
-        if ((base_insn & 0xbf0) == 0xa60)
-          { itype = CRISV10F_INSN_MOVE_M_D_M; goto extract_sfmt_move_m_d_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 155 : itype = CRISV10F_INSN_JUMP_R; goto extract_sfmt_jump_r;
+      case 156 : itype = CRISV10F_INSN_BOUND_M_B_M; goto extract_sfmt_bound_m_b_m;
+      case 157 : itype = CRISV10F_INSN_BOUND_M_W_M; goto extract_sfmt_bound_m_w_m;
+      case 158 : itype = CRISV10F_INSN_BOUND_M_D_M; goto extract_sfmt_bound_m_d_m;
+      case 160 : itype = CRISV10F_INSN_ADD_M_B_M; goto extract_sfmt_add_m_b_m;
+      case 161 : itype = CRISV10F_INSN_ADD_M_W_M; goto extract_sfmt_add_m_w_m;
+      case 162 : itype = CRISV10F_INSN_ADD_M_D_M; goto extract_sfmt_add_m_d_m;
+      case 163 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
+      case 164 : itype = CRISV10F_INSN_MOVE_M_B_M; goto extract_sfmt_move_m_b_m;
+      case 165 : itype = CRISV10F_INSN_MOVE_M_W_M; goto extract_sfmt_move_m_w_m;
+      case 166 : itype = CRISV10F_INSN_MOVE_M_D_M; goto extract_sfmt_move_m_d_m;
       case 167 : /* fall through */
-      case 231 :
-        if ((base_insn & 0xbf0) == 0xa70)
-          { itype = CRISV10F_INSN_MOVE_SPR_MV10; goto extract_sfmt_move_spr_mv10; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 168 :
-        if ((base_insn & 0xbf0) == 0xa80)
-          { itype = CRISV10F_INSN_SUB_M_B_M; goto extract_sfmt_add_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 169 :
-        if ((base_insn & 0xbf0) == 0xa90)
-          { itype = CRISV10F_INSN_SUB_M_W_M; goto extract_sfmt_add_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 170 :
-        if ((base_insn & 0xbf0) == 0xaa0)
-          { itype = CRISV10F_INSN_SUB_M_D_M; goto extract_sfmt_add_m_d_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 172 :
-        if ((base_insn & 0xbf0) == 0xac0)
-          { itype = CRISV10F_INSN_CMP_M_B_M; goto extract_sfmt_cmp_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 173 :
-        if ((base_insn & 0xbf0) == 0xad0)
-          { itype = CRISV10F_INSN_CMP_M_W_M; goto extract_sfmt_cmp_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 174 :
-        if ((base_insn & 0xbf0) == 0xae0)
-          { itype = CRISV10F_INSN_CMP_M_D_M; goto extract_sfmt_cmp_m_d_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 176 :
-        if ((base_insn & 0xbf0) == 0xb00)
-          { itype = CRISV10F_INSN_AND_M_B_M; goto extract_sfmt_and_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 177 :
-        if ((base_insn & 0xbf0) == 0xb10)
-          { itype = CRISV10F_INSN_AND_M_W_M; goto extract_sfmt_and_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 178 :
-        if ((base_insn & 0xbf0) == 0xb20)
-          { itype = CRISV10F_INSN_AND_M_D_M; goto extract_sfmt_and_m_d_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 180 :
-        if ((base_insn & 0xbf0) == 0xb40)
-          { itype = CRISV10F_INSN_OR_M_B_M; goto extract_sfmt_and_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 181 :
-        if ((base_insn & 0xbf0) == 0xb50)
-          { itype = CRISV10F_INSN_OR_M_W_M; goto extract_sfmt_and_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 182 :
-        if ((base_insn & 0xbf0) == 0xb60)
-          { itype = CRISV10F_INSN_OR_M_D_M; goto extract_sfmt_and_m_d_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 231 : itype = CRISV10F_INSN_MOVE_SPR_MV10; goto extract_sfmt_move_spr_mv10;
+      case 168 : itype = CRISV10F_INSN_SUB_M_B_M; goto extract_sfmt_add_m_b_m;
+      case 169 : itype = CRISV10F_INSN_SUB_M_W_M; goto extract_sfmt_add_m_w_m;
+      case 170 : itype = CRISV10F_INSN_SUB_M_D_M; goto extract_sfmt_add_m_d_m;
+      case 172 : itype = CRISV10F_INSN_CMP_M_B_M; goto extract_sfmt_cmp_m_b_m;
+      case 173 : itype = CRISV10F_INSN_CMP_M_W_M; goto extract_sfmt_cmp_m_w_m;
+      case 174 : itype = CRISV10F_INSN_CMP_M_D_M; goto extract_sfmt_cmp_m_d_m;
+      case 176 : itype = CRISV10F_INSN_AND_M_B_M; goto extract_sfmt_and_m_b_m;
+      case 177 : itype = CRISV10F_INSN_AND_M_W_M; goto extract_sfmt_and_m_w_m;
+      case 178 : itype = CRISV10F_INSN_AND_M_D_M; goto extract_sfmt_and_m_d_m;
+      case 180 : itype = CRISV10F_INSN_OR_M_B_M; goto extract_sfmt_and_m_b_m;
+      case 181 : itype = CRISV10F_INSN_OR_M_W_M; goto extract_sfmt_and_m_w_m;
+      case 182 : itype = CRISV10F_INSN_OR_M_D_M; goto extract_sfmt_and_m_d_m;
       case 183 : /* fall through */
       case 247 :
         if ((base_insn & 0xfbf0) == 0x3b70)
@@ -1422,37 +1020,19 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xbb0)
-              { itype = CRISV10F_INSN_MOVEM_M_R; goto extract_sfmt_movem_m_r; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfbf0) == 0xfbb0)
-              { itype = CRISV10F_INSN_MOVEM_M_PC; goto extract_sfmt_movem_m_pc; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_MOVEM_M_R; goto extract_sfmt_movem_m_r;
+          case 15 : itype = CRISV10F_INSN_MOVEM_M_PC; goto extract_sfmt_movem_m_pc;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
       case 188 : /* fall through */
-      case 252 :
-        if ((base_insn & 0xbf0) == 0xbc0)
-          { itype = CRISV10F_INSN_MOVE_R_M_B_M; goto extract_sfmt_move_r_m_b_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 252 : itype = CRISV10F_INSN_MOVE_R_M_B_M; goto extract_sfmt_move_r_m_b_m;
       case 189 : /* fall through */
-      case 253 :
-        if ((base_insn & 0xbf0) == 0xbd0)
-          { itype = CRISV10F_INSN_MOVE_R_M_W_M; goto extract_sfmt_move_r_m_w_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 253 : itype = CRISV10F_INSN_MOVE_R_M_W_M; goto extract_sfmt_move_r_m_w_m;
       case 190 : /* fall through */
-      case 254 :
-        if ((base_insn & 0xbf0) == 0xbe0)
-          { itype = CRISV10F_INSN_MOVE_R_M_D_M; goto extract_sfmt_move_r_m_d_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 254 : itype = CRISV10F_INSN_MOVE_R_M_D_M; goto extract_sfmt_move_r_m_d_m;
       case 191 : /* fall through */
-      case 255 :
-        if ((base_insn & 0xbf0) == 0xbf0)
-          { itype = CRISV10F_INSN_MOVEM_R_M; goto extract_sfmt_movem_r_m; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 255 : itype = CRISV10F_INSN_MOVEM_R_M; goto extract_sfmt_movem_r_m;
       case 192 :
         {
           unsigned int val = (((insn >> 0) & (15 << 0)));
@@ -1472,14 +1052,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x800)
-              { itype = CRISV10F_INSN_ADDU_M_B_M; goto extract_sfmt_adds_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc0f)
-              { itype = CRISV10F_INSN_ADDUCBR; goto extract_sfmt_addscbr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_ADDU_M_B_M; goto extract_sfmt_adds_m_b_m;
+          case 15 : itype = CRISV10F_INSN_ADDUCBR; goto extract_sfmt_addscbr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1502,14 +1076,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x810)
-              { itype = CRISV10F_INSN_ADDU_M_W_M; goto extract_sfmt_adds_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc1f)
-              { itype = CRISV10F_INSN_ADDUCWR; goto extract_sfmt_addscwr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_ADDU_M_W_M; goto extract_sfmt_adds_m_w_m;
+          case 15 : itype = CRISV10F_INSN_ADDUCWR; goto extract_sfmt_addscwr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1532,14 +1100,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x820)
-              { itype = CRISV10F_INSN_ADDS_M_B_M; goto extract_sfmt_adds_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc2f)
-              { itype = CRISV10F_INSN_ADDSCBR; goto extract_sfmt_addscbr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_ADDS_M_B_M; goto extract_sfmt_adds_m_b_m;
+          case 15 : itype = CRISV10F_INSN_ADDSCBR; goto extract_sfmt_addscbr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1562,14 +1124,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x830)
-              { itype = CRISV10F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc3f)
-              { itype = CRISV10F_INSN_ADDSCWR; goto extract_sfmt_addscwr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m;
+          case 15 : itype = CRISV10F_INSN_ADDSCWR; goto extract_sfmt_addscwr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1592,14 +1148,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x840)
-              { itype = CRISV10F_INSN_MOVU_M_B_M; goto extract_sfmt_movs_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc4f)
-              { itype = CRISV10F_INSN_MOVUCBR; goto extract_sfmt_movucbr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_MOVU_M_B_M; goto extract_sfmt_movs_m_b_m;
+          case 15 : itype = CRISV10F_INSN_MOVUCBR; goto extract_sfmt_movucbr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1622,14 +1172,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x850)
-              { itype = CRISV10F_INSN_MOVU_M_W_M; goto extract_sfmt_movs_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc5f)
-              { itype = CRISV10F_INSN_MOVUCWR; goto extract_sfmt_movucwr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_MOVU_M_W_M; goto extract_sfmt_movs_m_w_m;
+          case 15 : itype = CRISV10F_INSN_MOVUCWR; goto extract_sfmt_movucwr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1652,14 +1196,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x860)
-              { itype = CRISV10F_INSN_MOVS_M_B_M; goto extract_sfmt_movs_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc6f)
-              { itype = CRISV10F_INSN_MOVSCBR; goto extract_sfmt_movscbr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_MOVS_M_B_M; goto extract_sfmt_movs_m_b_m;
+          case 15 : itype = CRISV10F_INSN_MOVSCBR; goto extract_sfmt_movscbr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1682,14 +1220,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x870)
-              { itype = CRISV10F_INSN_MOVS_M_W_M; goto extract_sfmt_movs_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc7f)
-              { itype = CRISV10F_INSN_MOVSCWR; goto extract_sfmt_movscwr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_MOVS_M_W_M; goto extract_sfmt_movs_m_w_m;
+          case 15 : itype = CRISV10F_INSN_MOVSCWR; goto extract_sfmt_movscwr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1712,14 +1244,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x880)
-              { itype = CRISV10F_INSN_SUBU_M_B_M; goto extract_sfmt_adds_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc8f)
-              { itype = CRISV10F_INSN_SUBUCBR; goto extract_sfmt_addscbr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_SUBU_M_B_M; goto extract_sfmt_adds_m_b_m;
+          case 15 : itype = CRISV10F_INSN_SUBUCBR; goto extract_sfmt_addscbr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1742,14 +1268,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x890)
-              { itype = CRISV10F_INSN_SUBU_M_W_M; goto extract_sfmt_adds_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc9f)
-              { itype = CRISV10F_INSN_SUBUCWR; goto extract_sfmt_addscwr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_SUBU_M_W_M; goto extract_sfmt_adds_m_w_m;
+          case 15 : itype = CRISV10F_INSN_SUBUCWR; goto extract_sfmt_addscwr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1772,14 +1292,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x8a0)
-              { itype = CRISV10F_INSN_SUBS_M_B_M; goto extract_sfmt_adds_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xcaf)
-              { itype = CRISV10F_INSN_SUBSCBR; goto extract_sfmt_addscbr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_SUBS_M_B_M; goto extract_sfmt_adds_m_b_m;
+          case 15 : itype = CRISV10F_INSN_SUBSCBR; goto extract_sfmt_addscbr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1802,14 +1316,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x8b0)
-              { itype = CRISV10F_INSN_SUBS_M_W_M; goto extract_sfmt_adds_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xcbf)
-              { itype = CRISV10F_INSN_SUBSCWR; goto extract_sfmt_addscwr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_SUBS_M_W_M; goto extract_sfmt_adds_m_w_m;
+          case 15 : itype = CRISV10F_INSN_SUBSCWR; goto extract_sfmt_addscwr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1832,14 +1340,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x8c0)
-              { itype = CRISV10F_INSN_CMPU_M_B_M; goto extract_sfmt_cmp_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xccf)
-              { itype = CRISV10F_INSN_CMPUCBR; goto extract_sfmt_cmpucbr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_CMPU_M_B_M; goto extract_sfmt_cmp_m_b_m;
+          case 15 : itype = CRISV10F_INSN_CMPUCBR; goto extract_sfmt_cmpucbr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1862,14 +1364,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x8d0)
-              { itype = CRISV10F_INSN_CMPU_M_W_M; goto extract_sfmt_cmp_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xcdf)
-              { itype = CRISV10F_INSN_CMPUCWR; goto extract_sfmt_cmpucwr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_CMPU_M_W_M; goto extract_sfmt_cmp_m_w_m;
+          case 15 : itype = CRISV10F_INSN_CMPUCWR; goto extract_sfmt_cmpucwr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1892,14 +1388,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x8e0)
-              { itype = CRISV10F_INSN_CMPS_M_B_M; goto extract_sfmt_cmp_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xcef)
-              { itype = CRISV10F_INSN_CMPSCBR; goto extract_sfmt_cmpcbr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_CMPS_M_B_M; goto extract_sfmt_cmp_m_b_m;
+          case 15 : itype = CRISV10F_INSN_CMPSCBR; goto extract_sfmt_cmpcbr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1922,29 +1412,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x8f0)
-              { itype = CRISV10F_INSN_CMPS_M_W_M; goto extract_sfmt_cmp_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xcff)
-              { itype = CRISV10F_INSN_CMPSCWR; goto extract_sfmt_cmpcwr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_CMPS_M_W_M; goto extract_sfmt_cmp_m_w_m;
+          case 15 : itype = CRISV10F_INSN_CMPSCWR; goto extract_sfmt_cmpcwr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 208 :
-        if ((base_insn & 0xff0) == 0xd00)
-          { itype = CRISV10F_INSN_MULS_B; goto extract_sfmt_muls_b; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 209 :
-        if ((base_insn & 0xff0) == 0xd10)
-          { itype = CRISV10F_INSN_MULS_W; goto extract_sfmt_muls_b; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 210 :
-        if ((base_insn & 0xff0) == 0xd20)
-          { itype = CRISV10F_INSN_MULS_D; goto extract_sfmt_muls_b; }
-        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 208 : itype = CRISV10F_INSN_MULS_B; goto extract_sfmt_muls_b;
+      case 209 : itype = CRISV10F_INSN_MULS_W; goto extract_sfmt_muls_b;
+      case 210 : itype = CRISV10F_INSN_MULS_D; goto extract_sfmt_muls_b;
       case 211 :
         {
           unsigned int val = (((insn >> 0) & (15 << 0)));
@@ -1964,14 +1439,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x930)
-              { itype = CRISV10F_INSN_JUMP_M; goto extract_sfmt_jump_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xd3f)
-              { itype = CRISV10F_INSN_JUMP_C; goto extract_sfmt_jump_c; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_JUMP_M; goto extract_sfmt_jump_m;
+          case 15 : itype = CRISV10F_INSN_JUMP_C; goto extract_sfmt_jump_c;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1994,14 +1463,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x940)
-              { itype = CRISV10F_INSN_ADDO_M_B_M; goto extract_sfmt_addo_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xd4f)
-              { itype = CRISV10F_INSN_ADDO_CB; goto extract_sfmt_addo_cb; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_ADDO_M_B_M; goto extract_sfmt_addo_m_b_m;
+          case 15 : itype = CRISV10F_INSN_ADDO_CB; goto extract_sfmt_addo_cb;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2024,14 +1487,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x950)
-              { itype = CRISV10F_INSN_ADDO_M_W_M; goto extract_sfmt_addo_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xd5f)
-              { itype = CRISV10F_INSN_ADDO_CW; goto extract_sfmt_addo_cw; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_ADDO_M_W_M; goto extract_sfmt_addo_m_w_m;
+          case 15 : itype = CRISV10F_INSN_ADDO_CW; goto extract_sfmt_addo_cw;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2073,14 +1530,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0x960)
-                  { itype = CRISV10F_INSN_ADDO_M_D_M; goto extract_sfmt_addo_m_d_m; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xfff) == 0xd6f)
-                  { itype = CRISV10F_INSN_ADDO_CD; goto extract_sfmt_addo_cd; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV10F_INSN_ADDO_M_D_M; goto extract_sfmt_addo_m_d_m;
+              case 15 : itype = CRISV10F_INSN_ADDO_CD; goto extract_sfmt_addo_cd;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2103,14 +1554,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0x960)
-                  { itype = CRISV10F_INSN_ADDO_M_D_M; goto extract_sfmt_addo_m_d_m; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xffff) == 0xfd6f)
-                  { itype = CRISV10F_INSN_BDAP_32_PC; goto extract_sfmt_bdap_32_pc; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV10F_INSN_ADDO_M_D_M; goto extract_sfmt_addo_m_d_m;
+              case 15 : itype = CRISV10F_INSN_BDAP_32_PC; goto extract_sfmt_bdap_32_pc;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2166,14 +1611,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x9c0)
-              { itype = CRISV10F_INSN_BOUND_M_B_M; goto extract_sfmt_bound_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xdcf)
-              { itype = CRISV10F_INSN_BOUND_CB; goto extract_sfmt_bound_cb; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_BOUND_M_B_M; goto extract_sfmt_bound_m_b_m;
+          case 15 : itype = CRISV10F_INSN_BOUND_CB; goto extract_sfmt_bound_cb;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2196,14 +1635,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x9d0)
-              { itype = CRISV10F_INSN_BOUND_M_W_M; goto extract_sfmt_bound_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xddf)
-              { itype = CRISV10F_INSN_BOUND_CW; goto extract_sfmt_bound_cw; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_BOUND_M_W_M; goto extract_sfmt_bound_m_w_m;
+          case 15 : itype = CRISV10F_INSN_BOUND_CW; goto extract_sfmt_bound_cw;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2226,14 +1659,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x9e0)
-              { itype = CRISV10F_INSN_BOUND_M_D_M; goto extract_sfmt_bound_m_d_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xdef)
-              { itype = CRISV10F_INSN_BOUND_CD; goto extract_sfmt_bound_cd; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_BOUND_M_D_M; goto extract_sfmt_bound_m_d_m;
+          case 15 : itype = CRISV10F_INSN_BOUND_CD; goto extract_sfmt_bound_cd;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2286,14 +1713,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa00)
-              { itype = CRISV10F_INSN_ADD_M_B_M; goto extract_sfmt_add_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe0f)
-              { itype = CRISV10F_INSN_ADDCBR; goto extract_sfmt_addcbr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_ADD_M_B_M; goto extract_sfmt_add_m_b_m;
+          case 15 : itype = CRISV10F_INSN_ADDCBR; goto extract_sfmt_addcbr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2316,14 +1737,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa10)
-              { itype = CRISV10F_INSN_ADD_M_W_M; goto extract_sfmt_add_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe1f)
-              { itype = CRISV10F_INSN_ADDCWR; goto extract_sfmt_addcwr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_ADD_M_W_M; goto extract_sfmt_add_m_w_m;
+          case 15 : itype = CRISV10F_INSN_ADDCWR; goto extract_sfmt_addcwr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2365,14 +1780,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0xa20)
-                  { itype = CRISV10F_INSN_ADD_M_D_M; goto extract_sfmt_add_m_d_m; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xfff) == 0xe2f)
-                  { itype = CRISV10F_INSN_ADDCDR; goto extract_sfmt_addcdr; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV10F_INSN_ADD_M_D_M; goto extract_sfmt_add_m_d_m;
+              case 15 : itype = CRISV10F_INSN_ADDCDR; goto extract_sfmt_addcdr;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2395,14 +1804,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0xa20)
-                  { itype = CRISV10F_INSN_ADD_M_D_M; goto extract_sfmt_add_m_d_m; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xffff) == 0xfe2f)
-                  { itype = CRISV10F_INSN_ADDCPC; goto extract_sfmt_addcpc; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV10F_INSN_ADD_M_D_M; goto extract_sfmt_add_m_d_m;
+              case 15 : itype = CRISV10F_INSN_ADDCPC; goto extract_sfmt_addcpc;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2434,10 +1837,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 24 : /* fall through */
           case 26 : /* fall through */
           case 28 : /* fall through */
-          case 30 :
-            if ((base_insn & 0xbf0) == 0xa30)
-              { itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 30 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
           case 1 :
             {
               unsigned int val = (((insn >> 1) & (7 << 0)));
@@ -2449,14 +1849,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 3 : /* fall through */
               case 4 : /* fall through */
               case 5 : /* fall through */
-              case 6 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 7 :
-                if ((base_insn & 0xffff) == 0xe3f)
-                  { itype = CRISV10F_INSN_MOVE_M_PCPLUS_P0; goto extract_sfmt_move_m_pcplus_p0; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 6 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
+              case 7 : itype = CRISV10F_INSN_MOVE_M_PCPLUS_P0; goto extract_sfmt_move_m_pcplus_p0;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2471,14 +1865,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 3 : /* fall through */
               case 4 : /* fall through */
               case 5 : /* fall through */
-              case 6 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 7 :
-                if ((base_insn & 0xffff) == 0x5e3f)
-                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P5; goto extract_sfmt_move_c_sprv10_p5; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 6 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
+              case 7 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P5; goto extract_sfmt_move_c_sprv10_p5;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2493,14 +1881,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 3 : /* fall through */
               case 4 : /* fall through */
               case 5 : /* fall through */
-              case 6 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 7 :
-                if ((base_insn & 0xffff) == 0x7e3f)
-                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P7; goto extract_sfmt_move_c_sprv10_p9; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 6 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
+              case 7 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P7; goto extract_sfmt_move_c_sprv10_p9;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2515,14 +1897,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 3 : /* fall through */
               case 4 : /* fall through */
               case 5 : /* fall through */
-              case 6 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 7 :
-                if ((base_insn & 0xffff) == 0x8e3e)
-                  { itype = CRISV10F_INSN_MOVE_M_SPPLUS_P8; goto extract_sfmt_move_m_spplus_p8; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 6 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
+              case 7 : itype = CRISV10F_INSN_MOVE_M_SPPLUS_P8; goto extract_sfmt_move_m_spplus_p8;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2537,14 +1913,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 3 : /* fall through */
               case 4 : /* fall through */
               case 5 : /* fall through */
-              case 6 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 7 :
-                if ((base_insn & 0xffff) == 0x9e3f)
-                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P9; goto extract_sfmt_move_c_sprv10_p9; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 6 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
+              case 7 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P9; goto extract_sfmt_move_c_sprv10_p9;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2559,14 +1929,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 3 : /* fall through */
               case 4 : /* fall through */
               case 5 : /* fall through */
-              case 6 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 7 :
-                if ((base_insn & 0xffff) == 0xae3f)
-                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P10; goto extract_sfmt_move_c_sprv10_p9; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 6 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
+              case 7 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P10; goto extract_sfmt_move_c_sprv10_p9;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2581,14 +1945,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 3 : /* fall through */
               case 4 : /* fall through */
               case 5 : /* fall through */
-              case 6 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 7 :
-                if ((base_insn & 0xffff) == 0xbe3f)
-                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P11; goto extract_sfmt_move_c_sprv10_p9; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 6 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
+              case 7 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P11; goto extract_sfmt_move_c_sprv10_p9;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2603,14 +1961,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 3 : /* fall through */
               case 4 : /* fall through */
               case 5 : /* fall through */
-              case 6 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 7 :
-                if ((base_insn & 0xffff) == 0xce3f)
-                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P12; goto extract_sfmt_move_c_sprv10_p9; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 6 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
+              case 7 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P12; goto extract_sfmt_move_c_sprv10_p9;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2625,14 +1977,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 3 : /* fall through */
               case 4 : /* fall through */
               case 5 : /* fall through */
-              case 6 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 7 :
-                if ((base_insn & 0xffff) == 0xde3f)
-                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P13; goto extract_sfmt_move_c_sprv10_p9; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 6 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
+              case 7 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P13; goto extract_sfmt_move_c_sprv10_p9;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2647,14 +1993,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 3 : /* fall through */
               case 4 : /* fall through */
               case 5 : /* fall through */
-              case 6 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 7 :
-                if ((base_insn & 0xffff) == 0xee3f)
-                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P14; goto extract_sfmt_move_c_sprv10_p9; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 6 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
+              case 7 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P14; goto extract_sfmt_move_c_sprv10_p9;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2669,14 +2009,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 3 : /* fall through */
               case 4 : /* fall through */
               case 5 : /* fall through */
-              case 6 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 7 :
-                if ((base_insn & 0xffff) == 0xfe3f)
-                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P15; goto extract_sfmt_move_c_sprv10_p9; }
-                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 6 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
+              case 7 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P15; goto extract_sfmt_move_c_sprv10_p9;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2702,14 +2036,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa40)
-              { itype = CRISV10F_INSN_MOVE_M_B_M; goto extract_sfmt_move_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe4f)
-              { itype = CRISV10F_INSN_MOVECBR; goto extract_sfmt_movecbr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_MOVE_M_B_M; goto extract_sfmt_move_m_b_m;
+          case 15 : itype = CRISV10F_INSN_MOVECBR; goto extract_sfmt_movecbr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2732,14 +2060,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa50)
-              { itype = CRISV10F_INSN_MOVE_M_W_M; goto extract_sfmt_move_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe5f)
-              { itype = CRISV10F_INSN_MOVECWR; goto extract_sfmt_movecwr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_MOVE_M_W_M; goto extract_sfmt_move_m_w_m;
+          case 15 : itype = CRISV10F_INSN_MOVECWR; goto extract_sfmt_movecwr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2762,14 +2084,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa60)
-              { itype = CRISV10F_INSN_MOVE_M_D_M; goto extract_sfmt_move_m_d_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe6f)
-              { itype = CRISV10F_INSN_MOVECDR; goto extract_sfmt_movecdr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_MOVE_M_D_M; goto extract_sfmt_move_m_d_m;
+          case 15 : itype = CRISV10F_INSN_MOVECDR; goto extract_sfmt_movecdr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2792,14 +2108,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa80)
-              { itype = CRISV10F_INSN_SUB_M_B_M; goto extract_sfmt_add_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe8f)
-              { itype = CRISV10F_INSN_SUBCBR; goto extract_sfmt_addcbr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_SUB_M_B_M; goto extract_sfmt_add_m_b_m;
+          case 15 : itype = CRISV10F_INSN_SUBCBR; goto extract_sfmt_addcbr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2822,14 +2132,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa90)
-              { itype = CRISV10F_INSN_SUB_M_W_M; goto extract_sfmt_add_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe9f)
-              { itype = CRISV10F_INSN_SUBCWR; goto extract_sfmt_addcwr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_SUB_M_W_M; goto extract_sfmt_add_m_w_m;
+          case 15 : itype = CRISV10F_INSN_SUBCWR; goto extract_sfmt_addcwr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2852,14 +2156,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xaa0)
-              { itype = CRISV10F_INSN_SUB_M_D_M; goto extract_sfmt_add_m_d_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xeaf)
-              { itype = CRISV10F_INSN_SUBCDR; goto extract_sfmt_addcdr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_SUB_M_D_M; goto extract_sfmt_add_m_d_m;
+          case 15 : itype = CRISV10F_INSN_SUBCDR; goto extract_sfmt_addcdr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2882,14 +2180,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xac0)
-              { itype = CRISV10F_INSN_CMP_M_B_M; goto extract_sfmt_cmp_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xecf)
-              { itype = CRISV10F_INSN_CMPCBR; goto extract_sfmt_cmpcbr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_CMP_M_B_M; goto extract_sfmt_cmp_m_b_m;
+          case 15 : itype = CRISV10F_INSN_CMPCBR; goto extract_sfmt_cmpcbr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2912,14 +2204,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xad0)
-              { itype = CRISV10F_INSN_CMP_M_W_M; goto extract_sfmt_cmp_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xedf)
-              { itype = CRISV10F_INSN_CMPCWR; goto extract_sfmt_cmpcwr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_CMP_M_W_M; goto extract_sfmt_cmp_m_w_m;
+          case 15 : itype = CRISV10F_INSN_CMPCWR; goto extract_sfmt_cmpcwr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2942,14 +2228,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xae0)
-              { itype = CRISV10F_INSN_CMP_M_D_M; goto extract_sfmt_cmp_m_d_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xeef)
-              { itype = CRISV10F_INSN_CMPCDR; goto extract_sfmt_cmpcdr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_CMP_M_D_M; goto extract_sfmt_cmp_m_d_m;
+          case 15 : itype = CRISV10F_INSN_CMPCDR; goto extract_sfmt_cmpcdr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2972,14 +2252,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xb00)
-              { itype = CRISV10F_INSN_AND_M_B_M; goto extract_sfmt_and_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xf0f)
-              { itype = CRISV10F_INSN_ANDCBR; goto extract_sfmt_andcbr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_AND_M_B_M; goto extract_sfmt_and_m_b_m;
+          case 15 : itype = CRISV10F_INSN_ANDCBR; goto extract_sfmt_andcbr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3002,14 +2276,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xb10)
-              { itype = CRISV10F_INSN_AND_M_W_M; goto extract_sfmt_and_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xf1f)
-              { itype = CRISV10F_INSN_ANDCWR; goto extract_sfmt_andcwr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_AND_M_W_M; goto extract_sfmt_and_m_w_m;
+          case 15 : itype = CRISV10F_INSN_ANDCWR; goto extract_sfmt_andcwr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3032,14 +2300,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xb20)
-              { itype = CRISV10F_INSN_AND_M_D_M; goto extract_sfmt_and_m_d_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xf2f)
-              { itype = CRISV10F_INSN_ANDCDR; goto extract_sfmt_andcdr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_AND_M_D_M; goto extract_sfmt_and_m_d_m;
+          case 15 : itype = CRISV10F_INSN_ANDCDR; goto extract_sfmt_andcdr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3062,14 +2324,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xb40)
-              { itype = CRISV10F_INSN_OR_M_B_M; goto extract_sfmt_and_m_b_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xf4f)
-              { itype = CRISV10F_INSN_ORCBR; goto extract_sfmt_andcbr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_OR_M_B_M; goto extract_sfmt_and_m_b_m;
+          case 15 : itype = CRISV10F_INSN_ORCBR; goto extract_sfmt_andcbr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3092,14 +2348,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xb50)
-              { itype = CRISV10F_INSN_OR_M_W_M; goto extract_sfmt_and_m_w_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xf5f)
-              { itype = CRISV10F_INSN_ORCWR; goto extract_sfmt_andcwr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_OR_M_W_M; goto extract_sfmt_and_m_w_m;
+          case 15 : itype = CRISV10F_INSN_ORCWR; goto extract_sfmt_andcwr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3122,14 +2372,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xb60)
-              { itype = CRISV10F_INSN_OR_M_D_M; goto extract_sfmt_and_m_d_m; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xf6f)
-              { itype = CRISV10F_INSN_ORCDR; goto extract_sfmt_andcdr; }
-            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV10F_INSN_OR_M_D_M; goto extract_sfmt_and_m_d_m;
+          case 15 : itype = CRISV10F_INSN_ORCDR; goto extract_sfmt_andcdr;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3187,7 +2431,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -3215,7 +2459,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -3324,7 +2568,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   /* Record the fields for profiling.  */
   if (PROFILE_MODEL_P (current_cpu))
     {
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -3354,7 +2598,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   /* Record the fields for profiling.  */
   if (PROFILE_MODEL_P (current_cpu))
     {
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -3532,7 +2776,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -3865,7 +3109,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -3897,7 +3141,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -3929,7 +3173,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -4049,7 +3293,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Ps) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rs) = FLD (f_operand1);
+      FLD (out_h_gr_SI_index_of__INT_Rs) = FLD (f_operand1);
     }
 #endif
 #undef FLD
@@ -4377,7 +3621,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4406,7 +3650,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4439,7 +3683,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -4472,7 +3716,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -4505,7 +3749,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -4536,7 +3780,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4567,7 +3811,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4598,7 +3842,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4657,7 +3901,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -4690,7 +3934,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -4721,7 +3965,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4752,7 +3996,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4828,7 +4072,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4856,7 +4100,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -5153,36 +4397,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
-    }
-#endif
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_and_w_r:
-  {
-    const IDESC *idesc = &crisv10f_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
-#define FLD(f) abuf->fields.sfmt_add_b_r.f
-    UINT f_operand2;
-    UINT f_operand1;
-
-    f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
-    f_operand1 = EXTRACT_LSB0_UINT (insn, 16, 3, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_operand2) = f_operand2;
-  FLD (f_operand1) = f_operand1;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_w_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0));
-
-#if WITH_PROFILE_MODEL_P
-  /* Record the fields for profiling.  */
-  if (PROFILE_MODEL_P (current_cpu))
-    {
-      FLD (in_Rd) = f_operand2;
-      FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -5211,7 +4426,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -5244,7 +4459,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -5277,7 +4492,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -5310,7 +4525,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -5341,7 +4556,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -5372,7 +4587,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -5403,7 +4618,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -5431,7 +4646,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -5466,35 +4681,6 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     return idesc;
   }
 
- extract_sfmt_asrr_b_r:
-  {
-    const IDESC *idesc = &crisv10f_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
-#define FLD(f) abuf->fields.sfmt_add_b_r.f
-    UINT f_operand2;
-    UINT f_operand1;
-
-    f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
-    f_operand1 = EXTRACT_LSB0_UINT (insn, 16, 3, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_operand2) = f_operand2;
-  FLD (f_operand1) = f_operand1;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_asrr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0));
-
-#if WITH_PROFILE_MODEL_P
-  /* Record the fields for profiling.  */
-  if (PROFILE_MODEL_P (current_cpu))
-    {
-      FLD (in_Rd) = f_operand2;
-      FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
-    }
-#endif
-#undef FLD
-    return idesc;
-  }
-
  extract_sfmt_asrq:
   {
     const IDESC *idesc = &crisv10f_insn_data[itype];
@@ -5545,7 +4731,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -5574,7 +4760,7 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
diff --git a/sim/cris/decodev10.h b/sim/cris/decodev10.h
index d082d41..11c11fa 100644
--- a/sim/cris/decodev10.h
+++ b/sim/cris/decodev10.h
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
@@ -108,18 +108,18 @@ typedef enum crisv10f_sfmt_type {
  , CRISV10F_SFMT_NEG_B_R, CRISV10F_SFMT_NEG_D_R, CRISV10F_SFMT_TEST_M_B_M, CRISV10F_SFMT_TEST_M_W_M
  , CRISV10F_SFMT_TEST_M_D_M, CRISV10F_SFMT_MOVE_R_M_B_M, CRISV10F_SFMT_MOVE_R_M_W_M, CRISV10F_SFMT_MOVE_R_M_D_M
  , CRISV10F_SFMT_MULS_B, CRISV10F_SFMT_MSTEP, CRISV10F_SFMT_DSTEP, CRISV10F_SFMT_AND_B_R
- , CRISV10F_SFMT_AND_W_R, CRISV10F_SFMT_AND_D_R, CRISV10F_SFMT_AND_M_B_M, CRISV10F_SFMT_AND_M_W_M
- , CRISV10F_SFMT_AND_M_D_M, CRISV10F_SFMT_ANDCBR, CRISV10F_SFMT_ANDCWR, CRISV10F_SFMT_ANDCDR
- , CRISV10F_SFMT_ANDQ, CRISV10F_SFMT_SWAP, CRISV10F_SFMT_ASRR_B_R, CRISV10F_SFMT_ASRQ
- , CRISV10F_SFMT_LSRR_B_R, CRISV10F_SFMT_LSRR_D_R, CRISV10F_SFMT_BTST, CRISV10F_SFMT_BTSTQ
- , CRISV10F_SFMT_SETF, CRISV10F_SFMT_BCC_B, CRISV10F_SFMT_BA_B, CRISV10F_SFMT_BCC_W
- , CRISV10F_SFMT_BA_W, CRISV10F_SFMT_JUMP_R, CRISV10F_SFMT_JUMP_M, CRISV10F_SFMT_JUMP_C
- , CRISV10F_SFMT_BREAK, CRISV10F_SFMT_BOUND_M_B_M, CRISV10F_SFMT_BOUND_M_W_M, CRISV10F_SFMT_BOUND_M_D_M
- , CRISV10F_SFMT_BOUND_CB, CRISV10F_SFMT_BOUND_CW, CRISV10F_SFMT_BOUND_CD, CRISV10F_SFMT_SCC
- , CRISV10F_SFMT_ADDOQ, CRISV10F_SFMT_BDAPQPC, CRISV10F_SFMT_BDAP_32_PC, CRISV10F_SFMT_MOVE_M_PCPLUS_P0
- , CRISV10F_SFMT_MOVE_M_SPPLUS_P8, CRISV10F_SFMT_ADDO_M_B_M, CRISV10F_SFMT_ADDO_M_W_M, CRISV10F_SFMT_ADDO_M_D_M
- , CRISV10F_SFMT_ADDO_CB, CRISV10F_SFMT_ADDO_CW, CRISV10F_SFMT_ADDO_CD, CRISV10F_SFMT_DIP_M
- , CRISV10F_SFMT_DIP_C, CRISV10F_SFMT_ADDI_ACR_B_R, CRISV10F_SFMT_BIAP_PC_B_R
+ , CRISV10F_SFMT_AND_D_R, CRISV10F_SFMT_AND_M_B_M, CRISV10F_SFMT_AND_M_W_M, CRISV10F_SFMT_AND_M_D_M
+ , CRISV10F_SFMT_ANDCBR, CRISV10F_SFMT_ANDCWR, CRISV10F_SFMT_ANDCDR, CRISV10F_SFMT_ANDQ
+ , CRISV10F_SFMT_SWAP, CRISV10F_SFMT_ASRQ, CRISV10F_SFMT_LSRR_B_R, CRISV10F_SFMT_LSRR_D_R
+ , CRISV10F_SFMT_BTST, CRISV10F_SFMT_BTSTQ, CRISV10F_SFMT_SETF, CRISV10F_SFMT_BCC_B
+ , CRISV10F_SFMT_BA_B, CRISV10F_SFMT_BCC_W, CRISV10F_SFMT_BA_W, CRISV10F_SFMT_JUMP_R
+ , CRISV10F_SFMT_JUMP_M, CRISV10F_SFMT_JUMP_C, CRISV10F_SFMT_BREAK, CRISV10F_SFMT_BOUND_M_B_M
+ , CRISV10F_SFMT_BOUND_M_W_M, CRISV10F_SFMT_BOUND_M_D_M, CRISV10F_SFMT_BOUND_CB, CRISV10F_SFMT_BOUND_CW
+ , CRISV10F_SFMT_BOUND_CD, CRISV10F_SFMT_SCC, CRISV10F_SFMT_ADDOQ, CRISV10F_SFMT_BDAPQPC
+ , CRISV10F_SFMT_BDAP_32_PC, CRISV10F_SFMT_MOVE_M_PCPLUS_P0, CRISV10F_SFMT_MOVE_M_SPPLUS_P8, CRISV10F_SFMT_ADDO_M_B_M
+ , CRISV10F_SFMT_ADDO_M_W_M, CRISV10F_SFMT_ADDO_M_D_M, CRISV10F_SFMT_ADDO_CB, CRISV10F_SFMT_ADDO_CW
+ , CRISV10F_SFMT_ADDO_CD, CRISV10F_SFMT_DIP_M, CRISV10F_SFMT_DIP_C, CRISV10F_SFMT_ADDI_ACR_B_R
+ , CRISV10F_SFMT_BIAP_PC_B_R
 } CRISV10F_SFMT_TYPE;
 
 /* Function unit handlers (user written).  */
diff --git a/sim/cris/decodev32.c b/sim/cris/decodev32.c
index 27063b0..c2ee3a5 100644
--- a/sim/cris/decodev32.c
+++ b/sim/cris/decodev32.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
@@ -178,7 +178,7 @@ static const struct insn_sem crisv32f_insn_sem[] =
   { CRIS_INSN_DSTEP, CRISV32F_INSN_DSTEP, CRISV32F_SFMT_DSTEP },
   { CRIS_INSN_ABS, CRISV32F_INSN_ABS, CRISV32F_SFMT_MOVS_B_R },
   { CRIS_INSN_AND_B_R, CRISV32F_INSN_AND_B_R, CRISV32F_SFMT_AND_B_R },
-  { CRIS_INSN_AND_W_R, CRISV32F_INSN_AND_W_R, CRISV32F_SFMT_AND_W_R },
+  { CRIS_INSN_AND_W_R, CRISV32F_INSN_AND_W_R, CRISV32F_SFMT_AND_B_R },
   { CRIS_INSN_AND_D_R, CRISV32F_INSN_AND_D_R, CRISV32F_SFMT_AND_D_R },
   { CRIS_INSN_AND_M_B_M, CRISV32F_INSN_AND_M_B_M, CRISV32F_SFMT_AND_M_B_M },
   { CRIS_INSN_AND_M_W_M, CRISV32F_INSN_AND_M_W_M, CRISV32F_SFMT_AND_M_W_M },
@@ -188,7 +188,7 @@ static const struct insn_sem crisv32f_insn_sem[] =
   { CRIS_INSN_ANDCDR, CRISV32F_INSN_ANDCDR, CRISV32F_SFMT_ANDCDR },
   { CRIS_INSN_ANDQ, CRISV32F_INSN_ANDQ, CRISV32F_SFMT_ANDQ },
   { CRIS_INSN_ORR_B_R, CRISV32F_INSN_ORR_B_R, CRISV32F_SFMT_AND_B_R },
-  { CRIS_INSN_ORR_W_R, CRISV32F_INSN_ORR_W_R, CRISV32F_SFMT_AND_W_R },
+  { CRIS_INSN_ORR_W_R, CRISV32F_INSN_ORR_W_R, CRISV32F_SFMT_AND_B_R },
   { CRIS_INSN_ORR_D_R, CRISV32F_INSN_ORR_D_R, CRISV32F_SFMT_AND_D_R },
   { CRIS_INSN_OR_M_B_M, CRISV32F_INSN_OR_M_B_M, CRISV32F_SFMT_AND_M_B_M },
   { CRIS_INSN_OR_M_W_M, CRISV32F_INSN_OR_M_W_M, CRISV32F_SFMT_AND_M_W_M },
@@ -199,8 +199,8 @@ static const struct insn_sem crisv32f_insn_sem[] =
   { CRIS_INSN_ORQ, CRISV32F_INSN_ORQ, CRISV32F_SFMT_ANDQ },
   { CRIS_INSN_XOR, CRISV32F_INSN_XOR, CRISV32F_SFMT_DSTEP },
   { CRIS_INSN_SWAP, CRISV32F_INSN_SWAP, CRISV32F_SFMT_SWAP },
-  { CRIS_INSN_ASRR_B_R, CRISV32F_INSN_ASRR_B_R, CRISV32F_SFMT_ASRR_B_R },
-  { CRIS_INSN_ASRR_W_R, CRISV32F_INSN_ASRR_W_R, CRISV32F_SFMT_ASRR_B_R },
+  { CRIS_INSN_ASRR_B_R, CRISV32F_INSN_ASRR_B_R, CRISV32F_SFMT_AND_B_R },
+  { CRIS_INSN_ASRR_W_R, CRISV32F_INSN_ASRR_W_R, CRISV32F_SFMT_AND_B_R },
   { CRIS_INSN_ASRR_D_R, CRISV32F_INSN_ASRR_D_R, CRISV32F_SFMT_AND_D_R },
   { CRIS_INSN_ASRQ, CRISV32F_INSN_ASRQ, CRISV32F_SFMT_ASRQ },
   { CRIS_INSN_LSRR_B_R, CRISV32F_INSN_LSRR_B_R, CRISV32F_SFMT_LSRR_B_R },
@@ -367,14 +367,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 15 :
-            if ((base_insn & 0xf00) == 0x0)
-              { itype = CRISV32F_INSN_BCC_B; goto extract_sfmt_bcc_b; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 14 :
-            if ((base_insn & 0xff00) == 0xe000)
-              { itype = CRISV32F_INSN_BA_B; goto extract_sfmt_ba_b; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 15 : itype = CRISV32F_INSN_BCC_B; goto extract_sfmt_bcc_b;
+          case 14 : itype = CRISV32F_INSN_BA_B; goto extract_sfmt_ba_b;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -393,404 +387,122 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
       case 28 : /* fall through */
       case 29 : /* fall through */
       case 30 : /* fall through */
-      case 31 :
-        if ((base_insn & 0xf00) == 0x100)
-          { itype = CRISV32F_INSN_ADDOQ; goto extract_sfmt_addoq; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 31 : itype = CRISV32F_INSN_ADDOQ; goto extract_sfmt_addoq;
       case 32 : /* fall through */
       case 33 : /* fall through */
       case 34 : /* fall through */
-      case 35 :
-        if ((base_insn & 0xfc0) == 0x200)
-          { itype = CRISV32F_INSN_ADDQ; goto extract_sfmt_addq; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 35 : itype = CRISV32F_INSN_ADDQ; goto extract_sfmt_addq;
       case 36 : /* fall through */
       case 37 : /* fall through */
       case 38 : /* fall through */
-      case 39 :
-        if ((base_insn & 0xfc0) == 0x240)
-          { itype = CRISV32F_INSN_MOVEQ; goto extract_sfmt_moveq; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 39 : itype = CRISV32F_INSN_MOVEQ; goto extract_sfmt_moveq;
       case 40 : /* fall through */
       case 41 : /* fall through */
       case 42 : /* fall through */
-      case 43 :
-        if ((base_insn & 0xfc0) == 0x280)
-          { itype = CRISV32F_INSN_SUBQ; goto extract_sfmt_addq; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 43 : itype = CRISV32F_INSN_SUBQ; goto extract_sfmt_addq;
       case 44 : /* fall through */
       case 45 : /* fall through */
       case 46 : /* fall through */
-      case 47 :
-        if ((base_insn & 0xfc0) == 0x2c0)
-          { itype = CRISV32F_INSN_CMPQ; goto extract_sfmt_cmpq; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 47 : itype = CRISV32F_INSN_CMPQ; goto extract_sfmt_cmpq;
       case 48 : /* fall through */
       case 49 : /* fall through */
       case 50 : /* fall through */
-      case 51 :
-        if ((base_insn & 0xfc0) == 0x300)
-          { itype = CRISV32F_INSN_ANDQ; goto extract_sfmt_andq; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 51 : itype = CRISV32F_INSN_ANDQ; goto extract_sfmt_andq;
       case 52 : /* fall through */
       case 53 : /* fall through */
       case 54 : /* fall through */
-      case 55 :
-        if ((base_insn & 0xfc0) == 0x340)
-          { itype = CRISV32F_INSN_ORQ; goto extract_sfmt_andq; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 55 : itype = CRISV32F_INSN_ORQ; goto extract_sfmt_andq;
       case 56 : /* fall through */
-      case 57 :
-        if ((base_insn & 0xfe0) == 0x380)
-          { itype = CRISV32F_INSN_BTSTQ; goto extract_sfmt_btstq; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 57 : itype = CRISV32F_INSN_BTSTQ; goto extract_sfmt_btstq;
       case 58 : /* fall through */
-      case 59 :
-        if ((base_insn & 0xfe0) == 0x3a0)
-          { itype = CRISV32F_INSN_ASRQ; goto extract_sfmt_asrq; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 59 : itype = CRISV32F_INSN_ASRQ; goto extract_sfmt_asrq;
       case 60 : /* fall through */
-      case 61 :
-        if ((base_insn & 0xfe0) == 0x3c0)
-          { itype = CRISV32F_INSN_LSLQ; goto extract_sfmt_asrq; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 61 : itype = CRISV32F_INSN_LSLQ; goto extract_sfmt_asrq;
       case 62 : /* fall through */
-      case 63 :
-        if ((base_insn & 0xfe0) == 0x3e0)
-          { itype = CRISV32F_INSN_LSRQ; goto extract_sfmt_asrq; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 64 :
-        if ((base_insn & 0xff0) == 0x400)
-          { itype = CRISV32F_INSN_ADDU_B_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 65 :
-        if ((base_insn & 0xff0) == 0x410)
-          { itype = CRISV32F_INSN_ADDU_W_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 66 :
-        if ((base_insn & 0xff0) == 0x420)
-          { itype = CRISV32F_INSN_ADDS_B_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 67 :
-        if ((base_insn & 0xff0) == 0x430)
-          { itype = CRISV32F_INSN_ADDS_W_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 68 :
-        if ((base_insn & 0xff0) == 0x440)
-          { itype = CRISV32F_INSN_MOVU_B_R; goto extract_sfmt_movs_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 69 :
-        if ((base_insn & 0xff0) == 0x450)
-          { itype = CRISV32F_INSN_MOVU_W_R; goto extract_sfmt_movs_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 70 :
-        if ((base_insn & 0xff0) == 0x460)
-          { itype = CRISV32F_INSN_MOVS_B_R; goto extract_sfmt_movs_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 71 :
-        if ((base_insn & 0xff0) == 0x470)
-          { itype = CRISV32F_INSN_MOVS_W_R; goto extract_sfmt_movs_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 72 :
-        if ((base_insn & 0xff0) == 0x480)
-          { itype = CRISV32F_INSN_SUBU_B_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 73 :
-        if ((base_insn & 0xff0) == 0x490)
-          { itype = CRISV32F_INSN_SUBU_W_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 74 :
-        if ((base_insn & 0xff0) == 0x4a0)
-          { itype = CRISV32F_INSN_SUBS_B_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 75 :
-        if ((base_insn & 0xff0) == 0x4b0)
-          { itype = CRISV32F_INSN_SUBS_W_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 76 :
-        if ((base_insn & 0xff0) == 0x4c0)
-          { itype = CRISV32F_INSN_LSLR_B_R; goto extract_sfmt_lsrr_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 77 :
-        if ((base_insn & 0xff0) == 0x4d0)
-          { itype = CRISV32F_INSN_LSLR_W_R; goto extract_sfmt_lsrr_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 78 :
-        if ((base_insn & 0xff0) == 0x4e0)
-          { itype = CRISV32F_INSN_LSLR_D_R; goto extract_sfmt_lsrr_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 79 :
-        if ((base_insn & 0xff0) == 0x4f0)
-          { itype = CRISV32F_INSN_BTST; goto extract_sfmt_btst; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 80 :
-        if ((base_insn & 0xff0) == 0x500)
-          { itype = CRISV32F_INSN_ADDI_B_R; goto extract_sfmt_addi_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 81 :
-        if ((base_insn & 0xff0) == 0x510)
-          { itype = CRISV32F_INSN_ADDI_W_R; goto extract_sfmt_addi_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 82 :
-        if ((base_insn & 0xff0) == 0x520)
-          { itype = CRISV32F_INSN_ADDI_D_R; goto extract_sfmt_addi_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 83 :
-        if ((base_insn & 0xff0) == 0x530)
-          { itype = CRISV32F_INSN_SCC; goto extract_sfmt_scc; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 84 :
-        if ((base_insn & 0xff0) == 0x540)
-          { itype = CRISV32F_INSN_ADDI_ACR_B_R; goto extract_sfmt_addi_acr_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 85 :
-        if ((base_insn & 0xff0) == 0x550)
-          { itype = CRISV32F_INSN_ADDI_ACR_W_R; goto extract_sfmt_addi_acr_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 86 :
-        if ((base_insn & 0xff0) == 0x560)
-          { itype = CRISV32F_INSN_ADDI_ACR_D_R; goto extract_sfmt_addi_acr_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 87 :
-        if ((base_insn & 0xff0) == 0x570)
-          { itype = CRISV32F_INSN_ADDC_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 88 :
-        if ((base_insn & 0xff0) == 0x580)
-          { itype = CRISV32F_INSN_NEG_B_R; goto extract_sfmt_neg_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 89 :
-        if ((base_insn & 0xff0) == 0x590)
-          { itype = CRISV32F_INSN_NEG_W_R; goto extract_sfmt_neg_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 90 :
-        if ((base_insn & 0xff0) == 0x5a0)
-          { itype = CRISV32F_INSN_NEG_D_R; goto extract_sfmt_neg_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 91 :
-        if ((base_insn & 0xff0) == 0x5b0)
-          { itype = CRISV32F_INSN_SETF; goto extract_sfmt_setf; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 92 :
-        if ((base_insn & 0xff0) == 0x5c0)
-          { itype = CRISV32F_INSN_BOUND_R_B_R; goto extract_sfmt_dstep; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 93 :
-        if ((base_insn & 0xff0) == 0x5d0)
-          { itype = CRISV32F_INSN_BOUND_R_W_R; goto extract_sfmt_dstep; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 94 :
-        if ((base_insn & 0xff0) == 0x5e0)
-          { itype = CRISV32F_INSN_BOUND_R_D_R; goto extract_sfmt_dstep; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 95 :
-        if ((base_insn & 0xff0) == 0x5f0)
-          { itype = CRISV32F_INSN_CLEARF; goto extract_sfmt_setf; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 96 :
-        if ((base_insn & 0xff0) == 0x600)
-          { itype = CRISV32F_INSN_ADD_B_R; goto extract_sfmt_add_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 97 :
-        if ((base_insn & 0xff0) == 0x610)
-          { itype = CRISV32F_INSN_ADD_W_R; goto extract_sfmt_add_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 98 :
-        if ((base_insn & 0xff0) == 0x620)
-          { itype = CRISV32F_INSN_ADD_D_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 99 :
-        if ((base_insn & 0xff0) == 0x630)
-          { itype = CRISV32F_INSN_MOVE_R_SPRV32; goto extract_sfmt_move_r_sprv32; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 100 :
-        if ((base_insn & 0xff0) == 0x640)
-          { itype = CRISV32F_INSN_MOVE_B_R; goto extract_sfmt_move_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 101 :
-        if ((base_insn & 0xff0) == 0x650)
-          { itype = CRISV32F_INSN_MOVE_W_R; goto extract_sfmt_move_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 102 :
-        if ((base_insn & 0xff0) == 0x660)
-          { itype = CRISV32F_INSN_MOVE_D_R; goto extract_sfmt_move_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 103 :
-        if ((base_insn & 0xff0) == 0x670)
-          { itype = CRISV32F_INSN_MOVE_SPR_RV32; goto extract_sfmt_move_spr_rv32; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 104 :
-        if ((base_insn & 0xff0) == 0x680)
-          { itype = CRISV32F_INSN_SUB_B_R; goto extract_sfmt_add_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 105 :
-        if ((base_insn & 0xff0) == 0x690)
-          { itype = CRISV32F_INSN_SUB_W_R; goto extract_sfmt_add_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 106 :
-        if ((base_insn & 0xff0) == 0x6a0)
-          { itype = CRISV32F_INSN_SUB_D_R; goto extract_sfmt_add_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 107 :
-        if ((base_insn & 0xff0) == 0x6b0)
-          { itype = CRISV32F_INSN_ABS; goto extract_sfmt_movs_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 108 :
-        if ((base_insn & 0xff0) == 0x6c0)
-          { itype = CRISV32F_INSN_CMP_R_B_R; goto extract_sfmt_cmp_r_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 109 :
-        if ((base_insn & 0xff0) == 0x6d0)
-          { itype = CRISV32F_INSN_CMP_R_W_R; goto extract_sfmt_cmp_r_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 110 :
-        if ((base_insn & 0xff0) == 0x6e0)
-          { itype = CRISV32F_INSN_CMP_R_D_R; goto extract_sfmt_cmp_r_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 111 :
-        if ((base_insn & 0xff0) == 0x6f0)
-          { itype = CRISV32F_INSN_DSTEP; goto extract_sfmt_dstep; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 112 :
-        if ((base_insn & 0xff0) == 0x700)
-          { itype = CRISV32F_INSN_AND_B_R; goto extract_sfmt_and_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 113 :
-        if ((base_insn & 0xff0) == 0x710)
-          { itype = CRISV32F_INSN_AND_W_R; goto extract_sfmt_and_w_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 114 :
-        if ((base_insn & 0xff0) == 0x720)
-          { itype = CRISV32F_INSN_AND_D_R; goto extract_sfmt_and_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 115 :
-        if ((base_insn & 0xff0) == 0x730)
-          { itype = CRISV32F_INSN_LZ; goto extract_sfmt_movs_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 116 :
-        if ((base_insn & 0xff0) == 0x740)
-          { itype = CRISV32F_INSN_ORR_B_R; goto extract_sfmt_and_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 117 :
-        if ((base_insn & 0xff0) == 0x750)
-          { itype = CRISV32F_INSN_ORR_W_R; goto extract_sfmt_and_w_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 118 :
-        if ((base_insn & 0xff0) == 0x760)
-          { itype = CRISV32F_INSN_ORR_D_R; goto extract_sfmt_and_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 119 :
-        if ((base_insn & 0xff0) == 0x770)
-          { itype = CRISV32F_INSN_SWAP; goto extract_sfmt_swap; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 120 :
-        if ((base_insn & 0xff0) == 0x780)
-          { itype = CRISV32F_INSN_ASRR_B_R; goto extract_sfmt_asrr_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 121 :
-        if ((base_insn & 0xff0) == 0x790)
-          { itype = CRISV32F_INSN_ASRR_W_R; goto extract_sfmt_asrr_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 122 :
-        if ((base_insn & 0xff0) == 0x7a0)
-          { itype = CRISV32F_INSN_ASRR_D_R; goto extract_sfmt_and_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 123 :
-        if ((base_insn & 0xff0) == 0x7b0)
-          { itype = CRISV32F_INSN_XOR; goto extract_sfmt_dstep; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 124 :
-        if ((base_insn & 0xff0) == 0x7c0)
-          { itype = CRISV32F_INSN_LSRR_B_R; goto extract_sfmt_lsrr_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 125 :
-        if ((base_insn & 0xff0) == 0x7d0)
-          { itype = CRISV32F_INSN_LSRR_W_R; goto extract_sfmt_lsrr_b_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 126 :
-        if ((base_insn & 0xff0) == 0x7e0)
-          { itype = CRISV32F_INSN_LSRR_D_R; goto extract_sfmt_lsrr_d_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 127 :
-        if ((base_insn & 0xff0) == 0x7f0)
-          { itype = CRISV32F_INSN_MCP; goto extract_sfmt_mcp; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 128 :
-        if ((base_insn & 0xbf0) == 0x800)
-          { itype = CRISV32F_INSN_ADDU_M_B_M; goto extract_sfmt_adds_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 129 :
-        if ((base_insn & 0xbf0) == 0x810)
-          { itype = CRISV32F_INSN_ADDU_M_W_M; goto extract_sfmt_adds_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 130 :
-        if ((base_insn & 0xbf0) == 0x820)
-          { itype = CRISV32F_INSN_ADDS_M_B_M; goto extract_sfmt_adds_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 131 :
-        if ((base_insn & 0xbf0) == 0x830)
-          { itype = CRISV32F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 132 :
-        if ((base_insn & 0xbf0) == 0x840)
-          { itype = CRISV32F_INSN_MOVU_M_B_M; goto extract_sfmt_movs_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 133 :
-        if ((base_insn & 0xbf0) == 0x850)
-          { itype = CRISV32F_INSN_MOVU_M_W_M; goto extract_sfmt_movs_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 134 :
-        if ((base_insn & 0xbf0) == 0x860)
-          { itype = CRISV32F_INSN_MOVS_M_B_M; goto extract_sfmt_movs_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 135 :
-        if ((base_insn & 0xbf0) == 0x870)
-          { itype = CRISV32F_INSN_MOVS_M_W_M; goto extract_sfmt_movs_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 136 :
-        if ((base_insn & 0xbf0) == 0x880)
-          { itype = CRISV32F_INSN_SUBU_M_B_M; goto extract_sfmt_adds_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 137 :
-        if ((base_insn & 0xbf0) == 0x890)
-          { itype = CRISV32F_INSN_SUBU_M_W_M; goto extract_sfmt_adds_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 138 :
-        if ((base_insn & 0xbf0) == 0x8a0)
-          { itype = CRISV32F_INSN_SUBS_M_B_M; goto extract_sfmt_adds_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 139 :
-        if ((base_insn & 0xbf0) == 0x8b0)
-          { itype = CRISV32F_INSN_SUBS_M_W_M; goto extract_sfmt_adds_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 140 :
-        if ((base_insn & 0xbf0) == 0x8c0)
-          { itype = CRISV32F_INSN_CMPU_M_B_M; goto extract_sfmt_cmp_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 141 :
-        if ((base_insn & 0xbf0) == 0x8d0)
-          { itype = CRISV32F_INSN_CMPU_M_W_M; goto extract_sfmt_cmp_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 142 :
-        if ((base_insn & 0xbf0) == 0x8e0)
-          { itype = CRISV32F_INSN_CMPS_M_B_M; goto extract_sfmt_cmp_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 143 :
-        if ((base_insn & 0xbf0) == 0x8f0)
-          { itype = CRISV32F_INSN_CMPS_M_W_M; goto extract_sfmt_cmp_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 144 :
-        if ((base_insn & 0xff0) == 0x900)
-          { itype = CRISV32F_INSN_MULU_B; goto extract_sfmt_muls_b; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 145 :
-        if ((base_insn & 0xff0) == 0x910)
-          { itype = CRISV32F_INSN_MULU_W; goto extract_sfmt_muls_b; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 146 :
-        if ((base_insn & 0xff0) == 0x920)
-          { itype = CRISV32F_INSN_MULU_D; goto extract_sfmt_muls_b; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 63 : itype = CRISV32F_INSN_LSRQ; goto extract_sfmt_asrq;
+      case 64 : itype = CRISV32F_INSN_ADDU_B_R; goto extract_sfmt_add_d_r;
+      case 65 : itype = CRISV32F_INSN_ADDU_W_R; goto extract_sfmt_add_d_r;
+      case 66 : itype = CRISV32F_INSN_ADDS_B_R; goto extract_sfmt_add_d_r;
+      case 67 : itype = CRISV32F_INSN_ADDS_W_R; goto extract_sfmt_add_d_r;
+      case 68 : itype = CRISV32F_INSN_MOVU_B_R; goto extract_sfmt_movs_b_r;
+      case 69 : itype = CRISV32F_INSN_MOVU_W_R; goto extract_sfmt_movs_b_r;
+      case 70 : itype = CRISV32F_INSN_MOVS_B_R; goto extract_sfmt_movs_b_r;
+      case 71 : itype = CRISV32F_INSN_MOVS_W_R; goto extract_sfmt_movs_b_r;
+      case 72 : itype = CRISV32F_INSN_SUBU_B_R; goto extract_sfmt_add_d_r;
+      case 73 : itype = CRISV32F_INSN_SUBU_W_R; goto extract_sfmt_add_d_r;
+      case 74 : itype = CRISV32F_INSN_SUBS_B_R; goto extract_sfmt_add_d_r;
+      case 75 : itype = CRISV32F_INSN_SUBS_W_R; goto extract_sfmt_add_d_r;
+      case 76 : itype = CRISV32F_INSN_LSLR_B_R; goto extract_sfmt_lsrr_b_r;
+      case 77 : itype = CRISV32F_INSN_LSLR_W_R; goto extract_sfmt_lsrr_b_r;
+      case 78 : itype = CRISV32F_INSN_LSLR_D_R; goto extract_sfmt_lsrr_d_r;
+      case 79 : itype = CRISV32F_INSN_BTST; goto extract_sfmt_btst;
+      case 80 : itype = CRISV32F_INSN_ADDI_B_R; goto extract_sfmt_addi_b_r;
+      case 81 : itype = CRISV32F_INSN_ADDI_W_R; goto extract_sfmt_addi_b_r;
+      case 82 : itype = CRISV32F_INSN_ADDI_D_R; goto extract_sfmt_addi_b_r;
+      case 83 : itype = CRISV32F_INSN_SCC; goto extract_sfmt_scc;
+      case 84 : itype = CRISV32F_INSN_ADDI_ACR_B_R; goto extract_sfmt_addi_acr_b_r;
+      case 85 : itype = CRISV32F_INSN_ADDI_ACR_W_R; goto extract_sfmt_addi_acr_b_r;
+      case 86 : itype = CRISV32F_INSN_ADDI_ACR_D_R; goto extract_sfmt_addi_acr_b_r;
+      case 87 : itype = CRISV32F_INSN_ADDC_R; goto extract_sfmt_add_d_r;
+      case 88 : itype = CRISV32F_INSN_NEG_B_R; goto extract_sfmt_neg_b_r;
+      case 89 : itype = CRISV32F_INSN_NEG_W_R; goto extract_sfmt_neg_b_r;
+      case 90 : itype = CRISV32F_INSN_NEG_D_R; goto extract_sfmt_neg_d_r;
+      case 91 : itype = CRISV32F_INSN_SETF; goto extract_sfmt_setf;
+      case 92 : itype = CRISV32F_INSN_BOUND_R_B_R; goto extract_sfmt_dstep;
+      case 93 : itype = CRISV32F_INSN_BOUND_R_W_R; goto extract_sfmt_dstep;
+      case 94 : itype = CRISV32F_INSN_BOUND_R_D_R; goto extract_sfmt_dstep;
+      case 95 : itype = CRISV32F_INSN_CLEARF; goto extract_sfmt_setf;
+      case 96 : itype = CRISV32F_INSN_ADD_B_R; goto extract_sfmt_add_b_r;
+      case 97 : itype = CRISV32F_INSN_ADD_W_R; goto extract_sfmt_add_b_r;
+      case 98 : itype = CRISV32F_INSN_ADD_D_R; goto extract_sfmt_add_d_r;
+      case 99 : itype = CRISV32F_INSN_MOVE_R_SPRV32; goto extract_sfmt_move_r_sprv32;
+      case 100 : itype = CRISV32F_INSN_MOVE_B_R; goto extract_sfmt_move_b_r;
+      case 101 : itype = CRISV32F_INSN_MOVE_W_R; goto extract_sfmt_move_b_r;
+      case 102 : itype = CRISV32F_INSN_MOVE_D_R; goto extract_sfmt_move_d_r;
+      case 103 : itype = CRISV32F_INSN_MOVE_SPR_RV32; goto extract_sfmt_move_spr_rv32;
+      case 104 : itype = CRISV32F_INSN_SUB_B_R; goto extract_sfmt_add_b_r;
+      case 105 : itype = CRISV32F_INSN_SUB_W_R; goto extract_sfmt_add_b_r;
+      case 106 : itype = CRISV32F_INSN_SUB_D_R; goto extract_sfmt_add_d_r;
+      case 107 : itype = CRISV32F_INSN_ABS; goto extract_sfmt_movs_b_r;
+      case 108 : itype = CRISV32F_INSN_CMP_R_B_R; goto extract_sfmt_cmp_r_b_r;
+      case 109 : itype = CRISV32F_INSN_CMP_R_W_R; goto extract_sfmt_cmp_r_b_r;
+      case 110 : itype = CRISV32F_INSN_CMP_R_D_R; goto extract_sfmt_cmp_r_b_r;
+      case 111 : itype = CRISV32F_INSN_DSTEP; goto extract_sfmt_dstep;
+      case 112 : itype = CRISV32F_INSN_AND_B_R; goto extract_sfmt_and_b_r;
+      case 113 : itype = CRISV32F_INSN_AND_W_R; goto extract_sfmt_and_b_r;
+      case 114 : itype = CRISV32F_INSN_AND_D_R; goto extract_sfmt_and_d_r;
+      case 115 : itype = CRISV32F_INSN_LZ; goto extract_sfmt_movs_b_r;
+      case 116 : itype = CRISV32F_INSN_ORR_B_R; goto extract_sfmt_and_b_r;
+      case 117 : itype = CRISV32F_INSN_ORR_W_R; goto extract_sfmt_and_b_r;
+      case 118 : itype = CRISV32F_INSN_ORR_D_R; goto extract_sfmt_and_d_r;
+      case 119 : itype = CRISV32F_INSN_SWAP; goto extract_sfmt_swap;
+      case 120 : itype = CRISV32F_INSN_ASRR_B_R; goto extract_sfmt_and_b_r;
+      case 121 : itype = CRISV32F_INSN_ASRR_W_R; goto extract_sfmt_and_b_r;
+      case 122 : itype = CRISV32F_INSN_ASRR_D_R; goto extract_sfmt_and_d_r;
+      case 123 : itype = CRISV32F_INSN_XOR; goto extract_sfmt_dstep;
+      case 124 : itype = CRISV32F_INSN_LSRR_B_R; goto extract_sfmt_lsrr_b_r;
+      case 125 : itype = CRISV32F_INSN_LSRR_W_R; goto extract_sfmt_lsrr_b_r;
+      case 126 : itype = CRISV32F_INSN_LSRR_D_R; goto extract_sfmt_lsrr_d_r;
+      case 127 : itype = CRISV32F_INSN_MCP; goto extract_sfmt_mcp;
+      case 128 : itype = CRISV32F_INSN_ADDU_M_B_M; goto extract_sfmt_adds_m_b_m;
+      case 129 : itype = CRISV32F_INSN_ADDU_M_W_M; goto extract_sfmt_adds_m_w_m;
+      case 130 : itype = CRISV32F_INSN_ADDS_M_B_M; goto extract_sfmt_adds_m_b_m;
+      case 131 : itype = CRISV32F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m;
+      case 132 : itype = CRISV32F_INSN_MOVU_M_B_M; goto extract_sfmt_movs_m_b_m;
+      case 133 : itype = CRISV32F_INSN_MOVU_M_W_M; goto extract_sfmt_movs_m_w_m;
+      case 134 : itype = CRISV32F_INSN_MOVS_M_B_M; goto extract_sfmt_movs_m_b_m;
+      case 135 : itype = CRISV32F_INSN_MOVS_M_W_M; goto extract_sfmt_movs_m_w_m;
+      case 136 : itype = CRISV32F_INSN_SUBU_M_B_M; goto extract_sfmt_adds_m_b_m;
+      case 137 : itype = CRISV32F_INSN_SUBU_M_W_M; goto extract_sfmt_adds_m_w_m;
+      case 138 : itype = CRISV32F_INSN_SUBS_M_B_M; goto extract_sfmt_adds_m_b_m;
+      case 139 : itype = CRISV32F_INSN_SUBS_M_W_M; goto extract_sfmt_adds_m_w_m;
+      case 140 : itype = CRISV32F_INSN_CMPU_M_B_M; goto extract_sfmt_cmp_m_b_m;
+      case 141 : itype = CRISV32F_INSN_CMPU_M_W_M; goto extract_sfmt_cmp_m_w_m;
+      case 142 : itype = CRISV32F_INSN_CMPS_M_B_M; goto extract_sfmt_cmp_m_b_m;
+      case 143 : itype = CRISV32F_INSN_CMPS_M_W_M; goto extract_sfmt_cmp_m_w_m;
+      case 144 : itype = CRISV32F_INSN_MULU_B; goto extract_sfmt_muls_b;
+      case 145 : itype = CRISV32F_INSN_MULU_W; goto extract_sfmt_muls_b;
+      case 146 : itype = CRISV32F_INSN_MULU_D; goto extract_sfmt_muls_b;
       case 147 :
         {
           unsigned int val = (((insn >> 12) & (15 << 0)));
@@ -812,10 +524,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((base_insn & 0xffff) == 0x5930)
               { itype = CRISV32F_INSN_RFN; goto extract_sfmt_rfn; }
             itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 14 :
-            if ((base_insn & 0xfff0) == 0xe930)
-              { itype = CRISV32F_INSN_BREAK; goto extract_sfmt_break; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_BREAK; goto extract_sfmt_break;
           case 15 :
             if ((base_insn & 0xffff) == 0xf930)
               { itype = CRISV32F_INSN_HALT; goto extract_sfmt_halt; }
@@ -823,79 +532,28 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 148 :
-        if ((base_insn & 0xbf0) == 0x940)
-          { itype = CRISV32F_INSN_ADDO_M_B_M; goto extract_sfmt_addo_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 149 :
-        if ((base_insn & 0xbf0) == 0x950)
-          { itype = CRISV32F_INSN_ADDO_M_W_M; goto extract_sfmt_addo_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 150 :
-        if ((base_insn & 0xbf0) == 0x960)
-          { itype = CRISV32F_INSN_ADDO_M_D_M; goto extract_sfmt_addo_m_d_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 151 :
-        if ((base_insn & 0xff0) == 0x970)
-          { itype = CRISV32F_INSN_LAPCQ; goto extract_sfmt_lapcq; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 154 :
-        if ((base_insn & 0xbf0) == 0x9a0)
-          { itype = CRISV32F_INSN_ADDC_M; goto extract_sfmt_addc_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 155 :
-        if ((base_insn & 0xff0) == 0x9b0)
-          { itype = CRISV32F_INSN_JAS_R; goto extract_sfmt_jas_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 148 : itype = CRISV32F_INSN_ADDO_M_B_M; goto extract_sfmt_addo_m_b_m;
+      case 149 : itype = CRISV32F_INSN_ADDO_M_W_M; goto extract_sfmt_addo_m_w_m;
+      case 150 : itype = CRISV32F_INSN_ADDO_M_D_M; goto extract_sfmt_addo_m_d_m;
+      case 151 : itype = CRISV32F_INSN_LAPCQ; goto extract_sfmt_lapcq;
+      case 154 : itype = CRISV32F_INSN_ADDC_M; goto extract_sfmt_addc_m;
+      case 155 : itype = CRISV32F_INSN_JAS_R; goto extract_sfmt_jas_r;
       case 159 :
         if ((base_insn & 0xfff) == 0x9f0)
           { itype = CRISV32F_INSN_JUMP_P; goto extract_sfmt_jump_p; }
         itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 160 :
-        if ((base_insn & 0xbf0) == 0xa00)
-          { itype = CRISV32F_INSN_ADD_M_B_M; goto extract_sfmt_add_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 161 :
-        if ((base_insn & 0xbf0) == 0xa10)
-          { itype = CRISV32F_INSN_ADD_M_W_M; goto extract_sfmt_add_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 162 :
-        if ((base_insn & 0xbf0) == 0xa20)
-          { itype = CRISV32F_INSN_ADD_M_D_M; goto extract_sfmt_add_m_d_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 163 :
-        if ((base_insn & 0xbf0) == 0xa30)
-          { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 164 :
-        if ((base_insn & 0xbf0) == 0xa40)
-          { itype = CRISV32F_INSN_MOVE_M_B_M; goto extract_sfmt_move_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 165 :
-        if ((base_insn & 0xbf0) == 0xa50)
-          { itype = CRISV32F_INSN_MOVE_M_W_M; goto extract_sfmt_move_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 166 :
-        if ((base_insn & 0xbf0) == 0xa60)
-          { itype = CRISV32F_INSN_MOVE_M_D_M; goto extract_sfmt_move_m_d_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 160 : itype = CRISV32F_INSN_ADD_M_B_M; goto extract_sfmt_add_m_b_m;
+      case 161 : itype = CRISV32F_INSN_ADD_M_W_M; goto extract_sfmt_add_m_w_m;
+      case 162 : itype = CRISV32F_INSN_ADD_M_D_M; goto extract_sfmt_add_m_d_m;
+      case 163 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32;
+      case 164 : itype = CRISV32F_INSN_MOVE_M_B_M; goto extract_sfmt_move_m_b_m;
+      case 165 : itype = CRISV32F_INSN_MOVE_M_W_M; goto extract_sfmt_move_m_w_m;
+      case 166 : itype = CRISV32F_INSN_MOVE_M_D_M; goto extract_sfmt_move_m_d_m;
       case 167 : /* fall through */
-      case 231 :
-        if ((base_insn & 0xbf0) == 0xa70)
-          { itype = CRISV32F_INSN_MOVE_SPR_MV32; goto extract_sfmt_move_spr_mv32; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 168 :
-        if ((base_insn & 0xbf0) == 0xa80)
-          { itype = CRISV32F_INSN_SUB_M_B_M; goto extract_sfmt_add_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 169 :
-        if ((base_insn & 0xbf0) == 0xa90)
-          { itype = CRISV32F_INSN_SUB_M_W_M; goto extract_sfmt_add_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 170 :
-        if ((base_insn & 0xbf0) == 0xaa0)
-          { itype = CRISV32F_INSN_SUB_M_D_M; goto extract_sfmt_add_m_d_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 231 : itype = CRISV32F_INSN_MOVE_SPR_MV32; goto extract_sfmt_move_spr_mv32;
+      case 168 : itype = CRISV32F_INSN_SUB_M_B_M; goto extract_sfmt_add_m_b_m;
+      case 169 : itype = CRISV32F_INSN_SUB_M_W_M; goto extract_sfmt_add_m_w_m;
+      case 170 : itype = CRISV32F_INSN_SUB_M_D_M; goto extract_sfmt_add_m_d_m;
       case 171 :
         {
           unsigned int val = (((insn >> 12) & (1 << 0)));
@@ -912,50 +570,17 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 172 :
-        if ((base_insn & 0xbf0) == 0xac0)
-          { itype = CRISV32F_INSN_CMP_M_B_M; goto extract_sfmt_cmp_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 173 :
-        if ((base_insn & 0xbf0) == 0xad0)
-          { itype = CRISV32F_INSN_CMP_M_W_M; goto extract_sfmt_cmp_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 174 :
-        if ((base_insn & 0xbf0) == 0xae0)
-          { itype = CRISV32F_INSN_CMP_M_D_M; goto extract_sfmt_cmp_m_d_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 176 :
-        if ((base_insn & 0xbf0) == 0xb00)
-          { itype = CRISV32F_INSN_AND_M_B_M; goto extract_sfmt_and_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 177 :
-        if ((base_insn & 0xbf0) == 0xb10)
-          { itype = CRISV32F_INSN_AND_M_W_M; goto extract_sfmt_and_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 178 :
-        if ((base_insn & 0xbf0) == 0xb20)
-          { itype = CRISV32F_INSN_AND_M_D_M; goto extract_sfmt_and_m_d_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 179 :
-        if ((base_insn & 0xff0) == 0xb30)
-          { itype = CRISV32F_INSN_JASC_R; goto extract_sfmt_jasc_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 180 :
-        if ((base_insn & 0xbf0) == 0xb40)
-          { itype = CRISV32F_INSN_OR_M_B_M; goto extract_sfmt_and_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 181 :
-        if ((base_insn & 0xbf0) == 0xb50)
-          { itype = CRISV32F_INSN_OR_M_W_M; goto extract_sfmt_and_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 182 :
-        if ((base_insn & 0xbf0) == 0xb60)
-          { itype = CRISV32F_INSN_OR_M_D_M; goto extract_sfmt_and_m_d_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 183 :
-        if ((base_insn & 0xff0) == 0xb70)
-          { itype = CRISV32F_INSN_MOVE_R_SS; goto extract_sfmt_move_r_ss; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 172 : itype = CRISV32F_INSN_CMP_M_B_M; goto extract_sfmt_cmp_m_b_m;
+      case 173 : itype = CRISV32F_INSN_CMP_M_W_M; goto extract_sfmt_cmp_m_w_m;
+      case 174 : itype = CRISV32F_INSN_CMP_M_D_M; goto extract_sfmt_cmp_m_d_m;
+      case 176 : itype = CRISV32F_INSN_AND_M_B_M; goto extract_sfmt_and_m_b_m;
+      case 177 : itype = CRISV32F_INSN_AND_M_W_M; goto extract_sfmt_and_m_w_m;
+      case 178 : itype = CRISV32F_INSN_AND_M_D_M; goto extract_sfmt_and_m_d_m;
+      case 179 : itype = CRISV32F_INSN_JASC_R; goto extract_sfmt_jasc_r;
+      case 180 : itype = CRISV32F_INSN_OR_M_B_M; goto extract_sfmt_and_m_b_m;
+      case 181 : itype = CRISV32F_INSN_OR_M_W_M; goto extract_sfmt_and_m_w_m;
+      case 182 : itype = CRISV32F_INSN_OR_M_D_M; goto extract_sfmt_and_m_d_m;
+      case 183 : itype = CRISV32F_INSN_MOVE_R_SS; goto extract_sfmt_move_r_ss;
       case 184 : /* fall through */
       case 248 :
         if ((base_insn & 0xfbf0) == 0xb80)
@@ -972,30 +597,15 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           { itype = CRISV32F_INSN_TEST_M_D_M; goto extract_sfmt_test_m_d_m; }
         itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
       case 187 : /* fall through */
-      case 251 :
-        if ((base_insn & 0xbf0) == 0xbb0)
-          { itype = CRISV32F_INSN_MOVEM_M_R_V32; goto extract_sfmt_movem_m_r_v32; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 251 : itype = CRISV32F_INSN_MOVEM_M_R_V32; goto extract_sfmt_movem_m_r_v32;
       case 188 : /* fall through */
-      case 252 :
-        if ((base_insn & 0xbf0) == 0xbc0)
-          { itype = CRISV32F_INSN_MOVE_R_M_B_M; goto extract_sfmt_move_r_m_b_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 252 : itype = CRISV32F_INSN_MOVE_R_M_B_M; goto extract_sfmt_move_r_m_b_m;
       case 189 : /* fall through */
-      case 253 :
-        if ((base_insn & 0xbf0) == 0xbd0)
-          { itype = CRISV32F_INSN_MOVE_R_M_W_M; goto extract_sfmt_move_r_m_w_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 253 : itype = CRISV32F_INSN_MOVE_R_M_W_M; goto extract_sfmt_move_r_m_w_m;
       case 190 : /* fall through */
-      case 254 :
-        if ((base_insn & 0xbf0) == 0xbe0)
-          { itype = CRISV32F_INSN_MOVE_R_M_D_M; goto extract_sfmt_move_r_m_d_m; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 254 : itype = CRISV32F_INSN_MOVE_R_M_D_M; goto extract_sfmt_move_r_m_d_m;
       case 191 : /* fall through */
-      case 255 :
-        if ((base_insn & 0xbf0) == 0xbf0)
-          { itype = CRISV32F_INSN_MOVEM_R_M_V32; goto extract_sfmt_movem_r_m_v32; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 255 : itype = CRISV32F_INSN_MOVEM_R_M_V32; goto extract_sfmt_movem_r_m_v32;
       case 192 :
         {
           unsigned int val = (((insn >> 0) & (15 << 0)));
@@ -1015,14 +625,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x800)
-              { itype = CRISV32F_INSN_ADDU_M_B_M; goto extract_sfmt_adds_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc0f)
-              { itype = CRISV32F_INSN_ADDUCBR; goto extract_sfmt_addscbr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_ADDU_M_B_M; goto extract_sfmt_adds_m_b_m;
+          case 15 : itype = CRISV32F_INSN_ADDUCBR; goto extract_sfmt_addscbr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1045,14 +649,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x810)
-              { itype = CRISV32F_INSN_ADDU_M_W_M; goto extract_sfmt_adds_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc1f)
-              { itype = CRISV32F_INSN_ADDUCWR; goto extract_sfmt_addscwr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_ADDU_M_W_M; goto extract_sfmt_adds_m_w_m;
+          case 15 : itype = CRISV32F_INSN_ADDUCWR; goto extract_sfmt_addscwr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1075,14 +673,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x820)
-              { itype = CRISV32F_INSN_ADDS_M_B_M; goto extract_sfmt_adds_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc2f)
-              { itype = CRISV32F_INSN_ADDSCBR; goto extract_sfmt_addscbr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_ADDS_M_B_M; goto extract_sfmt_adds_m_b_m;
+          case 15 : itype = CRISV32F_INSN_ADDSCBR; goto extract_sfmt_addscbr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1105,14 +697,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x830)
-              { itype = CRISV32F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc3f)
-              { itype = CRISV32F_INSN_ADDSCWR; goto extract_sfmt_addscwr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m;
+          case 15 : itype = CRISV32F_INSN_ADDSCWR; goto extract_sfmt_addscwr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1135,14 +721,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x840)
-              { itype = CRISV32F_INSN_MOVU_M_B_M; goto extract_sfmt_movs_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc4f)
-              { itype = CRISV32F_INSN_MOVUCBR; goto extract_sfmt_movucbr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_MOVU_M_B_M; goto extract_sfmt_movs_m_b_m;
+          case 15 : itype = CRISV32F_INSN_MOVUCBR; goto extract_sfmt_movucbr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1165,14 +745,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x850)
-              { itype = CRISV32F_INSN_MOVU_M_W_M; goto extract_sfmt_movs_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc5f)
-              { itype = CRISV32F_INSN_MOVUCWR; goto extract_sfmt_movucwr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_MOVU_M_W_M; goto extract_sfmt_movs_m_w_m;
+          case 15 : itype = CRISV32F_INSN_MOVUCWR; goto extract_sfmt_movucwr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1195,14 +769,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x860)
-              { itype = CRISV32F_INSN_MOVS_M_B_M; goto extract_sfmt_movs_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc6f)
-              { itype = CRISV32F_INSN_MOVSCBR; goto extract_sfmt_movscbr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_MOVS_M_B_M; goto extract_sfmt_movs_m_b_m;
+          case 15 : itype = CRISV32F_INSN_MOVSCBR; goto extract_sfmt_movscbr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1225,14 +793,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x870)
-              { itype = CRISV32F_INSN_MOVS_M_W_M; goto extract_sfmt_movs_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc7f)
-              { itype = CRISV32F_INSN_MOVSCWR; goto extract_sfmt_movscwr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_MOVS_M_W_M; goto extract_sfmt_movs_m_w_m;
+          case 15 : itype = CRISV32F_INSN_MOVSCWR; goto extract_sfmt_movscwr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1255,14 +817,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x880)
-              { itype = CRISV32F_INSN_SUBU_M_B_M; goto extract_sfmt_adds_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc8f)
-              { itype = CRISV32F_INSN_SUBUCBR; goto extract_sfmt_addscbr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_SUBU_M_B_M; goto extract_sfmt_adds_m_b_m;
+          case 15 : itype = CRISV32F_INSN_SUBUCBR; goto extract_sfmt_addscbr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1285,14 +841,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x890)
-              { itype = CRISV32F_INSN_SUBU_M_W_M; goto extract_sfmt_adds_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xc9f)
-              { itype = CRISV32F_INSN_SUBUCWR; goto extract_sfmt_addscwr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_SUBU_M_W_M; goto extract_sfmt_adds_m_w_m;
+          case 15 : itype = CRISV32F_INSN_SUBUCWR; goto extract_sfmt_addscwr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1315,14 +865,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x8a0)
-              { itype = CRISV32F_INSN_SUBS_M_B_M; goto extract_sfmt_adds_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xcaf)
-              { itype = CRISV32F_INSN_SUBSCBR; goto extract_sfmt_addscbr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_SUBS_M_B_M; goto extract_sfmt_adds_m_b_m;
+          case 15 : itype = CRISV32F_INSN_SUBSCBR; goto extract_sfmt_addscbr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1345,14 +889,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x8b0)
-              { itype = CRISV32F_INSN_SUBS_M_W_M; goto extract_sfmt_adds_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xcbf)
-              { itype = CRISV32F_INSN_SUBSCWR; goto extract_sfmt_addscwr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_SUBS_M_W_M; goto extract_sfmt_adds_m_w_m;
+          case 15 : itype = CRISV32F_INSN_SUBSCWR; goto extract_sfmt_addscwr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1375,14 +913,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x8c0)
-              { itype = CRISV32F_INSN_CMPU_M_B_M; goto extract_sfmt_cmp_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xccf)
-              { itype = CRISV32F_INSN_CMPUCBR; goto extract_sfmt_cmpucbr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_CMPU_M_B_M; goto extract_sfmt_cmp_m_b_m;
+          case 15 : itype = CRISV32F_INSN_CMPUCBR; goto extract_sfmt_cmpucbr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1405,14 +937,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x8d0)
-              { itype = CRISV32F_INSN_CMPU_M_W_M; goto extract_sfmt_cmp_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xcdf)
-              { itype = CRISV32F_INSN_CMPUCWR; goto extract_sfmt_cmpucwr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_CMPU_M_W_M; goto extract_sfmt_cmp_m_w_m;
+          case 15 : itype = CRISV32F_INSN_CMPUCWR; goto extract_sfmt_cmpucwr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1435,14 +961,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x8e0)
-              { itype = CRISV32F_INSN_CMPS_M_B_M; goto extract_sfmt_cmp_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xcef)
-              { itype = CRISV32F_INSN_CMPSCBR; goto extract_sfmt_cmpcbr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_CMPS_M_B_M; goto extract_sfmt_cmp_m_b_m;
+          case 15 : itype = CRISV32F_INSN_CMPSCBR; goto extract_sfmt_cmpcbr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1465,29 +985,14 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x8f0)
-              { itype = CRISV32F_INSN_CMPS_M_W_M; goto extract_sfmt_cmp_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xcff)
-              { itype = CRISV32F_INSN_CMPSCWR; goto extract_sfmt_cmpcwr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_CMPS_M_W_M; goto extract_sfmt_cmp_m_w_m;
+          case 15 : itype = CRISV32F_INSN_CMPSCWR; goto extract_sfmt_cmpcwr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 208 :
-        if ((base_insn & 0xff0) == 0xd00)
-          { itype = CRISV32F_INSN_MULS_B; goto extract_sfmt_muls_b; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 209 :
-        if ((base_insn & 0xff0) == 0xd10)
-          { itype = CRISV32F_INSN_MULS_W; goto extract_sfmt_muls_b; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 210 :
-        if ((base_insn & 0xff0) == 0xd20)
-          { itype = CRISV32F_INSN_MULS_D; goto extract_sfmt_muls_b; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 208 : itype = CRISV32F_INSN_MULS_B; goto extract_sfmt_muls_b;
+      case 209 : itype = CRISV32F_INSN_MULS_W; goto extract_sfmt_muls_b;
+      case 210 : itype = CRISV32F_INSN_MULS_D; goto extract_sfmt_muls_b;
       case 211 :
         {
           unsigned int val = (((insn >> 12) & (1 << 0)));
@@ -1523,14 +1028,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x940)
-              { itype = CRISV32F_INSN_ADDO_M_B_M; goto extract_sfmt_addo_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xd4f)
-              { itype = CRISV32F_INSN_ADDO_CB; goto extract_sfmt_addo_cb; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_ADDO_M_B_M; goto extract_sfmt_addo_m_b_m;
+          case 15 : itype = CRISV32F_INSN_ADDO_CB; goto extract_sfmt_addo_cb;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1553,14 +1052,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x950)
-              { itype = CRISV32F_INSN_ADDO_M_W_M; goto extract_sfmt_addo_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xd5f)
-              { itype = CRISV32F_INSN_ADDO_CW; goto extract_sfmt_addo_cw; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_ADDO_M_W_M; goto extract_sfmt_addo_m_w_m;
+          case 15 : itype = CRISV32F_INSN_ADDO_CW; goto extract_sfmt_addo_cw;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1583,14 +1076,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x960)
-              { itype = CRISV32F_INSN_ADDO_M_D_M; goto extract_sfmt_addo_m_d_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xd6f)
-              { itype = CRISV32F_INSN_ADDO_CD; goto extract_sfmt_addo_cd; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_ADDO_M_D_M; goto extract_sfmt_addo_m_d_m;
+          case 15 : itype = CRISV32F_INSN_ADDO_CD; goto extract_sfmt_addo_cd;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1617,14 +1104,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0x9a0)
-              { itype = CRISV32F_INSN_ADDC_M; goto extract_sfmt_addc_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xdaf)
-              { itype = CRISV32F_INSN_ADDC_C; goto extract_sfmt_addcdr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_ADDC_M; goto extract_sfmt_addc_m;
+          case 15 : itype = CRISV32F_INSN_ADDC_C; goto extract_sfmt_addcdr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1693,14 +1174,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa00)
-              { itype = CRISV32F_INSN_ADD_M_B_M; goto extract_sfmt_add_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe0f)
-              { itype = CRISV32F_INSN_ADDCBR; goto extract_sfmt_addcbr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_ADD_M_B_M; goto extract_sfmt_add_m_b_m;
+          case 15 : itype = CRISV32F_INSN_ADDCBR; goto extract_sfmt_addcbr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1723,14 +1198,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa10)
-              { itype = CRISV32F_INSN_ADD_M_W_M; goto extract_sfmt_add_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe1f)
-              { itype = CRISV32F_INSN_ADDCWR; goto extract_sfmt_addcwr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_ADD_M_W_M; goto extract_sfmt_add_m_w_m;
+          case 15 : itype = CRISV32F_INSN_ADDCWR; goto extract_sfmt_addcwr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1753,14 +1222,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa20)
-              { itype = CRISV32F_INSN_ADD_M_D_M; goto extract_sfmt_add_m_d_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe2f)
-              { itype = CRISV32F_INSN_ADDCDR; goto extract_sfmt_addcdr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_ADD_M_D_M; goto extract_sfmt_add_m_d_m;
+          case 15 : itype = CRISV32F_INSN_ADDCDR; goto extract_sfmt_addcdr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1772,10 +1235,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 0 : /* fall through */
           case 1 : /* fall through */
           case 4 : /* fall through */
-          case 8 :
-            if ((base_insn & 0xbf0) == 0xa30)
-              { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 8 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32;
           case 2 :
             {
               unsigned int val = (((insn >> 0) & (15 << 0)));
@@ -1795,14 +1255,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xffff) == 0x2e3f)
-                  { itype = CRISV32F_INSN_MOVE_C_SPRV32_P2; goto extract_sfmt_move_c_sprv32_p2; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32;
+              case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P2; goto extract_sfmt_move_c_sprv32_p2;
               default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1825,14 +1279,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xffff) == 0x3e3f)
-                  { itype = CRISV32F_INSN_MOVE_C_SPRV32_P3; goto extract_sfmt_move_c_sprv32_p2; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32;
+              case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P3; goto extract_sfmt_move_c_sprv32_p2;
               default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1855,14 +1303,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xffff) == 0x5e3f)
-                  { itype = CRISV32F_INSN_MOVE_C_SPRV32_P5; goto extract_sfmt_move_c_sprv32_p2; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32;
+              case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P5; goto extract_sfmt_move_c_sprv32_p2;
               default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1885,14 +1327,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xffff) == 0x6e3f)
-                  { itype = CRISV32F_INSN_MOVE_C_SPRV32_P6; goto extract_sfmt_move_c_sprv32_p2; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32;
+              case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P6; goto extract_sfmt_move_c_sprv32_p2;
               default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1915,14 +1351,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xffff) == 0x7e3f)
-                  { itype = CRISV32F_INSN_MOVE_C_SPRV32_P7; goto extract_sfmt_move_c_sprv32_p2; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32;
+              case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P7; goto extract_sfmt_move_c_sprv32_p2;
               default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1945,14 +1375,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xffff) == 0x9e3f)
-                  { itype = CRISV32F_INSN_MOVE_C_SPRV32_P9; goto extract_sfmt_move_c_sprv32_p2; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32;
+              case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P9; goto extract_sfmt_move_c_sprv32_p2;
               default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1975,14 +1399,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xffff) == 0xae3f)
-                  { itype = CRISV32F_INSN_MOVE_C_SPRV32_P10; goto extract_sfmt_move_c_sprv32_p2; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32;
+              case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P10; goto extract_sfmt_move_c_sprv32_p2;
               default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2005,14 +1423,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xffff) == 0xbe3f)
-                  { itype = CRISV32F_INSN_MOVE_C_SPRV32_P11; goto extract_sfmt_move_c_sprv32_p2; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32;
+              case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P11; goto extract_sfmt_move_c_sprv32_p2;
               default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2035,14 +1447,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xffff) == 0xce3f)
-                  { itype = CRISV32F_INSN_MOVE_C_SPRV32_P12; goto extract_sfmt_move_c_sprv32_p2; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32;
+              case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P12; goto extract_sfmt_move_c_sprv32_p2;
               default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2065,14 +1471,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xffff) == 0xde3f)
-                  { itype = CRISV32F_INSN_MOVE_C_SPRV32_P13; goto extract_sfmt_move_c_sprv32_p2; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32;
+              case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P13; goto extract_sfmt_move_c_sprv32_p2;
               default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2095,14 +1495,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xffff) == 0xee3f)
-                  { itype = CRISV32F_INSN_MOVE_C_SPRV32_P14; goto extract_sfmt_move_c_sprv32_p2; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32;
+              case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P14; goto extract_sfmt_move_c_sprv32_p2;
               default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2125,14 +1519,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 :
-                if ((base_insn & 0xbf0) == 0xa30)
-                  { itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 15 :
-                if ((base_insn & 0xffff) == 0xfe3f)
-                  { itype = CRISV32F_INSN_MOVE_C_SPRV32_P15; goto extract_sfmt_move_c_sprv32_p2; }
-                itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 14 : itype = CRISV32F_INSN_MOVE_M_SPRV32; goto extract_sfmt_move_m_sprv32;
+              case 15 : itype = CRISV32F_INSN_MOVE_C_SPRV32_P15; goto extract_sfmt_move_c_sprv32_p2;
               default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2158,14 +1546,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa40)
-              { itype = CRISV32F_INSN_MOVE_M_B_M; goto extract_sfmt_move_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe4f)
-              { itype = CRISV32F_INSN_MOVECBR; goto extract_sfmt_movecbr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_MOVE_M_B_M; goto extract_sfmt_move_m_b_m;
+          case 15 : itype = CRISV32F_INSN_MOVECBR; goto extract_sfmt_movecbr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2188,14 +1570,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa50)
-              { itype = CRISV32F_INSN_MOVE_M_W_M; goto extract_sfmt_move_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe5f)
-              { itype = CRISV32F_INSN_MOVECWR; goto extract_sfmt_movecwr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_MOVE_M_W_M; goto extract_sfmt_move_m_w_m;
+          case 15 : itype = CRISV32F_INSN_MOVECWR; goto extract_sfmt_movecwr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2218,14 +1594,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa60)
-              { itype = CRISV32F_INSN_MOVE_M_D_M; goto extract_sfmt_move_m_d_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe6f)
-              { itype = CRISV32F_INSN_MOVECDR; goto extract_sfmt_movecdr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_MOVE_M_D_M; goto extract_sfmt_move_m_d_m;
+          case 15 : itype = CRISV32F_INSN_MOVECDR; goto extract_sfmt_movecdr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2248,14 +1618,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa80)
-              { itype = CRISV32F_INSN_SUB_M_B_M; goto extract_sfmt_add_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe8f)
-              { itype = CRISV32F_INSN_SUBCBR; goto extract_sfmt_addcbr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_SUB_M_B_M; goto extract_sfmt_add_m_b_m;
+          case 15 : itype = CRISV32F_INSN_SUBCBR; goto extract_sfmt_addcbr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2278,14 +1642,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xa90)
-              { itype = CRISV32F_INSN_SUB_M_W_M; goto extract_sfmt_add_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xe9f)
-              { itype = CRISV32F_INSN_SUBCWR; goto extract_sfmt_addcwr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_SUB_M_W_M; goto extract_sfmt_add_m_w_m;
+          case 15 : itype = CRISV32F_INSN_SUBCWR; goto extract_sfmt_addcwr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2308,14 +1666,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xaa0)
-              { itype = CRISV32F_INSN_SUB_M_D_M; goto extract_sfmt_add_m_d_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xeaf)
-              { itype = CRISV32F_INSN_SUBCDR; goto extract_sfmt_addcdr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_SUB_M_D_M; goto extract_sfmt_add_m_d_m;
+          case 15 : itype = CRISV32F_INSN_SUBCDR; goto extract_sfmt_addcdr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2342,14 +1694,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xac0)
-              { itype = CRISV32F_INSN_CMP_M_B_M; goto extract_sfmt_cmp_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xecf)
-              { itype = CRISV32F_INSN_CMPCBR; goto extract_sfmt_cmpcbr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_CMP_M_B_M; goto extract_sfmt_cmp_m_b_m;
+          case 15 : itype = CRISV32F_INSN_CMPCBR; goto extract_sfmt_cmpcbr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2372,14 +1718,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xad0)
-              { itype = CRISV32F_INSN_CMP_M_W_M; goto extract_sfmt_cmp_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xedf)
-              { itype = CRISV32F_INSN_CMPCWR; goto extract_sfmt_cmpcwr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_CMP_M_W_M; goto extract_sfmt_cmp_m_w_m;
+          case 15 : itype = CRISV32F_INSN_CMPCWR; goto extract_sfmt_cmpcwr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2402,14 +1742,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xae0)
-              { itype = CRISV32F_INSN_CMP_M_D_M; goto extract_sfmt_cmp_m_d_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xeef)
-              { itype = CRISV32F_INSN_CMPCDR; goto extract_sfmt_cmpcdr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_CMP_M_D_M; goto extract_sfmt_cmp_m_d_m;
+          case 15 : itype = CRISV32F_INSN_CMPCDR; goto extract_sfmt_cmpcdr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2436,14 +1770,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xb00)
-              { itype = CRISV32F_INSN_AND_M_B_M; goto extract_sfmt_and_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xf0f)
-              { itype = CRISV32F_INSN_ANDCBR; goto extract_sfmt_andcbr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_AND_M_B_M; goto extract_sfmt_and_m_b_m;
+          case 15 : itype = CRISV32F_INSN_ANDCBR; goto extract_sfmt_andcbr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2466,14 +1794,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xb10)
-              { itype = CRISV32F_INSN_AND_M_W_M; goto extract_sfmt_and_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xf1f)
-              { itype = CRISV32F_INSN_ANDCWR; goto extract_sfmt_andcwr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_AND_M_W_M; goto extract_sfmt_and_m_w_m;
+          case 15 : itype = CRISV32F_INSN_ANDCWR; goto extract_sfmt_andcwr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2496,14 +1818,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xb20)
-              { itype = CRISV32F_INSN_AND_M_D_M; goto extract_sfmt_and_m_d_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xf2f)
-              { itype = CRISV32F_INSN_ANDCDR; goto extract_sfmt_andcdr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_AND_M_D_M; goto extract_sfmt_and_m_d_m;
+          case 15 : itype = CRISV32F_INSN_ANDCDR; goto extract_sfmt_andcdr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2530,14 +1846,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xb40)
-              { itype = CRISV32F_INSN_OR_M_B_M; goto extract_sfmt_and_m_b_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xf4f)
-              { itype = CRISV32F_INSN_ORCBR; goto extract_sfmt_andcbr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_OR_M_B_M; goto extract_sfmt_and_m_b_m;
+          case 15 : itype = CRISV32F_INSN_ORCBR; goto extract_sfmt_andcbr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2560,14 +1870,8 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xb50)
-              { itype = CRISV32F_INSN_OR_M_W_M; goto extract_sfmt_and_m_w_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xf5f)
-              { itype = CRISV32F_INSN_ORCWR; goto extract_sfmt_andcwr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_OR_M_W_M; goto extract_sfmt_and_m_w_m;
+          case 15 : itype = CRISV32F_INSN_ORCWR; goto extract_sfmt_andcwr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2590,21 +1894,12 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 :
-            if ((base_insn & 0xbf0) == 0xb60)
-              { itype = CRISV32F_INSN_OR_M_D_M; goto extract_sfmt_and_m_d_m; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((base_insn & 0xfff) == 0xf6f)
-              { itype = CRISV32F_INSN_ORCDR; goto extract_sfmt_andcdr; }
-            itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 : itype = CRISV32F_INSN_OR_M_D_M; goto extract_sfmt_and_m_d_m;
+          case 15 : itype = CRISV32F_INSN_ORCDR; goto extract_sfmt_andcdr;
           default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 247 :
-        if ((base_insn & 0xff0) == 0xf70)
-          { itype = CRISV32F_INSN_MOVE_SS_R; goto extract_sfmt_move_ss_r; }
-        itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 247 : itype = CRISV32F_INSN_MOVE_SS_R; goto extract_sfmt_move_ss_r;
       default : itype = CRISV32F_INSN_X_INVALID; goto extract_sfmt_empty;
       }
     }
@@ -2646,7 +1941,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -2674,7 +1969,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -2759,7 +2054,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   /* Record the fields for profiling.  */
   if (PROFILE_MODEL_P (current_cpu))
     {
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -2789,7 +2084,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   /* Record the fields for profiling.  */
   if (PROFILE_MODEL_P (current_cpu))
     {
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -2967,7 +2262,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -3300,7 +2595,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -3332,7 +2627,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -3364,7 +2659,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -3484,7 +2779,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Ps) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rs) = FLD (f_operand1);
+      FLD (out_h_gr_SI_index_of__INT_Rs) = FLD (f_operand1);
     }
 #endif
 #undef FLD
@@ -3757,7 +3052,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -3786,7 +3081,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -3819,7 +3114,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -3852,7 +3147,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -3885,7 +3180,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -3916,7 +3211,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -3947,7 +3242,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -3978,7 +3273,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4011,7 +3306,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -4044,7 +3339,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -4075,7 +3370,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4106,7 +3401,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4139,7 +3434,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4253,7 +3548,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4281,7 +3576,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4520,7 +3815,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Ps) = f_operand2;
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rs) = FLD (f_operand1);
+      FLD (out_h_gr_SI_index_of__INT_Rs) = FLD (f_operand1);
     }
 #endif
 #undef FLD
@@ -4578,36 +3873,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
-    }
-#endif
-#undef FLD
-    return idesc;
-  }
-
- extract_sfmt_and_w_r:
-  {
-    const IDESC *idesc = &crisv32f_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
-#define FLD(f) abuf->fields.sfmt_addc_m.f
-    UINT f_operand2;
-    UINT f_operand1;
-
-    f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
-    f_operand1 = EXTRACT_LSB0_UINT (insn, 16, 3, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_operand2) = f_operand2;
-  FLD (f_operand1) = f_operand1;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_and_w_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0));
-
-#if WITH_PROFILE_MODEL_P
-  /* Record the fields for profiling.  */
-  if (PROFILE_MODEL_P (current_cpu))
-    {
-      FLD (in_Rd) = f_operand2;
-      FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4636,7 +3902,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4669,7 +3935,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -4702,7 +3968,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -4735,7 +4001,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
       FLD (out_Rs) = f_operand1;
-      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__DFLT_inc_index_of__DFLT_Rs_index_of__DFLT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
+      FLD (out_h_gr_SI_if__SI_andif__DFLT_prefix_set_not__UINT_inc_index_of__INT_Rs_index_of__INT_Rd) = ((ANDIF (GET_H_INSN_PREFIXED_P (), (! (FLD (f_memmode))))) ? (FLD (f_operand1)) : (FLD (f_operand2)));
     }
 #endif
 #undef FLD
@@ -4766,7 +4032,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4797,7 +4063,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4828,7 +4094,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4856,7 +4122,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_Rd) = f_operand2;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4891,35 +4157,6 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
     return idesc;
   }
 
- extract_sfmt_asrr_b_r:
-  {
-    const IDESC *idesc = &crisv32f_insn_data[itype];
-    CGEN_INSN_INT insn = base_insn;
-#define FLD(f) abuf->fields.sfmt_addc_m.f
-    UINT f_operand2;
-    UINT f_operand1;
-
-    f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
-    f_operand1 = EXTRACT_LSB0_UINT (insn, 16, 3, 4);
-
-  /* Record the fields for the semantic handler.  */
-  FLD (f_operand2) = f_operand2;
-  FLD (f_operand1) = f_operand1;
-  TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "sfmt_asrr_b_r", "f_operand2 0x%x", 'x', f_operand2, "f_operand1 0x%x", 'x', f_operand1, (char *) 0));
-
-#if WITH_PROFILE_MODEL_P
-  /* Record the fields for profiling.  */
-  if (PROFILE_MODEL_P (current_cpu))
-    {
-      FLD (in_Rd) = f_operand2;
-      FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
-    }
-#endif
-#undef FLD
-    return idesc;
-  }
-
  extract_sfmt_asrq:
   {
     const IDESC *idesc = &crisv32f_insn_data[itype];
@@ -4970,7 +4207,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
@@ -4999,7 +4236,7 @@ crisv32f_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_Rd) = f_operand2;
       FLD (in_Rs) = f_operand1;
-      FLD (out_h_gr_SI_index_of__DFLT_Rd) = FLD (f_operand2);
+      FLD (out_h_gr_SI_index_of__INT_Rd) = FLD (f_operand2);
     }
 #endif
 #undef FLD
diff --git a/sim/cris/decodev32.h b/sim/cris/decodev32.h
index 928433f..78a90e2 100644
--- a/sim/cris/decodev32.h
+++ b/sim/cris/decodev32.h
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
@@ -108,18 +108,17 @@ typedef enum crisv32f_sfmt_type {
  , CRISV32F_SFMT_ADDI_B_R, CRISV32F_SFMT_NEG_B_R, CRISV32F_SFMT_NEG_D_R, CRISV32F_SFMT_TEST_M_B_M
  , CRISV32F_SFMT_TEST_M_W_M, CRISV32F_SFMT_TEST_M_D_M, CRISV32F_SFMT_MOVE_R_M_B_M, CRISV32F_SFMT_MOVE_R_M_W_M
  , CRISV32F_SFMT_MOVE_R_M_D_M, CRISV32F_SFMT_MULS_B, CRISV32F_SFMT_MCP, CRISV32F_SFMT_DSTEP
- , CRISV32F_SFMT_AND_B_R, CRISV32F_SFMT_AND_W_R, CRISV32F_SFMT_AND_D_R, CRISV32F_SFMT_AND_M_B_M
- , CRISV32F_SFMT_AND_M_W_M, CRISV32F_SFMT_AND_M_D_M, CRISV32F_SFMT_ANDCBR, CRISV32F_SFMT_ANDCWR
- , CRISV32F_SFMT_ANDCDR, CRISV32F_SFMT_ANDQ, CRISV32F_SFMT_SWAP, CRISV32F_SFMT_ASRR_B_R
- , CRISV32F_SFMT_ASRQ, CRISV32F_SFMT_LSRR_B_R, CRISV32F_SFMT_LSRR_D_R, CRISV32F_SFMT_BTST
- , CRISV32F_SFMT_BTSTQ, CRISV32F_SFMT_SETF, CRISV32F_SFMT_RFE, CRISV32F_SFMT_SFE
- , CRISV32F_SFMT_RFG, CRISV32F_SFMT_RFN, CRISV32F_SFMT_HALT, CRISV32F_SFMT_BCC_B
- , CRISV32F_SFMT_BA_B, CRISV32F_SFMT_BCC_W, CRISV32F_SFMT_BA_W, CRISV32F_SFMT_JAS_R
- , CRISV32F_SFMT_JAS_C, CRISV32F_SFMT_JUMP_P, CRISV32F_SFMT_BAS_C, CRISV32F_SFMT_JASC_R
- , CRISV32F_SFMT_BREAK, CRISV32F_SFMT_BOUND_CB, CRISV32F_SFMT_BOUND_CW, CRISV32F_SFMT_BOUND_CD
- , CRISV32F_SFMT_SCC, CRISV32F_SFMT_ADDOQ, CRISV32F_SFMT_ADDO_M_B_M, CRISV32F_SFMT_ADDO_M_W_M
- , CRISV32F_SFMT_ADDO_M_D_M, CRISV32F_SFMT_ADDO_CB, CRISV32F_SFMT_ADDO_CW, CRISV32F_SFMT_ADDO_CD
- , CRISV32F_SFMT_ADDI_ACR_B_R, CRISV32F_SFMT_FIDXI
+ , CRISV32F_SFMT_AND_B_R, CRISV32F_SFMT_AND_D_R, CRISV32F_SFMT_AND_M_B_M, CRISV32F_SFMT_AND_M_W_M
+ , CRISV32F_SFMT_AND_M_D_M, CRISV32F_SFMT_ANDCBR, CRISV32F_SFMT_ANDCWR, CRISV32F_SFMT_ANDCDR
+ , CRISV32F_SFMT_ANDQ, CRISV32F_SFMT_SWAP, CRISV32F_SFMT_ASRQ, CRISV32F_SFMT_LSRR_B_R
+ , CRISV32F_SFMT_LSRR_D_R, CRISV32F_SFMT_BTST, CRISV32F_SFMT_BTSTQ, CRISV32F_SFMT_SETF
+ , CRISV32F_SFMT_RFE, CRISV32F_SFMT_SFE, CRISV32F_SFMT_RFG, CRISV32F_SFMT_RFN
+ , CRISV32F_SFMT_HALT, CRISV32F_SFMT_BCC_B, CRISV32F_SFMT_BA_B, CRISV32F_SFMT_BCC_W
+ , CRISV32F_SFMT_BA_W, CRISV32F_SFMT_JAS_R, CRISV32F_SFMT_JAS_C, CRISV32F_SFMT_JUMP_P
+ , CRISV32F_SFMT_BAS_C, CRISV32F_SFMT_JASC_R, CRISV32F_SFMT_BREAK, CRISV32F_SFMT_BOUND_CB
+ , CRISV32F_SFMT_BOUND_CW, CRISV32F_SFMT_BOUND_CD, CRISV32F_SFMT_SCC, CRISV32F_SFMT_ADDOQ
+ , CRISV32F_SFMT_ADDO_M_B_M, CRISV32F_SFMT_ADDO_M_W_M, CRISV32F_SFMT_ADDO_M_D_M, CRISV32F_SFMT_ADDO_CB
+ , CRISV32F_SFMT_ADDO_CW, CRISV32F_SFMT_ADDO_CD, CRISV32F_SFMT_ADDI_ACR_B_R, CRISV32F_SFMT_FIDXI
 } CRISV32F_SFMT_TYPE;
 
 /* Function unit handlers (user written).  */
diff --git a/sim/cris/modelv10.c b/sim/cris/modelv10.c
index 513af52..38fd850 100644
--- a/sim/cris/modelv10.c
+++ b/sim/cris/modelv10.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/cris/modelv32.c b/sim/cris/modelv32.c
index 8bb2f29..7812923 100644
--- a/sim/cris/modelv32.c
+++ b/sim/cris/modelv32.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/cris/semcrisv10f-switch.c b/sim/cris/semcrisv10f-switch.c
index 56d2e6b..44e1eed 100644
--- a/sim/cris/semcrisv10f-switch.c
+++ b/sim/cris/semcrisv10f-switch.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/cris/semcrisv32f-switch.c b/sim/cris/semcrisv32f-switch.c
index 88c8581..484e5a3 100644
--- a/sim/cris/semcrisv32f-switch.c
+++ b/sim/cris/semcrisv32f-switch.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
author	Doug Evans <dje@google.com>	2009-10-24 04:33:41 +0000
committer	Doug Evans <dje@google.com>	2009-10-24 04:33:41 +0000
commit	f09d60e19b823fd95f313d95449a933296ce6bc7 (patch)
tree	93ca32e1b35b111644972ce66a89e25f00b54716
parent	ac1e9eca7030ead24000a8ab765b573ab0d38de2 (diff)
download	gdb-f09d60e19b823fd95f313d95449a933296ce6bc7.zip gdb-f09d60e19b823fd95f313d95449a933296ce6bc7.tar.gz gdb-f09d60e19b823fd95f313d95449a933296ce6bc7.tar.bz2