* sim/cris/asm/movmp8.ms, sim/cris/asm/pcplus.ms: New tests.

[deliverable/binutils-gdb.git] / sim / cris / decodev10.c

diff --git a/sim/cris/decodev10.c b/sim/cris/decodev10.c
index 7aca438852ac6fec6b7e323f1a770bbd93fdecd4..f07f00d13450374a6409055a345226c233ed92bc 100644 (file)
--- a/sim/cris/decodev10.c
+++ b/sim/cris/decodev10.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2004 Free Software Foundation, Inc.
+Copyright 1996-2005 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 */
 
@@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "sim-main.h"
 #include "sim-assert.h"
+#include "cgen-ops.h"
 
 /* The instruction descriptor array.
    This is computed at runtime.  Space for it is not malloc'd to save a
@@ -363,8 +364,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 15 : itype = CRISV10F_INSN_BCC_B; goto extract_sfmt_bcc_b;
-          case 14 : itype = CRISV10F_INSN_BA_B; goto extract_sfmt_ba_b;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -402,59 +409,143 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 : itype = CRISV10F_INSN_ADDOQ; goto extract_sfmt_addoq;
-          case 15 : itype = CRISV10F_INSN_BDAPQPC; goto extract_sfmt_bdapqpc;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
       case 32 : /* fall through */
       case 33 : /* fall through */
       case 34 : /* fall through */
-      case 35 : itype = CRISV10F_INSN_ADDQ; goto extract_sfmt_addq;
+      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 36 : /* fall through */
       case 37 : /* fall through */
       case 38 : /* fall through */
-      case 39 : itype = CRISV10F_INSN_MOVEQ; goto extract_sfmt_moveq;
+      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 40 : /* fall through */
       case 41 : /* fall through */
       case 42 : /* fall through */
-      case 43 : itype = CRISV10F_INSN_SUBQ; goto extract_sfmt_addq;
+      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 44 : /* fall through */
       case 45 : /* fall through */
       case 46 : /* fall through */
-      case 47 : itype = CRISV10F_INSN_CMPQ; goto extract_sfmt_cmpq;
+      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 48 : /* fall through */
       case 49 : /* fall through */
       case 50 : /* fall through */
-      case 51 : itype = CRISV10F_INSN_ANDQ; goto extract_sfmt_andq;
+      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 52 : /* fall through */
       case 53 : /* fall through */
       case 54 : /* fall through */
