* m10300-dis.c: Only recognize instructions from the currently
authorJeff Law <law@redhat.com>
Fri, 26 Jun 1998 17:12:10 +0000 (17:12 +0000)
committerJeff Law <law@redhat.com>
Fri, 26 Jun 1998 17:12:10 +0000 (17:12 +0000)
        selected machine.
        * m10300-opc.c: Add field indicating the particular variant of
        the mn10300 each instruction is available on.

opcodes/ChangeLog
opcodes/m10300-dis.c
opcodes/m10300-opc.c

index 9311d6e8796111b40a4c5b0fd39edbd4562eb152..cc0b39d7d58589cf954d462f1bab9d35409bc438 100644 (file)
@@ -1,3 +1,10 @@
+Fri Jun 26 11:08:55 1998  Jeffrey A Law  (law@cygnus.com)
+
+       * m10300-dis.c: Only recognize instructions from the currently
+       selected machine.
+       * m10300-opc.c: Add field indicating the particular variant of
+       the mn10300 each instruction is available on.
+
 Fri Jun 26 12:04:21 1998  Ian Lance Taylor  <ian@cygnus.com>
 
        * configure.in: For bfd_vax_arch, build vax-dis.lo.
index b52efb35fdb57f78392893fea38b997264855286..cdba83bd1cadda04a954e0b668a6bf8f2e112b15 100644 (file)
@@ -254,7 +254,9 @@ disassemble (memaddr, info, insn, size)
        mysize = 7;
        
       if ((op->mask & insn) == op->opcode
-         && size == (unsigned int) mysize)
+         && size == (unsigned int) mysize
+         && (op->machine == 0
+             || op->machine == info->mach))
        {
          const unsigned char *opindex_ptr;
          unsigned int nocomma;
index 99970d466f0e896b5c70fe945dd7b2416d28baa8..4ff1512726e05557eebff6b6dbef41393a0dcaa5 100644 (file)
@@ -362,687 +362,700 @@ const struct mn10300_operand mn10300_operands[] = {
    sorted by major opcode.  */
 
 const struct mn10300_opcode mn10300_opcodes[] = {
-{ "mov",       0x8000,         0xf000,         FMT_S1, {SIMM8, DN01}},
-{ "mov",       0x80,           0xf0,           FMT_S0, {DM1, DN0}},
-{ "mov",       0xf1e0,         0xfff0,         FMT_D0, {DM1, AN0}},
-{ "mov",       0xf1d0,         0xfff0,         FMT_D0, {AM1, DN0}},
-{ "mov",       0x9000,         0xf000,         FMT_S1, {IMM8, AN01}},
-{ "mov",       0x90,           0xf0,           FMT_S0, {AM1, AN0}},
-{ "mov",       0x3c,           0xfc,           FMT_S0, {SP, AN0}},
-{ "mov",       0xf2f0,         0xfff3,         FMT_D0, {AM1, SP}},
-{ "mov",       0xf2e4,         0xfffc,         FMT_D0, {PSW, DN0}},
-{ "mov",       0xf2f3,         0xfff3,         FMT_D0, {DM1, PSW}},
-{ "mov",       0xf2e0,         0xfffc,         FMT_D0, {MDR, DN0}},
-{ "mov",       0xf2f2,         0xfff3,         FMT_D0, {DM1, MDR}},
-{ "mov",       0x70,           0xf0,           FMT_S0, {MEM(AM0), DN1}},
-{ "mov",       0x5800,         0xfcff,         FMT_S1, {MEM(SP), DN0}},
-{ "mov",       0x300000,       0xfc0000,       FMT_S2, {MEM(IMM16_MEM), DN0}},
-{ "mov",       0xfca40000,     0xfffc0000,     FMT_D4, {MEM(IMM32_MEM), DN0}},
-{ "mov",       0xf000,         0xfff0,         FMT_D0, {MEM(AM0), AN1}},
-{ "mov",       0x5c00,         0xfcff,         FMT_S1, {MEM(SP), AN0}},
-{ "mov",       0xfaa00000,     0xfffc0000,     FMT_D2, {MEM(IMM16_MEM), AN0}},
-{ "mov",       0xfca00000,     0xfffc0000,     FMT_D4, {MEM(IMM32_MEM), AN0}},
-{ "mov",       0x60,           0xf0,           FMT_S0, {DM1, MEM(AN0)}},
-{ "mov",       0x4200,         0xf3ff,         FMT_S1, {DM1, MEM(SP)}},
-{ "mov",       0x010000,       0xf30000,       FMT_S2, {DM1, MEM(IMM16_MEM)}},
-{ "mov",       0xfc810000,     0xfff30000,     FMT_D4, {DM1, MEM(IMM32_MEM)}},
-{ "mov",       0xf010,         0xfff0,         FMT_D0, {AM1, MEM(AN0)}},
-{ "mov",       0x4300,         0xf3ff,         FMT_S1, {AM1, MEM(SP)}},
-{ "mov",       0xfa800000,     0xfff30000,     FMT_D2, {AM1, MEM(IMM16_MEM)}},
-{ "mov",       0xfc800000,     0xfff30000,     FMT_D4, {AM1, MEM(IMM32_MEM)}},
-{ "mov",       0x5c00,         0xfc00,         FMT_S1, {MEM2(IMM8, SP), AN0}},
-{ "mov",       0xf80000,       0xfff000,       FMT_D1, {MEM2(SD8, AM0), DN1}},
-{ "mov",       0xfa000000,     0xfff00000,     FMT_D2, {MEM2(SD16, AM0), DN1}},
-{ "mov",       0xfc000000,     0xfff00000,     FMT_D4, {MEM2(IMM32,AM0), DN1}},
-{ "mov",       0x5800,         0xfc00,         FMT_S1, {MEM2(IMM8, SP), DN0}},
-{ "mov",       0xfab40000,     0xfffc0000,     FMT_D2, {MEM2(IMM16, SP), DN0}},
-{ "mov",       0xfcb40000,     0xfffc0000,     FMT_D4, {MEM2(IMM32, SP), DN0}},
-{ "mov",       0xf300,         0xffc0,         FMT_D0, {MEM2(DI, AM0), DN2}},
-{ "mov",       0xf82000,       0xfff000,       FMT_D1, {MEM2(SD8,AM0), AN1}},
-{ "mov",       0xfa200000,     0xfff00000,     FMT_D2, {MEM2(SD16, AM0), AN1}},
-{ "mov",       0xfc200000,     0xfff00000,     FMT_D4, {MEM2(IMM32,AM0), AN1}},
-{ "mov",       0xfab00000,     0xfffc0000,     FMT_D2, {MEM2(IMM16, SP), AN0}},
-{ "mov",       0xfcb00000,     0xfffc0000,     FMT_D4, {MEM2(IMM32, SP), AN0}},
-{ "mov",       0xf380,         0xffc0,         FMT_D0, {MEM2(DI, AM0), AN2}},
-{ "mov",       0x4300,         0xf300,         FMT_S1, {AM1, MEM2(IMM8, SP)}},
-{ "mov",       0xf81000,       0xfff000,       FMT_D1, {DM1, MEM2(SD8, AN0)}},
-{ "mov",       0xfa100000,     0xfff00000,     FMT_D2, {DM1, MEM2(SD16, AN0)}},
-{ "mov",       0xfc100000,     0xfff00000,     FMT_D4, {DM1, MEM2(IMM32,AN0)}},
-{ "mov",       0x4200,         0xf300,         FMT_S1, {DM1, MEM2(IMM8, SP)}},
-{ "mov",       0xfa910000,     0xfff30000,     FMT_D2, {DM1, MEM2(IMM16, SP)}},
-{ "mov",       0xfc910000,     0xfff30000,     FMT_D4, {DM1, MEM2(IMM32, SP)}},
-{ "mov",       0xf340,         0xffc0,         FMT_D0, {DM2, MEM2(DI, AN0)}},
-{ "mov",       0xf83000,       0xfff000,       FMT_D1, {AM1, MEM2(SD8, AN0)}},
-{ "mov",       0xfa300000,     0xfff00000,     FMT_D2, {AM1, MEM2(SD16, AN0)}},
-{ "mov",       0xfc300000,     0xfff00000,     FMT_D4, {AM1, MEM2(IMM32,AN0)}},
-{ "mov",       0xfa900000,     0xfff30000,     FMT_D2, {AM1, MEM2(IMM16, SP)}},
-{ "mov",       0xfc900000,     0xfff30000,     FMT_D4, {AM1, MEM2(IMM32, SP)}},
-{ "mov",       0xf3c0,         0xffc0,         FMT_D0, {AM2, MEM2(DI, AN0)}},
+{ "mov",       0x8000,      0xf000,      FMT_S1, 0,    {SIMM8, DN01}},
+{ "mov",       0x80,        0xf0,        FMT_S0, 0,    {DM1, DN0}},
+{ "mov",       0xf1e0,      0xfff0,      FMT_D0, 0,    {DM1, AN0}},
+{ "mov",       0xf1d0,      0xfff0,      FMT_D0, 0,    {AM1, DN0}},
+{ "mov",       0x9000,      0xf000,      FMT_S1, 0,    {IMM8, AN01}},
+{ "mov",       0x90,        0xf0,        FMT_S0, 0,    {AM1, AN0}},
+{ "mov",       0x3c,        0xfc,        FMT_S0, 0,    {SP, AN0}},
+{ "mov",       0xf2f0,      0xfff3,      FMT_D0, 0,    {AM1, SP}},
+{ "mov",       0xf2e4,      0xfffc,      FMT_D0, 0,    {PSW, DN0}},
+{ "mov",       0xf2f3,      0xfff3,      FMT_D0, 0,    {DM1, PSW}},
+{ "mov",       0xf2e0,      0xfffc,      FMT_D0, 0,    {MDR, DN0}},
+{ "mov",       0xf2f2,      0xfff3,      FMT_D0, 0,    {DM1, MDR}},
+{ "mov",       0x70,        0xf0,        FMT_S0, 0,    {MEM(AM0), DN1}},
+{ "mov",       0x5800,      0xfcff,      FMT_S1, 0,    {MEM(SP), DN0}},
+{ "mov",       0x300000,    0xfc0000,    FMT_S2, 0,    {MEM(IMM16_MEM), DN0}},
+{ "mov",       0xfca40000,  0xfffc0000,  FMT_D4, 0,    {MEM(IMM32_MEM), DN0}},
+{ "mov",       0xf000,      0xfff0,      FMT_D0, 0,    {MEM(AM0), AN1}},
+{ "mov",       0x5c00,      0xfcff,      FMT_S1, 0,    {MEM(SP), AN0}},
+{ "mov",       0xfaa00000,  0xfffc0000,  FMT_D2, 0,    {MEM(IMM16_MEM), AN0}},
+{ "mov",       0xfca00000,  0xfffc0000,  FMT_D4, 0,    {MEM(IMM32_MEM), AN0}},
+{ "mov",       0x60,        0xf0,        FMT_S0, 0,    {DM1, MEM(AN0)}},
+{ "mov",       0x4200,      0xf3ff,      FMT_S1, 0,    {DM1, MEM(SP)}},
+{ "mov",       0x010000,    0xf30000,    FMT_S2, 0,    {DM1, MEM(IMM16_MEM)}},
+{ "mov",       0xfc810000,  0xfff30000,  FMT_D4, 0,    {DM1, MEM(IMM32_MEM)}},
+{ "mov",       0xf010,      0xfff0,      FMT_D0, 0,    {AM1, MEM(AN0)}},
+{ "mov",       0x4300,      0xf3ff,      FMT_S1, 0,    {AM1, MEM(SP)}},
+{ "mov",       0xfa800000,  0xfff30000,  FMT_D2, 0,    {AM1, MEM(IMM16_MEM)}},
+{ "mov",       0xfc800000,  0xfff30000,  FMT_D4, 0,    {AM1, MEM(IMM32_MEM)}},
+{ "mov",       0x5c00,      0xfc00,      FMT_S1, 0,    {MEM2(IMM8, SP), AN0}},
+{ "mov",       0xf80000,    0xfff000,    FMT_D1, 0,    {MEM2(SD8, AM0), DN1}},
+{ "mov",       0xfa000000,  0xfff00000,  FMT_D2, 0,    {MEM2(SD16, AM0), DN1}},
+{ "mov",       0xfc000000,  0xfff00000,  FMT_D4, 0,    {MEM2(IMM32,AM0), DN1}},
+{ "mov",       0x5800,      0xfc00,      FMT_S1, 0,    {MEM2(IMM8, SP), DN0}},
+{ "mov",       0xfab40000,  0xfffc0000,  FMT_D2, 0,    {MEM2(IMM16, SP), DN0}},
+{ "mov",       0xfcb40000,  0xfffc0000,  FMT_D4, 0,    {MEM2(IMM32, SP), DN0}},
+{ "mov",       0xf300,      0xffc0,      FMT_D0, 0,    {MEM2(DI, AM0), DN2}},
+{ "mov",       0xf82000,    0xfff000,    FMT_D1, 0,    {MEM2(SD8,AM0), AN1}},
+{ "mov",       0xfa200000,  0xfff00000,  FMT_D2, 0,    {MEM2(SD16, AM0), AN1}},
+{ "mov",       0xfc200000,  0xfff00000,  FMT_D4, 0,    {MEM2(IMM32,AM0), AN1}},
+{ "mov",       0xfab00000,  0xfffc0000,  FMT_D2, 0,    {MEM2(IMM16, SP), AN0}},
+{ "mov",       0xfcb00000,  0xfffc0000,  FMT_D4, 0,    {MEM2(IMM32, SP), AN0}},
+{ "mov",       0xf380,      0xffc0,      FMT_D0, 0,    {MEM2(DI, AM0), AN2}},
+{ "mov",       0x4300,      0xf300,      FMT_S1, 0,    {AM1, MEM2(IMM8, SP)}},
+{ "mov",       0xf81000,    0xfff000,    FMT_D1, 0,    {DM1, MEM2(SD8, AN0)}},
+{ "mov",       0xfa100000,  0xfff00000,  FMT_D2, 0,    {DM1, MEM2(SD16, AN0)}},
+{ "mov",       0xfc100000,  0xfff00000,  FMT_D4, 0,    {DM1, MEM2(IMM32,AN0)}},
+{ "mov",       0x4200,      0xf300,      FMT_S1, 0,    {DM1, MEM2(IMM8, SP)}},
+{ "mov",       0xfa910000,  0xfff30000,  FMT_D2, 0,    {DM1, MEM2(IMM16, SP)}},
+{ "mov",       0xfc910000,  0xfff30000,  FMT_D4, 0,    {DM1, MEM2(IMM32, SP)}},
+{ "mov",       0xf340,      0xffc0,      FMT_D0, 0,    {DM2, MEM2(DI, AN0)}},
+{ "mov",       0xf83000,    0xfff000,    FMT_D1, 0,    {AM1, MEM2(SD8, AN0)}},
+{ "mov",       0xfa300000,  0xfff00000,  FMT_D2, 0,    {AM1, MEM2(SD16, AN0)}},
+{ "mov",       0xfc300000,  0xfff00000,  FMT_D4, 0,    {AM1, MEM2(IMM32,AN0)}},
+{ "mov",       0xfa900000,  0xfff30000,  FMT_D2, 0,    {AM1, MEM2(IMM16, SP)}},
+{ "mov",       0xfc900000,  0xfff30000,  FMT_D4, 0,    {AM1, MEM2(IMM32, SP)}},
+{ "mov",       0xf3c0,      0xffc0,      FMT_D0, 0,    {AM2, MEM2(DI, AN0)}},
 
 /* start-sanitize-am33 */
-{ "mov",       0xf020,         0xfffc,         FMT_D0, {USP, AN0}},
-{ "mov",       0xf024,         0xfffc,         FMT_D0, {SSP, AN0}},
-{ "mov",       0xf028,         0xfffc,         FMT_D0, {MSP, AN0}},
-{ "mov",       0xf02c,         0xfffc,         FMT_D0, {PC, AN0}},
-{ "mov",       0xf030,         0xfff3,         FMT_D0, {AN1, USP}},
-{ "mov",       0xf031,         0xfff3,         FMT_D0, {AN1, SSP}},
-{ "mov",       0xf032,         0xfff3,         FMT_D0, {AN1, MSP}},
-{ "mov",       0xf2ec,         0xfffc,         FMT_D0, {EPSW, DN0}},
-{ "mov",       0xf2f1,         0xfff3,         FMT_D0, {DM1, EPSW}},
-{ "mov",       0xf500,         0xffc0,         FMT_D0, {AM2, RN0}},
-{ "mov",       0xf540,         0xffc0,         FMT_D0, {DM2, RN0}},
-{ "mov",       0xf580,         0xffc0,         FMT_D0, {RM1, AN0}},
-{ "mov",       0xf5c0,         0xffc0,         FMT_D0, {RM1, DN0}},
-{ "mov",       0xf90800,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "mov",       0xf9e800,       0xffff00,       FMT_D6, {XRM2, RN0}},
-{ "mov",       0xf9f800,       0xffff00,       FMT_D6, {RM2, XRN0}},
-{ "mov",       0xf90a00,       0xffff00,       FMT_D6, {MEM(RM0), RN2}},
-{ "mov",       0xf98a00,       0xffff0f,       FMT_D6, {MEM(SP), RN2}},
-{ "mov",       0xf96a00,       0xffff00,       FMT_D6, {MEMINC(RM0), RN2}},
-{ "mov",       0xfb0e0000,     0xffff0f00,     FMT_D7, {MEM(IMM8_MEM), RN2}},
-{ "mov",       0xfd0e0000,     0xffff0f00,     FMT_D8, {MEM(IMM24_MEM), RN2}},
-{ "mov",       0xfe0e0000,     0xffff0f00,     FMT_D9, {MEM(IMM32_HIGH8_MEM),
+{ "mov",       0xf020,      0xfffc,      FMT_D0, AM33, {USP, AN0}},
+{ "mov",       0xf024,      0xfffc,      FMT_D0, AM33, {SSP, AN0}},
+{ "mov",       0xf028,      0xfffc,      FMT_D0, AM33, {MSP, AN0}},
+{ "mov",       0xf02c,      0xfffc,      FMT_D0, AM33, {PC, AN0}},
+{ "mov",       0xf030,      0xfff3,      FMT_D0, AM33, {AN1, USP}},
+{ "mov",       0xf031,      0xfff3,      FMT_D0, AM33, {AN1, SSP}},
+{ "mov",       0xf032,      0xfff3,      FMT_D0, AM33, {AN1, MSP}},
+{ "mov",       0xf2ec,      0xfffc,      FMT_D0, AM33, {EPSW, DN0}},
+{ "mov",       0xf2f1,      0xfff3,      FMT_D0, AM33, {DM1, EPSW}},
+{ "mov",       0xf500,      0xffc0,      FMT_D0, AM33, {AM2, RN0}},
+{ "mov",       0xf540,      0xffc0,      FMT_D0, AM33, {DM2, RN0}},
+{ "mov",       0xf580,      0xffc0,      FMT_D0, AM33, {RM1, AN0}},
+{ "mov",       0xf5c0,      0xffc0,      FMT_D0, AM33, {RM1, DN0}},
+{ "mov",       0xf90800,    0xffff00,    FMT_D6, AM33, {RM2, RN0}},
+{ "mov",       0xf9e800,    0xffff00,    FMT_D6, AM33, {XRM2, RN0}},
+{ "mov",       0xf9f800,    0xffff00,    FMT_D6, AM33, {RM2, XRN0}},
+{ "mov",       0xf90a00,    0xffff00,    FMT_D6, AM33, {MEM(RM0), RN2}},
+{ "mov",       0xf98a00,    0xffff0f,    FMT_D6, AM33, {MEM(SP), RN2}},
+{ "mov",       0xf96a00,    0xffff00,    FMT_D6, AM33, {MEMINC(RM0), RN2}},
+{ "mov",       0xfb0e0000,  0xffff0f00,  FMT_D7, AM33, {MEM(IMM8_MEM), RN2}},
+{ "mov",       0xfd0e0000,  0xffff0f00,  FMT_D8, AM33, {MEM(IMM24_MEM), RN2}},
+{ "mov",       0xfe0e0000,  0xffff0f00,  FMT_D9, AM33, {MEM(IMM32_HIGH8_MEM),
                                                         RN2}},
-{ "mov",       0xf91a00,       0xffff00,       FMT_D6, {RM2, MEM(RN0)}},
-{ "mov",       0xf99a00,       0xffff0f,       FMT_D6, {RM2, MEM(SP)}},
-{ "mov",       0xf97a00,       0xffff00,       FMT_D6, {RM2, MEMINC(RN0)}},
-{ "mov",       0xfb1e0000,     0xffff0f00,     FMT_D7, {RM2, MEM(IMM8_MEM)}},
-{ "mov",       0xfd1e0000,     0xffff0f00,     FMT_D8, {RM2, MEM(IMM24_MEM)}},
-{ "mov",       0xfe1e0000,     0xffff0f00,     FMT_D9, {RM2,
+{ "mov",       0xf91a00,    0xffff00,    FMT_D6, AM33, {RM2, MEM(RN0)}},
+{ "mov",       0xf99a00,    0xffff0f,    FMT_D6, AM33, {RM2, MEM(SP)}},
+{ "mov",       0xf97a00,    0xffff00,    FMT_D6, AM33, {RM2, MEMINC(RN0)}},
+{ "mov",       0xfb1e0000,  0xffff0f00,  FMT_D7, AM33, {RM2, MEM(IMM8_MEM)}},
+{ "mov",       0xfd1e0000,  0xffff0f00,  FMT_D8, AM33, {RM2, MEM(IMM24_MEM)}},
+{ "mov",       0xfe1e0000,  0xffff0f00,  FMT_D9, AM33, {RM2,
                                                         MEM(IMM32_HIGH8_MEM)}},
-{ "mov",       0xfb0a0000,     0xffff0000,     FMT_D7, {MEM2(SD8, RM0), RN2}},
-{ "mov",       0xfd0a0000,     0xffff0000,     FMT_D8, {MEM2(SD24, RM0), RN2}},
-{ "mov",       0xfe0a0000,     0xffff0000,     FMT_D9, {MEM2(IMM32_HIGH8,RM0), RN2}},
-{ "mov",       0xfb8e0000,     0xffff000f,     FMT_D7, {MEM2(RI, RM0), RD2}},
-{ "mov",       0xfb1a0000,     0xffff0000,     FMT_D7, {RM2, MEM2(SD8, RN0)}},
-{ "mov",       0xfd1a0000,     0xffff0000,     FMT_D8, {RM2, MEM2(SD24, RN0)}},
-{ "mov",       0xfe1a0000,     0xffff0000,     FMT_D9, {RM2, MEM2(IMM32_HIGH8,RN0)}},
-{ "mov",       0xfb8a0000,     0xffff0f00,     FMT_D7, {MEM2(SD8, SP), RN2}},
-{ "mov",       0xfd8a0000,     0xffff0f00,     FMT_D8, {MEM2(SD24, SP), RN2}},
-{ "mov",       0xfe8a0000,     0xffff0f00,     FMT_D9, {MEM2(IMM32_HIGH8, SP), RN2}},
-{ "mov",       0xfb9a0000,     0xffff0f00,     FMT_D7, {RM2, MEM2(SD8, SP)}},
-{ "mov",       0xfd9a0000,     0xffff0f00,     FMT_D8, {RM2, MEM2(SD24, SP)}},
-{ "mov",       0xfe9a0000,     0xffff0f00,     FMT_D9, {RM2, MEM2(IMM32_HIGH8, SP)}},
-{ "mov",       0xfb9e0000,     0xffff000f,     FMT_D7, {RD2, MEM2(RI, RN0)}},
+{ "mov",       0xfb0a0000,  0xffff0000,  FMT_D7, AM33, {MEM2(SD8, RM0), RN2}},
+{ "mov",       0xfd0a0000,  0xffff0000,  FMT_D8, AM33, {MEM2(SD24, RM0), RN2}},
+{ "mov",       0xfe0a0000,  0xffff0000,  FMT_D9, AM33, {MEM2(IMM32_HIGH8,RM0),
+                                                        RN2}},
+{ "mov",       0xfb8e0000,  0xffff000f,  FMT_D7, AM33, {MEM2(RI, RM0), RD2}},
+{ "mov",       0xfb1a0000,  0xffff0000,  FMT_D7, AM33, {RM2, MEM2(SD8, RN0)}},
+{ "mov",       0xfd1a0000,  0xffff0000,  FMT_D8, AM33, {RM2, MEM2(SD24, RN0)}},
+{ "mov",       0xfe1a0000,  0xffff0000,  FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8,
+                                                                  RN0)}},
+{ "mov",       0xfb8a0000,  0xffff0f00,  FMT_D7, AM33, {MEM2(SD8, SP), RN2}},
+{ "mov",       0xfd8a0000,  0xffff0f00,  FMT_D8, AM33, {MEM2(SD24, SP), RN2}},
+{ "mov",       0xfe8a0000,  0xffff0f00,  FMT_D9, AM33, {MEM2(IMM32_HIGH8, SP),
+                                                        RN2}},
+{ "mov",       0xfb9a0000,  0xffff0f00,  FMT_D7, AM33, {RM2, MEM2(SD8, SP)}},
+{ "mov",       0xfd9a0000,  0xffff0f00,  FMT_D8, AM33, {RM2, MEM2(SD24, SP)}},
+{ "mov",       0xfe9a0000,  0xffff0f00,  FMT_D9, AM33, {RM2, MEM2(IMM32_HIGH8, 
+                                                                  SP)}},
+{ "mov",       0xfb9e0000,  0xffff000f,  FMT_D7, AM33, {RD2, MEM2(RI, RN0)}},
 /* end-sanitize-am33 */
 /* These must come after most of the other move instructions to avoid matching
    a symbolic name with IMMxx operands.  Ugh.  */
-{ "mov",       0x2c0000,       0xfc0000,       FMT_S2, {SIMM16, DN0}},
-{ "mov",       0xfccc0000,     0xfffc0000,     FMT_D4, {IMM32, DN0}},
-{ "mov",       0x240000,       0xfc0000,       FMT_S2, {IMM16, AN0}},
-{ "mov",       0xfcdc0000,     0xfffc0000,     FMT_D4, {IMM32, AN0}},
+{ "mov",       0x2c0000,    0xfc0000,    FMT_S2, 0,    {SIMM16, DN0}},
+{ "mov",       0xfccc0000,  0xfffc0000,  FMT_D4, 0,    {IMM32, DN0}},
+{ "mov",       0x240000,    0xfc0000,    FMT_S2, 0,    {IMM16, AN0}},
+{ "mov",       0xfcdc0000,  0xfffc0000,  FMT_D4, 0,    {IMM32, AN0}},
 /* These non-promoting variants need to come after all the other memory
    moves.  */
-{ "mov",       0xf8f000,       0xfffc00,       FMT_D1, {MEM2(SD8N, AM0), SP}},
-{ "mov",       0xf8f400,       0xfffc00,       FMT_D1, {SP, MEM2(SD8N, AN0)}},
+{ "mov",       0xf8f000,    0xfffc00,    FMT_D1, 0,    {MEM2(SD8N, AM0), SP}},
+{ "mov",       0xf8f400,    0xfffc00,    FMT_D1, 0,    {SP, MEM2(SD8N, AN0)}},
 /* start-sanitize-am33 */
 /* These must come last so that we favor shorter move instructions for
    loading immediates into d0-d3/a0-a3.  */
-{ "mov",       0xfb080000,     0xffff0000,     FMT_D7, {SIMM8, RN02}},
-{ "mov",       0xfd080000,     0xffff0000,     FMT_D8, {SIMM24, RN02}},
-{ "mov",       0xfe080000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
-{ "mov",       0xfbf80000,     0xffff0000,     FMT_D7, {SIMM8, XRN02}},
-{ "mov",       0xfdf80000,     0xffff0000,     FMT_D8, {SIMM24, XRN02}},
-{ "mov",       0xfef80000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, XRN02}},
+{ "mov",       0xfb080000,  0xffff0000, FMT_D7, AM33,  {SIMM8, RN02}},
+{ "mov",       0xfd080000,  0xffff0000, FMT_D8, AM33,  {SIMM24, RN02}},
+{ "mov",       0xfe080000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
+{ "mov",       0xfbf80000,  0xffff0000, FMT_D7, AM33,  {SIMM8, XRN02}},
+{ "mov",       0xfdf80000,  0xffff0000, FMT_D8, AM33,  {SIMM24, XRN02}},
+{ "mov",       0xfef80000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, XRN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "movu",      0xfb180000,     0xffff0000,     FMT_D7, {IMM8, RN02}},
-{ "movu",      0xfd180000,     0xffff0000,     FMT_D8, {IMM24, RN02}},
-{ "movu",      0xfe180000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "movu",      0xfb180000,  0xffff0000, FMT_D7, AM33,  {IMM8, RN02}},
+{ "movu",      0xfd180000,  0xffff0000, FMT_D8, AM33,  {IMM24, RN02}},
+{ "movu",      0xfe180000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "mcst9",     0xf630,         0xfff0,         FMT_D0, {DN01}},
-{ "mcst48",    0xf660,         0xfff0,         FMT_D0, {DN01}},
-{ "swap",      0xf680,         0xfff0,         FMT_D0, {DM1, DN0}},
-{ "swap",      0xf9cb00,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "swaph",     0xf690,         0xfff0,         FMT_D0, {DM1, DN0}},
-{ "swaph",     0xf9db00,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "getchx",    0xf6c0,         0xfff0,         FMT_D0, {DN01}},
-{ "getclx",    0xf6d0,         0xfff0,         FMT_D0, {DN01}},
-{ "mac",       0xfb0f0000,     0xffff0000,     FMT_D7, {RM2, RN0, RD2, RD0}},
-{ "mac",       0xf90b00,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "mac",       0xfb0b0000,     0xffff0000,     FMT_D7, {SIMM8, RN02}},
-{ "mac",       0xfd0b0000,     0xffff0000,     FMT_D8, {SIMM24, RN02}},
-{ "mac",       0xfe0b0000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
-{ "macu",      0xfb1f0000,     0xffff0000,     FMT_D7, {RM2, RN0, RD2, RD0}},
-{ "macu",      0xf91b00,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "macu",      0xfb1b0000,     0xffff0000,     FMT_D7, {IMM8, RN02}},
-{ "macu",      0xfd1b0000,     0xffff0000,     FMT_D8, {IMM24, RN02}},
-{ "macu",      0xfe1b0000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
-{ "macb",      0xfb2f0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD2}},
-{ "macb",      0xf92b00,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "macb",      0xfb2b0000,     0xffff0000,     FMT_D7, {SIMM8, RN02}},
-{ "macb",      0xfd2b0000,     0xffff0000,     FMT_D8, {SIMM24, RN02}},
-{ "macb",      0xfe2b0000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
-{ "macbu",     0xfb3f0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD2}},
-{ "macbu",     0xf93b00,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "macbu",     0xfb3b0000,     0xffff0000,     FMT_D7, {IMM8, RN02}},
-{ "macbu",     0xfd3b0000,     0xffff0000,     FMT_D8, {IMM24, RN02}},
-{ "macbu",     0xfe3b0000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
-{ "mach",      0xfb4f0000,     0xffff0000,     FMT_D7, {RM2, RN0, RD2, RD0}},
-{ "mach",      0xf94b00,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "mach",      0xfb4b0000,     0xffff0000,     FMT_D7, {SIMM8, RN02}},
-{ "mach",      0xfd4b0000,     0xffff0000,     FMT_D8, {SIMM24, RN02}},
-{ "mach",      0xfe4b0000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
-{ "machu",     0xfb5f0000,     0xffff0000,     FMT_D7, {RM2, RN0, RD2, RD0}},
-{ "machu",     0xf95b00,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "machu",     0xfb5b0000,     0xffff0000,     FMT_D7, {IMM8, RN02}},
-{ "machu",     0xfd5b0000,     0xffff0000,     FMT_D8, {IMM24, RN02}},
-{ "machu",     0xfe5b0000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
-{ "dmach",     0xfb6f0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD2}},
-{ "dmach",     0xf96b00,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "dmach",     0xfe6b0000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
-{ "dmachu",    0xfb7f0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD2}},
-{ "dmachu",    0xf97b00,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "dmachu",    0xfe7b0000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
-{ "dmulh",     0xfb8f0000,     0xffff0000,     FMT_D7, {RM2, RN0, RD2, RD0}},
-{ "dmulh",     0xf98b00,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "dmulh",     0xfe8b0000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
-{ "dmulhu",    0xfb9f0000,     0xffff0000,     FMT_D7, {RM2, RN0, RD2, RD0}},
-{ "dmulhu",    0xf99b00,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "dmulhu",    0xfe9b0000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
-{ "mcste",     0xf9bb00,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "mcste",     0xfbbb0000,     0xffff0000,     FMT_D7, {IMM8, RN02}},
-{ "swhw",      0xf9eb00,       0xffff00,       FMT_D6, {RM2, RN0}},
+{ "mcst9",     0xf630,      0xfff0,     FMT_D0, AM33,  {DN01}},
+{ "mcst48",    0xf660,      0xfff0,     FMT_D0, AM33,  {DN01}},
+{ "swap",      0xf680,      0xfff0,     FMT_D0, AM33,  {DM1, DN0}},
+{ "swap",      0xf9cb00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "swaph",     0xf690,      0xfff0,     FMT_D0, AM33,  {DM1, DN0}},
+{ "swaph",     0xf9db00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "getchx",    0xf6c0,      0xfff0,     FMT_D0, AM33,  {DN01}},
+{ "getclx",    0xf6d0,      0xfff0,     FMT_D0, AM33,  {DN01}},
+{ "mac",       0xfb0f0000,  0xffff0000, FMT_D7, AM33,  {RM2, RN0, RD2, RD0}},
+{ "mac",       0xf90b00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "mac",       0xfb0b0000,  0xffff0000, FMT_D7, AM33,  {SIMM8, RN02}},
+{ "mac",       0xfd0b0000,  0xffff0000, FMT_D8, AM33,  {SIMM24, RN02}},
+{ "mac",       0xfe0b0000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
+{ "macu",      0xfb1f0000,  0xffff0000, FMT_D7, AM33,  {RM2, RN0, RD2, RD0}},
+{ "macu",      0xf91b00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "macu",      0xfb1b0000,  0xffff0000, FMT_D7, AM33,  {IMM8, RN02}},
+{ "macu",      0xfd1b0000,  0xffff0000, FMT_D8, AM33,  {IMM24, RN02}},
+{ "macu",      0xfe1b0000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
+{ "macb",      0xfb2f0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD2}},
+{ "macb",      0xf92b00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "macb",      0xfb2b0000,  0xffff0000, FMT_D7, AM33,  {SIMM8, RN02}},
+{ "macb",      0xfd2b0000,  0xffff0000, FMT_D8, AM33,  {SIMM24, RN02}},
+{ "macb",      0xfe2b0000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
+{ "macbu",     0xfb3f0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD2}},
+{ "macbu",     0xf93b00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "macbu",     0xfb3b0000,  0xffff0000, FMT_D7, AM33,  {IMM8, RN02}},
+{ "macbu",     0xfd3b0000,  0xffff0000, FMT_D8, AM33,  {IMM24, RN02}},
+{ "macbu",     0xfe3b0000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
+{ "mach",      0xfb4f0000,  0xffff0000, FMT_D7, AM33,  {RM2, RN0, RD2, RD0}},
+{ "mach",      0xf94b00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "mach",      0xfb4b0000,  0xffff0000, FMT_D7, AM33,  {SIMM8, RN02}},
+{ "mach",      0xfd4b0000,  0xffff0000, FMT_D8, AM33,  {SIMM24, RN02}},
+{ "mach",      0xfe4b0000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
+{ "machu",     0xfb5f0000,  0xffff0000, FMT_D7, AM33,  {RM2, RN0, RD2, RD0}},
+{ "machu",     0xf95b00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "machu",     0xfb5b0000,  0xffff0000, FMT_D7, AM33,  {IMM8, RN02}},
+{ "machu",     0xfd5b0000,  0xffff0000, FMT_D8, AM33,  {IMM24, RN02}},
+{ "machu",     0xfe5b0000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
+{ "dmach",     0xfb6f0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD2}},
+{ "dmach",     0xf96b00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "dmach",     0xfe6b0000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
+{ "dmachu",    0xfb7f0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD2}},
+{ "dmachu",    0xf97b00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "dmachu",    0xfe7b0000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
+{ "dmulh",     0xfb8f0000,  0xffff0000, FMT_D7, AM33,  {RM2, RN0, RD2, RD0}},
+{ "dmulh",     0xf98b00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "dmulh",     0xfe8b0000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
+{ "dmulhu",    0xfb9f0000,  0xffff0000, FMT_D7, AM33,  {RM2, RN0, RD2, RD0}},
+{ "dmulhu",    0xf99b00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "dmulhu",    0xfe9b0000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
+{ "mcste",     0xf9bb00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "mcste",     0xfbbb0000,  0xffff0000, FMT_D7, AM33,  {IMM8, RN02}},
+{ "swhw",      0xf9eb00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
 /* end-sanitize-am33 */
 
-{ "movbu",     0xf040,         0xfff0,         FMT_D0, {MEM(AM0), DN1}},
-{ "movbu",     0xf84000,       0xfff000,       FMT_D1, {MEM2(SD8, AM0), DN1}},
-{ "movbu",     0xfa400000,     0xfff00000,     FMT_D2, {MEM2(SD16, AM0), DN1}},
-{ "movbu",     0xfc400000,     0xfff00000,     FMT_D4, {MEM2(IMM32,AM0), DN1}},
-{ "movbu",     0xf8b800,       0xfffcff,       FMT_D1, {MEM(SP), DN0}},
-{ "movbu",     0xf8b800,       0xfffc00,       FMT_D1, {MEM2(IMM8, SP), DN0}},
-{ "movbu",     0xfab80000,     0xfffc0000,     FMT_D2, {MEM2(IMM16, SP), DN0}},
-{ "movbu",     0xfcb80000,     0xfffc0000,     FMT_D4, {MEM2(IMM32, SP), DN0}},
-{ "movbu",     0xf400,         0xffc0,         FMT_D0, {MEM2(DI, AM0), DN2}},
-{ "movbu",     0x340000,       0xfc0000,       FMT_S2, {MEM(IMM16_MEM), DN0}},
-{ "movbu",     0xfca80000,     0xfffc0000,     FMT_D4, {MEM(IMM32_MEM), DN0}},
-{ "movbu",     0xf050,         0xfff0,         FMT_D0, {DM1, MEM(AN0)}},
-{ "movbu",     0xf85000,       0xfff000,       FMT_D1, {DM1, MEM2(SD8, AN0)}},
-{ "movbu",     0xfa500000,     0xfff00000,     FMT_D2, {DM1, MEM2(SD16, AN0)}},
-{ "movbu",     0xfc500000,     0xfff00000,     FMT_D4, {DM1, MEM2(IMM32,AN0)}},
-{ "movbu",     0xf89200,       0xfff3ff,       FMT_D1, {DM1, MEM(SP)}},
-{ "movbu",     0xf89200,       0xfff300,       FMT_D1, {DM1, MEM2(IMM8, SP)}},
-{ "movbu",     0xfa920000,     0xfff30000,     FMT_D2, {DM1, MEM2(IMM16, SP)}},
-{ "movbu",     0xfc920000,     0xfff30000,     FMT_D4, {DM1, MEM2(IMM32, SP)}},
-{ "movbu",     0xf440,         0xffc0,         FMT_D0, {DM2, MEM2(DI, AN0)}},
-{ "movbu",     0x020000,       0xf30000,       FMT_S2, {DM1, MEM(IMM16_MEM)}},
-{ "movbu",     0xfc820000,     0xfff30000,     FMT_D4, {DM1, MEM(IMM32_MEM)}},
+{ "movbu",     0xf040,      0xfff0,     FMT_D0, 0,     {MEM(AM0), DN1}},
+{ "movbu",     0xf84000,    0xfff000,   FMT_D1, 0,     {MEM2(SD8, AM0), DN1}},
+{ "movbu",     0xfa400000,  0xfff00000, FMT_D2, 0,     {MEM2(SD16, AM0), DN1}},
+{ "movbu",     0xfc400000,  0xfff00000, FMT_D4, 0,     {MEM2(IMM32,AM0), DN1}},
+{ "movbu",     0xf8b800,    0xfffcff,   FMT_D1, 0,     {MEM(SP), DN0}},
+{ "movbu",     0xf8b800,    0xfffc00,   FMT_D1, 0,     {MEM2(IMM8, SP), DN0}},
+{ "movbu",     0xfab80000,  0xfffc0000, FMT_D2, 0,     {MEM2(IMM16, SP), DN0}},
+{ "movbu",     0xfcb80000,  0xfffc0000, FMT_D4, 0,     {MEM2(IMM32, SP), DN0}},
+{ "movbu",     0xf400,      0xffc0,     FMT_D0, 0,     {MEM2(DI, AM0), DN2}},
+{ "movbu",     0x340000,    0xfc0000,   FMT_S2, 0,     {MEM(IMM16_MEM), DN0}},
+{ "movbu",     0xfca80000,  0xfffc0000, FMT_D4, 0,     {MEM(IMM32_MEM), DN0}},
+{ "movbu",     0xf050,      0xfff0,     FMT_D0, 0,     {DM1, MEM(AN0)}},
+{ "movbu",     0xf85000,    0xfff000,   FMT_D1, 0,     {DM1, MEM2(SD8, AN0)}},
+{ "movbu",     0xfa500000,  0xfff00000, FMT_D2, 0,     {DM1, MEM2(SD16, AN0)}},
+{ "movbu",     0xfc500000,  0xfff00000, FMT_D4, 0,     {DM1, MEM2(IMM32,AN0)}},
+{ "movbu",     0xf89200,    0xfff3ff,   FMT_D1, 0,     {DM1, MEM(SP)}},
+{ "movbu",     0xf89200,    0xfff300,   FMT_D1, 0,     {DM1, MEM2(IMM8, SP)}},
+{ "movbu",     0xfa920000,  0xfff30000, FMT_D2, 0,     {DM1, MEM2(IMM16, SP)}},
+{ "movbu",     0xfc920000,  0xfff30000, FMT_D4, 0,     {DM1, MEM2(IMM32, SP)}},
+{ "movbu",     0xf440,      0xffc0,     FMT_D0, 0,     {DM2, MEM2(DI, AN0)}},
+{ "movbu",     0x020000,    0xf30000,   FMT_S2, 0,     {DM1, MEM(IMM16_MEM)}},
+{ "movbu",     0xfc820000,  0xfff30000, FMT_D4, 0,     {DM1, MEM(IMM32_MEM)}},
 /* start-sanitize-am33 */
-{ "movbu",     0xf92a00,       0xffff00,       FMT_D6, {MEM(RM0), RN2}},
-{ "movbu",     0xf93a00,       0xffff00,       FMT_D6, {RM2, MEM(RN0)}},
-{ "movbu",     0xf9aa00,       0xffff0f,       FMT_D6, {MEM(SP), RN2}},
-{ "movbu",     0xf9ba00,       0xffff0f,       FMT_D6, {RM2, MEM(SP)}},
-{ "movbu",     0xfb2a0000,     0xffff0000,     FMT_D7, {MEM2(SD8, RM0), RN2}},
-{ "movbu",     0xfd2a0000,     0xffff0000,     FMT_D8, {MEM2(SD24, RM0), RN2}},
-{ "movbu",     0xfe2a0000,     0xffff0000,     FMT_D9, {MEM2(IMM32_HIGH8,RM0), RN2}},
-{ "movbu",     0xfb3a0000,     0xffff0000,     FMT_D7, {RM2, MEM2(SD8, RN0)}},
-{ "movbu",     0xfd3a0000,     0xffff0000,     FMT_D8, {RM2, MEM2(SD24, RN0)}},
-{ "movbu",     0xfe3a0000,     0xffff0000,     FMT_D9, {RM2, MEM2(IMM32_HIGH8,RN0)}},
-{ "movbu",     0xfbaa0000,     0xffff0f00,     FMT_D7, {MEM2(SD8, SP), RN2}},
-{ "movbu",     0xfdaa0000,     0xffff0f00,     FMT_D8, {MEM2(SD24, SP), RN2}},
-{ "movbu",     0xfeaa0000,     0xffff0f00,     FMT_D9, {MEM2(IMM32_HIGH8,SP), RN2}},
-{ "movbu",     0xfbba0000,     0xffff0f00,     FMT_D7, {RM2, MEM2(SD8, SP)}},
-{ "movbu",     0xfdba0000,     0xffff0f00,     FMT_D8, {RM2, MEM2(SD24, SP)}},
-{ "movbu",     0xfeba0000,     0xffff0f00,     FMT_D9, {RM2, MEM2(IMM32_HIGH8, SP)}},
-{ "movbu",     0xfb2e0000,     0xffff0f00,     FMT_D7, {MEM(IMM8_MEM), RN2}},
-{ "movbu",     0xfd2e0000,     0xffff0f00,     FMT_D8, {MEM(IMM24_MEM), RN2}},
-{ "movbu",     0xfe2e0000,     0xffff0f00,     FMT_D9, {MEM(IMM32_HIGH8_MEM),
+{ "movbu",     0xf92a00,    0xffff00,   FMT_D6, AM33,  {MEM(RM0), RN2}},
+{ "movbu",     0xf93a00,    0xffff00,   FMT_D6, AM33,  {RM2, MEM(RN0)}},
+{ "movbu",     0xf9aa00,    0xffff0f,   FMT_D6, AM33,  {MEM(SP), RN2}},
+{ "movbu",     0xf9ba00,    0xffff0f,   FMT_D6, AM33,  {RM2, MEM(SP)}},
+{ "movbu",     0xfb2a0000,  0xffff0000, FMT_D7, AM33,  {MEM2(SD8, RM0), RN2}},
+{ "movbu",     0xfd2a0000,  0xffff0000, FMT_D8, AM33,  {MEM2(SD24, RM0), RN2}},
+{ "movbu",     0xfe2a0000,  0xffff0000, FMT_D9, AM33,  {MEM2(IMM32_HIGH8,RM0),
+                                                        RN2}},
+{ "movbu",     0xfb3a0000,  0xffff0000, FMT_D7, AM33,  {RM2, MEM2(SD8, RN0)}},
+{ "movbu",     0xfd3a0000,  0xffff0000, FMT_D8, AM33,  {RM2, MEM2(SD24, RN0)}},
+{ "movbu",     0xfe3a0000,  0xffff0000, FMT_D9, AM33,  {RM2, MEM2(IMM32_HIGH8,
+                                                                  RN0)}},
+{ "movbu",     0xfbaa0000,  0xffff0f00, FMT_D7, AM33,  {MEM2(SD8, SP), RN2}},
+{ "movbu",     0xfdaa0000,  0xffff0f00, FMT_D8, AM33,  {MEM2(SD24, SP), RN2}},
+{ "movbu",     0xfeaa0000,  0xffff0f00, FMT_D9, AM33,  {MEM2(IMM32_HIGH8,SP),
                                                         RN2}},
-{ "movbu",     0xfb3e0000,     0xffff0f00,     FMT_D7, {RM2, MEM(IMM8_MEM)}},
-{ "movbu",     0xfd3e0000,     0xffff0f00,     FMT_D8, {RM2, MEM(IMM24_MEM)}},
-{ "movbu",     0xfe3e0000,     0xffff0f00,     FMT_D9, {RM2,
+{ "movbu",     0xfbba0000,  0xffff0f00, FMT_D7, AM33,  {RM2, MEM2(SD8, SP)}},
+{ "movbu",     0xfdba0000,  0xffff0f00, FMT_D8, AM33,  {RM2, MEM2(SD24, SP)}},
+{ "movbu",     0xfeba0000,  0xffff0f00, FMT_D9, AM33,  {RM2, MEM2(IMM32_HIGH8,
+                                                                  SP)}},
+{ "movbu",     0xfb2e0000,  0xffff0f00, FMT_D7, AM33,  {MEM(IMM8_MEM), RN2}},
+{ "movbu",     0xfd2e0000,  0xffff0f00, FMT_D8, AM33,  {MEM(IMM24_MEM), RN2}},
+{ "movbu",     0xfe2e0000,  0xffff0f00, FMT_D9, AM33,  {MEM(IMM32_HIGH8_MEM),
+                                                        RN2}},
+{ "movbu",     0xfb3e0000,  0xffff0f00, FMT_D7, AM33,  {RM2, MEM(IMM8_MEM)}},
+{ "movbu",     0xfd3e0000,  0xffff0f00, FMT_D8, AM33,  {RM2, MEM(IMM24_MEM)}},
+{ "movbu",     0xfe3e0000,  0xffff0f00, FMT_D9, AM33,  {RM2,
                                                         MEM(IMM32_HIGH8_MEM)}},
-{ "movbu",     0xfbae0000,     0xffff000f,     FMT_D7, {MEM2(RI, RM0), RD2}},
-{ "movbu",     0xfbbe0000,     0xffff000f,     FMT_D7, {RD2, MEM2(RI, RN0)}},
+{ "movbu",     0xfbae0000,  0xffff000f, FMT_D7, AM33,  {MEM2(RI, RM0), RD2}},
+{ "movbu",     0xfbbe0000,  0xffff000f, FMT_D7, AM33,  {RD2, MEM2(RI, RN0)}},
 /* end-sanitize-am33 */
 
-{ "movhu",     0xf060,         0xfff0,         FMT_D0, {MEM(AM0), DN1}},
-{ "movhu",     0xf86000,       0xfff000,       FMT_D1, {MEM2(SD8, AM0), DN1}},
-{ "movhu",     0xfa600000,     0xfff00000,     FMT_D2, {MEM2(SD16, AM0), DN1}},
-{ "movhu",     0xfc600000,     0xfff00000,     FMT_D4, {MEM2(IMM32,AM0), DN1}},
-{ "movhu",     0xf8bc00,       0xfffcff,       FMT_D1, {MEM(SP), DN0}},
-{ "movhu",     0xf8bc00,       0xfffc00,       FMT_D1, {MEM2(IMM8, SP), DN0}},
-{ "movhu",     0xfabc0000,     0xfffc0000,     FMT_D2, {MEM2(IMM16, SP), DN0}},
-{ "movhu",     0xfcbc0000,     0xfffc0000,     FMT_D4, {MEM2(IMM32, SP), DN0}},
-{ "movhu",     0xf480,         0xffc0,         FMT_D0, {MEM2(DI, AM0), DN2}},
-{ "movhu",     0x380000,       0xfc0000,       FMT_S2, {MEM(IMM16_MEM), DN0}},
-{ "movhu",     0xfcac0000,     0xfffc0000,     FMT_D4, {MEM(IMM32_MEM), DN0}},
-{ "movhu",     0xf070,         0xfff0,         FMT_D0, {DM1, MEM(AN0)}},
-{ "movhu",     0xf87000,       0xfff000,       FMT_D1, {DM1, MEM2(SD8, AN0)}},
-{ "movhu",     0xfa700000,     0xfff00000,     FMT_D2, {DM1, MEM2(SD16, AN0)}},
-{ "movhu",     0xfc700000,     0xfff00000,     FMT_D4, {DM1, MEM2(IMM32,AN0)}},
-{ "movhu",     0xf89300,       0xfff3ff,       FMT_D1, {DM1, MEM(SP)}},
-{ "movhu",     0xf89300,       0xfff300,       FMT_D1, {DM1, MEM2(IMM8, SP)}},
-{ "movhu",     0xfa930000,     0xfff30000,     FMT_D2, {DM1, MEM2(IMM16, SP)}},
-{ "movhu",     0xfc930000,     0xfff30000,     FMT_D4, {DM1, MEM2(IMM32, SP)}},
-{ "movhu",     0xf4c0,         0xffc0,         FMT_D0, {DM2, MEM2(DI, AN0)}},
-{ "movhu",     0x030000,       0xf30000,       FMT_S2, {DM1, MEM(IMM16_MEM)}},
-{ "movhu",     0xfc830000,     0xfff30000,     FMT_D4, {DM1, MEM(IMM32_MEM)}},
+{ "movhu",     0xf060,      0xfff0,     FMT_D0, 0,     {MEM(AM0), DN1}},
+{ "movhu",     0xf86000,    0xfff000,   FMT_D1, 0,     {MEM2(SD8, AM0), DN1}},
+{ "movhu",     0xfa600000,  0xfff00000, FMT_D2, 0,     {MEM2(SD16, AM0), DN1}},
+{ "movhu",     0xfc600000,  0xfff00000, FMT_D4, 0,     {MEM2(IMM32,AM0), DN1}},
+{ "movhu",     0xf8bc00,    0xfffcff,   FMT_D1, 0,     {MEM(SP), DN0}},
+{ "movhu",     0xf8bc00,    0xfffc00,   FMT_D1, 0,     {MEM2(IMM8, SP), DN0}},
+{ "movhu",     0xfabc0000,  0xfffc0000, FMT_D2, 0,     {MEM2(IMM16, SP), DN0}},
+{ "movhu",     0xfcbc0000,  0xfffc0000, FMT_D4, 0,     {MEM2(IMM32, SP), DN0}},
+{ "movhu",     0xf480,      0xffc0,     FMT_D0, 0,     {MEM2(DI, AM0), DN2}},
+{ "movhu",     0x380000,    0xfc0000,   FMT_S2, 0,     {MEM(IMM16_MEM), DN0}},
+{ "movhu",     0xfcac0000,  0xfffc0000, FMT_D4, 0,     {MEM(IMM32_MEM), DN0}},
+{ "movhu",     0xf070,      0xfff0,     FMT_D0, 0,     {DM1, MEM(AN0)}},
+{ "movhu",     0xf87000,    0xfff000,   FMT_D1, 0,     {DM1, MEM2(SD8, AN0)}},
+{ "movhu",     0xfa700000,  0xfff00000, FMT_D2, 0,     {DM1, MEM2(SD16, AN0)}},
+{ "movhu",     0xfc700000,  0xfff00000, FMT_D4, 0,     {DM1, MEM2(IMM32,AN0)}},
+{ "movhu",     0xf89300,    0xfff3ff,   FMT_D1, 0,     {DM1, MEM(SP)}},
+{ "movhu",     0xf89300,    0xfff300,   FMT_D1, 0,     {DM1, MEM2(IMM8, SP)}},
+{ "movhu",     0xfa930000,  0xfff30000, FMT_D2, 0,     {DM1, MEM2(IMM16, SP)}},
+{ "movhu",     0xfc930000,  0xfff30000, FMT_D4, 0,     {DM1, MEM2(IMM32, SP)}},
+{ "movhu",     0xf4c0,      0xffc0,     FMT_D0, 0,     {DM2, MEM2(DI, AN0)}},
+{ "movhu",     0x030000,    0xf30000,   FMT_S2, 0,     {DM1, MEM(IMM16_MEM)}},
+{ "movhu",     0xfc830000,  0xfff30000, FMT_D4, 0,     {DM1, MEM(IMM32_MEM)}},
 /* start-sanitize-am33 */
-{ "movhu",     0xf94a00,       0xffff00,       FMT_D6, {MEM(RM0), RN2}},
-{ "movhu",     0xf95a00,       0xffff00,       FMT_D6, {RM2, MEM(RN0)}},
-{ "movhu",     0xf9ca00,       0xffff0f,       FMT_D6, {MEM(SP), RN2}},
-{ "movhu",     0xf9da00,       0xffff0f,       FMT_D6, {RM2, MEM(SP)}},
-{ "movhu",     0xf9ea00,       0xffff00,       FMT_D6, {MEMINC(RM0), RN2}},
-{ "movhu",     0xf9fa00,       0xffff00,       FMT_D6, {RM2, MEMINC(RN0)}},
-{ "movhu",     0xfb4a0000,     0xffff0000,     FMT_D7, {MEM2(SD8, RM0), RN2}},
-{ "movhu",     0xfd4a0000,     0xffff0000,     FMT_D8, {MEM2(SD24, RM0), RN2}},
-{ "movhu",     0xfe4a0000,     0xffff0000,     FMT_D9, {MEM2(IMM32_HIGH8,RM0), RN2}},
-{ "movhu",     0xfb5a0000,     0xffff0000,     FMT_D7, {RM2, MEM2(SD8, RN0)}},
-{ "movhu",     0xfd5a0000,     0xffff0000,     FMT_D8, {RM2, MEM2(SD24, RN0)}},
-{ "movhu",     0xfe5a0000,     0xffff0000,     FMT_D9, {RM2, MEM2(IMM32_HIGH8,RN0)}},
-{ "movhu",     0xfbca0000,     0xffff0f00,     FMT_D7, {MEM2(SD8, SP), RN2}},
-{ "movhu",     0xfdca0000,     0xffff0f00,     FMT_D8, {MEM2(SD24, SP), RN2}},
-{ "movhu",     0xfeca0000,     0xffff0f00,     FMT_D9, {MEM2(IMM32_HIGH8, SP), RN2}},
-{ "movhu",     0xfbda0000,     0xffff0f00,     FMT_D7, {RM2, MEM2(SD8, SP)}},
-{ "movhu",     0xfdda0000,     0xffff0f00,     FMT_D8, {RM2, MEM2(SD24, SP)}},
-{ "movhu",     0xfeda0000,     0xffff0f00,     FMT_D9, {RM2, MEM2(IMM32_HIGH8, SP)}},
-{ "movhu",     0xfb4e0000,     0xffff0f00,     FMT_D7, {MEM(IMM8_MEM), RN2}},
-{ "movhu",     0xfd4e0000,     0xffff0f00,     FMT_D8, {MEM(IMM24_MEM), RN2}},
-{ "movhu",     0xfe4e0000,     0xffff0f00,     FMT_D9, {MEM(IMM32_HIGH8_MEM),
+{ "movhu",     0xf94a00,    0xffff00,   FMT_D6, AM33,  {MEM(RM0), RN2}},
+{ "movhu",     0xf95a00,    0xffff00,   FMT_D6, AM33,  {RM2, MEM(RN0)}},
+{ "movhu",     0xf9ca00,    0xffff0f,   FMT_D6, AM33,  {MEM(SP), RN2}},
+{ "movhu",     0xf9da00,    0xffff0f,   FMT_D6, AM33,  {RM2, MEM(SP)}},
+{ "movhu",     0xf9ea00,    0xffff00,   FMT_D6, AM33,  {MEMINC(RM0), RN2}},
+{ "movhu",     0xf9fa00,    0xffff00,   FMT_D6, AM33,  {RM2, MEMINC(RN0)}},
+{ "movhu",     0xfb4a0000,  0xffff0000, FMT_D7, AM33,  {MEM2(SD8, RM0), RN2}},
+{ "movhu",     0xfd4a0000,  0xffff0000, FMT_D8, AM33,  {MEM2(SD24, RM0), RN2}},
+{ "movhu",     0xfe4a0000,  0xffff0000, FMT_D9, AM33,  {MEM2(IMM32_HIGH8,RM0),
+                                                        RN2}},
+{ "movhu",     0xfb5a0000,  0xffff0000, FMT_D7, AM33,  {RM2, MEM2(SD8, RN0)}},
+{ "movhu",     0xfd5a0000,  0xffff0000, FMT_D8, AM33,  {RM2, MEM2(SD24, RN0)}},
+{ "movhu",     0xfe5a0000,  0xffff0000, FMT_D9, AM33,  {RM2, MEM2(IMM32_HIGH8,
+                                                                  RN0)}},
+{ "movhu",     0xfbca0000,  0xffff0f00, FMT_D7, AM33,  {MEM2(SD8, SP), RN2}},
+{ "movhu",     0xfdca0000,  0xffff0f00, FMT_D8, AM33,  {MEM2(SD24, SP), RN2}},
+{ "movhu",     0xfeca0000,  0xffff0f00, FMT_D9, AM33,  {MEM2(IMM32_HIGH8, SP),
+                                                        RN2}},
+{ "movhu",     0xfbda0000,  0xffff0f00, FMT_D7, AM33,  {RM2, MEM2(SD8, SP)}},
+{ "movhu",     0xfdda0000,  0xffff0f00, FMT_D8, AM33,  {RM2, MEM2(SD24, SP)}},
+{ "movhu",     0xfeda0000,  0xffff0f00, FMT_D9, AM33,  {RM2, MEM2(IMM32_HIGH8,
+                                                                  SP)}},
+{ "movhu",     0xfb4e0000,  0xffff0f00, FMT_D7, AM33,  {MEM(IMM8_MEM), RN2}},
+{ "movhu",     0xfd4e0000,  0xffff0f00, FMT_D8, AM33,  {MEM(IMM24_MEM), RN2}},
+{ "movhu",     0xfe4e0000,  0xffff0f00, FMT_D9, AM33,  {MEM(IMM32_HIGH8_MEM),
                                                         RN2}},
-{ "movhu",     0xfb5e0000,     0xffff0f00,     FMT_D7, {RM2, MEM(IMM8_MEM)}},
-{ "movhu",     0xfd5e0000,     0xffff0f00,     FMT_D8, {RM2, MEM(IMM24_MEM)}},
-{ "movhu",     0xfe5e0000,     0xffff0f00,     FMT_D9, {RM2,
+{ "movhu",     0xfb5e0000,  0xffff0f00, FMT_D7, AM33,  {RM2, MEM(IMM8_MEM)}},
+{ "movhu",     0xfd5e0000,  0xffff0f00, FMT_D8, AM33,  {RM2, MEM(IMM24_MEM)}},
+{ "movhu",     0xfe5e0000,  0xffff0f00, FMT_D9, AM33,  {RM2,
                                                         MEM(IMM32_HIGH8_MEM)}},
-{ "movhu",     0xfbce0000,     0xffff000f,     FMT_D7, {MEM2(RI, RM0), RD2}},
-{ "movhu",     0xfbde0000,     0xffff000f,     FMT_D7, {RD2, MEM2(RI, RN0)}},
+{ "movhu",     0xfbce0000,  0xffff000f, FMT_D7, AM33,  {MEM2(RI, RM0), RD2}},
+{ "movhu",     0xfbde0000,  0xffff000f, FMT_D7, AM33,  {RD2, MEM2(RI, RN0)}},
 /* end-sanitize-am33 */
 
-{ "ext",       0xf2d0,         0xfffc,         FMT_D0, {DN0}},
+{ "ext",       0xf2d0,      0xfffc,     FMT_D0, 0,     {DN0}},
 /* start-sanitize-am33 */
-{ "ext",       0xf91800,       0xffff00,       FMT_D6, {RN02}},
+{ "ext",       0xf91800,    0xffff00,   FMT_D6, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "extb",      0xf92800,       0xffff00,       FMT_D6, {RM2, RN0}},
+{ "extb",      0xf92800,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
 /* end-sanitize-am33 */
-{ "extb",      0x10,           0xfc,           FMT_S0, {DN0}},
+{ "extb",      0x10,        0xfc,       FMT_S0, 0,     {DN0}},
 /* start-sanitize-am33 */
-{ "extb",      0xf92800,       0xffff00,       FMT_D6, {RN02}},
+{ "extb",      0xf92800,    0xffff00,   FMT_D6, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "extbu",     0xf93800,       0xffff00,       FMT_D6, {RM2, RN0}},
+{ "extbu",     0xf93800,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
 /* end-sanitize-am33 */
-{ "extbu",     0x14,           0xfc,           FMT_S0, {DN0}},
+{ "extbu",     0x14,        0xfc,       FMT_S0, 0,     {DN0}},
 /* start-sanitize-am33 */
-{ "extbu",     0xf93800,       0xffff00,       FMT_D6, {RN02}},
+{ "extbu",     0xf93800,    0xffff00,   FMT_D6, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "exth",      0xf94800,       0xffff00,       FMT_D6, {RM2, RN0}},
+{ "exth",      0xf94800,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
 /* end-sanitize-am33 */
-{ "exth",      0x18,           0xfc,           FMT_S0, {DN0}},
+{ "exth",      0x18,        0xfc,       FMT_S0, 0,     {DN0}},
 /* start-sanitize-am33 */
-{ "exth",      0xf94800,       0xffff00,       FMT_D6, {RN02}},
+{ "exth",      0xf94800,    0xffff00,   FMT_D6, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "exthu",     0xf95800,       0xffff00,       FMT_D6, {RM2, RN0}},
+{ "exthu",     0xf95800,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
 /* end-sanitize-am33 */
-{ "exthu",     0x1c,           0xfc,           FMT_S0, {DN0}},
+{ "exthu",     0x1c,        0xfc,       FMT_S0, 0,     {DN0}},
 /* start-sanitize-am33 */
-{ "exthu",     0xf95800,       0xffff00,       FMT_D6, {RN02}},
+{ "exthu",     0xf95800,    0xffff00,   FMT_D6, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
-{ "movm",      0xce00,         0xff00,         FMT_S1, {MEM(SP), REGS}},
-{ "movm",      0xcf00,         0xff00,         FMT_S1, {REGS, MEM(SP)}},
+{ "movm",      0xce00,      0xff00,     FMT_S1, 0,     {MEM(SP), REGS}},
+{ "movm",      0xcf00,      0xff00,     FMT_S1, 0,     {REGS, MEM(SP)}},
 /* start-sanitize-am33 */
-{ "movm",      0xf8ce00,       0xffff00,       FMT_D1, {MEM(USP), REGS}},
-{ "movm",      0xf8cf00,       0xffff00,       FMT_D1, {REGS, MEM(USP)}},
+{ "movm",      0xf8ce00,    0xffff00,   FMT_D1, AM33,  {MEM(USP), REGS}},
+{ "movm",      0xf8cf00,    0xffff00,   FMT_D1, AM33,  {REGS, MEM(USP)}},
 /* end-sanitize-am33 */
 
-{ "clr",       0x00,           0xf3,           FMT_S0, {DN1}},
+{ "clr",       0x00,        0xf3,       FMT_S0, 0,     {DN1}},
 /* start-sanitize-am33 */
-{ "clr",       0xf96800,       0xffff00,       FMT_D6, {RN02}},
+{ "clr",       0xf96800,    0xffff00,   FMT_D6, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "add",       0xfb7c0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD2}},
+{ "add",       0xfb7c0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD2}},
 /* end-sanitize-am33 */
-{ "add",       0xe0,           0xf0,           FMT_S0, {DM1, DN0}},
-{ "add",       0xf160,         0xfff0,         FMT_D0, {DM1, AN0}},
-{ "add",       0xf150,         0xfff0,         FMT_D0, {AM1, DN0}},
-{ "add",       0xf170,         0xfff0,         FMT_D0, {AM1, AN0}},
-{ "add",       0x2800,         0xfc00,         FMT_S1, {SIMM8, DN0}},
-{ "add",       0xfac00000,     0xfffc0000,     FMT_D2, {SIMM16, DN0}},
-{ "add",       0xfcc00000,     0xfffc0000,     FMT_D4, {IMM32, DN0}},
-{ "add",       0x2000,         0xfc00,         FMT_S1, {SIMM8, AN0}},
-{ "add",       0xfad00000,     0xfffc0000,     FMT_D2, {SIMM16, AN0}},
-{ "add",       0xfcd00000,     0xfffc0000,     FMT_D4, {IMM32, AN0}},
-{ "add",       0xf8fe00,       0xffff00,       FMT_D1, {SIMM8, SP}},
-{ "add",       0xfafe0000,     0xffff0000,     FMT_D2, {SIMM16, SP}},
-{ "add",       0xfcfe0000,     0xffff0000,     FMT_D4, {IMM32, SP}},
+{ "add",       0xe0,        0xf0,       FMT_S0, 0,     {DM1, DN0}},
+{ "add",       0xf160,      0xfff0,     FMT_D0, 0,     {DM1, AN0}},
+{ "add",       0xf150,      0xfff0,     FMT_D0, 0,     {AM1, DN0}},
+{ "add",       0xf170,      0xfff0,     FMT_D0, 0,     {AM1, AN0}},
+{ "add",       0x2800,      0xfc00,     FMT_S1, 0,     {SIMM8, DN0}},
+{ "add",       0xfac00000,  0xfffc0000, FMT_D2, 0,     {SIMM16, DN0}},
+{ "add",       0xfcc00000,  0xfffc0000, FMT_D4, 0,     {IMM32, DN0}},
+{ "add",       0x2000,      0xfc00,     FMT_S1, 0,     {SIMM8, AN0}},
+{ "add",       0xfad00000,  0xfffc0000, FMT_D2, 0,     {SIMM16, AN0}},
+{ "add",       0xfcd00000,  0xfffc0000, FMT_D4, 0,     {IMM32, AN0}},
+{ "add",       0xf8fe00,    0xffff00,   FMT_D1, 0,     {SIMM8, SP}},
+{ "add",       0xfafe0000,  0xffff0000, FMT_D2, 0,     {SIMM16, SP}},
+{ "add",       0xfcfe0000,  0xffff0000, FMT_D4, 0,     {IMM32, SP}},
 /* start-sanitize-am33 */
-{ "add",       0xf97800,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "add",       0xfb780000,     0xffff0000,     FMT_D7, {SIMM8, RN02}},
-{ "add",       0xfd780000,     0xffff0000,     FMT_D8, {SIMM24, RN02}},
-{ "add",       0xfe780000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "add",       0xf97800,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "add",       0xfb780000,  0xffff0000, FMT_D7, AM33,  {SIMM8, RN02}},
+{ "add",       0xfd780000,  0xffff0000, FMT_D8, AM33,  {SIMM24, RN02}},
+{ "add",       0xfe780000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "addc",      0xfb8c0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD0}},
+{ "addc",      0xfb8c0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD0}},
 /* end-sanitize-am33 */
-{ "addc",      0xf140,         0xfff0,         FMT_D0, {DM1, DN0}},
+{ "addc",      0xf140,      0xfff0,     FMT_D0, 0,     {DM1, DN0}},
 /* start-sanitize-am33 */
-{ "addc",      0xf98800,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "addc",      0xfb880000,     0xffff0000,     FMT_D7, {SIMM8, RN02}},
-{ "addc",      0xfd880000,     0xffff0000,     FMT_D8, {SIMM24, RN02}},
-{ "addc",      0xfe880000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "addc",      0xf98800,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "addc",      0xfb880000,  0xffff0000, FMT_D7, AM33,  {SIMM8, RN02}},
+{ "addc",      0xfd880000,  0xffff0000, FMT_D8, AM33,  {SIMM24, RN02}},
+{ "addc",      0xfe880000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "sub",       0xfb9c0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD0}},
+{ "sub",       0xfb9c0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD0}},
 /* end-sanitize-am33 */
-{ "sub",       0xf100,         0xfff0,         FMT_D0, {DM1, DN0}},
-{ "sub",       0xf120,         0xfff0,         FMT_D0, {DM1, AN0}},
-{ "sub",       0xf110,         0xfff0,         FMT_D0, {AM1, DN0}},
-{ "sub",       0xf130,         0xfff0,         FMT_D0, {AM1, AN0}},
-{ "sub",       0xfcc40000,     0xfffc0000,     FMT_D4, {IMM32, DN0}},
-{ "sub",       0xfcd40000,     0xfffc0000,     FMT_D4, {IMM32, AN0}},
+{ "sub",       0xf100,      0xfff0,     FMT_D0, 0,     {DM1, DN0}},
+{ "sub",       0xf120,      0xfff0,     FMT_D0, 0,     {DM1, AN0}},
+{ "sub",       0xf110,      0xfff0,     FMT_D0, 0,     {AM1, DN0}},
+{ "sub",       0xf130,      0xfff0,     FMT_D0, 0,     {AM1, AN0}},
+{ "sub",       0xfcc40000,  0xfffc0000, FMT_D4, 0,     {IMM32, DN0}},
+{ "sub",       0xfcd40000,  0xfffc0000, FMT_D4, 0,     {IMM32, AN0}},
 /* start-sanitize-am33 */
-{ "sub",       0xf99800,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "sub",       0xfb980000,     0xffff0000,     FMT_D7, {SIMM8, RN02}},
-{ "sub",       0xfd980000,     0xffff0000,     FMT_D8, {SIMM24, RN02}},
-{ "sub",       0xfe980000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "sub",       0xf99800,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "sub",       0xfb980000,  0xffff0000, FMT_D7, AM33,  {SIMM8, RN02}},
+{ "sub",       0xfd980000,  0xffff0000, FMT_D8, AM33,  {SIMM24, RN02}},
+{ "sub",       0xfe980000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "subc",      0xfa8c0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD0}},
+{ "subc",      0xfa8c0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD0}},
 /* end-sanitize-am33 */
-{ "subc",      0xf180,         0xfff0,         FMT_D0, {DM1, DN0}},
+{ "subc",      0xf180,      0xfff0,     FMT_D0, 0,     {DM1, DN0}},
 /* start-sanitize-am33 */
-{ "subc",      0xf9a800,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "subc",      0xfba80000,     0xffff0000,     FMT_D7, {SIMM8, RN02}},
-{ "subc",      0xfda80000,     0xffff0000,     FMT_D8, {SIMM24, RN02}},
-{ "subc",      0xfea80000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "subc",      0xf9a800,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "subc",      0xfba80000,  0xffff0000, FMT_D7, AM33,  {SIMM8, RN02}},
+{ "subc",      0xfda80000,  0xffff0000, FMT_D8, AM33,  {SIMM24, RN02}},
+{ "subc",      0xfea80000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "mul",       0xfbab0000,     0xffff0000,     FMT_D7, {RM2, RN0, RD2, RD0}},
+{ "mul",       0xfbab0000,  0xffff0000, FMT_D7, AM33,  {RM2, RN0, RD2, RD0}},
 /* end-sanitize-am33 */
-{ "mul",       0xf240,         0xfff0,         FMT_D0, {DM1, DN0}},
+{ "mul",       0xf240,      0xfff0,     FMT_D0, 0,     {DM1, DN0}},
 /* start-sanitize-am33 */
-{ "mul",       0xf9a900,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "mul",       0xfba90000,     0xffff0000,     FMT_D7, {SIMM8, RN02}},
-{ "mul",       0xfda90000,     0xffff0000,     FMT_D8, {SIMM24, RN02}},
-{ "mul",       0xfea90000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "mul",       0xf9a900,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "mul",       0xfba90000,  0xffff0000, FMT_D7, AM33,  {SIMM8, RN02}},
+{ "mul",       0xfda90000,  0xffff0000, FMT_D8, AM33,  {SIMM24, RN02}},
+{ "mul",       0xfea90000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "mulu",      0xfbbb0000,     0xffff0000,     FMT_D7, {RM2, RN0, RD2, RD0}},
+{ "mulu",      0xfbbb0000,  0xffff0000, FMT_D7, AM33,  {RM2, RN0, RD2, RD0}},
 /* end-sanitize-am33 */
-{ "mulu",      0xf250,         0xfff0,         FMT_D0, {DM1, DN0}},
+{ "mulu",      0xf250,      0xfff0,     FMT_D0, 0,     {DM1, DN0}},
 /* start-sanitize-am33 */
-{ "mulu",      0xf9b900,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "mulu",      0xfbb90000,     0xffff0000,     FMT_D7, {IMM8, RN02}},
-{ "mulu",      0xfdb90000,     0xffff0000,     FMT_D8, {IMM24, RN02}},
-{ "mulu",      0xfeb90000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "mulu",      0xf9b900,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "mulu",      0xfbb90000,  0xffff0000, FMT_D7, AM33,  {IMM8, RN02}},
+{ "mulu",      0xfdb90000,  0xffff0000, FMT_D8, AM33,  {IMM24, RN02}},
+{ "mulu",      0xfeb90000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
 
-{ "div",       0xf260,         0xfff0,         FMT_D0, {DM1, DN0}},
+{ "div",       0xf260,      0xfff0,     FMT_D0, 0,     {DM1, DN0}},
 /* start-sanitize-am33 */
-{ "div",       0xf9c900,       0xffff00,       FMT_D6, {RM2, RN0}},
+{ "div",       0xf9c900,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
 /* end-sanitize-am33 */
 
-{ "divu",      0xf270,         0xfff0,         FMT_D0, {DM1, DN0}},
+{ "divu",      0xf270,      0xfff0,     FMT_D0, 0,     {DM1, DN0}},
 /* start-sanitize-am33 */
-{ "divu",      0xf9d900,       0xffff00,       FMT_D6, {RM2, RN0}},
+{ "divu",      0xf9d900,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
 /* end-sanitize-am33 */
 
-{ "inc",       0x40,           0xf3,           FMT_S0, {DN1}},
-{ "inc",       0x41,           0xf3,           FMT_S0, {AN1}},
+{ "inc",       0x40,        0xf3,       FMT_S0, 0,     {DN1}},
+{ "inc",       0x41,        0xf3,       FMT_S0, 0,     {AN1}},
 /* start-sanitize-am33 */
-{ "inc",       0xf9b800,       0xffff00,       FMT_D6, {RN02}},
+{ "inc",       0xf9b800,    0xffff00,   FMT_D6, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
-{ "inc4",      0x50,           0xfc,           FMT_S0, {AN0}},
+{ "inc4",      0x50,        0xfc,       FMT_S0, 0,     {AN0}},
 /* start-sanitize-am33 */
-{ "inc4",      0xf9c800,       0xffff00,       FMT_D6, {RN02}},
+{ "inc4",      0xf9c800,    0xffff00,   FMT_D6, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
-{ "cmp",       0xa000,         0xf000,         FMT_S1, {SIMM8, DN01}},
-{ "cmp",       0xa0,           0xf0,           FMT_S0, {DM1, DN0}},
-{ "cmp",       0xf1a0,         0xfff0,         FMT_D0, {DM1, AN0}},
-{ "cmp",       0xf190,         0xfff0,         FMT_D0, {AM1, DN0}},
-{ "cmp",       0xb000,         0xf000,         FMT_S1, {IMM8, AN01}},
-{ "cmp",       0xb0,           0xf0,           FMT_S0, {AM1, AN0}},
-{ "cmp",       0xfac80000,     0xfffc0000,     FMT_D2, {SIMM16, DN0}},
-{ "cmp",       0xfcc80000,     0xfffc0000,     FMT_D4, {IMM32, DN0}},
-{ "cmp",       0xfad80000,     0xfffc0000,     FMT_D2, {IMM16, AN0}},
-{ "cmp",       0xfcd80000,     0xfffc0000,     FMT_D4, {IMM32, AN0}},
+{ "cmp",       0xa000,      0xf000,     FMT_S1, 0,     {SIMM8, DN01}},
+{ "cmp",       0xa0,        0xf0,       FMT_S0, 0,     {DM1, DN0}},
+{ "cmp",       0xf1a0,      0xfff0,     FMT_D0, 0,     {DM1, AN0}},
+{ "cmp",       0xf190,      0xfff0,     FMT_D0, 0,     {AM1, DN0}},
+{ "cmp",       0xb000,      0xf000,     FMT_S1, 0,     {IMM8, AN01}},
+{ "cmp",       0xb0,        0xf0,       FMT_S0, 0,     {AM1, AN0}},
+{ "cmp",       0xfac80000,  0xfffc0000, FMT_D2, 0,     {SIMM16, DN0}},
+{ "cmp",       0xfcc80000,  0xfffc0000, FMT_D4, 0,     {IMM32, DN0}},
+{ "cmp",       0xfad80000,  0xfffc0000, FMT_D2, 0,     {IMM16, AN0}},
+{ "cmp",       0xfcd80000,  0xfffc0000, FMT_D4, 0,     {IMM32, AN0}},
 /* start-sanitize-am33 */
-{ "cmp",       0xf9d800,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "cmp",       0xfbd80000,     0xffff0000,     FMT_D7, {SIMM8, RN02}},
-{ "cmp",       0xfdd80000,     0xffff0000,     FMT_D8, {SIMM24, RN02}},
-{ "cmp",       0xfed80000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "cmp",       0xf9d800,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "cmp",       0xfbd80000,  0xffff0000, FMT_D7, AM33,  {SIMM8, RN02}},
+{ "cmp",       0xfdd80000,  0xffff0000, FMT_D8, AM33,  {SIMM24, RN02}},
+{ "cmp",       0xfed80000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "and",       0xfb0d0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD0}},
+{ "and",       0xfb0d0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD0}},
 /* end-sanitize-am33 */
-{ "and",       0xf200,         0xfff0,         FMT_D0, {DM1, DN0}},
-{ "and",       0xf8e000,       0xfffc00,       FMT_D1, {IMM8, DN0}},
-{ "and",       0xfae00000,     0xfffc0000,     FMT_D2, {IMM16, DN0}},
-{ "and",       0xfce00000,     0xfffc0000,     FMT_D4, {IMM32, DN0}},
-{ "and",       0xfafc0000,     0xffff0000,     FMT_D2, {IMM16, PSW}},
+{ "and",       0xf200,      0xfff0,     FMT_D0, 0,     {DM1, DN0}},
+{ "and",       0xf8e000,    0xfffc00,   FMT_D1, 0,     {IMM8, DN0}},
+{ "and",       0xfae00000,  0xfffc0000, FMT_D2, 0,     {IMM16, DN0}},
+{ "and",       0xfce00000,  0xfffc0000, FMT_D4, 0,     {IMM32, DN0}},
+{ "and",       0xfafc0000,  0xffff0000, FMT_D2, 0,     {IMM16, PSW}},
 /* start-sanitize-am33 */
-{ "and",       0xfcfc0000,     0xffff0000,     FMT_D4, {IMM32, EPSW}},
-{ "and",       0xf90900,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "and",       0xfb090000,     0xffff0000,     FMT_D7, {IMM8, RN02}},
-{ "and",       0xfd090000,     0xffff0000,     FMT_D8, {IMM24, RN02}},
-{ "and",       0xfe090000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "and",       0xfcfc0000,  0xffff0000, FMT_D4, AM33,  {IMM32, EPSW}},
+{ "and",       0xf90900,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "and",       0xfb090000,  0xffff0000, FMT_D7, AM33,  {IMM8, RN02}},
+{ "and",       0xfd090000,  0xffff0000, FMT_D8, AM33,  {IMM24, RN02}},
+{ "and",       0xfe090000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "or",                0xfb1d0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD0}},
+{ "or",                0xfb1d0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD0}},
 /* end-sanitize-am33 */
-{ "or",                0xf210,         0xfff0,         FMT_D0, {DM1, DN0}},
-{ "or",                0xf8e400,       0xfffc00,       FMT_D1, {IMM8, DN0}},
-{ "or",                0xfae40000,     0xfffc0000,     FMT_D2, {IMM16, DN0}},
-{ "or",                0xfce40000,     0xfffc0000,     FMT_D4, {IMM32, DN0}},
-{ "or",                0xfafd0000,     0xffff0000,     FMT_D2, {IMM16, PSW}},
+{ "or",                0xf210,      0xfff0,     FMT_D0, 0,     {DM1, DN0}},
+{ "or",                0xf8e400,    0xfffc00,   FMT_D1, 0,     {IMM8, DN0}},
+{ "or",                0xfae40000,  0xfffc0000, FMT_D2, 0,     {IMM16, DN0}},
+{ "or",                0xfce40000,  0xfffc0000, FMT_D4, 0,     {IMM32, DN0}},
+{ "or",                0xfafd0000,  0xffff0000, FMT_D2, 0,     {IMM16, PSW}},
 /* start-sanitize-am33 */
-{ "or",                0xfcfd0000,     0xffff0000,     FMT_D4, {IMM32, EPSW}},
-{ "or",                0xf91900,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "or",                0xfb190000,     0xffff0000,     FMT_D7, {IMM8, RN02}},
-{ "or",                0xfd190000,     0xffff0000,     FMT_D8, {IMM24, RN02}},
-{ "or",                0xfe190000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "or",                0xfcfd0000,  0xffff0000, FMT_D4, AM33,  {IMM32, EPSW}},
+{ "or",                0xf91900,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "or",                0xfb190000,  0xffff0000, FMT_D7, AM33,  {IMM8, RN02}},
+{ "or",                0xfd190000,  0xffff0000, FMT_D8, AM33,  {IMM24, RN02}},
+{ "or",                0xfe190000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "xor",       0xfb2d0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD0}},
+{ "xor",       0xfb2d0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD0}},
 /* end-sanitize-am33 */
-{ "xor",       0xf220,         0xfff0,         FMT_D0, {DM1, DN0}},
-{ "xor",       0xfae80000,     0xfffc0000,     FMT_D2, {IMM16, DN0}},
-{ "xor",       0xfce80000,     0xfffc0000,     FMT_D4, {IMM32, DN0}},
+{ "xor",       0xf220,      0xfff0,     FMT_D0, 0,     {DM1, DN0}},
+{ "xor",       0xfae80000,  0xfffc0000, FMT_D2, 0,     {IMM16, DN0}},
+{ "xor",       0xfce80000,  0xfffc0000, FMT_D4, 0,     {IMM32, DN0}},
 /* start-sanitize-am33 */
-{ "xor",       0xf92900,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "xor",       0xfb290000,     0xffff0000,     FMT_D7, {IMM8, RN02}},
-{ "xor",       0xfd290000,     0xffff0000,     FMT_D8, {IMM24, RN02}},
-{ "xor",       0xfe290000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "xor",       0xf92900,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "xor",       0xfb290000,  0xffff0000, FMT_D7, AM33,  {IMM8, RN02}},
+{ "xor",       0xfd290000,  0xffff0000, FMT_D8, AM33,  {IMM24, RN02}},
+{ "xor",       0xfe290000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
-{ "not",       0xf230,         0xfffc,         FMT_D0, {DN0}},
+{ "not",       0xf230,      0xfffc,     FMT_D0, 0,     {DN0}},
 /* start-sanitize-am33 */
-{ "not",       0xf93900,       0xffff00,       FMT_D6, {RN02}},
+{ "not",       0xf93900,    0xffff00,   FMT_D6, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
-{ "btst",      0xf8ec00,       0xfffc00,       FMT_D1, {IMM8, DN0}},
-{ "btst",      0xfaec0000,     0xfffc0000,     FMT_D2, {IMM16, DN0}},
-{ "btst",      0xfcec0000,     0xfffc0000,     FMT_D4, {IMM32, DN0}},
+{ "btst",      0xf8ec00,    0xfffc00,   FMT_D1, 0,     {IMM8, DN0}},
+{ "btst",      0xfaec0000,  0xfffc0000, FMT_D2, 0,     {IMM16, DN0}},
+{ "btst",      0xfcec0000,  0xfffc0000, FMT_D4, 0,     {IMM32, DN0}},
 /* start-sanitize-am33 */
 /* Place these before the ones with IMM8E and SD8N_SHIFT8 since we want the
    them to match last since they do not promote.  */
-{ "btst",      0xfbe90000,     0xffff0000,     FMT_D7, {IMM8, RN02}},
-{ "btst",      0xfde90000,     0xffff0000,     FMT_D8, {IMM24, RN02}},
-{ "btst",      0xfee90000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "btst",      0xfbe90000,  0xffff0000, FMT_D7, AM33,  {IMM8, RN02}},
+{ "btst",      0xfde90000,  0xffff0000, FMT_D8, AM33,  {IMM24, RN02}},
+{ "btst",      0xfee90000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
-{ "btst",      0xfe020000,     0xffff0000,     FMT_D5, {IMM8E,
+{ "btst",      0xfe020000,  0xffff0000, FMT_D5, 0,     {IMM8E,
                                                         MEM(IMM32_LOWSHIFT8)}},
-{ "btst",      0xfaf80000,     0xfffc0000,     FMT_D2,
-                                       {IMM8, MEM2(SD8N_SHIFT8,AN0)}},
+{ "btst",      0xfaf80000,  0xfffc0000, FMT_D2, 0,     {IMM8, MEM2(SD8N_SHIFT8,
+                                                                   AN0)}},
 
-{ "bset",      0xf080,         0xfff0,         FMT_D0, {DM1, MEM(AN0)}},
-{ "bset",      0xfe000000,     0xffff0000,     FMT_D5, {IMM8E,
+{ "bset",      0xf080,      0xfff0,     FMT_D0, 0,     {DM1, MEM(AN0)}},
+{ "bset",      0xfe000000,  0xffff0000, FMT_D5, 0,     {IMM8E,
                                                         MEM(IMM32_LOWSHIFT8)}},
-{ "bset",      0xfaf00000,     0xfffc0000,     FMT_D2,
-                                       {IMM8, MEM2(SD8N_SHIFT8,AN0)}},
+{ "bset",      0xfaf00000,  0xfffc0000, FMT_D2, 0,     {IMM8, MEM2(SD8N_SHIFT8,
+                                                                   AN0)}},
 
-{ "bclr",      0xf090,         0xfff0,         FMT_D0, {DM1, MEM(AN0)}},
-{ "bclr",      0xfe010000,     0xffff0000,     FMT_D5, {IMM8E,
+{ "bclr",      0xf090,      0xfff0,     FMT_D0, 0,     {DM1, MEM(AN0)}},
+{ "bclr",      0xfe010000,  0xffff0000, FMT_D5, 0,     {IMM8E,
                                                         MEM(IMM32_LOWSHIFT8)}},
-{ "bclr",      0xfaf40000,     0xfffc0000,     FMT_D2, {IMM8,
-                                               MEM2(SD8N_SHIFT8,AN0)}},
+{ "bclr",      0xfaf40000,  0xfffc0000, FMT_D2, 0,     {IMM8,
+                                                        MEM2(SD8N_SHIFT8,AN0)}},
 
 /* start-sanitize-am33 */
-{ "asr",       0xfb4d0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD0}},
+{ "asr",       0xfb4d0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD0}},
 /* end-sanitize-am33 */
-{ "asr",       0xf2b0,         0xfff0,         FMT_D0, {DM1, DN0}},
-{ "asr",       0xf8c800,       0xfffc00,       FMT_D1, {IMM8, DN0}},
+{ "asr",       0xf2b0,      0xfff0,     FMT_D0, 0,     {DM1, DN0}},
+{ "asr",       0xf8c800,    0xfffc00,   FMT_D1, 0,     {IMM8, DN0}},
 /* start-sanitize-am33 */
-{ "asr",       0xf94900,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "asr",       0xfb490000,     0xffff0000,     FMT_D7, {IMM8, RN02}},
-{ "asr",       0xfd490000,     0xffff0000,     FMT_D8, {IMM24, RN02}},
-{ "asr",       0xfe490000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "asr",       0xf94900,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "asr",       0xfb490000,  0xffff0000, FMT_D7, AM33,  {IMM8, RN02}},
+{ "asr",       0xfd490000,  0xffff0000, FMT_D8, AM33,  {IMM24, RN02}},
+{ "asr",       0xfe490000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
-{ "asr",       0xf8c801,       0xfffcff,       FMT_D1, {DN0}},
+{ "asr",       0xf8c801,    0xfffcff,   FMT_D1, 0,     {DN0}},
 /* start-sanitize-am33 */
-{ "asr",       0xfb490000,     0xffff00ff,     FMT_D7, {RN02}},
+{ "asr",       0xfb490000,  0xffff00ff, FMT_D7, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "lsr",       0xfb5d0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD0}},
+{ "lsr",       0xfb5d0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD0}},
 /* end-sanitize-am33 */
-{ "lsr",       0xf2a0,         0xfff0,         FMT_D0, {DM1, DN0}},
-{ "lsr",       0xf8c400,       0xfffc00,       FMT_D1, {IMM8, DN0}},
+{ "lsr",       0xf2a0,      0xfff0,     FMT_D0, 0,     {DM1, DN0}},
+{ "lsr",       0xf8c400,    0xfffc00,   FMT_D1, 0,     {IMM8, DN0}},
 /* start-sanitize-am33 */
-{ "lsr",       0xf95900,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "lsr",       0xfb590000,     0xffff0000,     FMT_D7, {IMM8, RN02}},
-{ "lsr",       0xfd590000,     0xffff0000,     FMT_D8, {IMM24, RN02}},
-{ "lsr",       0xfe590000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "lsr",       0xf95900,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "lsr",       0xfb590000,  0xffff0000, FMT_D7, AM33,  {IMM8, RN02}},
+{ "lsr",       0xfd590000,  0xffff0000, FMT_D8, AM33,  {IMM24, RN02}},
+{ "lsr",       0xfe590000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
-{ "lsr",       0xf8c401,       0xfffcff,       FMT_D1, {DN0}},
+{ "lsr",       0xf8c401,    0xfffcff,   FMT_D1, 0,     {DN0}},
 /* start-sanitize-am33 */
-{ "lsr",       0xfb590000,     0xffff00ff,     FMT_D7, {RN02}},
+{ "lsr",       0xfb590000,  0xffff00ff, FMT_D7, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "asl",       0xfb6d0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD0}},
+{ "asl",       0xfb6d0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD0}},
 /* end-sanitize-am33 */
-{ "asl",       0xf290,         0xfff0,         FMT_D0, {DM1, DN0}},
-{ "asl",       0xf8c000,       0xfffc00,       FMT_D1, {IMM8, DN0}},
+{ "asl",       0xf290,      0xfff0,     FMT_D0, 0,     {DM1, DN0}},
+{ "asl",       0xf8c000,    0xfffc00,   FMT_D1, 0,     {IMM8, DN0}},
 /* start-sanitize-am33 */
-{ "asl",       0xf96900,       0xffff00,       FMT_D6, {RM2, RN0}},
-{ "asl",       0xfb690000,     0xffff0000,     FMT_D7, {SIMM8, RN02}},
-{ "asl",       0xfd690000,     0xffff0000,     FMT_D8, {IMM24, RN02}},
-{ "asl",       0xfe690000,     0xffff0000,     FMT_D9, {IMM32_HIGH8, RN02}},
+{ "asl",       0xf96900,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
+{ "asl",       0xfb690000,  0xffff0000, FMT_D7, AM33,  {SIMM8, RN02}},
+{ "asl",       0xfd690000,  0xffff0000, FMT_D8, AM33,  {IMM24, RN02}},
+{ "asl",       0xfe690000,  0xffff0000, FMT_D9, AM33,  {IMM32_HIGH8, RN02}},
 /* end-sanitize-am33 */
-{ "asl",       0xf8c001,       0xfffcff,       FMT_D1, {DN0}},
+{ "asl",       0xf8c001,    0xfffcff,   FMT_D1, 0,     {DN0}},
 /* start-sanitize-am33 */
-{ "asl",       0xfb690000,     0xffff00ff,     FMT_D7, {RN02}},
+{ "asl",       0xfb690000,  0xffff00ff, FMT_D7, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
-{ "asl2",      0x54,           0xfc,           FMT_S0, {DN0}},
+{ "asl2",      0x54,        0xfc,       FMT_S0, 0,     {DN0}},
 /* start-sanitize-am33 */
-{ "asl2",      0xf97900,       0xffff00,       FMT_D6, {RN02}},
+{ "asl2",      0xf97900,    0xffff00,   FMT_D6, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
-{ "ror",       0xf284,         0xfffc,         FMT_D0, {DN0}},
+{ "ror",       0xf284,      0xfffc,     FMT_D0, 0,     {DN0}},
 /* start-sanitize-am33 */
-{ "ror",       0xf98900,       0xffff00,       FMT_D6, {RN02}},
+{ "ror",       0xf98900,    0xffff00,   FMT_D6, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
-{ "rol",       0xf280,         0xfffc,         FMT_D0, {DN0}},
+{ "rol",       0xf280,      0xfffc,     FMT_D0, 0,     {DN0}},
 /* start-sanitize-am33 */
-{ "rol",       0xf99900,       0xffff00,       FMT_D6, {RN02}},
+{ "rol",       0xf99900,    0xffff00,   FMT_D6, AM33,  {RN02}},
 /* end-sanitize-am33 */
 
-{ "beq",       0xc800,         0xff00,         FMT_S1, {SD8N_PCREL}},
-{ "bne",       0xc900,         0xff00,         FMT_S1, {SD8N_PCREL}},
-{ "bgt",       0xc100,         0xff00,         FMT_S1, {SD8N_PCREL}},
-{ "bge",       0xc200,         0xff00,         FMT_S1, {SD8N_PCREL}},
-{ "ble",       0xc300,         0xff00,         FMT_S1, {SD8N_PCREL}},
-{ "blt",       0xc000,         0xff00,         FMT_S1, {SD8N_PCREL}},
-{ "bhi",       0xc500,         0xff00,         FMT_S1, {SD8N_PCREL}},
-{ "bcc",       0xc600,         0xff00,         FMT_S1, {SD8N_PCREL}},
-{ "bls",       0xc700,         0xff00,         FMT_S1, {SD8N_PCREL}},
-{ "bcs",       0xc400,         0xff00,         FMT_S1, {SD8N_PCREL}},
-{ "bvc",       0xf8e800,       0xffff00,       FMT_D1, {SD8N_PCREL}},
-{ "bvs",       0xf8e900,       0xffff00,       FMT_D1, {SD8N_PCREL}},
-{ "bnc",       0xf8ea00,       0xffff00,       FMT_D1, {SD8N_PCREL}},
-{ "bns",       0xf8eb00,       0xffff00,       FMT_D1, {SD8N_PCREL}},
-{ "bra",       0xca00,         0xff00,         FMT_S1, {SD8N_PCREL}},
-
-{ "leq",       0xd8,           0xff,           FMT_S0, {UNUSED}},
-{ "lne",       0xd9,           0xff,           FMT_S0, {UNUSED}},
-{ "lgt",       0xd1,           0xff,           FMT_S0, {UNUSED}},
-{ "lge",       0xd2,           0xff,           FMT_S0, {UNUSED}},
-{ "lle",       0xd3,           0xff,           FMT_S0, {UNUSED}},
-{ "llt",       0xd0,           0xff,           FMT_S0, {UNUSED}},
-{ "lhi",       0xd5,           0xff,           FMT_S0, {UNUSED}},
-{ "lcc",       0xd6,           0xff,           FMT_S0, {UNUSED}},
-{ "lls",       0xd7,           0xff,           FMT_S0, {UNUSED}},
-{ "lcs",       0xd4,           0xff,           FMT_S0, {UNUSED}},
-{ "lra",       0xda,           0xff,           FMT_S0, {UNUSED}},
-{ "setlb",     0xdb,           0xff,           FMT_S0, {UNUSED}},
-
-{ "jmp",       0xf0f4,         0xfffc,         FMT_D0, {PAREN,AN0,PAREN}},
-{ "jmp",       0xcc0000,       0xff0000,       FMT_S2, {IMM16_PCREL}},
-{ "jmp",       0xdc000000,     0xff000000,     FMT_S4, {IMM32_HIGH24}},
-{ "call",      0xcd000000,     0xff000000,     FMT_S4, {D16_SHIFT,REGS,IMM8E}},
-{ "call",      0xdd000000,     0xff000000,     FMT_S6,
-                                       {IMM32_HIGH24_LOWSHIFT16,REGSE_SHIFT8,IMM8E}},
-{ "calls",     0xf0f0,         0xfffc,         FMT_D0, {PAREN,AN0,PAREN}},
-{ "calls",     0xfaff0000,     0xffff0000,     FMT_D2, {IMM16_PCREL}},
-{ "calls",     0xfcff0000,     0xffff0000,     FMT_D4, {IMM32_PCREL}},
-
-{ "ret",       0xdf0000,       0xff0000,       FMT_S2, {REGS_SHIFT8, IMM8}},
-{ "retf",      0xde0000,       0xff0000,       FMT_S2, {REGS_SHIFT8, IMM8}},
-{ "rets",      0xf0fc,         0xffff,         FMT_D0, {UNUSED}},
-{ "rti",       0xf0fd,         0xffff,         FMT_D0, {UNUSED}},
-{ "trap",      0xf0fe,         0xffff,         FMT_D0, {UNUSED}},
-{ "rtm",       0xf0ff,         0xffff,         FMT_D0, {UNUSED}},
-{ "nop",       0xcb,           0xff,           FMT_S0, {UNUSED}},
+{ "beq",       0xc800,      0xff00,     FMT_S1, 0,     {SD8N_PCREL}},
+{ "bne",       0xc900,      0xff00,     FMT_S1, 0,     {SD8N_PCREL}},
+{ "bgt",       0xc100,      0xff00,     FMT_S1, 0,     {SD8N_PCREL}},
+{ "bge",       0xc200,      0xff00,     FMT_S1, 0,     {SD8N_PCREL}},
+{ "ble",       0xc300,      0xff00,     FMT_S1, 0,     {SD8N_PCREL}},
+{ "blt",       0xc000,      0xff00,     FMT_S1, 0,     {SD8N_PCREL}},
+{ "bhi",       0xc500,      0xff00,     FMT_S1, 0,     {SD8N_PCREL}},
+{ "bcc",       0xc600,      0xff00,     FMT_S1, 0,     {SD8N_PCREL}},
+{ "bls",       0xc700,      0xff00,     FMT_S1, 0,     {SD8N_PCREL}},
+{ "bcs",       0xc400,      0xff00,     FMT_S1, 0,     {SD8N_PCREL}},
+{ "bvc",       0xf8e800,    0xffff00,   FMT_D1, 0,     {SD8N_PCREL}},
+{ "bvs",       0xf8e900,    0xffff00,   FMT_D1, 0,     {SD8N_PCREL}},
+{ "bnc",       0xf8ea00,    0xffff00,   FMT_D1, 0,     {SD8N_PCREL}},
+{ "bns",       0xf8eb00,    0xffff00,   FMT_D1, 0,     {SD8N_PCREL}},
+{ "bra",       0xca00,      0xff00,     FMT_S1, 0,     {SD8N_PCREL}},
+
+{ "leq",       0xd8,        0xff,       FMT_S0, 0,     {UNUSED}},
+{ "lne",       0xd9,        0xff,       FMT_S0, 0,     {UNUSED}},
+{ "lgt",       0xd1,        0xff,       FMT_S0, 0,     {UNUSED}},
+{ "lge",       0xd2,        0xff,       FMT_S0, 0,     {UNUSED}},
+{ "lle",       0xd3,        0xff,       FMT_S0, 0,     {UNUSED}},
+{ "llt",       0xd0,        0xff,       FMT_S0, 0,     {UNUSED}},
+{ "lhi",       0xd5,        0xff,       FMT_S0, 0,     {UNUSED}},
+{ "lcc",       0xd6,        0xff,       FMT_S0, 0,     {UNUSED}},
+{ "lls",       0xd7,        0xff,       FMT_S0, 0,     {UNUSED}},
+{ "lcs",       0xd4,        0xff,       FMT_S0, 0,     {UNUSED}},
+{ "lra",       0xda,        0xff,       FMT_S0, 0,     {UNUSED}},
+{ "setlb",     0xdb,        0xff,       FMT_S0, 0,     {UNUSED}},
+
+{ "jmp",       0xf0f4,      0xfffc,     FMT_D0, 0,     {PAREN,AN0,PAREN}},
+{ "jmp",       0xcc0000,    0xff0000,   FMT_S2, 0,     {IMM16_PCREL}},
+{ "jmp",       0xdc000000,  0xff000000, FMT_S4, 0,     {IMM32_HIGH24}},
+{ "call",      0xcd000000,  0xff000000, FMT_S4, 0,     {D16_SHIFT,REGS,IMM8E}},
+{ "call",      0xdd000000,  0xff000000, FMT_S6, 0,
+                                       {IMM32_HIGH24_LOWSHIFT16,
+                                        REGSE_SHIFT8,IMM8E}},
+{ "calls",     0xf0f0,      0xfffc,     FMT_D0, 0,     {PAREN,AN0,PAREN}},
+{ "calls",     0xfaff0000,  0xffff0000, FMT_D2, 0,     {IMM16_PCREL}},
+{ "calls",     0xfcff0000,  0xffff0000, FMT_D4, 0,     {IMM32_PCREL}},
+
+{ "ret",       0xdf0000,    0xff0000,   FMT_S2, 0,     {REGS_SHIFT8, IMM8}},
+{ "retf",      0xde0000,    0xff0000,   FMT_S2, 0,     {REGS_SHIFT8, IMM8}},
+{ "rets",      0xf0fc,      0xffff,     FMT_D0, 0,     {UNUSED}},
+{ "rti",       0xf0fd,      0xffff,     FMT_D0, 0,     {UNUSED}},
+{ "trap",      0xf0fe,      0xffff,     FMT_D0, 0,     {UNUSED}},
+{ "rtm",       0xf0ff,      0xffff,     FMT_D0, 0,     {UNUSED}},
+{ "nop",       0xcb,        0xff,       FMT_S0, 0,     {UNUSED}},
 /* { "udf", 0, 0, {0}},  */
 
-{ "putx",      0xf500,         0xfff0,         FMT_D0, {DN01}},
-{ "getx",      0xf6f0,         0xfff0,         FMT_D0, {DN01}},
-{ "mulq",      0xf600,         0xfff0,         FMT_D0, {DM1, DN0}},
-{ "mulq",      0xf90000,       0xfffc00,       FMT_D1, {SIMM8, DN0}},
-{ "mulq",      0xfb000000,     0xfffc0000,     FMT_D2, {SIMM16, DN0}},
-{ "mulq",      0xfd000000,     0xfffc0000,     FMT_D4, {IMM32, DN0}},
-{ "mulqu",     0xf610,         0xfff0,         FMT_D0, {DM1, DN0}},
-{ "mulqu",     0xf91400,       0xfffc00,       FMT_D1, {SIMM8, DN0}},
-{ "mulqu",     0xfb140000,     0xfffc0000,     FMT_D2, {SIMM16, DN0}},
-{ "mulqu",     0xfd140000,     0xfffc0000,     FMT_D4, {IMM32, DN0}},
-{ "sat16",     0xf640,         0xfff0,         FMT_D0, {DM1, DN0}},
+{ "putx",      0xf500,      0xfff0,     FMT_D0, AM30,  {DN01}},
+{ "getx",      0xf6f0,      0xfff0,     FMT_D0, AM30,  {DN01}},
+{ "mulq",      0xf600,      0xfff0,     FMT_D0, AM30,  {DM1, DN0}},
+{ "mulq",      0xf90000,    0xfffc00,   FMT_D1, AM30,  {SIMM8, DN0}},
+{ "mulq",      0xfb000000,  0xfffc0000, FMT_D2, AM30,  {SIMM16, DN0}},
+{ "mulq",      0xfd000000,  0xfffc0000, FMT_D4, AM30,  {IMM32, DN0}},
+{ "mulqu",     0xf610,      0xfff0,     FMT_D0, AM30,  {DM1, DN0}},
+{ "mulqu",     0xf91400,    0xfffc00,   FMT_D1, AM30,  {SIMM8, DN0}},
+{ "mulqu",     0xfb140000,  0xfffc0000, FMT_D2, AM30,  {SIMM16, DN0}},
+{ "mulqu",     0xfd140000,  0xfffc0000, FMT_D4, AM30,  {IMM32, DN0}},
+{ "sat16",     0xf640,      0xfff0,     FMT_D0, AM30,  {DM1, DN0}},
 /* start-sanitize-am33 */
-{ "sat16",     0xf9ab00,       0xffff00,       FMT_D6, {RM2, RN0}},
+{ "sat16",     0xf9ab00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
 /* end-sanitize-am33 */
 
-{ "sat24",     0xf650,         0xfff0,         FMT_D0, {DM1, DN0}},
+{ "sat24",     0xf650,      0xfff0,     FMT_D0, AM30,  {DM1, DN0}},
 /* start-sanitize-am33 */
-{ "sat24",     0xfbaf0000,     0xffff00ff,     FMT_D7, {RM2, RN0}},
+{ "sat24",     0xfbaf0000,  0xffff00ff, FMT_D7, AM33,  {RM2, RN0}},
 /* end-sanitize-am33 */
 
 /* start-sanitize-am33 */
-{ "bsch",      0xfbff0000,     0xffff000f,     FMT_D7, {RM2, RN0, RD0}},
+{ "bsch",      0xfbff0000,  0xffff000f, FMT_D7, AM33,  {RM2, RN0, RD0}},
 /* end-sanitize-am33 */
-{ "bsch",      0xf670,         0xfff0,         FMT_D0, {DM1, DN0}},
+{ "bsch",      0xf670,      0xfff0,     FMT_D0, AM30,  {DM1, DN0}},
 /* start-sanitize-am33 */
-{ "bsch",      0xf9fb00,       0xffff00,       FMT_D6, {RM2, RN0}},
+{ "bsch",      0xf9fb00,    0xffff00,   FMT_D6, AM33,  {RM2, RN0}},
 /* end-sanitize-am33 */
 
 /* Extension.  We need some instruction to trigger "emulated syscalls"
    for our simulator.  */
 /* start-sanitize-am33 */
-{ "syscall",   0xf0e0,         0xfff0,         FMT_D0, {IMM4}},
+{ "syscall",   0xf0e0,      0xfff0,     FMT_D0, AM33,  {IMM4}},
 /* end-sanitize-am33 */
-{ "syscall",    0xf0c0,         0xffff,         FMT_D0, {UNUSED}},
+{ "syscall",    0xf0c0,      0xffff,     FMT_D0, 0,    {UNUSED}},
 
 /* Extension.  When talking to the simulator, gdb requires some instruction
    that will trigger a "breakpoint" (really just an instruction that isn't
@@ -1050,368 +1063,368 @@ const struct mn10300_opcode mn10300_opcodes[] = {
    as the smallest instruction on the target machine.  In the case of the
    mn10x00 the "break" instruction must be one byte.  0xff is available on
    both mn10x00 architectures.  */
-{ "break",     0xff,           0xff,           FMT_S0, {UNUSED}},
+{ "break",     0xff,        0xff,       FMT_S0, 0,     {UNUSED}},
 
 /* start-sanitize-am33 */
-{ "add_add",   0xf7000000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "add_add",   0xf7100000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "add_add",   0xf7000000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "add_add",   0xf7100000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "add_add",   0xf7040000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "add_add",   0xf7040000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "add_add",   0xf7140000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "add_add",   0xf7140000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "add_sub",   0xf7200000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "add_sub",   0xf7300000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "add_sub",   0xf7200000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "add_sub",   0xf7300000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "add_sub",   0xf7240000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "add_sub",   0xf7240000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "add_sub",   0xf7340000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "add_sub",   0xf7340000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "add_cmp",   0xf7400000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "add_cmp",   0xf7500000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "add_cmp",   0xf7400000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "add_cmp",   0xf7500000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "add_cmp",   0xf7440000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "add_cmp",   0xf7440000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "add_cmp",   0xf7540000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "add_cmp",   0xf7540000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "add_mov",   0xf7600000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "add_mov",   0xf7700000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "add_mov",   0xf7600000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "add_mov",   0xf7700000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "add_mov",   0xf7640000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "add_mov",   0xf7640000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "add_mov",   0xf7740000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "add_mov",   0xf7740000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "add_asr",   0xf7800000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "add_asr",   0xf7900000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "add_asr",   0xf7800000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "add_asr",   0xf7900000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "add_asr",   0xf7840000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "add_asr",   0xf7840000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "add_asr",   0xf7940000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "add_asr",   0xf7940000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          IMM4_2, RN0}},
-{ "add_lsr",   0xf7a00000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "add_lsr",   0xf7b00000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "add_lsr",   0xf7a00000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "add_lsr",   0xf7b00000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "add_lsr",   0xf7a40000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "add_lsr",   0xf7a40000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "add_lsr",   0xf7b40000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "add_lsr",   0xf7b40000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          IMM4_2, RN0}},
-{ "add_asl",   0xf7c00000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "add_asl",   0xf7d00000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "add_asl",   0xf7c00000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "add_asl",   0xf7d00000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "add_asl",   0xf7c40000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "add_asl",   0xf7c40000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "add_asl",   0xf7d40000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "add_asl",   0xf7d40000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          IMM4_2, RN0}},
-{ "cmp_add",   0xf7010000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "cmp_add",   0xf7110000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "cmp_add",   0xf7010000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "cmp_add",   0xf7110000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "cmp_add",   0xf7050000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "cmp_add",   0xf7050000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "cmp_add",   0xf7150000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "cmp_add",   0xf7150000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "cmp_sub",   0xf7210000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "cmp_sub",   0xf7310000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "cmp_sub",   0xf7210000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "cmp_sub",   0xf7310000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "cmp_sub",   0xf7250000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "cmp_sub",   0xf7250000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "cmp_sub",   0xf7350000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "cmp_sub",   0xf7350000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "cmp_mov",   0xf7610000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "cmp_mov",   0xf7710000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "cmp_mov",   0xf7610000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "cmp_mov",   0xf7710000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "cmp_mov",   0xf7650000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "cmp_mov",   0xf7650000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "cmp_mov",   0xf7750000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "cmp_mov",   0xf7750000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "cmp_asr",   0xf7810000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "cmp_asr",   0xf7910000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "cmp_asr",   0xf7810000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "cmp_asr",   0xf7910000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "cmp_asr",   0xf7850000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "cmp_asr",   0xf7850000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "cmp_asr",   0xf7950000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "cmp_asr",   0xf7950000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          IMM4_2, RN0}},
-{ "cmp_lsr",   0xf7a10000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "cmp_lsr",   0xf7b10000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "cmp_lsr",   0xf7a10000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "cmp_lsr",   0xf7b10000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "cmp_lsr",   0xf7a50000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "cmp_lsr",   0xf7a50000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "cmp_lsr",   0xf7b50000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "cmp_lsr",   0xf7b50000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          IMM4_2, RN0}},
-{ "cmp_asl",   0xf7c10000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "cmp_asl",   0xf7d10000,     0xffff0000,     FMT_D10, {RM6, RN4, IMM4_2, RN0}},
-{ "cmp_asl",   0xf7c50000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "cmp_asl",   0xf7c10000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "cmp_asl",   0xf7d10000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, IMM4_2, RN0}},
+{ "cmp_asl",   0xf7c50000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "cmp_asl",   0xf7d50000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "cmp_asl",   0xf7d50000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          IMM4_2, RN0}},
-{ "sub_add",   0xf7020000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "sub_add",   0xf7120000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sub_add",   0xf7020000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "sub_add",   0xf7120000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "sub_add",   0xf7060000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "sub_add",   0xf7060000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "sub_add",   0xf7160000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "sub_add",   0xf7160000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "sub_sub",   0xf7220000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "sub_sub",   0xf7320000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sub_sub",   0xf7220000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "sub_sub",   0xf7320000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "sub_sub",   0xf7260000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "sub_sub",   0xf7260000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "sub_sub",   0xf7360000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "sub_sub",   0xf7360000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "sub_cmp",   0xf7420000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "sub_cmp",   0xf7520000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sub_cmp",   0xf7420000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "sub_cmp",   0xf7520000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "sub_cmp",   0xf7460000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "sub_cmp",   0xf7460000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "sub_cmp",   0xf7560000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "sub_cmp",   0xf7560000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "sub_mov",   0xf7620000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "sub_mov",   0xf7720000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sub_mov",   0xf7620000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "sub_mov",   0xf7720000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "sub_mov",   0xf7660000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "sub_mov",   0xf7660000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "sub_mov",   0xf7760000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "sub_mov",   0xf7760000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "sub_asr",   0xf7820000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "sub_asr",   0xf7920000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sub_asr",   0xf7820000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "sub_asr",   0xf7920000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "sub_asr",   0xf7860000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "sub_asr",   0xf7860000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "sub_asr",   0xf7960000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "sub_asr",   0xf7960000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          IMM4_2, RN0}},
-{ "sub_lsr",   0xf7a20000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "sub_lsr",   0xf7b20000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sub_lsr",   0xf7a20000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "sub_lsr",   0xf7b20000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "sub_lsr",   0xf7a60000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "sub_lsr",   0xf7a60000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "sub_lsr",   0xf7b60000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "sub_lsr",   0xf7b60000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          IMM4_2, RN0}},
-{ "sub_asl",   0xf7c20000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "sub_asl",   0xf7d20000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sub_asl",   0xf7c20000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "sub_asl",   0xf7d20000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "sub_asl",   0xf7c60000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "sub_asl",   0xf7c60000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "sub_asl",   0xf7d60000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "sub_asl",   0xf7d60000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          IMM4_2, RN0}},
-{ "mov_add",   0xf7030000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "mov_add",   0xf7130000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "mov_add",   0xf7030000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "mov_add",   0xf7130000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "mov_add",   0xf7070000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "mov_add",   0xf7070000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "mov_add",   0xf7170000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "mov_add",   0xf7170000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "mov_sub",   0xf7230000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "mov_sub",   0xf7330000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "mov_sub",   0xf7230000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "mov_sub",   0xf7330000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "mov_sub",   0xf7270000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "mov_sub",   0xf7270000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "mov_sub",   0xf7370000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "mov_sub",   0xf7370000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "mov_cmp",   0xf7430000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "mov_cmp",   0xf7530000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "mov_cmp",   0xf7430000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "mov_cmp",   0xf7530000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "mov_cmp",   0xf7470000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "mov_cmp",   0xf7470000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "mov_cmp",   0xf7570000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "mov_cmp",   0xf7570000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "mov_mov",   0xf7630000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "mov_mov",   0xf7730000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "mov_mov",   0xf7630000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "mov_mov",   0xf7730000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "mov_mov",   0xf7670000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "mov_mov",   0xf7670000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "mov_mov",   0xf7770000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "mov_mov",   0xf7770000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          SIMM4_2, RN0}},
-{ "mov_asr",   0xf7830000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "mov_asr",   0xf7930000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "mov_asr",   0xf7830000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "mov_asr",   0xf7930000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "mov_asr",   0xf7870000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "mov_asr",   0xf7870000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "mov_asr",   0xf7970000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "mov_asr",   0xf7970000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          IMM4_2, RN0}},
-{ "mov_lsr",   0xf7a30000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "mov_lsr",   0xf7b30000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "mov_lsr",   0xf7a30000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "mov_lsr",   0xf7b30000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "mov_lsr",   0xf7a70000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "mov_lsr",   0xf7a70000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "mov_lsr",   0xf7b70000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "mov_lsr",   0xf7b70000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          IMM4_2, RN0}},
-{ "mov_asl",   0xf7c30000,     0xffff0000,     FMT_D10, {RM6, RN4, RM2, RN0}},
-{ "mov_asl",   0xf7d30000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "mov_asl",   0xf7c30000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4, RM2, RN0}},
+{ "mov_asl",   0xf7d30000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "mov_asl",   0xf7c70000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "mov_asl",   0xf7c70000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          RM2, RN0}},
-{ "mov_asl",   0xf7d70000,     0xffff0000,     FMT_D10, {SIMM4_6, RN4,
+{ "mov_asl",   0xf7d70000,  0xffff0000, FMT_D10, AM33,  {SIMM4_6, RN4,
                                                          IMM4_2, RN0}},
-{ "and_add",   0xf7080000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "and_add",   0xf7080000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "and_add",   0xf7180000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "and_add",   0xf7180000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "and_sub",   0xf7280000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "and_sub",   0xf7280000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "and_sub",   0xf7380000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "and_sub",   0xf7380000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "and_cmp",   0xf7480000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "and_cmp",   0xf7480000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "and_cmp",   0xf7580000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "and_cmp",   0xf7580000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "and_mov",   0xf7680000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "and_mov",   0xf7680000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "and_mov",   0xf7780000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "and_mov",   0xf7780000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "and_asr",   0xf7880000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "and_asr",   0xf7880000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "and_asr",   0xf7980000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "and_asr",   0xf7980000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "and_lsr",   0xf7a80000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "and_lsr",   0xf7a80000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "and_lsr",   0xf7b80000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "and_lsr",   0xf7b80000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "and_asl",   0xf7c80000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "and_asl",   0xf7c80000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "and_asl",   0xf7d80000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "and_asl",   0xf7d80000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "dmach_add", 0xf7090000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "dmach_add", 0xf7090000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "dmach_add", 0xf7190000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "dmach_add", 0xf7190000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "dmach_sub", 0xf7290000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "dmach_sub", 0xf7290000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "dmach_sub", 0xf7390000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "dmach_sub", 0xf7390000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "dmach_cmp", 0xf7490000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "dmach_cmp", 0xf7490000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "dmach_cmp", 0xf7590000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "dmach_cmp", 0xf7590000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "dmach_mov", 0xf7690000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "dmach_mov", 0xf7690000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "dmach_mov", 0xf7790000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "dmach_mov", 0xf7790000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "dmach_asr", 0xf7890000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "dmach_asr", 0xf7890000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "dmach_asr", 0xf7990000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "dmach_asr", 0xf7990000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "dmach_lsr", 0xf7a90000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "dmach_lsr", 0xf7a90000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "dmach_lsr", 0xf7b90000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "dmach_lsr", 0xf7b90000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "dmach_asl", 0xf7c90000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "dmach_asl", 0xf7c90000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "dmach_asl", 0xf7d90000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "dmach_asl", 0xf7d90000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "xor_add",   0xf70a0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "xor_add",   0xf70a0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "xor_add",   0xf71a0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "xor_add",   0xf71a0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "xor_sub",   0xf72a0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "xor_sub",   0xf72a0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "xor_sub",   0xf73a0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "xor_sub",   0xf73a0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "xor_cmp",   0xf74a0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "xor_cmp",   0xf74a0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "xor_cmp",   0xf75a0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "xor_cmp",   0xf75a0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "xor_mov",   0xf76a0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "xor_mov",   0xf76a0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "xor_mov",   0xf77a0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "xor_mov",   0xf77a0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "xor_asr",   0xf78a0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "xor_asr",   0xf78a0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "xor_asr",   0xf79a0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "xor_asr",   0xf79a0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "xor_lsr",   0xf7aa0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "xor_lsr",   0xf7aa0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "xor_lsr",   0xf7ba0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "xor_lsr",   0xf7ba0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "xor_asl",   0xf7ca0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "xor_asl",   0xf7ca0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "xor_asl",   0xf7da0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "xor_asl",   0xf7da0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "swhw_add",  0xf70b0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "swhw_add",  0xf70b0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "swhw_add",  0xf71b0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "swhw_add",  0xf71b0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "swhw_sub",  0xf72b0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "swhw_sub",  0xf72b0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "swhw_sub",  0xf73b0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "swhw_sub",  0xf73b0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "swhw_cmp",  0xf74b0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "swhw_cmp",  0xf74b0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "swhw_cmp",  0xf75b0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "swhw_cmp",  0xf75b0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "swhw_mov",  0xf76b0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "swhw_mov",  0xf76b0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "swhw_mov",  0xf77b0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "swhw_mov",  0xf77b0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "swhw_asr",  0xf78b0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "swhw_asr",  0xf78b0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "swhw_asr",  0xf79b0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "swhw_asr",  0xf79b0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "swhw_lsr",  0xf7ab0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "swhw_lsr",  0xf7ab0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "swhw_lsr",  0xf7bb0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "swhw_lsr",  0xf7bb0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "swhw_asl",  0xf7cb0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "swhw_asl",  0xf7cb0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "swhw_asl",  0xf7db0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "swhw_asl",  0xf7db0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "or_add",    0xf70c0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "or_add",    0xf70c0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "or_add",    0xf71c0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "or_add",    0xf71c0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "or_sub",    0xf72c0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "or_sub",    0xf72c0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "or_sub",    0xf73c0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "or_sub",    0xf73c0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "or_cmp",    0xf74c0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "or_cmp",    0xf74c0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "or_cmp",    0xf75c0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "or_cmp",    0xf75c0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "or_mov",    0xf76c0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "or_mov",    0xf76c0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "or_mov",    0xf77c0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "or_mov",    0xf77c0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "or_asr",    0xf78c0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "or_asr",    0xf78c0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "or_asr",    0xf79c0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "or_asr",    0xf79c0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "or_lsr",    0xf7ac0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "or_lsr",    0xf7ac0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "or_lsr",    0xf7bc0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "or_lsr",    0xf7bc0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "or_asl",    0xf7cc0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "or_asl",    0xf7cc0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "or_asl",    0xf7dc0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "or_asl",    0xf7dc0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "sat16_add", 0xf70d0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sat16_add", 0xf70d0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "sat16_add", 0xf71d0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sat16_add", 0xf71d0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "sat16_sub", 0xf72d0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sat16_sub", 0xf72d0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "sat16_sub", 0xf73d0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sat16_sub", 0xf73d0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "sat16_cmp", 0xf74d0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sat16_cmp", 0xf74d0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "sat16_cmp", 0xf75d0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sat16_cmp", 0xf75d0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "sat16_mov", 0xf76d0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sat16_mov", 0xf76d0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "sat16_mov", 0xf77d0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sat16_mov", 0xf77d0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          SIMM4_2, RN0}},
-{ "sat16_asr", 0xf78d0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sat16_asr", 0xf78d0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "sat16_asr", 0xf79d0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sat16_asr", 0xf79d0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "sat16_lsr", 0xf7ad0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sat16_lsr", 0xf7ad0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "sat16_lsr", 0xf7bd0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sat16_lsr", 0xf7bd0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
-{ "sat16_asl", 0xf7cd0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sat16_asl", 0xf7cd0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          RM2, RN0}},
-{ "sat16_asl", 0xf7dd0000,     0xffff0000,     FMT_D10, {RM6, RN4,
+{ "sat16_asl", 0xf7dd0000,  0xffff0000, FMT_D10, AM33,  {RM6, RN4,
                                                          IMM4_2, RN0}},
 /* end-sanitize-am33 */
 
-{ 0, 0, 0, 0, {0}},
+{ 0, 0, 0, 0, 0, {0}},
 
 } ;
 
This page took 0.129885 seconds and 4 git commands to generate.