-      case 55 : itype = CRISV10F_INSN_ORQ; goto extract_sfmt_andq;
+      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 56 : /* fall through */
-      case 57 : itype = CRISV10F_INSN_BTSTQ; goto extract_sfmt_btstq;
+      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 58 : /* fall through */
-      case 59 : itype = CRISV10F_INSN_ASRQ; goto extract_sfmt_asrq;
+      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 60 : /* fall through */
-      case 61 : itype = CRISV10F_INSN_LSLQ; goto extract_sfmt_asrq;
+      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 62 : /* fall through */
-      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 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 80 :
         {
           unsigned int val = (((insn >> 8) & (7 << 4)) | ((insn >> 0) & (15 << 0)));
@@ -586,23 +677,41 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 124 : /* fall through */
           case 125 : /* fall through */
           case 126 : /* fall through */
-          case 127 : itype = CRISV10F_INSN_ADDI_B_R; goto extract_sfmt_addi_b_r;
+          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 15 :
             {
               unsigned int val = (((insn >> 15) & (1 << 0)));
               switch (val)
               {
-              case 0 : itype = CRISV10F_INSN_NOP; goto extract_sfmt_nop;
-              case 1 : itype = CRISV10F_INSN_ADDI_B_R; goto extract_sfmt_addi_b_r;
+              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;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
           default : 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 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 84 :
         {
           unsigned int val = (((insn >> 0) & (15 << 0)));
@@ -622,8 +731,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -646,8 +761,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -670,25 +791,73 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : 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 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 102 :
         {
           unsigned int val = (((insn >> 0) & (15 << 0)));
@@ -708,8 +877,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 : itype = CRISV10F_INSN_MOVE_D_R; goto extract_sfmt_move_d_r;
-          case 15 : itype = CRISV10F_INSN_MOVEPCR; goto extract_sfmt_movepcr;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -732,38 +907,125 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : 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_w_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_w_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_asrr_b_r;
-      case 121 : itype = CRISV10F_INSN_ASRR_W_R; goto extract_sfmt_asrr_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 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 131 :
         {
           unsigned int val = (((insn >> 8) & (7 << 4)) | ((insn >> 0) & (15 << 0)));
@@ -895,35 +1157,89 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 123 : /* fall through */
           case 124 : /* fall through */
           case 125 : /* fall through */
-          case 126 : itype = CRISV10F_INSN_ADDS_M_W_M; goto extract_sfmt_adds_m_w_m;
+          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 127 :
             {
               unsigned int val = (((insn >> 15) & (1 << 0)));
               switch (val)
               {
-              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;
+              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;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
           default : 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 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 147 :
         {
           unsigned int val = (((insn >> 12) & (15 << 0)));
@@ -943,48 +1259,150 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 15 : itype = CRISV10F_INSN_JUMP_M; goto extract_sfmt_jump_m;
-          case 14 : itype = CRISV10F_INSN_BREAK; goto extract_sfmt_break;
+          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;
           default : 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 : itype = CRISV10F_INSN_DIP_M; goto extract_sfmt_dip_m;
-      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 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 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 167 : /* fall through */
-      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 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 183 : /* fall through */
-      case 247 : itype = CRISV10F_INSN_SBFS; goto extract_sfmt_sbfs;
+      case 247 :
+        if ((base_insn & 0xfbf0) == 0x3b70)
+          { itype = CRISV10F_INSN_SBFS; goto extract_sfmt_sbfs; }
+        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
       case 184 : /* fall through */
-      case 248 : itype = CRISV10F_INSN_TEST_M_B_M; goto extract_sfmt_test_m_b_m;
+      case 248 :
+        if ((base_insn & 0xfbf0) == 0xb80)
+          { itype = CRISV10F_INSN_TEST_M_B_M; goto extract_sfmt_test_m_b_m; }
+        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
       case 185 : /* fall through */
-      case 249 : itype = CRISV10F_INSN_TEST_M_W_M; goto extract_sfmt_test_m_w_m;
+      case 249 :
+        if ((base_insn & 0xfbf0) == 0xb90)
+          { itype = CRISV10F_INSN_TEST_M_W_M; goto extract_sfmt_test_m_w_m; }
+        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
       case 186 : /* fall through */
-      case 250 : itype = CRISV10F_INSN_TEST_M_D_M; goto extract_sfmt_test_m_d_m;
+      case 250 :
+        if ((base_insn & 0xfbf0) == 0xba0)
+          { itype = CRISV10F_INSN_TEST_M_D_M; goto extract_sfmt_test_m_d_m; }
+        itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
       case 187 : /* fall through */
       case 251 :
         {
@@ -1005,19 +1423,37 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
       case 188 : /* fall through */
-      case 252 : itype = CRISV10F_INSN_MOVE_R_M_B_M; goto extract_sfmt_move_r_m_b_m;
+      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 189 : /* fall through */
-      case 253 : itype = CRISV10F_INSN_MOVE_R_M_W_M; goto extract_sfmt_move_r_m_w_m;
+      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 190 : /* fall through */
-      case 254 : itype = CRISV10F_INSN_MOVE_R_M_D_M; goto extract_sfmt_move_r_m_d_m;
+      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 191 : /* fall through */
-      case 255 : itype = CRISV10F_INSN_MOVEM_R_M; goto extract_sfmt_movem_r_m;
+      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 192 :
         {
           unsigned int val = (((insn >> 0) & (15 << 0)));
@@ -1037,8 +1473,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1061,8 +1503,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1085,8 +1533,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1109,8 +1563,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1133,8 +1593,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1157,8 +1623,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1181,8 +1653,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1205,8 +1683,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1229,8 +1713,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1253,8 +1743,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1277,8 +1773,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1301,8 +1803,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1325,8 +1833,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1349,8 +1863,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1373,8 +1893,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1397,14 +1923,29 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : 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 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 211 :
         {
           unsigned int val = (((insn >> 0) & (15 << 0)));
@@ -1424,8 +1965,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 : itype = CRISV10F_INSN_JUMP_M; goto extract_sfmt_jump_m;
-          case 15 : itype = CRISV10F_INSN_JUMP_C; goto extract_sfmt_jump_c;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1448,8 +1995,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1472,8 +2025,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1496,8 +2055,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1520,8 +2085,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 14 : itype = CRISV10F_INSN_DIP_M; goto extract_sfmt_dip_m;
-          case 15 : itype = CRISV10F_INSN_DIP_C; goto extract_sfmt_dip_c;
+          case 14 :
+            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 15 :
+            if ((base_insn & 0xffff) == 0xd7f)
+              { itype = CRISV10F_INSN_DIP_C; goto extract_sfmt_dip_c; }
+            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1544,8 +2115,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1568,8 +2145,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1592,8 +2175,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1616,8 +2205,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          case 15 : itype = CRISV10F_INSN_BCC_W; goto extract_sfmt_bcc_w;
-          case 14 : itype = CRISV10F_INSN_BA_W; goto extract_sfmt_ba_w;
+          case 15 :
+            if ((base_insn & 0xfff) == 0xdff)
+              { itype = CRISV10F_INSN_BCC_W; goto extract_sfmt_bcc_w; }
+            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 14 :
+            if ((base_insn & 0xffff) == 0xedff)
+              { itype = CRISV10F_INSN_BA_W; goto extract_sfmt_ba_w; }
+            itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1640,8 +2235,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1664,8 +2265,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1707,8 +2314,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              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;
+              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;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1731,8 +2344,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              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;
+              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;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1763,8 +2382,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
-              case 15 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P0; goto extract_sfmt_move_c_sprv10_p0;
+              case 14 :
+                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 15 :
+                if ((base_insn & 0xffff) == 0xe3f)
+                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P0; goto extract_sfmt_move_c_sprv10_p0; }
+                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1787,14 +2412,23 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
-              case 15 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P1; goto extract_sfmt_move_c_sprv10_p0;
+              case 14 :
+                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 15 :
+                if ((base_insn & 0xffff) == 0x1e3f)
+                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P1; goto extract_sfmt_move_c_sprv10_p0; }
+                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
           case 2 : /* fall through */
           case 3 : /* fall through */
-          case 6 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
+          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 4 :
             {
               unsigned int val = (((insn >> 0) & (15 << 0)));
@@ -1814,8 +2448,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
-              case 15 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P4; goto extract_sfmt_move_c_sprv10_p4;
+              case 14 :
+                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 15 :
+                if ((base_insn & 0xffff) == 0x4e3f)
+                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P4; goto extract_sfmt_move_c_sprv10_p4; }
+                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1838,8 +2478,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
-              case 15 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P5; goto extract_sfmt_move_c_sprv10_p4;
+              case 14 :
+                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 15 :
+                if ((base_insn & 0xffff) == 0x5e3f)
+                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P5; goto extract_sfmt_move_c_sprv10_p4; }
+                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1862,8 +2508,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
-              case 15 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P7; goto extract_sfmt_move_c_sprv10_p8;
+              case 14 :
+                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 15 :
+                if ((base_insn & 0xffff) == 0x7e3f)
+                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P7; goto extract_sfmt_move_c_sprv10_p8; }
+                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1886,8 +2538,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
-              case 15 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P8; goto extract_sfmt_move_c_sprv10_p8;
+              case 14 :
+                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 15 :
+                if ((base_insn & 0xffff) == 0x8e3f)
+                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P8; goto extract_sfmt_move_c_sprv10_p8; }
+                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1910,8 +2568,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
-              case 15 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P9; goto extract_sfmt_move_c_sprv10_p8;
+              case 14 :
+                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 15 :
+                if ((base_insn & 0xffff) == 0x9e3f)
+                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P9; goto extract_sfmt_move_c_sprv10_p8; }
+                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1934,8 +2598,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
-              case 15 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P10; goto extract_sfmt_move_c_sprv10_p8;
+              case 14 :
+                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 15 :
+                if ((base_insn & 0xffff) == 0xae3f)
+                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P10; goto extract_sfmt_move_c_sprv10_p8; }
+                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1958,8 +2628,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
-              case 15 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P11; goto extract_sfmt_move_c_sprv10_p8;
+              case 14 :
+                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 15 :
+                if ((base_insn & 0xffff) == 0xbe3f)
+                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P11; goto extract_sfmt_move_c_sprv10_p8; }
+                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -1982,8 +2658,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
-              case 15 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P12; goto extract_sfmt_move_c_sprv10_p8;
+              case 14 :
+                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 15 :
+                if ((base_insn & 0xffff) == 0xce3f)
+                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P12; goto extract_sfmt_move_c_sprv10_p8; }
+                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2006,8 +2688,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
-              case 15 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P13; goto extract_sfmt_move_c_sprv10_p8;
+              case 14 :
+                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 15 :
+                if ((base_insn & 0xffff) == 0xde3f)
+                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P13; goto extract_sfmt_move_c_sprv10_p8; }
+                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2030,8 +2718,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
-              case 15 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P14; goto extract_sfmt_move_c_sprv10_p8;
+              case 14 :
+                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 15 :
+                if ((base_insn & 0xffff) == 0xee3f)
+                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P14; goto extract_sfmt_move_c_sprv10_p8; }
+                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2054,8 +2748,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
               case 11 : /* fall through */
               case 12 : /* fall through */
               case 13 : /* fall through */
-              case 14 : itype = CRISV10F_INSN_MOVE_M_SPRV10; goto extract_sfmt_move_m_sprv10;
-              case 15 : itype = CRISV10F_INSN_MOVE_C_SPRV10_P15; goto extract_sfmt_move_c_sprv10_p8;
+              case 14 :
+                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 15 :
+                if ((base_insn & 0xffff) == 0xfe3f)
+                  { itype = CRISV10F_INSN_MOVE_C_SPRV10_P15; goto extract_sfmt_move_c_sprv10_p8; }
+                itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -2081,8 +2781,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2105,8 +2811,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2129,8 +2841,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2153,8 +2871,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2177,8 +2901,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2201,8 +2931,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2225,8 +2961,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2249,8 +2991,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2273,8 +3021,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2297,8 +3051,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2321,8 +3081,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2345,8 +3111,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2369,8 +3141,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2393,8 +3171,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2417,8 +3201,14 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
           case 11 : /* fall through */
           case 12 : /* fall through */
           case 13 : /* fall through */
-          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;
+          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;
           default : itype = CRISV10F_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2600,8 +3390,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -2630,8 +3420,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -2690,9 +3480,9 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
-    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
 
   /* Record the fields for the semantic handler.  */
   FLD (f_indir_pc__byte) = f_indir_pc__byte;
@@ -2720,9 +3510,9 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
-    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
 
   /* Record the fields for the semantic handler.  */
   FLD (f_indir_pc__word) = f_indir_pc__word;
@@ -2750,9 +3540,9 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
-    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
 
   /* Record the fields for the semantic handler.  */
   FLD (f_indir_pc__byte) = f_indir_pc__byte;
@@ -2780,9 +3570,9 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
-    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
 
   /* Record the fields for the semantic handler.  */
   FLD (f_indir_pc__word) = f_indir_pc__word;
@@ -2962,8 +3752,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -2992,8 +3782,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -3079,8 +3869,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -3109,8 +3899,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -3411,9 +4201,9 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
-    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
 
   /* Record the fields for the semantic handler.  */
   FLD (f_indir_pc__byte) = f_indir_pc__byte;
@@ -3441,9 +4231,9 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
-    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
 
   /* Record the fields for the semantic handler.  */
   FLD (f_indir_pc__word) = f_indir_pc__word;
@@ -3841,8 +4631,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -3872,8 +4662,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -4026,8 +4816,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -4057,8 +4847,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -4646,8 +5436,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -4677,8 +5467,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -5055,8 +5845,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__word_pcrel = ((EXTHISI (((HI) (UINT) ((0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0)))))) + (((pc) + (((GET_H_V32_NON_V32 ()) ? (0) : (4))))));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__word_pcrel = ((EXTHISI (((HI) (UINT) ((0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0)))))) + (((pc) + (((GET_H_V32_NON_V32 ()) ? (0) : (4))))));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -5083,8 +5873,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__word_pcrel = ((EXTHISI (((HI) (UINT) ((0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0)))))) + (((pc) + (((GET_H_V32_NON_V32 ()) ? (0) : (4))))));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__word_pcrel = ((EXTHISI (((HI) (UINT) ((0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0)))))) + (((pc) + (((GET_H_V32_NON_V32 ()) ? (0) : (4))))));
 
   /* Record the fields for the semantic handler.  */
   FLD (i_o_word_pcrel) = f_indir_pc__word_pcrel;
@@ -5322,8 +6112,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -5353,8 +6143,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -5588,8 +6378,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__byte = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */
@@ -5618,8 +6408,8 @@ crisv10f_decode (SIM_CPU *current_cpu, IADDR pc,
     /* Contents of trailing part of insn.  */
     UINT word_1;
 
-  word_1 = GETIMEMUHI (current_cpu, pc + 2);
-    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 16, 15, 16) << 0));
+  word_1 = GETIMEMUSI (current_cpu, pc + 2);
+    f_indir_pc__word = (0|(EXTRACT_LSB0_UINT (word_1, 32, 15, 16) << 0));
     f_operand2 = EXTRACT_LSB0_UINT (insn, 16, 15, 4);
 
   /* Record the fields for the semantic handler.  */