Expect the srec_test to fail for ARM targets because the -oformat linker

[deliverable/binutils-gdb.git] / opcodes / h8500-opc.h

diff --git a/opcodes/h8500-opc.h b/opcodes/h8500-opc.h
index 1323ed63ab3bdde542e4b8226f12f54204933a1e..d4949af34d0096d8140b8ee05cacfa8c6cd24f2e 100644 (file)
--- a/opcodes/h8500-opc.h
+++ b/opcodes/h8500-opc.h
@@ -55,7 +55,7 @@ typedef enum
 #define O_EXTS 48
 #define O_DSUB 49
 #define O_DIVXU 50
-#define O_DAAD 51
+#define O_DADD 51
 #define O_CMP 52
 #define O_CLR 53
 #define O_BVS 54
@@ -124,7 +124,7 @@ typedef enum
 #define RS     39
 #define SP     40
 typedef enum { AC_BAD, AC_EI, AC_RI, AC_D, AC_,AC_ERR, AC_X,AC_B, AC_EE,AC_RR,AC_IE,
- AC_RE,AC_E, AC_I, AC_ER,AC_IRR, AC_IR, AC_RER, AC_ERE,AC_EIE, } addr_class_type; 
+ AC_RE,AC_E, AC_I, AC_ER,AC_IRR, AC_IR, AC_RER, AC_ERE,AC_EIE } addr_class_type; 
 typedef struct {
        short int idx;
        char flags,src1,src2,dst;
@@ -139,6 +139,13 @@ h8500_opcode_info h8500_table[]
 #ifdef ASSEMBLER_TABLE
 #ifdef DEFINE_TABLE
 ={
+/*
+{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,ABS16},6,   {{0x1d,0xff, },
+                                                                  {0x00,0x00,ABS16 },
+                                                                  {0x00,0x00, },
+                                                                  {0x07,0xff, },
+                                                                  {0x00,0x00,IMM16 },{0x00,0x00, }}},*/
+
 {1,'s','E','C','C',O_XORC|O_WORD,"xorc.w",2,{IMM16,CRW},4,     {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x68,0xf8,CRW }}},
 {2,'s','E','C','C',O_XORC|O_BYTE,"xorc.b",2,{IMM8,CRB},3,      {{0x04,0xff, },{0x00,0x00,IMM8 },{0x68,0xf8,CRB }}},
 {3,'m','E','D','D',O_XOR|O_WORD,"xor.w",2,{RN,RD},2,   {{0xa8,0xf8,RN },{0x60,0xf8,RD }}},
@@ -171,33 +178,33 @@ h8500_opcode_info h8500_table[]
 {6,'-','X','!','!',O_XCH|O_WORD,"xch.w",2,{RS,RD},2,   {{0xa8,0xf8,RS },{0x90,0xf8,RD }}},
 {7,'-','X','!','!',O_XCH|O_UNSZ,"xch",2,{RS,RD},2,     {{0xa8,0xf8,RS },{0x90,0xf8,RD }}},
 {8,'-','B','!','!',O_UNLK|O_UNSZ,"unlk",1,{FP,0},1,    {{0x0f,0xff, }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{RN,0},2,    {{0xa8,0xf8,RN },{0x16,0xff, }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{RNINC,0},2, {{0xc8,0xf8,RN },{0x16,0xff, }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{RNDEC,0},2, {{0xb8,0xf8,RN },{0x16,0xff, }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{RNIND,0},2, {{0xd8,0xf8,RN },{0x16,0xff, }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{ABS8,0},3,  {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x16,0xff, }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{RNIND_D8,0},3,      {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x16,0xff, }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{ABS16,0},4, {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x16,0xff, }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{IMM16,0},4, {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x16,0xff, }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{RNIND_D16,0},4,     {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x16,0xff, }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{RN,0},2,   {{0xa0,0xf8,RN },{0x16,0xff, }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNDEC,0},2,        {{0xb0,0xf8,RN },{0x16,0xff, }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNINC,0},2,        {{0xc0,0xf8,RN },{0x16,0xff, }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNIND,0},2,        {{0xd0,0xf8,RN },{0x16,0xff, }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{IMM8,0},3, {{0x04,0xff, },{0x00,0x00,IMM8 },{0x16,0xff, }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{ABS8,0},3, {{0x05,0xff, },{0x00,0x00,ABS8 },{0x16,0xff, }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNIND_D8,0},3,     {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x16,0xff, }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{ABS16,0},4,        {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x16,0xff, }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNIND_D16,0},4,    {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x16,0xff, }}},
-{11,'m','E','!','!',O_TST|O_UNSZ,"tst",1,{RN,0},2,     {{0xa8,0xf8,RN },{0x16,0xff, }}},
-{11,'m','E','!','!',O_TST|O_UNSZ,"tst",1,{RNIND,0},2,  {{0xd8,0xf8,RN },{0x16,0xff, }}},
-{11,'m','E','!','!',O_TST|O_UNSZ,"tst",1,{RNDEC,0},2,  {{0xb8,0xf8,RN },{0x16,0xff, }}},
-{11,'m','E','!','!',O_TST|O_UNSZ,"tst",1,{RNINC,0},2,  {{0xc8,0xf8,RN },{0x16,0xff, }}},
-{11,'m','E','!','!',O_TST|O_UNSZ,"tst",1,{ABS8,0},3,   {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x16,0xff, }}},
-{11,'m','E','!','!',O_TST|O_UNSZ,"tst",1,{RNIND_D8,0},3,       {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x16,0xff, }}},
-{11,'m','E','!','!',O_TST|O_UNSZ,"tst",1,{IMM16,0},4,  {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x16,0xff, }}},
-{11,'m','E','!','!',O_TST|O_UNSZ,"tst",1,{ABS16,0},4,  {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x16,0xff, }}},
-{11,'m','E','!','!',O_TST|O_UNSZ,"tst",1,{RNIND_D16,0},4,      {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{RN,0},2,    {{0xa8,0xf8,RN },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{RNINC,0},2, {{0xc8,0xf8,RN },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{RNDEC,0},2, {{0xb8,0xf8,RN },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{RNIND,0},2, {{0xd8,0xf8,RN },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{ABS8,0},3,  {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{RNIND_D8,0},3,      {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{ABS16,0},4, {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{IMM16,0},4, {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{RNIND_D16,0},4,     {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{RN,0},2,   {{0xa0,0xf8,RN },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNDEC,0},2,        {{0xb0,0xf8,RN },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNINC,0},2,        {{0xc0,0xf8,RN },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNIND,0},2,        {{0xd0,0xf8,RN },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{IMM8,0},3, {{0x04,0xff, },{0x00,0x00,IMM8 },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{ABS8,0},3, {{0x05,0xff, },{0x00,0x00,ABS8 },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNIND_D8,0},3,     {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{ABS16,0},4,        {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNIND_D16,0},4,    {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x16,0xff, }}},
+{11,'a','E','!','!',O_TST|O_UNSZ,"tst",1,{RN,0},2,     {{0xa8,0xf8,RN },{0x16,0xff, }}},
+{11,'a','E','!','!',O_TST|O_UNSZ,"tst",1,{RNIND,0},2,  {{0xd8,0xf8,RN },{0x16,0xff, }}},
+{11,'a','E','!','!',O_TST|O_UNSZ,"tst",1,{RNDEC,0},2,  {{0xb8,0xf8,RN },{0x16,0xff, }}},
+{11,'a','E','!','!',O_TST|O_UNSZ,"tst",1,{RNINC,0},2,  {{0xc8,0xf8,RN },{0x16,0xff, }}},
+{11,'a','E','!','!',O_TST|O_UNSZ,"tst",1,{ABS8,0},3,   {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x16,0xff, }}},
+{11,'a','E','!','!',O_TST|O_UNSZ,"tst",1,{RNIND_D8,0},3,       {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x16,0xff, }}},
+{11,'a','E','!','!',O_TST|O_UNSZ,"tst",1,{IMM16,0},4,  {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x16,0xff, }}},
+{11,'a','E','!','!',O_TST|O_UNSZ,"tst",1,{ABS16,0},4,  {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x16,0xff, }}},
+{11,'a','E','!','!',O_TST|O_UNSZ,"tst",1,{RNIND_D16,0},4,      {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x16,0xff, }}},
 {12,'-','I','!','!',O_TRAPA|O_UNSZ,"trapa",1,{IMM4,0},2,       {{0x08,0xff, },{0x10,0xf0,IMM4 }}},
 {13,'-','B','!','!',O_TRAP_VS|O_UNSZ,"trap/vs",0,{0,0},1,      {{0x09,0xff, }}},
 {14,'s','E','!','E',O_TAS|O_BYTE,"tas.b",1,{RN,0},2,   {{0xa0,0xf8,RN },{0x17,0xff, }}},
@@ -302,15 +309,15 @@ h8500_opcode_info h8500_table[]
 {26,'a','E','D','D',O_SUB|O_UNSZ,"sub",2,{ABS16,RD},4, {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x30,0xf8,RD }}},
 {26,'a','E','D','D',O_SUB|O_UNSZ,"sub",2,{RNIND_D16,RD},4,     {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x30,0xf8,RD }}},
 {27,'-','I','!','E',O_STM|O_UNSZ,"stm",2,{RLIST,SPDEC},2,      {{0x12,0xff, },{0x00,0x00,RLIST }}},
-{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,RN},2, {{0xa0,0xf8,RN },{0x98,0xf8,CRW }}},
-{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,RNDEC},2,      {{0xb0,0xf8,RN },{0x98,0xf8,CRW }}},
-{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,RNINC},2,      {{0xc0,0xf8,RN },{0x98,0xf8,CRW }}},
-{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,RNIND},2,      {{0xd0,0xf8,RN },{0x98,0xf8,CRW }}},
-{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,ABS8},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x98,0xf8,CRW }}},
-{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,RNIND_D8},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x98,0xf8,CRW }}},
-{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,ABS16},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x98,0xf8,CRW }}},
-{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,RNIND_D16},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x98,0xf8,CRW }}},
-{29,'s','C','!','E',O_STC|O_BYTE,"stc.b",2,{CRB,RN},2, {{0xa0,0xf8,RN },{0x98,0xf8,CRB }}},
+{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,RN},2,         {{0xa8,0xf8,RN },{0x98,0xf8,CRW }}},
+{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,RNDEC},2,      {{0xb8,0xf8,RN },{0x98,0xf8,CRW }}},
+{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,RNINC},2,      {{0xc8,0xf8,RN },{0x98,0xf8,CRW }}},
+{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,RNIND},2,      {{0xd8,0xf8,RN },{0x98,0xf8,CRW }}},
+{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,ABS8},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x98,0xf8,CRW }}},
+{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,RNIND_D8},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x98,0xf8,CRW }}},
+{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,ABS16},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x98,0xf8,CRW }}},
+{28,'s','C','!','E',O_STC|O_WORD,"stc.w",2,{CRW,RNIND_D16},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x98,0xf8,CRW }}},
+{29,'s','C','!','E',O_STC|O_BYTE,"stc.b",2,{CRB,RN},2,         {{0xa0,0xf8,RN },{0x98,0xf8,CRB }}},
 {29,'s','C','!','E',O_STC|O_BYTE,"stc.b",2,{CRB,RNDEC},2,      {{0xb0,0xf8,RN },{0x98,0xf8,CRB }}},
 {29,'s','C','!','E',O_STC|O_BYTE,"stc.b",2,{CRB,RNINC},2,      {{0xc0,0xf8,RN },{0x98,0xf8,CRB }}},
 {29,'s','C','!','E',O_STC|O_BYTE,"stc.b",2,{CRB,RNIND},2,      {{0xd0,0xf8,RN },{0x98,0xf8,CRB }}},
@@ -318,245 +325,245 @@ h8500_opcode_info h8500_table[]
 {29,'s','C','!','E',O_STC|O_BYTE,"stc.b",2,{CRB,RNIND_D8},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x98,0xf8,CRB }}},
 {29,'s','C','!','E',O_STC|O_BYTE,"stc.b",2,{CRB,ABS16},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x98,0xf8,CRB }}},
 {29,'s','C','!','E',O_STC|O_BYTE,"stc.b",2,{CRB,RNIND_D16},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x98,0xf8,CRB }}},
-{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,RN},2,   {{0xa0,0xf8,RN },{0x98,0xf8,CRW }}},
+{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,RN},2,   {{0xa8,0xf8,RN },{0x98,0xf8,CRW }}},
 {30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRB,RN},2,   {{0xa0,0xf8,RN },{0x98,0xf8,CRB }}},
 {30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRB,RNDEC},2,        {{0xb0,0xf8,RN },{0x98,0xf8,CRB }}},
-{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,RNIND},2,        {{0xd0,0xf8,RN },{0x98,0xf8,CRW }}},
-{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,RNINC},2,        {{0xc0,0xf8,RN },{0x98,0xf8,CRW }}},
-{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,RNDEC},2,        {{0xb0,0xf8,RN },{0x98,0xf8,CRW }}},
+{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,RNIND},2,        {{0xd8,0xf8,RN },{0x98,0xf8,CRW }}},
+{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,RNINC},2,        {{0xc8,0xf8,RN },{0x98,0xf8,CRW }}},
+{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,RNDEC},2,        {{0xb8,0xf8,RN },{0x98,0xf8,CRW }}},
 {30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRB,RNIND},2,        {{0xd0,0xf8,RN },{0x98,0xf8,CRB }}},
 {30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRB,RNINC},2,        {{0xc0,0xf8,RN },{0x98,0xf8,CRB }}},
-{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,RNIND_D8},3,     {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x98,0xf8,CRW }}},
+{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,RNIND_D8},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x98,0xf8,CRW }}},
 {30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRB,ABS8},3, {{0x05,0xff, },{0x00,0x00,ABS8 },{0x98,0xf8,CRB }}},
 {30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRB,RNIND_D8},3,     {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x98,0xf8,CRB }}},
-{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,ABS8},3, {{0x05,0xff, },{0x00,0x00,ABS8 },{0x98,0xf8,CRW }}},
-{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,RNIND_D16},4,    {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x98,0xf8,CRW }}},
-{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,ABS16},4,        {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x98,0xf8,CRW }}},
+{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,ABS8},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x98,0xf8,CRW }}},
+{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,RNIND_D16},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x98,0xf8,CRW }}},
+{30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRW,ABS16},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x98,0xf8,CRW }}},
 {30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRB,ABS16},4,        {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x98,0xf8,CRB }}},
 {30,'s','C','!','E',O_STC|O_UNSZ,"stc",2,{CRB,RNIND_D16},4,    {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x98,0xf8,CRB }}},
 {31,'-','!','!','!',O_SLEEP|O_UNSZ,"sleep",0,{0,0},1,  {{0x1a,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1b,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1b,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1b,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1b,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1b,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1b,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1b,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1b,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1b,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1b,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1b,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1b,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1b,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1b,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1b,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1b,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1b,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1b,0xff, }}},
-{34,'s','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{RN,0},2,   {{0xa8,0xf8,RN },{0x1b,0xff, }}},
-{34,'s','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{RNIND,0},2,        {{0xd8,0xf8,RN },{0x1b,0xff, }}},
-{34,'s','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{RNDEC,0},2,        {{0xb8,0xf8,RN },{0x1b,0xff, }}},
-{34,'s','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{RNINC,0},2,        {{0xc8,0xf8,RN },{0x1b,0xff, }}},
-{34,'s','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{ABS8,0},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1b,0xff, }}},
-{34,'s','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{RNIND_D8,0},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1b,0xff, }}},
-{34,'s','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{ABS16,0},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1b,0xff, }}},
-{34,'s','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{IMM16,0},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1b,0xff, }}},
-{34,'s','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{RNIND_D16,0},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1b,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1a,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1a,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1a,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1a,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1a,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1a,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1a,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1a,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1a,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1a,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1a,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1a,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1a,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1a,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1a,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1a,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1a,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1a,0xff, }}},
-{37,'s','E','!','E',O_SHLL|O_UNSZ,"shll",1,{RN,0},2,   {{0xa8,0xf8,RN },{0x1a,0xff, }}},
-{37,'s','E','!','E',O_SHLL|O_UNSZ,"shll",1,{RNDEC,0},2,        {{0xb8,0xf8,RN },{0x1a,0xff, }}},
-{37,'s','E','!','E',O_SHLL|O_UNSZ,"shll",1,{RNIND,0},2,        {{0xd8,0xf8,RN },{0x1a,0xff, }}},
-{37,'s','E','!','E',O_SHLL|O_UNSZ,"shll",1,{RNINC,0},2,        {{0xc8,0xf8,RN },{0x1a,0xff, }}},
-{37,'s','E','!','E',O_SHLL|O_UNSZ,"shll",1,{ABS8,0},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1a,0xff, }}},
-{37,'s','E','!','E',O_SHLL|O_UNSZ,"shll",1,{RNIND_D8,0},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1a,0xff, }}},
-{37,'s','E','!','E',O_SHLL|O_UNSZ,"shll",1,{IMM16,0},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1a,0xff, }}},
-{37,'s','E','!','E',O_SHLL|O_UNSZ,"shll",1,{ABS16,0},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1a,0xff, }}},
-{37,'s','E','!','E',O_SHLL|O_UNSZ,"shll",1,{RNIND_D16,0},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1a,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x19,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x19,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x19,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x19,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x19,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x19,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x19,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x19,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x19,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x19,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x19,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x19,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x19,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x19,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x19,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x19,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x19,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x19,0xff, }}},
-{40,'s','E','!','E',O_SHAR|O_UNSZ,"shar",1,{RN,0},2,   {{0xa8,0xf8,RN },{0x19,0xff, }}},
-{40,'s','E','!','E',O_SHAR|O_UNSZ,"shar",1,{RNDEC,0},2,        {{0xb8,0xf8,RN },{0x19,0xff, }}},
-{40,'s','E','!','E',O_SHAR|O_UNSZ,"shar",1,{RNIND,0},2,        {{0xd8,0xf8,RN },{0x19,0xff, }}},
-{40,'s','E','!','E',O_SHAR|O_UNSZ,"shar",1,{RNINC,0},2,        {{0xc8,0xf8,RN },{0x19,0xff, }}},
-{40,'s','E','!','E',O_SHAR|O_UNSZ,"shar",1,{ABS8,0},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x19,0xff, }}},
-{40,'s','E','!','E',O_SHAR|O_UNSZ,"shar",1,{RNIND_D8,0},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x19,0xff, }}},
-{40,'s','E','!','E',O_SHAR|O_UNSZ,"shar",1,{IMM16,0},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x19,0xff, }}},
-{40,'s','E','!','E',O_SHAR|O_UNSZ,"shar",1,{ABS16,0},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x19,0xff, }}},
-{40,'s','E','!','E',O_SHAR|O_UNSZ,"shar",1,{RNIND_D16,0},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x19,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x18,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x18,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x18,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x18,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x18,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x18,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x18,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x18,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x18,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x18,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x18,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x18,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x18,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x18,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x18,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x18,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x18,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x18,0xff, }}},
-{43,'s','E','!','E',O_SHAL|O_UNSZ,"shal",1,{RN,0},2,   {{0xa8,0xf8,RN },{0x18,0xff, }}},
-{43,'s','E','!','E',O_SHAL|O_UNSZ,"shal",1,{RNIND,0},2,        {{0xd8,0xf8,RN },{0x18,0xff, }}},
-{43,'s','E','!','E',O_SHAL|O_UNSZ,"shal",1,{RNDEC,0},2,        {{0xb8,0xf8,RN },{0x18,0xff, }}},
-{43,'s','E','!','E',O_SHAL|O_UNSZ,"shal",1,{RNINC,0},2,        {{0xc8,0xf8,RN },{0x18,0xff, }}},
-{43,'s','E','!','E',O_SHAL|O_UNSZ,"shal",1,{ABS8,0},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x18,0xff, }}},
-{43,'s','E','!','E',O_SHAL|O_UNSZ,"shal",1,{RNIND_D8,0},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x18,0xff, }}},
-{43,'s','E','!','E',O_SHAL|O_UNSZ,"shal",1,{ABS16,0},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x18,0xff, }}},
-{43,'s','E','!','E',O_SHAL|O_UNSZ,"shal",1,{IMM16,0},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x18,0xff, }}},
-{43,'s','E','!','E',O_SHAL|O_UNSZ,"shal",1,{RNIND_D16,0},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x18,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1b,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1b,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1b,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1b,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1b,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1b,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1b,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1b,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1b,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1b,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1b,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1b,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1b,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1b,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1b,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1b,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1b,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1b,0xff, }}},
+{34,'h','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{RN,0},2,   {{0xa8,0xf8,RN },{0x1b,0xff, }}},
+{34,'h','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{RNIND,0},2,        {{0xd8,0xf8,RN },{0x1b,0xff, }}},
+{34,'h','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{RNDEC,0},2,        {{0xb8,0xf8,RN },{0x1b,0xff, }}},
+{34,'h','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{RNINC,0},2,        {{0xc8,0xf8,RN },{0x1b,0xff, }}},
+{34,'h','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{ABS8,0},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1b,0xff, }}},
+{34,'h','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{RNIND_D8,0},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1b,0xff, }}},
+{34,'h','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{ABS16,0},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1b,0xff, }}},
+{34,'h','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{IMM16,0},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1b,0xff, }}},
+{34,'h','E','!','E',O_SHLR|O_UNSZ,"shlr",1,{RNIND_D16,0},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1b,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1a,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1a,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1a,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1a,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1a,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1a,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1a,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1a,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1a,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1a,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1a,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1a,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1a,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1a,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1a,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1a,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1a,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1a,0xff, }}},
+{37,'h','E','!','E',O_SHLL|O_UNSZ,"shll",1,{RN,0},2,   {{0xa8,0xf8,RN },{0x1a,0xff, }}},
+{37,'h','E','!','E',O_SHLL|O_UNSZ,"shll",1,{RNDEC,0},2,        {{0xb8,0xf8,RN },{0x1a,0xff, }}},
+{37,'h','E','!','E',O_SHLL|O_UNSZ,"shll",1,{RNIND,0},2,        {{0xd8,0xf8,RN },{0x1a,0xff, }}},
+{37,'h','E','!','E',O_SHLL|O_UNSZ,"shll",1,{RNINC,0},2,        {{0xc8,0xf8,RN },{0x1a,0xff, }}},
+{37,'h','E','!','E',O_SHLL|O_UNSZ,"shll",1,{ABS8,0},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1a,0xff, }}},
+{37,'h','E','!','E',O_SHLL|O_UNSZ,"shll",1,{RNIND_D8,0},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1a,0xff, }}},
+{37,'h','E','!','E',O_SHLL|O_UNSZ,"shll",1,{IMM16,0},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1a,0xff, }}},
+{37,'h','E','!','E',O_SHLL|O_UNSZ,"shll",1,{ABS16,0},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1a,0xff, }}},
+{37,'h','E','!','E',O_SHLL|O_UNSZ,"shll",1,{RNIND_D16,0},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1a,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x19,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x19,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x19,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x19,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x19,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x19,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x19,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x19,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x19,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x19,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x19,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x19,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x19,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x19,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x19,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x19,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x19,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x19,0xff, }}},
+{40,'h','E','!','E',O_SHAR|O_UNSZ,"shar",1,{RN,0},2,   {{0xa8,0xf8,RN },{0x19,0xff, }}},
+{40,'h','E','!','E',O_SHAR|O_UNSZ,"shar",1,{RNDEC,0},2,        {{0xb8,0xf8,RN },{0x19,0xff, }}},
+{40,'h','E','!','E',O_SHAR|O_UNSZ,"shar",1,{RNIND,0},2,        {{0xd8,0xf8,RN },{0x19,0xff, }}},
+{40,'h','E','!','E',O_SHAR|O_UNSZ,"shar",1,{RNINC,0},2,        {{0xc8,0xf8,RN },{0x19,0xff, }}},
+{40,'h','E','!','E',O_SHAR|O_UNSZ,"shar",1,{ABS8,0},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x19,0xff, }}},
+{40,'h','E','!','E',O_SHAR|O_UNSZ,"shar",1,{RNIND_D8,0},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x19,0xff, }}},
+{40,'h','E','!','E',O_SHAR|O_UNSZ,"shar",1,{IMM16,0},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x19,0xff, }}},
+{40,'h','E','!','E',O_SHAR|O_UNSZ,"shar",1,{ABS16,0},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x19,0xff, }}},
+{40,'h','E','!','E',O_SHAR|O_UNSZ,"shar",1,{RNIND_D16,0},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x19,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x18,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x18,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x18,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x18,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x18,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x18,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x18,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x18,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x18,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x18,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x18,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x18,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x18,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x18,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x18,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x18,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x18,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x18,0xff, }}},
+{43,'h','E','!','E',O_SHAL|O_UNSZ,"shal",1,{RN,0},2,   {{0xa8,0xf8,RN },{0x18,0xff, }}},
+{43,'h','E','!','E',O_SHAL|O_UNSZ,"shal",1,{RNIND,0},2,        {{0xd8,0xf8,RN },{0x18,0xff, }}},
+{43,'h','E','!','E',O_SHAL|O_UNSZ,"shal",1,{RNDEC,0},2,        {{0xb8,0xf8,RN },{0x18,0xff, }}},
+{43,'h','E','!','E',O_SHAL|O_UNSZ,"shal",1,{RNINC,0},2,        {{0xc8,0xf8,RN },{0x18,0xff, }}},
+{43,'h','E','!','E',O_SHAL|O_UNSZ,"shal",1,{ABS8,0},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x18,0xff, }}},
+{43,'h','E','!','E',O_SHAL|O_UNSZ,"shal",1,{RNIND_D8,0},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x18,0xff, }}},
+{43,'h','E','!','E',O_SHAL|O_UNSZ,"shal",1,{ABS16,0},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x18,0xff, }}},
+{43,'h','E','!','E',O_SHAL|O_UNSZ,"shal",1,{IMM16,0},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x18,0xff, }}},
+{43,'h','E','!','E',O_SHAL|O_UNSZ,"shal",1,{RNIND_D16,0},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x18,0xff, }}},
 {44,'-','B','S','S',O_SCB_NE|O_UNSZ,"scb/ne",2,{RS,PCREL8},3,  {{0x06,0xff, },{0xb8,0xf8,RS },{0x00,0x00,PCREL8 }}},
 {45,'-','B','S','S',O_SCB_F|O_UNSZ,"scb/f",2,{RS,PCREL8},3,    {{0x01,0xff, },{0xb8,0xf8,RS },{0x00,0x00,PCREL8 }}},
 {46,'-','B','S','S',O_SCB_EQ|O_UNSZ,"scb/eq",2,{RS,PCREL8},3,  {{0x07,0xff, },{0xb8,0xf8,RS },{0x00,0x00,PCREL8 }}},
 {47,'-','B','!','!',O_RTS|O_UNSZ,"rts",0,{0,0},1,      {{0x19,0xff, }}},
 {48,'-','B','!','!',O_RTD|O_UNSZ,"rtd",1,{IMM8,0},2,   {{0x14,0xff, },{0x00,0x00,IMM8 }}},
 {48,'-','B','!','!',O_RTD|O_UNSZ,"rtd",1,{IMM16,0},3,  {{0x14,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RN,0},2,       {{0xa8,0xf8,RN },{0x1f,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNDEC,0},2,    {{0xb8,0xf8,RN },{0x1f,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNINC,0},2,    {{0xc8,0xf8,RN },{0x1f,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNIND,0},2,    {{0xd8,0xf8,RN },{0x1f,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{ABS8,0},3,     {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1f,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNIND_D8,0},3, {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1f,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{ABS16,0},4,    {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1f,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{IMM16,0},4,    {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1f,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNIND_D16,0},4,        {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1f,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RN,0},2,       {{0xa0,0xf8,RN },{0x1f,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNDEC,0},2,    {{0xb0,0xf8,RN },{0x1f,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNIND,0},2,    {{0xd0,0xf8,RN },{0x1f,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNINC,0},2,    {{0xc0,0xf8,RN },{0x1f,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{IMM8,0},3,     {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1f,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{ABS8,0},3,     {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1f,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNIND_D8,0},3, {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1f,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{ABS16,0},4,    {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1f,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNIND_D16,0},4,        {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1f,0xff, }}},
-{51,'s','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1f,0xff, }}},
-{51,'s','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1f,0xff, }}},
-{51,'s','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1f,0xff, }}},
-{51,'s','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1f,0xff, }}},
-{51,'s','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1f,0xff, }}},
-{51,'s','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1f,0xff, }}},
-{51,'s','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1f,0xff, }}},
-{51,'s','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1f,0xff, }}},
-{51,'s','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1f,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RN,0},2,       {{0xa8,0xf8,RN },{0x1e,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNIND,0},2,    {{0xd8,0xf8,RN },{0x1e,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNINC,0},2,    {{0xc8,0xf8,RN },{0x1e,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNDEC,0},2,    {{0xb8,0xf8,RN },{0x1e,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{ABS8,0},3,     {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1e,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNIND_D8,0},3, {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1e,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{ABS16,0},4,    {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1e,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{IMM16,0},4,    {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1e,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNIND_D16,0},4,        {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1e,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RN,0},2,       {{0xa0,0xf8,RN },{0x1e,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNINC,0},2,    {{0xc0,0xf8,RN },{0x1e,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNDEC,0},2,    {{0xb0,0xf8,RN },{0x1e,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNIND,0},2,    {{0xd0,0xf8,RN },{0x1e,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{ABS8,0},3,     {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1e,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{IMM8,0},3,     {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1e,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNIND_D8,0},3, {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1e,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{ABS16,0},4,    {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1e,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNIND_D16,0},4,        {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1e,0xff, }}},
-{54,'s','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1e,0xff, }}},
-{54,'s','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1e,0xff, }}},
-{54,'s','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1e,0xff, }}},
-{54,'s','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1e,0xff, }}},
-{54,'s','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1e,0xff, }}},
-{54,'s','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1e,0xff, }}},
-{54,'s','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1e,0xff, }}},
-{54,'s','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1e,0xff, }}},
-{54,'s','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1e,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1d,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1d,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1d,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1d,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1d,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1d,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1d,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1d,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1d,0xff, }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1d,0xff, }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1d,0xff, }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1d,0xff, }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1d,0xff, }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1d,0xff, }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1d,0xff, }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1d,0xff, }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1d,0xff, }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1d,0xff, }}},
-{57,'s','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{RN,0},2,   {{0xa8,0xf8,RN },{0x1d,0xff, }}},
-{57,'s','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{RNDEC,0},2,        {{0xb8,0xf8,RN },{0x1d,0xff, }}},
-{57,'s','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{RNIND,0},2,        {{0xd8,0xf8,RN },{0x1d,0xff, }}},
-{57,'s','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{RNINC,0},2,        {{0xc8,0xf8,RN },{0x1d,0xff, }}},
-{57,'s','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{ABS8,0},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1d,0xff, }}},
-{57,'s','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{RNIND_D8,0},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1d,0xff, }}},
-{57,'s','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{ABS16,0},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1d,0xff, }}},
-{57,'s','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{IMM16,0},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1d,0xff, }}},
-{57,'s','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{RNIND_D16,0},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1d,0xff, }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1c,0xff, }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1c,0xff, }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1c,0xff, }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1c,0xff, }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1c,0xff, }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1c,0xff, }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1c,0xff, }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1c,0xff, }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1c,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1c,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1c,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1c,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1c,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1c,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1c,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1c,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1c,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1c,0xff, }}},
-{60,'s','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{RN,0},2,   {{0xa8,0xf8,RN },{0x1c,0xff, }}},
-{60,'s','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{RNDEC,0},2,        {{0xb8,0xf8,RN },{0x1c,0xff, }}},
-{60,'s','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{RNIND,0},2,        {{0xd8,0xf8,RN },{0x1c,0xff, }}},
-{60,'s','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{RNINC,0},2,        {{0xc8,0xf8,RN },{0x1c,0xff, }}},
-{60,'s','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{RNIND_D8,0},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1c,0xff, }}},
-{60,'s','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{ABS8,0},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1c,0xff, }}},
-{60,'s','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{IMM16,0},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1c,0xff, }}},
-{60,'s','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{ABS16,0},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1c,0xff, }}},
-{60,'s','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{RNIND_D16,0},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1c,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RN,0},2,       {{0xa8,0xf8,RN },{0x1f,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNDEC,0},2,    {{0xb8,0xf8,RN },{0x1f,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNINC,0},2,    {{0xc8,0xf8,RN },{0x1f,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNIND,0},2,    {{0xd8,0xf8,RN },{0x1f,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{ABS8,0},3,     {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1f,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNIND_D8,0},3, {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1f,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{ABS16,0},4,    {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1f,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{IMM16,0},4,    {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1f,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNIND_D16,0},4,        {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1f,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RN,0},2,       {{0xa0,0xf8,RN },{0x1f,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNDEC,0},2,    {{0xb0,0xf8,RN },{0x1f,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNIND,0},2,    {{0xd0,0xf8,RN },{0x1f,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNINC,0},2,    {{0xc0,0xf8,RN },{0x1f,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{IMM8,0},3,     {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1f,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{ABS8,0},3,     {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1f,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNIND_D8,0},3, {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1f,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{ABS16,0},4,    {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1f,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNIND_D16,0},4,        {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1f,0xff, }}},
+{51,'h','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1f,0xff, }}},
+{51,'h','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1f,0xff, }}},
+{51,'h','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1f,0xff, }}},
+{51,'h','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1f,0xff, }}},
+{51,'h','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1f,0xff, }}},
+{51,'h','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1f,0xff, }}},
+{51,'h','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1f,0xff, }}},
+{51,'h','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1f,0xff, }}},
+{51,'h','E','!','E',O_ROTXR|O_UNSZ,"rotxr",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1f,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RN,0},2,       {{0xa8,0xf8,RN },{0x1e,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNIND,0},2,    {{0xd8,0xf8,RN },{0x1e,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNINC,0},2,    {{0xc8,0xf8,RN },{0x1e,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNDEC,0},2,    {{0xb8,0xf8,RN },{0x1e,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{ABS8,0},3,     {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1e,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNIND_D8,0},3, {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1e,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{ABS16,0},4,    {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1e,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{IMM16,0},4,    {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1e,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNIND_D16,0},4,        {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1e,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RN,0},2,       {{0xa0,0xf8,RN },{0x1e,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNINC,0},2,    {{0xc0,0xf8,RN },{0x1e,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNDEC,0},2,    {{0xb0,0xf8,RN },{0x1e,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNIND,0},2,    {{0xd0,0xf8,RN },{0x1e,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{ABS8,0},3,     {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1e,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{IMM8,0},3,     {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1e,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNIND_D8,0},3, {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1e,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{ABS16,0},4,    {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1e,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNIND_D16,0},4,        {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1e,0xff, }}},
+{54,'h','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1e,0xff, }}},
+{54,'h','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1e,0xff, }}},
+{54,'h','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1e,0xff, }}},
+{54,'h','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1e,0xff, }}},
+{54,'h','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1e,0xff, }}},
+{54,'h','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1e,0xff, }}},
+{54,'h','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1e,0xff, }}},
+{54,'h','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1e,0xff, }}},
+{54,'h','E','!','E',O_ROTXL|O_UNSZ,"rotxl",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1e,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1d,0xff, }}},
+{57,'h','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{RN,0},2,   {{0xa8,0xf8,RN },{0x1d,0xff, }}},
+{57,'h','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{RNDEC,0},2,        {{0xb8,0xf8,RN },{0x1d,0xff, }}},
+{57,'h','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{RNIND,0},2,        {{0xd8,0xf8,RN },{0x1d,0xff, }}},
+{57,'h','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{RNINC,0},2,        {{0xc8,0xf8,RN },{0x1d,0xff, }}},
+{57,'h','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{ABS8,0},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1d,0xff, }}},
+{57,'h','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{RNIND_D8,0},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1d,0xff, }}},
+{57,'h','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{ABS16,0},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1d,0xff, }}},
+{57,'h','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{IMM16,0},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1d,0xff, }}},
+{57,'h','E','!','E',O_ROTR|O_UNSZ,"rotr",1,{RNIND_D16,0},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1d,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1c,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1c,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1c,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1c,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1c,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1c,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1c,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1c,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1c,0xff, }}},
+{60,'h','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{RN,0},2,   {{0xa8,0xf8,RN },{0x1c,0xff, }}},
+{60,'h','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{RNDEC,0},2,        {{0xb8,0xf8,RN },{0x1c,0xff, }}},
+{60,'h','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{RNIND,0},2,        {{0xd8,0xf8,RN },{0x1c,0xff, }}},
+{60,'h','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{RNINC,0},2,        {{0xc8,0xf8,RN },{0x1c,0xff, }}},
+{60,'h','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{RNIND_D8,0},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1c,0xff, }}},
+{60,'h','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{ABS8,0},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1c,0xff, }}},
+{60,'h','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{IMM16,0},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1c,0xff, }}},
+{60,'h','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{ABS16,0},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1c,0xff, }}},
+{60,'h','E','!','E',O_ROTL|O_UNSZ,"rotl",1,{RNIND_D16,0},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1c,0xff, }}},
 {61,'-','B','!','!',O_PRTS|O_UNSZ,"prts",0,{0,0},2,    {{0x11,0xff, },{0x19,0xff, }}},
 {62,'-','B','!','!',O_PRTD|O_UNSZ,"prtd",1,{IMM8,0},3, {{0x11,0xff, },{0x14,0xff, },{0x00,0x00,IMM8 }}},
 {62,'-','B','!','!',O_PRTD|O_UNSZ,"prtd",1,{IMM16,0},4,        {{0x11,0xff, },{0x1c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
@@ -650,33 +657,33 @@ h8500_opcode_info h8500_table[]
 {77,'a','E','!','E',O_NEG|O_UNSZ,"neg",1,{ABS16,0},4,  {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x14,0xff, }}},
 {77,'a','E','!','E',O_NEG|O_UNSZ,"neg",1,{IMM16,0},4,  {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x14,0xff, }}},
 {77,'a','E','!','E',O_NEG|O_UNSZ,"neg",1,{RNIND_D16,0},4,      {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x14,0xff, }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{RN,RD},2,      {{0xa8,0xf8,RN },{0xa8,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{RNDEC,RD},2,   {{0xb8,0xf8,RN },{0xa8,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{RNINC,RD},2,   {{0xc8,0xf8,RN },{0xa8,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{RNIND,RD},2,   {{0xd8,0xf8,RN },{0xa8,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{ABS8,RD},3,    {{0x0d,0xff, },{0x00,0x00,ABS8 },{0xa8,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{RNIND_D8,RD},3,        {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0xa8,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{ABS16,RD},4,   {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{IMM16,RD},4,   {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{RNIND_D16,RD},4,       {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{RN,RD},2,      {{0xa0,0xf8,RN },{0xa8,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNIND,RD},2,   {{0xd0,0xf8,RN },{0xa8,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNINC,RD},2,   {{0xc0,0xf8,RN },{0xa8,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNDEC,RD},2,   {{0xb0,0xf8,RN },{0xa8,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{IMM8,RD},3,    {{0x04,0xff, },{0x00,0x00,IMM8 },{0xa8,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{ABS8,RD},3,    {{0x05,0xff, },{0x00,0x00,ABS8 },{0xa8,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNIND_D8,RD},3,        {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0xa8,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{ABS16,RD},4,   {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNIND_D16,RD},4,       {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
-{80,'s','E','!','D',O_MULXU|O_UNSZ,"mulxu",2,{RN,RD},2,        {{0xa8,0xf8,RN },{0xa8,0xf8,RD }}},
-{80,'s','E','!','D',O_MULXU|O_UNSZ,"mulxu",2,{RNIND,RD},2,     {{0xd8,0xf8,RN },{0xa8,0xf8,RD }}},
-{80,'s','E','!','D',O_MULXU|O_UNSZ,"mulxu",2,{RNDEC,RD},2,     {{0xb8,0xf8,RN },{0xa8,0xf8,RD }}},
-{80,'s','E','!','D',O_MULXU|O_UNSZ,"mulxu",2,{RNINC,RD},2,     {{0xc8,0xf8,RN },{0xa8,0xf8,RD }}},
-{80,'s','E','!','D',O_MULXU|O_UNSZ,"mulxu",2,{RNIND_D8,RD},3,  {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0xa8,0xf8,RD }}},
-{80,'s','E','!','D',O_MULXU|O_UNSZ,"mulxu",2,{ABS8,RD},3,      {{0x0d,0xff, },{0x00,0x00,ABS8 },{0xa8,0xf8,RD }}},
-{80,'s','E','!','D',O_MULXU|O_UNSZ,"mulxu",2,{IMM16,RD},4,     {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
-{80,'s','E','!','D',O_MULXU|O_UNSZ,"mulxu",2,{ABS16,RD},4,     {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
-{80,'s','E','!','D',O_MULXU|O_UNSZ,"mulxu",2,{RNIND_D16,RD},4, {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{RN,RD},2,      {{0xa8,0xf8,RN },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{RNDEC,RD},2,   {{0xb8,0xf8,RN },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{RNINC,RD},2,   {{0xc8,0xf8,RN },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{RNIND,RD},2,   {{0xd8,0xf8,RN },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{ABS8,RD},3,    {{0x0d,0xff, },{0x00,0x00,ABS8 },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{RNIND_D8,RD},3,        {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{ABS16,RD},4,   {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{IMM16,RD},4,   {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{RNIND_D16,RD},4,       {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{RN,RD},2,      {{0xa0,0xf8,RN },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNIND,RD},2,   {{0xd0,0xf8,RN },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNINC,RD},2,   {{0xc0,0xf8,RN },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNDEC,RD},2,   {{0xb0,0xf8,RN },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{IMM8,RD},3,    {{0x04,0xff, },{0x00,0x00,IMM8 },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{ABS8,RD},3,    {{0x05,0xff, },{0x00,0x00,ABS8 },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNIND_D8,RD},3,        {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{ABS16,RD},4,   {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNIND_D16,RD},4,       {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
+{80,'p','E','D','D',O_MULXU|O_UNSZ,"mulxu",2,{RN,RD},2,        {{0xa8,0xf8,RN },{0xa8,0xf8,RD }}},
+{80,'p','E','D','D',O_MULXU|O_UNSZ,"mulxu",2,{RNIND,RD},2,     {{0xd8,0xf8,RN },{0xa8,0xf8,RD }}},
+{80,'p','E','D','D',O_MULXU|O_UNSZ,"mulxu",2,{RNDEC,RD},2,     {{0xb8,0xf8,RN },{0xa8,0xf8,RD }}},
+{80,'p','E','D','D',O_MULXU|O_UNSZ,"mulxu",2,{RNINC,RD},2,     {{0xc8,0xf8,RN },{0xa8,0xf8,RD }}},
+{80,'p','E','D','D',O_MULXU|O_UNSZ,"mulxu",2,{RNIND_D8,RD},3,  {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0xa8,0xf8,RD }}},
+{80,'p','E','D','D',O_MULXU|O_UNSZ,"mulxu",2,{ABS8,RD},3,      {{0x0d,0xff, },{0x00,0x00,ABS8 },{0xa8,0xf8,RD }}},
+{80,'p','E','D','D',O_MULXU|O_UNSZ,"mulxu",2,{IMM16,RD},4,     {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
+{80,'p','E','D','D',O_MULXU|O_UNSZ,"mulxu",2,{ABS16,RD},4,     {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
+{80,'p','E','D','D',O_MULXU|O_UNSZ,"mulxu",2,{RNIND_D16,RD},4, {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
 {81,'-','S','!','E',O_MOVTPE|O_BYTE,"movtpe.b",2,{RS,RN},3,    {{0xa0,0xf8,RN },{0x00,0xff, },{0x90,0xf8,RS }}},
 {81,'-','S','!','E',O_MOVTPE|O_BYTE,"movtpe.b",2,{RS,RNDEC},3, {{0xb0,0xf8,RN },{0x00,0xff, },{0x90,0xf8,RS }}},
 {81,'-','S','!','E',O_MOVTPE|O_BYTE,"movtpe.b",2,{RS,RNINC},3, {{0xc0,0xf8,RN },{0x00,0xff, },{0x90,0xf8,RS }}},
@@ -718,30 +725,32 @@ h8500_opcode_info h8500_table[]
 {89,'m','E','!','D',O_MOV|O_BYTE,"mov:l.b",2,{ABS8,RD},2,      {{0x60,0xf8,RD },{0x00,0x00,ABS8 }}},
 {90,'m','E','!','D',O_MOV|O_UNSZ,"mov:l",2,{ABS8,RD},2,        {{0x68,0xf8,RD },{0x00,0x00,ABS8 }}},
 {91,'m','I','!','D',O_MOV|O_WORD,"mov:i.w",2,{IMM16,RD},3,     {{0x58,0xf8,RD },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{92,'m','I','!','D',O_MOV|O_UNSZ,"mov:i",2,{IMM16,RD},3,       {{0x58,0xf8,RD },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{92,'m','I','!','D',O_MOV|O_UNSZ,"mov:i",  2,{IMM16,RD},3,     {{0x58,0xf8,RD },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {93,'m','S','!','E',O_MOV|O_WORD,"mov:g.w",2,{RS,RNIND},2,     {{0xd8,0xf8,RN },{0x90,0xf8,RS }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{RNIND,RD},2,     {{0xd8,0xf8,RN },{0x80,0xf8,RD }}},
 {93,'m','S','!','E',O_MOV|O_WORD,"mov:g.w",2,{RS,RNDEC},2,     {{0xb8,0xf8,RN },{0x90,0xf8,RS }}},
 {93,'m','S','!','E',O_MOV|O_WORD,"mov:g.w",2,{RS,RNINC},2,     {{0xc8,0xf8,RN },{0x90,0xf8,RS }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{RNDEC,RD},2,     {{0xb8,0xf8,RN },{0x80,0xf8,RD }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{RNINC,RD},2,     {{0xc8,0xf8,RN },{0x80,0xf8,RD }}},
-{93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{RN,RD},2,        {{0xa8,0xf8,RN },{0x80,0xf8,RD }}},
+{93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{RN,RD},2,                {{0xa8,0xf8,RN },{0x80,0xf8,RD }}},
 {93,'m','S','!','E',O_MOV|O_WORD,"mov:g.w",2,{RS,ABS8},3,      {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x90,0xf8,RS }}},
 {93,'m','S','!','E',O_MOV|O_WORD,"mov:g.w",2,{RS,RNIND_D8},3,  {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x90,0xf8,RS }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{RNIND_D8,RD},3,  {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x80,0xf8,RD }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{ABS8,RD},3,      {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x80,0xf8,RD }}},
-{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNIND},4,  {{0xd0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNIND},4,  {{0xd8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {93,'m','S','!','E',O_MOV|O_WORD,"mov:g.w",2,{RS,RNIND_D16},4, {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x90,0xf8,RS }}},
-{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNDEC},4,  {{0xb0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNDEC},4,  {{0xb8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RD},4,     {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x80,0xf8,RD }}},
 {93,'m','S','!','E',O_MOV|O_WORD,"mov:g.w",2,{RS,ABS16},4,     {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x90,0xf8,RS }}},
-{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNINC},4,  {{0xc0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNINC},4,  {{0xc8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{ABS16,RD},4,     {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x80,0xf8,RD }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{RNIND_D16,RD},4, {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x80,0xf8,RD }}},
-{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNIND_D8},5,       {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,ABS8},5,   {{0x05,0xff, },{0x00,0x00,ABS8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNIND_D16},6,      {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,ABS16},6,  {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNIND_D8},5,{{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,ABS8},5,   {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNIND_D16},6,{{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,ABS16},6,  {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+
 {94,'m','S','!','E',O_MOV|O_BYTE,"mov:g.b",2,{RS,RNINC},2,     {{0xc0,0xf8,RN },{0x90,0xf8,RS }}},
 {94,'m','E','!','D',O_MOV|O_BYTE,"mov:g.b",2,{RNIND,RD},2,     {{0xd0,0xf8,RN },{0x80,0xf8,RD }}},
 {94,'m','S','!','E',O_MOV|O_BYTE,"mov:g.b",2,{RS,RNIND},2,     {{0xd0,0xf8,RN },{0x90,0xf8,RS }}},
@@ -775,26 +784,26 @@ h8500_opcode_info h8500_table[]
 {95,'m','S','!','E',O_MOV|O_UNSZ,"mov:g",2,{RS,RNIND_D8},3,    {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x90,0xf8,RS }}},
 {95,'m','S','!','E',O_MOV|O_UNSZ,"mov:g",2,{RS,ABS8},3,        {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x90,0xf8,RS }}},
 {95,'m','E','!','D',O_MOV|O_UNSZ,"mov:g",2,{RNIND_D8,RD},3,    {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x80,0xf8,RD }}},
-{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM8,RNIND},3,     {{0xd0,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
+{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM8,RNIND},3,     {{0xd8,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
 {95,'m','E','!','D',O_MOV|O_UNSZ,"mov:g",2,{ABS8,RD},3,        {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x80,0xf8,RD }}},
-{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM8,RNDEC},3,     {{0xb0,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
-{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM8,RNINC},3,     {{0xc0,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
-{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM8,RNIND_D8},4,  {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x06,0xff, },{0x00,0x00,IMM8 }}},
-{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM8,ABS8},4,      {{0x05,0xff, },{0x00,0x00,ABS8 },{0x06,0xff, },{0x00,0x00,IMM8 }}},
+{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM8,RNDEC},3,     {{0xb8,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
+{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM8,RNINC},3,     {{0xc8,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
+{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM8,RNIND_D8},4,  {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x06,0xff, },{0x00,0x00,IMM8 }}},
+{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM8,ABS8},4,      {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x06,0xff, },{0x00,0x00,IMM8 }}},
 {95,'m','S','!','E',O_MOV|O_UNSZ,"mov:g",2,{RS,RNIND_D16},4,   {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x90,0xf8,RS }}},
 {95,'m','E','!','D',O_MOV|O_UNSZ,"mov:g",2,{IMM16,RD},4,       {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x80,0xf8,RD }}},
-{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM16,RNIND},4,    {{0xd0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM16,RNINC},4,    {{0xc0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM16,RNDEC},4,    {{0xb0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM16,RNIND},4,    {{0xd8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM16,RNINC},4,    {{0xc8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM16,RNDEC},4,    {{0xb8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {95,'m','S','!','E',O_MOV|O_UNSZ,"mov:g",2,{RS,ABS16},4,       {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x90,0xf8,RS }}},
 {95,'m','E','!','D',O_MOV|O_UNSZ,"mov:g",2,{RNIND_D16,RD},4,   {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x80,0xf8,RD }}},
 {95,'m','E','!','D',O_MOV|O_UNSZ,"mov:g",2,{ABS16,RD},4,       {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x80,0xf8,RD }}},
-{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM16,RNIND_D8},5, {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM8,ABS16},5,     {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x06,0xff, },{0x00,0x00,IMM8 }}},
-{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM16,ABS8},5,     {{0x05,0xff, },{0x00,0x00,ABS8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM8,RNIND_D16},5, {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x06,0xff, },{0x00,0x00,IMM8 }}},
-{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM16,ABS16},6,    {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM16,RNIND_D16},6,        {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM16,RNIND_D8},5, {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM8,ABS16},5,     {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x06,0xff, },{0x00,0x00,IMM8 }}},
+{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM16,ABS8},5,     {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM8,RNIND_D16},5, {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x06,0xff, },{0x00,0x00,IMM8 }}},
+{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM16,ABS16},6,    {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{95,'m','I','!','E',O_MOV|O_UNSZ,"mov:g",2,{IMM16,RNIND_D16},6,        {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {96,'m','S','!','E',O_MOV|O_WORD,"mov:f.w",2,{RS,FPIND_D8},2,  {{0x98,0xf8,RS },{0x00,0x00,FPIND_D8 }}},
 {96,'m','E','!','D',O_MOV|O_WORD,"mov:f.w",2,{FPIND_D8,RD},2,  {{0x88,0xf8,RD },{0x00,0x00,FPIND_D8 }}},
 {97,'m','S','!','E',O_MOV|O_BYTE,"mov:f.b",2,{RS,FPIND_D8},2,  {{0x90,0xf8,RS },{0x00,0x00,FPIND_D8 }}},
@@ -819,18 +828,19 @@ h8500_opcode_info h8500_table[]
 {101,'m','S','!','E',O_MOV|O_WORD,"mov.w",2,{RS,RNIND_D8},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x90,0xf8,RS }}},
 {101,'m','I','!','D',O_MOV|O_WORD,"mov.w",2,{IMM16,RD},3,      {{0x58,0xf8,RD },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {101,'m','E','!','D',O_MOV|O_WORD,"mov.w",2,{ABS8,RD},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x80,0xf8,RD }}},
-{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,RNINC},4,   {{0xc0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,RNDEC},4,   {{0xb0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,RNIND},4,   {{0xd0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,RNINC},4,   {{0xc8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,RNDEC},4,   {{0xb8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,RNIND},4,   {{0xd8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {101,'m','S','!','E',O_MOV|O_WORD,"mov.w",2,{RS,RNIND_D16},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x90,0xf8,RS }}},
 {101,'m','S','!','E',O_MOV|O_WORD,"mov.w",2,{RS,ABS16},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x90,0xf8,RS }}},
 {101,'m','E','!','D',O_MOV|O_WORD,"mov.w",2,{ABS16,RD},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x80,0xf8,RD }}},
 {101,'m','E','!','D',O_MOV|O_WORD,"mov.w",2,{IMM16,RD},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x80,0xf8,RD }}},
 {101,'m','E','!','D',O_MOV|O_WORD,"mov.w",2,{RNIND_D16,RD},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x80,0xf8,RD }}},
-{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,RNIND_D8},5,        {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,ABS8},5,    {{0x05,0xff, },{0x00,0x00,ABS8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,RNIND_D16},6,       {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,ABS16},6,   {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,RNIND_D8},5,        {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,ABS8},5,    {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,RNIND_D16},6,       {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{101,'m','I','!','E',O_MOV|O_WORD,"mov.w",2,{IMM16,ABS16},6,   {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+
 {102,'m','E','!','D',O_MOV|O_BYTE,"mov.b",2,{FPIND_D8,RD},2,   {{0x80,0xf8,RD },{0x00,0x00,FPIND_D8 }}},
 {102,'m','S','!','E',O_MOV|O_BYTE,"mov.b",2,{RS,ABS8},2,       {{0x70,0xf8,RS },{0x00,0x00,ABS8 }}},
 {102,'m','E','!','D',O_MOV|O_BYTE,"mov.b",2,{RNINC,RD},2,      {{0xc0,0xf8,RN },{0x80,0xf8,RD }}},
@@ -869,45 +879,45 @@ h8500_opcode_info h8500_table[]
 {103,'m','S','!','E',O_MOV|O_UNSZ,"mov",2,{RS,FPIND_D8},2,     {{0x98,0xf8,RS },{0x00,0x00,FPIND_D8 }}},
 {103,'m','E','!','D',O_MOV|O_UNSZ,"mov",2,{RNINC,RD},2,        {{0xc8,0xf8,RN },{0x80,0xf8,RD }}},
 {103,'m','E','!','D',O_MOV|O_UNSZ,"mov",2,{FPIND_D8,RD},2,     {{0x88,0xf8,RD },{0x00,0x00,FPIND_D8 }}},
-{103,'m','I','!','D',O_MOV|O_UNSZ,"mov",2,{IMM8,RD},2, {{0x50,0xf8,RD },{0x00,0x00,IMM8 }}},
+/*{103,'m','I','!','D',O_MOV|O_UNSZ,"mov",2,{IMM8,RD},2,       {{0x58,0xf8,RD },{0x00,0x00,IMM8 }}},*/
 {103,'m','E','!','D',O_MOV|O_UNSZ,"mov",2,{RNDEC,RD},2,        {{0xb8,0xf8,RN },{0x80,0xf8,RD }}},
 {103,'m','S','!','E',O_MOV|O_UNSZ,"mov",2,{RS,RNIND_D8},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x90,0xf8,RS }}},
-{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM8,RNIND},3,      {{0xd0,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
-{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM8,RNINC},3,      {{0xc0,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
-{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM8,RNDEC},3,      {{0xb0,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
+{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM8,RNIND},3,      {{0xd8,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
+{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM8,RNINC},3,      {{0xc8,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
+{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM8,RNDEC},3,      {{0xb8,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
 {103,'m','E','!','D',O_MOV|O_UNSZ,"mov",2,{RNIND_D8,RD},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x80,0xf8,RD }}},
 {103,'m','S','!','E',O_MOV|O_UNSZ,"mov",2,{RS,ABS8},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x90,0xf8,RS }}},
 {103,'m','E','!','D',O_MOV|O_UNSZ,"mov",2,{ABS8,RD},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x80,0xf8,RD }}},
 {103,'m','I','!','D',O_MOV|O_UNSZ,"mov",2,{IMM16,RD},3,        {{0x58,0xf8,RD },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM8,ABS8},4,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x06,0xff, },{0x00,0x00,IMM8 }}},
+{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM8,ABS8},4,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x06,0xff, },{0x00,0x00,IMM8 }}},
 {103,'m','S','!','E',O_MOV|O_UNSZ,"mov",2,{RS,RNIND_D16},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x90,0xf8,RS }}},
-{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM16,RNIND},4,     {{0xd0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM16,RNINC},4,     {{0xc0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM16,RNDEC},4,     {{0xb0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM16,RNIND},4,     {{0xd8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM16,RNINC},4,     {{0xc8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM16,RNDEC},4,     {{0xb8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {103,'m','S','!','E',O_MOV|O_UNSZ,"mov",2,{RS,ABS16},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x90,0xf8,RS }}},
 {103,'m','E','!','D',O_MOV|O_UNSZ,"mov",2,{IMM16,RD},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x80,0xf8,RD }}},
-{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM8,RNIND_D8},4,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x06,0xff, },{0x00,0x00,IMM8 }}},
+{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM8,RNIND_D8},4,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x06,0xff, },{0x00,0x00,IMM8 }}},
 {103,'m','E','!','D',O_MOV|O_UNSZ,"mov",2,{RNIND_D16,RD},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x80,0xf8,RD }}},
 {103,'m','E','!','D',O_MOV|O_UNSZ,"mov",2,{ABS16,RD},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x80,0xf8,RD }}},
-{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM16,RNIND_D8},5,  {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM8,ABS16},5,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x06,0xff, },{0x00,0x00,IMM8 }}},
-{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM16,ABS8},5,      {{0x05,0xff, },{0x00,0x00,ABS8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM8,RNIND_D16},5,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x06,0xff, },{0x00,0x00,IMM8 }}},
-{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM16,ABS16},6,     {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM16,RNIND_D16},6, {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM16,RNIND_D8},5,  {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM8,ABS16},5,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x06,0xff, },{0x00,0x00,IMM8 }}},
+{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM16,ABS8},5,      {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM8,RNIND_D16},5,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x06,0xff, },{0x00,0x00,IMM8 }}},
+{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM16,ABS16},6,     {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{103,'m','I','!','E',O_MOV|O_UNSZ,"mov",2,{IMM16,RNIND_D16},6, {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {104,'-','S','I','!',O_LINK|O_UNSZ,"link",2,{FP,IMM8},2,       {{0x17,0xff, },{0x00,0x00,IMM8 }}},
 {104,'-','S','I','!',O_LINK|O_UNSZ,"link",2,{FP,IMM16},3,      {{0x1f,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {105,'-','E','!','C',O_LDM|O_UNSZ,"ldm",2,{SPINC,RLIST},2,     {{0x02,0xff, },{0x00,0x00,RLIST }}},
-{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{RN,CRW},2,        {{0xa0,0xf8,RN },{0x88,0xf8,CRW }}},
-{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{RNIND,CRW},2,     {{0xd0,0xf8,RN },{0x88,0xf8,CRW }}},
-{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{RNINC,CRW},2,     {{0xc0,0xf8,RN },{0x88,0xf8,CRW }}},
-{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{RNDEC,CRW},2,     {{0xb0,0xf8,RN },{0x88,0xf8,CRW }}},
-{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{ABS8,CRW},3,      {{0x05,0xff, },{0x00,0x00,ABS8 },{0x88,0xf8,CRW }}},
-{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{RNIND_D8,CRW},3,  {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x88,0xf8,CRW }}},
+{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{RN,CRW},2,                {{0xa8,0xf8,RN },{0x88,0xf8,CRW }}},
+{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{RNIND,CRW},2,     {{0xd8,0xf8,RN },{0x88,0xf8,CRW }}},
+{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{RNINC,CRW},2,     {{0xc8,0xf8,RN },{0x88,0xf8,CRW }}},
+{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{RNDEC,CRW},2,     {{0xb8,0xf8,RN },{0x88,0xf8,CRW }}},
+{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{ABS8,CRW},3,      {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x88,0xf8,CRW }}},
+{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{RNIND_D8,CRW},3,  {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x88,0xf8,CRW }}},
 {106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{IMM16,CRW},4,     {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x88,0xf8,CRW }}},
-{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{ABS16,CRW},4,     {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x88,0xf8,CRW }}},
-{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{RNIND_D16,CRW},4, {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x88,0xf8,CRW }}},
-{107,'s','E','!','C',O_LDC|O_BYTE,"ldc.b",2,{RN,CRB},2,        {{0xa0,0xf8,RN },{0x88,0xf8,CRB }}},
+{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{ABS16,CRW},4,     {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x88,0xf8,CRW }}},
+{106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{RNIND_D16,CRW},4, {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x88,0xf8,CRW }}},
+{107,'s','E','!','C',O_LDC|O_BYTE,"ldc.b",2,{RN,CRB},2,                {{0xa0,0xf8,RN },{0x88,0xf8,CRB }}},
 {107,'s','E','!','C',O_LDC|O_BYTE,"ldc.b",2,{RNDEC,CRB},2,     {{0xb0,0xf8,RN },{0x88,0xf8,CRB }}},
 {107,'s','E','!','C',O_LDC|O_BYTE,"ldc.b",2,{RNINC,CRB},2,     {{0xc0,0xf8,RN },{0x88,0xf8,CRB }}},
 {107,'s','E','!','C',O_LDC|O_BYTE,"ldc.b",2,{RNIND,CRB},2,     {{0xd0,0xf8,RN },{0x88,0xf8,CRB }}},
@@ -916,29 +926,29 @@ h8500_opcode_info h8500_table[]
 {107,'s','E','!','C',O_LDC|O_BYTE,"ldc.b",2,{RNIND_D8,CRB},3,  {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x88,0xf8,CRB }}},
 {107,'s','E','!','C',O_LDC|O_BYTE,"ldc.b",2,{ABS16,CRB},4,     {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x88,0xf8,CRB }}},
 {107,'s','E','!','C',O_LDC|O_BYTE,"ldc.b",2,{RNIND_D16,CRB},4, {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x88,0xf8,CRB }}},
-{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RN,CRW},2,  {{0xa0,0xf8,RN },{0x88,0xf8,CRW }}},
+{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RN,CRW},2,  {{0xa8,0xf8,RN },{0x88,0xf8,CRW }}},
 {108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RN,CRB},2,  {{0xa0,0xf8,RN },{0x88,0xf8,CRB }}},
-{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RNINC,CRW},2,       {{0xc0,0xf8,RN },{0x88,0xf8,CRW }}},
+{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RNINC,CRW},2,       {{0xc8,0xf8,RN },{0x88,0xf8,CRW }}},
 {108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RNIND,CRB},2,       {{0xd0,0xf8,RN },{0x88,0xf8,CRB }}},
-{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RNDEC,CRW},2,       {{0xb0,0xf8,RN },{0x88,0xf8,CRW }}},
-{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RNIND,CRW},2,       {{0xd0,0xf8,RN },{0x88,0xf8,CRW }}},
+{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RNDEC,CRW},2,       {{0xb8,0xf8,RN },{0x88,0xf8,CRW }}},
+{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RNIND,CRW},2,       {{0xd8,0xf8,RN },{0x88,0xf8,CRW }}},
 {108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RNDEC,CRB},2,       {{0xb0,0xf8,RN },{0x88,0xf8,CRB }}},
 {108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RNINC,CRB},2,       {{0xc0,0xf8,RN },{0x88,0xf8,CRB }}},
-{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{ABS8,CRW},3,        {{0x05,0xff, },{0x00,0x00,ABS8 },{0x88,0xf8,CRW }}},
-{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{ABS8,CRB},3,        {{0x05,0xff, },{0x00,0x00,ABS8 },{0x88,0xf8,CRB }}},
-{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{IMM8,CRB},3,        {{0x04,0xff, },{0x00,0x00,IMM8 },{0x88,0xf8,CRB }}},
+{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{ABS8,CRW},3,                {{0x05,0xff, },{0x00,0x00,ABS8 },{0x88,0xf8,CRW }}},
+{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{ABS8,CRB},3,                {{0x05,0xff, },{0x00,0x00,ABS8 },{0x88,0xf8,CRB }}},
+{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{IMM8,CRB},3,                {{0x04,0xff, },{0x00,0x00,IMM8 },{0x88,0xf8,CRB }}},
 {108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RNIND_D8,CRW},3,    {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x88,0xf8,CRW }}},
 {108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RNIND_D8,CRB},3,    {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x88,0xf8,CRB }}},
 {108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{ABS16,CRB},4,       {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x88,0xf8,CRB }}},
-{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{ABS16,CRW},4,       {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x88,0xf8,CRW }}},
+{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{ABS16,CRW},4,       {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x88,0xf8,CRW }}},
 {108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{IMM16,CRW},4,       {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x88,0xf8,CRW }}},
-{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RNIND_D16,CRW},4,   {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x88,0xf8,CRW }}},
+{108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RNIND_D16,CRW},4,   {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x88,0xf8,CRW }}},
 {108,'s','E','!','C',O_LDC|O_UNSZ,"ldc",2,{RNIND_D16,CRB},4,   {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x88,0xf8,CRB }}},
-{109,'-','B','!','!',O_JSR|O_UNSZ,"jsr",1,{RDIND,0},2, {{0x11,0xff, },{0xd8,0xf8,RDIND }}},
+{109,'-','B','!','!',O_JSR|O_UNSZ,"jsr",1,{RDIND,0},2, {{0x11,0xff, },{0xd8,0xf8,RD }}},
 {109,'-','B','!','!',O_JSR|O_UNSZ,"jsr",1,{ABS16,0},3, {{0x18,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, }}},
 {109,'-','B','!','!',O_JSR|O_UNSZ,"jsr",1,{RDIND_D8,0},3,      {{0x11,0xff, },{0xe8,0xf8,RDIND_D8 },{0x00,0x00, }}},
 {109,'-','B','!','!',O_JSR|O_UNSZ,"jsr",1,{RDIND_D16,0},4,     {{0x11,0xff, },{0xf8,0xf8,RDIND_D16 },{0x00,0x00, },{0x00,0x00, }}},
-{110,'-','B','!','!',O_JMP|O_UNSZ,"jmp",1,{RDIND,0},2, {{0x11,0xff, },{0xd0,0xf8,RDIND }}},
+{110,'-','B','!','!',O_JMP|O_UNSZ,"jmp",1,{RDIND,0},2, {{0x11,0xff, },{0xd0,0xf8,RD }}},
 {110,'-','B','!','!',O_JMP|O_UNSZ,"jmp",1,{ABS16,0},3, {{0x10,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, }}},
 {110,'-','B','!','!',O_JMP|O_UNSZ,"jmp",1,{RDIND_D8,0},3,      {{0x11,0xff, },{0xe0,0xf8,RDIND_D8 },{0x00,0x00, }}},
 {110,'-','B','!','!',O_JMP|O_UNSZ,"jmp",1,{RDIND_D16,0},4,     {{0x11,0xff, },{0xf0,0xf8,RDIND_D16 },{0x00,0x00, },{0x00,0x00, }}},
@@ -974,7 +984,7 @@ h8500_opcode_info h8500_table[]
 {118,'s','E','D','D',O_DIVXU|O_UNSZ,"divxu",2,{IMM16,RD},4,    {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0xb8,0xf8,RD }}},
 {118,'s','E','D','D',O_DIVXU|O_UNSZ,"divxu",2,{ABS16,RD},4,    {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0xb8,0xf8,RD }}},
 {118,'s','E','D','D',O_DIVXU|O_UNSZ,"divxu",2,{RNIND_D16,RD},4,        {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0xb8,0xf8,RD }}},
-{119,'s','D','!','!',O_DAAD|O_UNSZ,"daad",2,{RS,RD},3, {{0xa0,0xf8,RS },{0x00,0xff, },{0xa0,0xf8,RD }}},
+{119,'s','D','!','!',O_DADD|O_UNSZ,"dadd",2,{RS,RD},3, {{0xa0,0xf8,RS },{0x00,0xff, },{0xa0,0xf8,RD }}},
 {120,'a','D','I','!',O_CMP|O_WORD,"cmp:i.w",2,{IMM16,RD},3,    {{0x48,0xf8,RD },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {121,'a','D','I','!',O_CMP|O_UNSZ,"cmp:i",2,{IMM16,RD},3,      {{0x48,0xf8,RD },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{RN,RD},2,       {{0xa8,0xf8,RN },{0x70,0xf8,RD }}},
@@ -983,17 +993,17 @@ h8500_opcode_info h8500_table[]
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{RNDEC,RD},2,    {{0xb8,0xf8,RN },{0x70,0xf8,RD }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{RNIND_D8,RD},3, {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x70,0xf8,RD }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{ABS8,RD},3,     {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x70,0xf8,RD }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNINC},4, {{0xc0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNDEC},4, {{0xb0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RN},4,    {{0xa0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNIND},4, {{0xd0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNINC},4, {{0xc8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNDEC},4, {{0xb8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RN},4,    {{0xa8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNIND},4, {{0xd8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RD},4,    {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x70,0xf8,RD }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{ABS16,RD},4,    {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x70,0xf8,RD }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{RNIND_D16,RD},4,        {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x70,0xf8,RD }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNIND_D8},5,      {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,ABS8},5,  {{0x05,0xff, },{0x00,0x00,ABS8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNIND_D16},6,     {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,ABS16},6, {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNIND_D8},5,{{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,ABS8},5,  {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNIND_D16},6,     {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,ABS16},6, {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {123,'a','D','E','!',O_CMP|O_BYTE,"cmp:g.b",2,{RN,RD},2,       {{0xa0,0xf8,RN },{0x70,0xf8,RD }}},
 {123,'a','D','E','!',O_CMP|O_BYTE,"cmp:g.b",2,{RNDEC,RD},2,    {{0xb0,0xf8,RN },{0x70,0xf8,RD }}},
 {123,'a','D','E','!',O_CMP|O_BYTE,"cmp:g.b",2,{RNIND,RD},2,    {{0xd0,0xf8,RN },{0x70,0xf8,RD }}},
@@ -1011,44 +1021,44 @@ h8500_opcode_info h8500_table[]
 {123,'a','D','E','!',O_CMP|O_BYTE,"cmp:g.b",2,{RNIND_D16,RD},4,        {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x70,0xf8,RD }}},
 {123,'a','E','I','!',O_CMP|O_BYTE,"cmp:g.b",2,{IMM8,ABS16},5,  {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x04,0xff, },{0x00,0x00,IMM8 }}},
 {123,'a','E','I','!',O_CMP|O_BYTE,"cmp:g.b",2,{IMM8,RNIND_D16},5,      {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x04,0xff, },{0x00,0x00,IMM8 }}},
-{124,'a','D','E','!',O_CMP|O_UNSZ,"cmp:g",2,{RN,RD},2, {{0xa8,0xf8,RN },{0x70,0xf8,RD }}},
+{124,'a','D','E','!',O_CMP|O_UNSZ,"cmp:g",2,{RN,RD},2,         {{0xa8,0xf8,RN },{0x70,0xf8,RD }}},
 {124,'a','D','E','!',O_CMP|O_UNSZ,"cmp:g",2,{RNIND,RD},2,      {{0xd8,0xf8,RN },{0x70,0xf8,RD }}},
 {124,'a','D','E','!',O_CMP|O_UNSZ,"cmp:g",2,{RNINC,RD},2,      {{0xc8,0xf8,RN },{0x70,0xf8,RD }}},
 {124,'a','D','E','!',O_CMP|O_UNSZ,"cmp:g",2,{RNDEC,RD},2,      {{0xb8,0xf8,RN },{0x70,0xf8,RD }}},
 {124,'a','D','E','!',O_CMP|O_UNSZ,"cmp:g",2,{RNIND_D8,RD},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x70,0xf8,RD }}},
 {124,'a','D','E','!',O_CMP|O_UNSZ,"cmp:g",2,{ABS8,RD},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x70,0xf8,RD }}},
-{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,RNINC},4,   {{0xc0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,RNIND},4,   {{0xd0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,RN},4,      {{0xa0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,RNDEC},4,   {{0xb0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,RNINC},4,   {{0xc8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,RNIND},4,   {{0xd8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,RN},4,      {{0xa8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,RNDEC},4,   {{0xb8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {124,'a','D','E','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,RD},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x70,0xf8,RD }}},
 {124,'a','D','E','!',O_CMP|O_UNSZ,"cmp:g",2,{ABS16,RD},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x70,0xf8,RD }}},
 {124,'a','D','E','!',O_CMP|O_UNSZ,"cmp:g",2,{RNIND_D16,RD},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x70,0xf8,RD }}},
-{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,RNIND_D8},5,        {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,ABS8},5,    {{0x05,0xff, },{0x00,0x00,ABS8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,RNIND_D16},6,       {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,ABS16},6,   {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,RNIND_D8},5,        {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,ABS8},5,    {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,RNIND_D16},6,{{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{124,'a','E','I','!',O_CMP|O_UNSZ,"cmp:g",2,{IMM16,ABS16},6,   {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {125,'a','D','I','!',O_CMP|O_BYTE,"cmp:e.b",2,{IMM8,RD},2,     {{0x40,0xf8,RD },{0x00,0x00,IMM8 }}},
-{126,'a','D','I','!',O_CMP|O_UNSZ,"cmp:e",2,{IMM8,RD},2,       {{0x40,0xf8,RD },{0x00,0x00,IMM8 }}},
-{127,'a','D','E','!',O_CMP|O_WORD,"cmp.w",2,{RN,RD},2, {{0xa8,0xf8,RN },{0x70,0xf8,RD }}},
+{126,'a','D','I','!',O_CMP|O_UNSZ,"cmp:e",2,{IMM8,RD},2,       {{0x48,0xf8,RD },{0x00,0x00,IMM8 }}},
+{127,'a','D','E','!',O_CMP|O_WORD,"cmp.w",2,{RN,RD},2,         {{0xa8,0xf8,RN },{0x70,0xf8,RD }}},
 {127,'a','D','E','!',O_CMP|O_WORD,"cmp.w",2,{RNDEC,RD},2,      {{0xb8,0xf8,RN },{0x70,0xf8,RD }}},
 {127,'a','D','E','!',O_CMP|O_WORD,"cmp.w",2,{RNINC,RD},2,      {{0xc8,0xf8,RN },{0x70,0xf8,RD }}},
 {127,'a','D','E','!',O_CMP|O_WORD,"cmp.w",2,{RNIND,RD},2,      {{0xd8,0xf8,RN },{0x70,0xf8,RD }}},
 {127,'a','D','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,RD},3,      {{0x48,0xf8,RD },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {127,'a','D','E','!',O_CMP|O_WORD,"cmp.w",2,{RNIND_D8,RD},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x70,0xf8,RD }}},
 {127,'a','D','E','!',O_CMP|O_WORD,"cmp.w",2,{ABS8,RD},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x70,0xf8,RD }}},
-{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,RNINC},4,   {{0xc0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,RNDEC},4,   {{0xb0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,RNIND},4,   {{0xd0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,RNINC},4,   {{0xc8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,RNDEC},4,   {{0xb8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,RNIND},4,   {{0xd8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {127,'a','D','E','!',O_CMP|O_WORD,"cmp.w",2,{RNIND_D16,RD},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x70,0xf8,RD }}},
 {127,'a','D','E','!',O_CMP|O_WORD,"cmp.w",2,{ABS16,RD},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x70,0xf8,RD }}},
 {127,'a','D','E','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,RD},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x70,0xf8,RD }}},
-{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,RN},4,      {{0xa0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,RNIND_D8},5,        {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,ABS8},5,    {{0x05,0xff, },{0x00,0x00,ABS8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,RNIND_D16},6,       {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,ABS16},6,   {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{128,'a','D','E','!',O_CMP|O_BYTE,"cmp.b",2,{RN,RD},2, {{0xa0,0xf8,RN },{0x70,0xf8,RD }}},
+{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,RN},4,      {{0xa8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,RNIND_D8},5,        {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,ABS8},5,    {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,RNIND_D16},6,{{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{127,'a','E','I','!',O_CMP|O_WORD,"cmp.w",2,{IMM16,ABS16},6,   {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{128,'a','D','E','!',O_CMP|O_BYTE,"cmp.b",2,{RN,RD},2,         {{0xa0,0xf8,RN },{0x70,0xf8,RD }}},
 {128,'a','D','E','!',O_CMP|O_BYTE,"cmp.b",2,{RNDEC,RD},2,      {{0xb0,0xf8,RN },{0x70,0xf8,RD }}},
 {128,'a','D','E','!',O_CMP|O_BYTE,"cmp.b",2,{RNINC,RD},2,      {{0xc0,0xf8,RN },{0x70,0xf8,RD }}},
 {128,'a','D','I','!',O_CMP|O_BYTE,"cmp.b",2,{IMM8,RD},2,       {{0x40,0xf8,RD },{0x00,0x00,IMM8 }}},
@@ -1067,24 +1077,24 @@ h8500_opcode_info h8500_table[]
 {128,'a','E','I','!',O_CMP|O_BYTE,"cmp.b",2,{IMM8,ABS16},5,    {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x04,0xff, },{0x00,0x00,IMM8 }}},
 {128,'a','E','I','!',O_CMP|O_BYTE,"cmp.b",2,{IMM8,RNIND_D16},5,        {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x04,0xff, },{0x00,0x00,IMM8 }}},
 {129,'a','D','E','!',O_CMP|O_UNSZ,"cmp",2,{RN,RD},2,   {{0xa8,0xf8,RN },{0x70,0xf8,RD }}},
-{129,'a','D','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM8,RD},2, {{0x40,0xf8,RD },{0x00,0x00,IMM8 }}},
+{129,'a','D','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM8,RD},2, {{0x48,0xf8,RD },{0x00,0x00,IMM8 }}},
 {129,'a','D','E','!',O_CMP|O_UNSZ,"cmp",2,{RNINC,RD},2,        {{0xc8,0xf8,RN },{0x70,0xf8,RD }}},
 {129,'a','D','E','!',O_CMP|O_UNSZ,"cmp",2,{RNIND,RD},2,        {{0xd8,0xf8,RN },{0x70,0xf8,RD }}},
 {129,'a','D','E','!',O_CMP|O_UNSZ,"cmp",2,{RNDEC,RD},2,        {{0xb8,0xf8,RN },{0x70,0xf8,RD }}},
 {129,'a','D','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,RD},3,        {{0x48,0xf8,RD },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {129,'a','D','E','!',O_CMP|O_UNSZ,"cmp",2,{RNIND_D8,RD},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x70,0xf8,RD }}},
-{129,'a','D','E','!',O_CMP|O_UNSZ,"cmp",2,{ABS8,RD},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x70,0xf8,RD }}},
-{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,RN},4,        {{0xa0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,RNDEC},4,     {{0xb0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,RNIND},4,     {{0xd0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{129,'a','D','E','!',O_CMP|O_UNSZ,"cmp",2,{ABS8,RD},3,         {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x70,0xf8,RD }}},
+{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,RN},4,                {{0xa8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,RNDEC},4,     {{0xb8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,RNIND},4,     {{0xd8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {129,'a','D','E','!',O_CMP|O_UNSZ,"cmp",2,{RNIND_D16,RD},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x70,0xf8,RD }}},
-{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,RNINC},4,     {{0xc0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,RNINC},4,     {{0xc8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {129,'a','D','E','!',O_CMP|O_UNSZ,"cmp",2,{ABS16,RD},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x70,0xf8,RD }}},
 {129,'a','D','E','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,RD},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x70,0xf8,RD }}},
-{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,ABS8},5,      {{0x05,0xff, },{0x00,0x00,ABS8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,RNIND_D8},5,  {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,ABS16},6,     {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,RNIND_D16},6, {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,ABS8},5,      {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,RNIND_D8},5,  {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,ABS16},6,     {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{129,'a','E','I','!',O_CMP|O_UNSZ,"cmp",2,{IMM16,RNIND_D16},6, {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {130,'c','!','!','E',O_CLR|O_WORD,"clr.w",1,{RN,0},2,  {{0xa8,0xf8,RN },{0x13,0xff, }}},
 {130,'c','!','!','E',O_CLR|O_WORD,"clr.w",1,{RNIND,0},2,       {{0xd8,0xf8,RN },{0x13,0xff, }}},
 {130,'c','!','!','E',O_CLR|O_WORD,"clr.w",1,{RNINC,0},2,       {{0xc8,0xf8,RN },{0x13,0xff, }}},
@@ -1604,26 +1614,26 @@ h8500_opcode_info h8500_table[]
 {29,'s','C','!','E',O_STC|O_BYTE,"stc.b",2,{CRB,RNIND_D16},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x98,0xf8,CRB }}},
 {3,'m','E','D','D',O_XOR|O_WORD,"xor.w",2,{RNIND_D16,RD},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x60,0xf8,RD }}},
 {25,'a','E','D','D',O_SUB|O_BYTE,"sub.b",2,{RN,RD},2,  {{0xa0,0xf8,RN },{0x30,0xf8,RD }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{RN,0},2,   {{0xa0,0xf8,RN },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{RN,0},2,   {{0xa0,0xf8,RN },{0x16,0xff, }}},
 {6,'-','X','!','!',O_XCH|O_WORD,"xch.w",2,{RS,RD},2,   {{0xa8,0xf8,RS },{0x90,0xf8,RD }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{RN,0},2,    {{0xa8,0xf8,RN },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{RN,0},2,    {{0xa8,0xf8,RN },{0x16,0xff, }}},
 {25,'a','E','D','D',O_SUB|O_BYTE,"sub.b",2,{RNDEC,RD},2,       {{0xb0,0xf8,RN },{0x30,0xf8,RD }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNDEC,0},2,        {{0xb0,0xf8,RN },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNDEC,0},2,        {{0xb0,0xf8,RN },{0x16,0xff, }}},
 {24,'a','E','D','D',O_SUB|O_WORD,"sub.w",2,{RNDEC,RD},2,       {{0xb8,0xf8,RN },{0x30,0xf8,RD }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{RNDEC,0},2, {{0xb8,0xf8,RN },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{RNDEC,0},2, {{0xb8,0xf8,RN },{0x16,0xff, }}},
 {25,'a','E','D','D',O_SUB|O_BYTE,"sub.b",2,{RNINC,RD},2,       {{0xc0,0xf8,RN },{0x30,0xf8,RD }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNINC,0},2,        {{0xc0,0xf8,RN },{0x16,0xff, }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{RNINC,0},2, {{0xc8,0xf8,RN },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNINC,0},2,        {{0xc0,0xf8,RN },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{RNINC,0},2, {{0xc8,0xf8,RN },{0x16,0xff, }}},
 {25,'a','E','D','D',O_SUB|O_BYTE,"sub.b",2,{RNIND,RD},2,       {{0xd0,0xf8,RN },{0x30,0xf8,RD }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNIND,0},2,        {{0xd0,0xf8,RN },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNIND,0},2,        {{0xd0,0xf8,RN },{0x16,0xff, }}},
 {24,'a','E','D','D',O_SUB|O_WORD,"sub.w",2,{RNIND,RD},2,       {{0xd8,0xf8,RN },{0x30,0xf8,RD }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{RNIND,0},2, {{0xd8,0xf8,RN },{0x16,0xff, }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNIND_D8,0},3,     {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{RNIND,0},2, {{0xd8,0xf8,RN },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNIND_D8,0},3,     {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x16,0xff, }}},
 {24,'a','E','D','D',O_SUB|O_WORD,"sub.w",2,{RNIND_D8,RD},3,    {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x30,0xf8,RD }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{RNIND_D8,0},3,      {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x16,0xff, }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNIND_D16,0},4,    {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{RNIND_D8,0},3,      {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{RNIND_D16,0},4,    {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x16,0xff, }}},
 {24,'a','E','D','D',O_SUB|O_WORD,"sub.w",2,{RNIND_D16,RD},4,   {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x30,0xf8,RD }}},
-{16,'m','D','!','D',O_SWAP|O_BYTE,"swap.b",1,{RD,0},2, {{0xa0,0xf8,RD },{0x10,0xff, }}},
+{16,'m','D','!','D',O_SWAP|O_WORD,"swap.b",1,{RD,0},2, {{0xa0,0xf8,RD },{0x10,0xff, }}},
 {14,'s','E','!','E',O_TAS|O_BYTE,"tas.b",1,{RN,0},2,   {{0xa0,0xf8,RN },{0x17,0xff, }}},
 {24,'a','E','D','D',O_SUB|O_WORD,"sub.w",2,{RN,RD},2,  {{0xa8,0xf8,RN },{0x30,0xf8,RD }}},
 {18,'a','E','D','D',O_SUBX|O_WORD,"subx.w",2,{RN,RD},2,        {{0xa8,0xf8,RN },{0xb0,0xf8,RD }}},
@@ -1656,20 +1666,20 @@ h8500_opcode_info h8500_table[]
 {21,'-','E','D','D',O_SUBS|O_WORD,"subs.w",2,{RNIND,RD},2,     {{0xd8,0xf8,RN },{0x38,0xf8,RD }}},
 {18,'a','E','D','D',O_SUBX|O_WORD,"subx.w",2,{RNIND_D8,RD},3,  {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0xb0,0xf8,RD }}},
 {18,'a','E','D','D',O_SUBX|O_WORD,"subx.w",2,{RNIND_D16,RD},4, {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0xb0,0xf8,RD }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{RNIND_D16,0},4,     {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{RNIND_D16,0},4,     {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x16,0xff, }}},
 {25,'a','E','D','D',O_SUB|O_BYTE,"sub.b",2,{IMM8,RD},3,        {{0x04,0xff, },{0x00,0x00,IMM8 },{0x30,0xf8,RD }}},
 {22,'-','E','D','D',O_SUBS|O_BYTE,"subs.b",2,{IMM8,RD},3,      {{0x04,0xff, },{0x00,0x00,IMM8 },{0x38,0xf8,RD }}},
 {4,'m','E','D','D',O_XOR|O_BYTE,"xor.b",2,{IMM8,RD},3, {{0x04,0xff, },{0x00,0x00,IMM8 },{0x60,0xf8,RD }}},
 {2,'s','E','C','C',O_XORC|O_BYTE,"xorc.b",2,{IMM8,CRB},3,      {{0x04,0xff, },{0x00,0x00,IMM8 },{0x68,0xf8,CRB }}},
 {19,'a','E','D','D',O_SUBX|O_BYTE,"subx.b",2,{IMM8,RD},3,      {{0x04,0xff, },{0x00,0x00,IMM8 },{0xb0,0xf8,RD }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{IMM8,0},3, {{0x04,0xff, },{0x00,0x00,IMM8 },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{IMM8,0},3, {{0x04,0xff, },{0x00,0x00,IMM8 },{0x16,0xff, }}},
 {14,'s','E','!','E',O_TAS|O_BYTE,"tas.b",1,{IMM8,0},3, {{0x04,0xff, },{0x00,0x00,IMM8 },{0x17,0xff, }}},
 {25,'a','E','D','D',O_SUB|O_BYTE,"sub.b",2,{ABS8,RD},3,        {{0x05,0xff, },{0x00,0x00,ABS8 },{0x30,0xf8,RD }}},
 {22,'-','E','D','D',O_SUBS|O_BYTE,"subs.b",2,{ABS8,RD},3,      {{0x05,0xff, },{0x00,0x00,ABS8 },{0x38,0xf8,RD }}},
 {4,'m','E','D','D',O_XOR|O_BYTE,"xor.b",2,{ABS8,RD},3, {{0x05,0xff, },{0x00,0x00,ABS8 },{0x60,0xf8,RD }}},
 {29,'s','C','!','E',O_STC|O_BYTE,"stc.b",2,{CRB,ABS8},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x98,0xf8,CRB }}},
 {19,'a','E','D','D',O_SUBX|O_BYTE,"subx.b",2,{ABS8,RD},3,      {{0x05,0xff, },{0x00,0x00,ABS8 },{0xb0,0xf8,RD }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{ABS8,0},3, {{0x05,0xff, },{0x00,0x00,ABS8 },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{ABS8,0},3, {{0x05,0xff, },{0x00,0x00,ABS8 },{0x16,0xff, }}},
 {14,'s','E','!','E',O_TAS|O_BYTE,"tas.b",1,{ABS8,0},3, {{0x05,0xff, },{0x00,0x00,ABS8 },{0x17,0xff, }}},
 {12,'-','I','!','!',O_TRAPA|O_UNSZ,"trapa",1,{IMM4,0},2,       {{0x08,0xff, },{0x10,0xf0,IMM4 }}},
 {13,'-','B','!','!',O_TRAP_VS|O_UNSZ,"trap/vs",0,{0,0},1,      {{0x09,0xff, }}},
@@ -1678,12 +1688,12 @@ h8500_opcode_info h8500_table[]
 {3,'m','E','D','D',O_XOR|O_WORD,"xor.w",2,{IMM16,RD},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x60,0xf8,RD }}},
 {1,'s','E','C','C',O_XORC|O_WORD,"xorc.w",2,{IMM16,CRW},4,     {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x68,0xf8,CRW }}},
 {18,'a','E','D','D',O_SUBX|O_WORD,"subx.w",2,{IMM16,RD},4,     {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0xb0,0xf8,RD }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{IMM16,0},4, {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{IMM16,0},4, {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x16,0xff, }}},
 {24,'a','E','D','D',O_SUB|O_WORD,"sub.w",2,{ABS8,RD},3,        {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x30,0xf8,RD }}},
 {21,'-','E','D','D',O_SUBS|O_WORD,"subs.w",2,{ABS8,RD},3,      {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x38,0xf8,RD }}},
 {3,'m','E','D','D',O_XOR|O_WORD,"xor.w",2,{ABS8,RD},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x60,0xf8,RD }}},
 {18,'a','E','D','D',O_SUBX|O_WORD,"subx.w",2,{ABS8,RD},3,      {{0x0d,0xff, },{0x00,0x00,ABS8 },{0xb0,0xf8,RD }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{ABS8,0},3,  {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x16,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{ABS8,0},3,  {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x16,0xff, }}},
 {8,'-','B','!','!',O_UNLK|O_UNSZ,"unlk",1,{FP,0},1,    {{0x0f,0xff, }}},
 {25,'a','E','D','D',O_SUB|O_BYTE,"sub.b",2,{ABS16,RD},4,       {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x30,0xf8,RD }}},
 {22,'-','E','D','D',O_SUBS|O_BYTE,"subs.b",2,{ABS16,RD},4,     {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x38,0xf8,RD }}},
@@ -1691,135 +1701,135 @@ h8500_opcode_info h8500_table[]
 {29,'s','C','!','E',O_STC|O_BYTE,"stc.b",2,{CRB,ABS16},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x98,0xf8,CRB }}},
 {27,'-','I','!','E',O_STM|O_UNSZ,"stm",2,{RLIST,SPDEC},2,      {{0x12,0xff, },{0x00,0x00,RLIST }}},
 {19,'a','E','D','D',O_SUBX|O_BYTE,"subx.b",2,{ABS16,RD},4,     {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0xb0,0xf8,RD }}},
-{10,'m','E','!','!',O_TST|O_BYTE,"tst.b",1,{ABS16,0},4,        {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x16,0xff, }}},
+{10,'a','E','!','!',O_TST|O_BYTE,"tst.b",1,{ABS16,0},4,        {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x16,0xff, }}},
 {14,'s','E','!','E',O_TAS|O_BYTE,"tas.b",1,{ABS16,0},4,        {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x17,0xff, }}},
 {24,'a','E','D','D',O_SUB|O_WORD,"sub.w",2,{ABS16,RD},4,       {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x30,0xf8,RD }}},
 {21,'-','E','D','D',O_SUBS|O_WORD,"subs.w",2,{ABS16,RD},4,     {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x38,0xf8,RD }}},
 {3,'m','E','D','D',O_XOR|O_WORD,"xor.w",2,{ABS16,RD},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x60,0xf8,RD }}},
 {18,'a','E','D','D',O_SUBX|O_WORD,"subx.w",2,{ABS16,RD},4,     {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0xb0,0xf8,RD }}},
-{9,'m','E','!','!',O_TST|O_WORD,"tst.w",1,{ABS16,0},4, {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x16,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x19,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x19,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1b,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x19,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x19,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x19,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1b,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x19,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1b,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1a,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1b,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x19,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1a,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1b,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x19,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1a,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1b,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1a,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1b,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1a,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1a,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1a,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1a,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1a,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1b,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1a,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1a,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1b,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1a,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1a,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1b,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1a,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1a,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1a,0xff, }}},
-{36,'s','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1a,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1b,0xff, }}},
-{35,'s','E','!','E',O_SHLL|O_WORD,"shll.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1a,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1b,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x19,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x19,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1b,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x19,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x19,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1b,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x19,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x19,0xff, }}},
-{33,'s','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1b,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x19,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1b,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x19,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1b,0xff, }}},
-{39,'s','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x19,0xff, }}},
+{9,'a','E','!','!',O_TST|O_WORD,"tst.w",1,{ABS16,0},4, {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x16,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x19,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x19,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1b,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x19,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x19,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x19,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1b,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x19,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1b,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1a,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1b,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x19,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1a,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1b,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x19,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1a,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1b,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1a,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1b,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1a,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1a,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1a,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1a,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1a,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1b,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1a,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1a,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1b,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1a,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1a,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1b,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1a,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1a,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1a,0xff, }}},
+{36,'h','E','!','E',O_SHLL|O_BYTE,"shll.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1a,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1b,0xff, }}},
+{35,'h','E','!','E',O_SHLL|O_WORD,"shll.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1a,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1b,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x19,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x19,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1b,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x19,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x19,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1b,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x19,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x19,0xff, }}},
+{33,'h','E','!','E',O_SHLR|O_BYTE,"shlr.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1b,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x19,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1b,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x19,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1b,0xff, }}},
+{39,'h','E','!','E',O_SHAR|O_BYTE,"shar.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x19,0xff, }}},
 {31,'-','!','!','!',O_SLEEP|O_UNSZ,"sleep",0,{0,0},1,  {{0x1a,0xff, }}},
-{38,'s','E','!','E',O_SHAR|O_WORD,"shar.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x19,0xff, }}},
-{32,'s','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1b,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x18,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x18,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x18,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x18,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNDEC,0},2,    {{0xb8,0xf8,RN },{0x1e,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x18,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x18,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x18,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x18,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x18,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNIND_D8,0},3, {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1e,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x18,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNIND_D8,0},3, {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1e,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x18,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNIND_D16,0},4,        {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1e,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x18,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNIND_D16,0},4,        {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1e,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x18,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNDEC,0},2,    {{0xb0,0xf8,RN },{0x1f,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RN,0},2,       {{0xa0,0xf8,RN },{0x1e,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RN,0},2,       {{0xa0,0xf8,RN },{0x1f,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RN,0},2,       {{0xa8,0xf8,RN },{0x1e,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RN,0},2,       {{0xa8,0xf8,RN },{0x1f,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNDEC,0},2,    {{0xb0,0xf8,RN },{0x1e,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNDEC,0},2,    {{0xb8,0xf8,RN },{0x1f,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNINC,0},2,    {{0xc0,0xf8,RN },{0x1e,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNINC,0},2,    {{0xc0,0xf8,RN },{0x1f,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNINC,0},2,    {{0xc8,0xf8,RN },{0x1e,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNINC,0},2,    {{0xc8,0xf8,RN },{0x1f,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNIND,0},2,    {{0xd0,0xf8,RN },{0x1e,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNIND,0},2,    {{0xd0,0xf8,RN },{0x1f,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNIND,0},2,    {{0xd8,0xf8,RN },{0x1e,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNIND,0},2,    {{0xd8,0xf8,RN },{0x1f,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNIND_D8,0},3, {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1f,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNIND_D8,0},3, {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1f,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNIND_D16,0},4,        {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1f,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNIND_D16,0},4,        {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1f,0xff, }}},
+{38,'h','E','!','E',O_SHAR|O_WORD,"shar.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x19,0xff, }}},
+{32,'h','E','!','E',O_SHLR|O_WORD,"shlr.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1b,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x18,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x18,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x18,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x18,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNDEC,0},2,    {{0xb8,0xf8,RN },{0x1e,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x18,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x18,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x18,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x18,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x18,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNIND_D8,0},3, {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1e,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x18,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNIND_D8,0},3, {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1e,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x18,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNIND_D16,0},4,        {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1e,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x18,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNIND_D16,0},4,        {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1e,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x18,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNDEC,0},2,    {{0xb0,0xf8,RN },{0x1f,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RN,0},2,       {{0xa0,0xf8,RN },{0x1e,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RN,0},2,       {{0xa0,0xf8,RN },{0x1f,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RN,0},2,       {{0xa8,0xf8,RN },{0x1e,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RN,0},2,       {{0xa8,0xf8,RN },{0x1f,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNDEC,0},2,    {{0xb0,0xf8,RN },{0x1e,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNDEC,0},2,    {{0xb8,0xf8,RN },{0x1f,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNINC,0},2,    {{0xc0,0xf8,RN },{0x1e,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNINC,0},2,    {{0xc0,0xf8,RN },{0x1f,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNINC,0},2,    {{0xc8,0xf8,RN },{0x1e,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNINC,0},2,    {{0xc8,0xf8,RN },{0x1f,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{RNIND,0},2,    {{0xd0,0xf8,RN },{0x1e,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNIND,0},2,    {{0xd0,0xf8,RN },{0x1f,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{RNIND,0},2,    {{0xd8,0xf8,RN },{0x1e,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNIND,0},2,    {{0xd8,0xf8,RN },{0x1f,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNIND_D8,0},3, {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1f,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNIND_D8,0},3, {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1f,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{RNIND_D16,0},4,        {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1f,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{RNIND_D16,0},4,        {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1f,0xff, }}},
 {45,'-','B','S','S',O_SCB_F|O_UNSZ,"scb/f",2,{RS,PCREL8},3,    {{0x01,0xff, },{0xb8,0xf8,RS },{0x00,0x00,PCREL8 }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{IMM8,0},3,     {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1e,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{IMM8,0},3,     {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1f,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{ABS8,0},3,     {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1f,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{IMM16,0},4,    {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1f,0xff, }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x18,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{ABS8,0},3,     {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1e,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{IMM8,0},3,     {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1e,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{IMM8,0},3,     {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1f,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{ABS8,0},3,     {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1f,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{IMM16,0},4,    {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1f,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x18,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{ABS8,0},3,     {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1e,0xff, }}},
 {44,'-','B','S','S',O_SCB_NE|O_UNSZ,"scb/ne",2,{RS,PCREL8},3,  {{0x06,0xff, },{0xb8,0xf8,RS },{0x00,0x00,PCREL8 }}},
 {46,'-','B','S','S',O_SCB_EQ|O_UNSZ,"scb/eq",2,{RS,PCREL8},3,  {{0x07,0xff, },{0xb8,0xf8,RS },{0x00,0x00,PCREL8 }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x18,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{IMM16,0},4,    {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1e,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x18,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{ABS8,0},3,     {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1e,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{ABS8,0},3,     {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1f,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x18,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{IMM16,0},4,    {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1e,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x18,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{ABS8,0},3,     {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1e,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{ABS8,0},3,     {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1f,0xff, }}},
 {48,'-','B','!','!',O_RTD|O_UNSZ,"rtd",1,{IMM16,0},3,  {{0x14,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {48,'-','B','!','!',O_RTD|O_UNSZ,"rtd",1,{IMM8,0},2,   {{0x14,0xff, },{0x00,0x00,IMM8 }}},
-{42,'s','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x18,0xff, }}},
-{53,'s','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{ABS16,0},4,    {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1e,0xff, }}},
-{50,'s','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{ABS16,0},4,    {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1f,0xff, }}},
+{42,'h','E','!','E',O_SHAL|O_BYTE,"shal.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x18,0xff, }}},
+{53,'h','E','!','E',O_ROTXL|O_BYTE,"rotxl.b",1,{ABS16,0},4,    {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1e,0xff, }}},
+{50,'h','E','!','E',O_ROTXR|O_BYTE,"rotxr.b",1,{ABS16,0},4,    {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1f,0xff, }}},
 {47,'-','B','!','!',O_RTS|O_UNSZ,"rts",0,{0,0},1,      {{0x19,0xff, }}},
-{41,'s','E','!','E',O_SHAL|O_WORD,"shal.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x18,0xff, }}},
-{52,'s','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{ABS16,0},4,    {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1e,0xff, }}},
-{49,'s','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{ABS16,0},4,    {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1f,0xff, }}},
+{41,'h','E','!','E',O_SHAL|O_WORD,"shal.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x18,0xff, }}},
+{52,'h','E','!','E',O_ROTXL|O_WORD,"rotxl.w",1,{ABS16,0},4,    {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1e,0xff, }}},
+{49,'h','E','!','E',O_ROTXR|O_WORD,"rotxr.w",1,{ABS16,0},4,    {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1f,0xff, }}},
 {99,'m','I','!','D',O_MOV|O_BYTE,"mov:e.b",2,{IMM8,RD},2,      {{0x50,0xf8,RD },{0x00,0x00,IMM8 }}},
 {97,'m','E','!','D',O_MOV|O_BYTE,"mov:f.b",2,{FPIND_D8,RD},2,  {{0x80,0xf8,RD },{0x00,0x00,FPIND_D8 }}},
 {96,'m','E','!','D',O_MOV|O_WORD,"mov:f.w",2,{FPIND_D8,RD},2,  {{0x88,0xf8,RD },{0x00,0x00,FPIND_D8 }}},
 {97,'m','S','!','E',O_MOV|O_BYTE,"mov:f.b",2,{RS,FPIND_D8},2,  {{0x90,0xf8,RS },{0x00,0x00,FPIND_D8 }}},
 {96,'m','S','!','E',O_MOV|O_WORD,"mov:f.w",2,{RS,FPIND_D8},2,  {{0x98,0xf8,RS },{0x00,0x00,FPIND_D8 }}},
 {94,'m','E','!','D',O_MOV|O_BYTE,"mov:g.b",2,{RN,RD},2,        {{0xa0,0xf8,RN },{0x80,0xf8,RD }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1d,0xff, }}},
 {94,'m','S','!','E',O_MOV|O_BYTE,"mov:g.b",2,{RS,RNDEC},2,     {{0xb0,0xf8,RN },{0x90,0xf8,RS }}},
 {91,'m','I','!','D',O_MOV|O_WORD,"mov:i.w",2,{IMM16,RD},3,     {{0x58,0xf8,RD },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {89,'m','E','!','D',O_MOV|O_BYTE,"mov:l.b",2,{ABS8,RD},2,      {{0x60,0xf8,RD },{0x00,0x00,ABS8 }}},
@@ -1827,85 +1837,85 @@ h8500_opcode_info h8500_table[]
 {86,'m','S','!','E',O_MOV|O_BYTE,"mov:s.b",2,{RS,ABS8},2,      {{0x70,0xf8,RS },{0x00,0x00,ABS8 }}},
 {85,'m','S','!','E',O_MOV|O_WORD,"mov:s.w",2,{RS,ABS8},2,      {{0x78,0xf8,RS },{0x00,0x00,ABS8 }}},
 {83,'-','E','!','D',O_MOVFPE|O_BYTE,"movfpe.b",2,{RN,RD},3,    {{0xa0,0xf8,RN },{0x00,0xff, },{0x80,0xf8,RD }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1d,0xff, }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{RN,RD},2,        {{0xa8,0xf8,RN },{0x80,0xf8,RD }}},
 {94,'m','E','!','D',O_MOV|O_BYTE,"mov:g.b",2,{RNDEC,RD},2,     {{0xb0,0xf8,RN },{0x80,0xf8,RD }}},
 {83,'-','E','!','D',O_MOVFPE|O_BYTE,"movfpe.b",2,{RNDEC,RD},3, {{0xb0,0xf8,RN },{0x00,0xff, },{0x80,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNDEC,RD},2,   {{0xb0,0xf8,RN },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNDEC,RD},2,   {{0xb0,0xf8,RN },{0xa8,0xf8,RD }}},
 {81,'-','S','!','E',O_MOVTPE|O_BYTE,"movtpe.b",2,{RS,RN},3,    {{0xa0,0xf8,RN },{0x00,0xff, },{0x90,0xf8,RS }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1c,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RN,0},2, {{0xa8,0xf8,RN },{0x1c,0xff, }}},
 {69,'m','E','D','D',O_OR|O_BYTE,"or.b",2,{RN,RD},2,    {{0xa0,0xf8,RN },{0x40,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{RN,RD},2,      {{0xa0,0xf8,RN },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{RN,RD},2,      {{0xa0,0xf8,RN },{0xa8,0xf8,RD }}},
 {76,'a','E','!','E',O_NEG|O_BYTE,"neg.b",1,{RN,0},2,   {{0xa0,0xf8,RN },{0x14,0xff, }}},
 {72,'m','E','!','E',O_NOT|O_BYTE,"not.b",1,{RN,0},2,   {{0xa0,0xf8,RN },{0x15,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RN,0},2, {{0xa0,0xf8,RN },{0x1c,0xff, }}},
 {68,'m','E','D','D',O_OR|O_WORD,"or.w",2,{RN,RD},2,    {{0xa8,0xf8,RN },{0x40,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{RN,RD},2,      {{0xa8,0xf8,RN },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{RN,RD},2,      {{0xa8,0xf8,RN },{0xa8,0xf8,RD }}},
 {75,'a','E','!','E',O_NEG|O_WORD,"neg.w",1,{RN,0},2,   {{0xa8,0xf8,RN },{0x14,0xff, }}},
 {71,'m','E','!','E',O_NOT|O_WORD,"not.w",1,{RN,0},2,   {{0xa8,0xf8,RN },{0x15,0xff, }}},
 {69,'m','E','D','D',O_OR|O_BYTE,"or.b",2,{RNDEC,RD},2, {{0xb0,0xf8,RN },{0x40,0xf8,RD }}},
 {81,'-','S','!','E',O_MOVTPE|O_BYTE,"movtpe.b",2,{RS,RNDEC},3, {{0xb0,0xf8,RN },{0x00,0xff, },{0x90,0xf8,RS }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1c,0xff, }}},
 {75,'a','E','!','E',O_NEG|O_WORD,"neg.w",1,{RNDEC,0},2,        {{0xb8,0xf8,RN },{0x14,0xff, }}},
 {69,'m','E','D','D',O_OR|O_BYTE,"or.b",2,{RNINC,RD},2, {{0xc0,0xf8,RN },{0x40,0xf8,RD }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1c,0xff, }}},
 {76,'a','E','!','E',O_NEG|O_BYTE,"neg.b",1,{RNDEC,0},2,        {{0xb0,0xf8,RN },{0x14,0xff, }}},
 {72,'m','E','!','E',O_NOT|O_BYTE,"not.b",1,{RNDEC,0},2,        {{0xb0,0xf8,RN },{0x15,0xff, }}},
 {68,'m','E','D','D',O_OR|O_WORD,"or.w",2,{RNDEC,RD},2, {{0xb8,0xf8,RN },{0x40,0xf8,RD }}},
 {71,'m','E','!','E',O_NOT|O_WORD,"not.w",1,{RNDEC,0},2,        {{0xb8,0xf8,RN },{0x15,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1d,0xff, }}},
 {76,'a','E','!','E',O_NEG|O_BYTE,"neg.b",1,{RNINC,0},2,        {{0xc0,0xf8,RN },{0x14,0xff, }}},
 {72,'m','E','!','E',O_NOT|O_BYTE,"not.b",1,{RNINC,0},2,        {{0xc0,0xf8,RN },{0x15,0xff, }}},
 {68,'m','E','D','D',O_OR|O_WORD,"or.w",2,{RNINC,RD},2, {{0xc8,0xf8,RN },{0x40,0xf8,RD }}},
 {75,'a','E','!','E',O_NEG|O_WORD,"neg.w",1,{RNINC,0},2,        {{0xc8,0xf8,RN },{0x14,0xff, }}},
 {71,'m','E','!','E',O_NOT|O_WORD,"not.w",1,{RNINC,0},2,        {{0xc8,0xf8,RN },{0x15,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1d,0xff, }}},
 {69,'m','E','D','D',O_OR|O_BYTE,"or.b",2,{RNIND,RD},2, {{0xd0,0xf8,RN },{0x40,0xf8,RD }}},
 {76,'a','E','!','E',O_NEG|O_BYTE,"neg.b",1,{RNIND,0},2,        {{0xd0,0xf8,RN },{0x14,0xff, }}},
 {72,'m','E','!','E',O_NOT|O_BYTE,"not.b",1,{RNIND,0},2,        {{0xd0,0xf8,RN },{0x15,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1c,0xff, }}},
 {68,'m','E','D','D',O_OR|O_WORD,"or.w",2,{RNIND,RD},2, {{0xd8,0xf8,RN },{0x40,0xf8,RD }}},
 {75,'a','E','!','E',O_NEG|O_WORD,"neg.w",1,{RNIND,0},2,        {{0xd8,0xf8,RN },{0x14,0xff, }}},
 {71,'m','E','!','E',O_NOT|O_WORD,"not.w",1,{RNIND,0},2,        {{0xd8,0xf8,RN },{0x15,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1d,0xff, }}},
 {69,'m','E','D','D',O_OR|O_BYTE,"or.b",2,{RNIND_D8,RD},3,      {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x40,0xf8,RD }}},
 {76,'a','E','!','E',O_NEG|O_BYTE,"neg.b",1,{RNIND_D8,0},3,     {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x14,0xff, }}},
 {72,'m','E','!','E',O_NOT|O_BYTE,"not.b",1,{RNIND_D8,0},3,     {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x15,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1c,0xff, }}},
 {68,'m','E','D','D',O_OR|O_WORD,"or.w",2,{RNIND_D8,RD},3,      {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x40,0xf8,RD }}},
 {75,'a','E','!','E',O_NEG|O_WORD,"neg.w",1,{RNIND_D8,0},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x14,0xff, }}},
 {71,'m','E','!','E',O_NOT|O_WORD,"not.w",1,{RNIND_D8,0},3,     {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x15,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1d,0xff, }}},
 {69,'m','E','D','D',O_OR|O_BYTE,"or.b",2,{RNIND_D16,RD},4,     {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x40,0xf8,RD }}},
 {68,'m','E','D','D',O_OR|O_WORD,"or.w",2,{RNIND_D16,RD},4,     {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x40,0xf8,RD }}},
 {75,'a','E','!','E',O_NEG|O_WORD,"neg.w",1,{RNIND_D16,0},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x14,0xff, }}},
 {71,'m','E','!','E',O_NOT|O_WORD,"not.w",1,{RNIND_D16,0},4,    {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x15,0xff, }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1c,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1c,0xff, }}},
 {63,'-','J','!','!',O_PJSR|O_UNSZ,"pjsr",1,{ABS24,0},4,        {{0x03,0xff, },{0x00,0x00,ABS24 },{0x00,0x00, },{0x00,0x00, }}},
 {69,'m','E','D','D',O_OR|O_BYTE,"or.b",2,{IMM8,RD},3,  {{0x04,0xff, },{0x00,0x00,IMM8 },{0x40,0xf8,RD }}},
 {66,'s','I','C','C',O_ORC|O_BYTE,"orc.b",2,{IMM8,CRB},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x48,0xf8,CRB }}},
 {76,'a','E','!','E',O_NEG|O_BYTE,"neg.b",1,{IMM8,0},3, {{0x04,0xff, },{0x00,0x00,IMM8 },{0x14,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1c,0xff, }}},
 {69,'m','E','D','D',O_OR|O_BYTE,"or.b",2,{ABS8,RD},3,  {{0x05,0xff, },{0x00,0x00,ABS8 },{0x40,0xf8,RD }}},
 {94,'m','E','!','D',O_MOV|O_BYTE,"mov:g.b",2,{RNIND_D16,RD},4, {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x80,0xf8,RD }}},
 {76,'a','E','!','E',O_NEG|O_BYTE,"neg.b",1,{RNIND_D16,0},4,    {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x14,0xff, }}},
 {72,'m','E','!','E',O_NOT|O_BYTE,"not.b",1,{RNIND_D16,0},4,    {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x15,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1c,0xff, }}},
 {72,'m','E','!','E',O_NOT|O_BYTE,"not.b",1,{IMM8,0},3, {{0x04,0xff, },{0x00,0x00,IMM8 },{0x15,0xff, }}},
 {76,'a','E','!','E',O_NEG|O_BYTE,"neg.b",1,{ABS8,0},3, {{0x05,0xff, },{0x00,0x00,ABS8 },{0x14,0xff, }}},
 {72,'m','E','!','E',O_NOT|O_BYTE,"not.b",1,{ABS8,0},3, {{0x05,0xff, },{0x00,0x00,ABS8 },{0x15,0xff, }}},
 {94,'m','I','!','E',O_MOV|O_BYTE,"mov:g.b",2,{IMM8,RNIND_D16},5,       {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x06,0xff, },{0x00,0x00,IMM8 }}},
 {74,'-','!','!','!',O_NOP|O_UNSZ,"nop",0,{0,0},1,      {{0x00,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1c,0xff, }}},
 {68,'m','E','D','D',O_OR|O_WORD,"or.w",2,{IMM16,RD},4, {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x40,0xf8,RD }}},
 {65,'s','I','C','C',O_ORC|O_WORD,"orc.w",2,{IMM16,CRW},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x48,0xf8,CRW }}},
 {75,'a','E','!','E',O_NEG|O_WORD,"neg.w",1,{IMM16,0},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x14,0xff, }}},
 {71,'m','E','!','E',O_NOT|O_WORD,"not.w",1,{IMM16,0},4,        {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x15,0xff, }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1c,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1c,0xff, }}},
 {68,'m','E','D','D',O_OR|O_WORD,"or.w",2,{ABS8,RD},3,  {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x40,0xf8,RD }}},
 {75,'a','E','!','E',O_NEG|O_WORD,"neg.w",1,{ABS8,0},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x14,0xff, }}},
 {71,'m','E','!','E',O_NOT|O_WORD,"not.w",1,{ABS8,0},3, {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x15,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1d,0xff, }}},
 {64,'-','J','!','!',O_PJMP|O_UNSZ,"pjmp",1,{RDIND,0},2,        {{0x11,0xff, },{0xc0,0xf8,RDIND }}},
 {63,'-','J','!','!',O_PJSR|O_UNSZ,"pjsr",1,{RDIND,0},2,        {{0x11,0xff, },{0xc8,0xf8,RDIND }}},
 {62,'-','B','!','!',O_PRTD|O_UNSZ,"prtd",1,{IMM8,0},3, {{0x11,0xff, },{0x14,0xff, },{0x00,0x00,IMM8 }}},
@@ -1913,106 +1923,133 @@ h8500_opcode_info h8500_table[]
 {62,'-','B','!','!',O_PRTD|O_UNSZ,"prtd",1,{IMM16,0},4,        {{0x11,0xff, },{0x1c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {64,'-','J','!','!',O_PJMP|O_UNSZ,"pjmp",1,{ABS24,0},4,        {{0x13,0xff, },{0x00,0x00,ABS24 },{0x00,0x00, },{0x00,0x00, }}},
 {69,'m','E','D','D',O_OR|O_BYTE,"or.b",2,{ABS16,RD},4, {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x40,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{RNDEC,RD},2,   {{0xb8,0xf8,RN },{0xa8,0xf8,RD }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1c,0xff, }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNINC,RD},2,   {{0xc0,0xf8,RN },{0xa8,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{RNINC,RD},2,   {{0xc8,0xf8,RN },{0xa8,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNIND,RD},2,   {{0xd0,0xf8,RN },{0xa8,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{RNIND,RD},2,   {{0xd8,0xf8,RN },{0xa8,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNIND_D8,RD},3,        {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0xa8,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{RNIND_D8,RD},3,        {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0xa8,0xf8,RD }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1c,0xff, }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNIND_D16,RD},4,       {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{RNIND_D16,RD},4,       {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{IMM8,RD},3,    {{0x04,0xff, },{0x00,0x00,IMM8 },{0xa8,0xf8,RD }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{ABS8,RD},3,    {{0x05,0xff, },{0x00,0x00,ABS8 },{0xa8,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{IMM16,RD},4,   {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{ABS8,RD},3,    {{0x0d,0xff, },{0x00,0x00,ABS8 },{0xa8,0xf8,RD }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1c,0xff, }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{RNDEC,RD},2,   {{0xb8,0xf8,RN },{0xa8,0xf8,RD }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNDEC,0},2,      {{0xb8,0xf8,RN },{0x1c,0xff, }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNINC,RD},2,   {{0xc0,0xf8,RN },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{RNINC,RD},2,   {{0xc8,0xf8,RN },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNIND,RD},2,   {{0xd0,0xf8,RN },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{RNIND,RD},2,   {{0xd8,0xf8,RN },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNIND_D8,RD},3,        {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{RNIND_D8,RD},3,        {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0xa8,0xf8,RD }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNIND_D8,0},3,   {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x1c,0xff, }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{RNIND_D16,RD},4,       {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{RNIND_D16,RD},4,       {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{IMM8,RD},3,    {{0x04,0xff, },{0x00,0x00,IMM8 },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{ABS8,RD},3,    {{0x05,0xff, },{0x00,0x00,ABS8 },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{IMM16,RD},4,   {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{ABS8,RD},3,    {{0x0d,0xff, },{0x00,0x00,ABS8 },{0xa8,0xf8,RD }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{ABS8,0},3,       {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x1c,0xff, }}},
 {94,'m','S','!','E',O_MOV|O_BYTE,"mov:g.b",2,{RS,ABS16},4,     {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x90,0xf8,RS }}},
-{79,'s','E','!','D',O_MULXU|O_BYTE,"mulxu.b",2,{ABS16,RD},4,   {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
+{79,'p','E','D','D',O_MULXU|O_BYTE,"mulxu.b",2,{ABS16,RD},4,   {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
 {81,'-','S','!','E',O_MOVTPE|O_BYTE,"movtpe.b",2,{RS,RNINC},3, {{0xc0,0xf8,RN },{0x00,0xff, },{0x90,0xf8,RS }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1c,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNINC,0},2,      {{0xc8,0xf8,RN },{0x1c,0xff, }}},
 {81,'-','S','!','E',O_MOVTPE|O_BYTE,"movtpe.b",2,{RS,RNIND},3, {{0xd0,0xf8,RN },{0x00,0xff, },{0x90,0xf8,RS }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1c,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{RNIND,0},2,      {{0xd8,0xf8,RN },{0x1c,0xff, }}},
 {81,'-','S','!','E',O_MOVTPE|O_BYTE,"movtpe.b",2,{RS,RNIND_D8},4,      {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x00,0xff, },{0x90,0xf8,RS }}},
 {94,'m','S','!','E',O_MOV|O_BYTE,"mov:g.b",2,{RS,RNIND_D16},4, {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x90,0xf8,RS }}},
 {81,'-','S','!','E',O_MOVTPE|O_BYTE,"movtpe.b",2,{RS,RNIND_D16},5,     {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x00,0xff, },{0x90,0xf8,RS }}},
 {81,'-','S','!','E',O_MOVTPE|O_BYTE,"movtpe.b",2,{RS,ABS8},4,  {{0x05,0xff, },{0x00,0x00,ABS8 },{0x00,0xff, },{0x90,0xf8,RS }}},
 {83,'-','E','!','D',O_MOVFPE|O_BYTE,"movfpe.b",2,{RNIND,RD},3, {{0xd0,0xf8,RN },{0x00,0xff, },{0x80,0xf8,RD }}},
 {83,'-','E','!','D',O_MOVFPE|O_BYTE,"movfpe.b",2,{RNINC,RD},3, {{0xc0,0xf8,RN },{0x00,0xff, },{0x80,0xf8,RD }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNIND_D16,0},4,  {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1d,0xff, }}},
 {94,'m','E','!','D',O_MOV|O_BYTE,"mov:g.b",2,{ABS16,RD},4,     {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x80,0xf8,RD }}},
 {83,'-','E','!','D',O_MOVFPE|O_BYTE,"movfpe.b",2,{RNIND_D8,RD},4,      {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x00,0xff, },{0x80,0xf8,RD }}},
 {94,'m','I','!','E',O_MOV|O_BYTE,"mov:g.b",2,{IMM8,RNIND_D8},4,        {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x06,0xff, },{0x00,0x00,IMM8 }}},
 {83,'-','E','!','D',O_MOVFPE|O_BYTE,"movfpe.b",2,{RNIND_D16,RD},5,     {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x00,0xff, },{0x80,0xf8,RD }}},
 {83,'-','E','!','D',O_MOVFPE|O_BYTE,"movfpe.b",2,{IMM8,RD},4,  {{0x04,0xff, },{0x00,0x00,IMM8 },{0x00,0xff, },{0x80,0xf8,RD }}},
 {83,'-','E','!','D',O_MOVFPE|O_BYTE,"movfpe.b",2,{ABS8,RD},4,  {{0x05,0xff, },{0x00,0x00,ABS8 },{0x00,0xff, },{0x80,0xf8,RD }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1d,0xff, }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1d,0xff, }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNINC,0},2,      {{0xc0,0xf8,RN },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNIND,0},2,      {{0xd0,0xf8,RN },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNIND_D8,0},3,   {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x1d,0xff, }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{RNDEC,RD},2,     {{0xb8,0xf8,RN },{0x80,0xf8,RD }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{RNINC,RD},2,     {{0xc8,0xf8,RN },{0x80,0xf8,RD }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{RNDEC,0},2,      {{0xb0,0xf8,RN },{0x1d,0xff, }}},
 {93,'m','S','!','E',O_MOV|O_WORD,"mov:g.w",2,{RS,RNDEC},2,     {{0xb8,0xf8,RN },{0x90,0xf8,RS }}},
 {93,'m','S','!','E',O_MOV|O_WORD,"mov:g.w",2,{RS,RNINC},2,     {{0xc8,0xf8,RN },{0x90,0xf8,RS }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{RNIND,RD},2,     {{0xd8,0xf8,RN },{0x80,0xf8,RD }}},
 {93,'m','S','!','E',O_MOV|O_WORD,"mov:g.w",2,{RS,RNIND},2,     {{0xd8,0xf8,RN },{0x90,0xf8,RS }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{RNIND_D8,RD},3,  {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x80,0xf8,RD }}},
 {93,'m','S','!','E',O_MOV|O_WORD,"mov:g.w",2,{RS,RNIND_D8},3,  {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x90,0xf8,RS }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1d,0xff, }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{IMM8,0},3,       {{0x04,0xff, },{0x00,0x00,IMM8 },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{ABS8,0},3,       {{0x05,0xff, },{0x00,0x00,ABS8 },{0x1d,0xff, }}},
 {93,'m','S','!','E',O_MOV|O_WORD,"mov:g.w",2,{RS,ABS8},3,      {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x90,0xf8,RS }}},
 {94,'m','I','!','E',O_MOV|O_BYTE,"mov:g.b",2,{IMM8,RNDEC},3,   {{0xb0,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
-{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNDEC},4,  {{0xb0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNDEC},4,  {{0xb8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM8,RNDEC},4,   {{0xb8,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 },{0x00,0x00, }}},
+
+
 {94,'m','E','!','D',O_MOV|O_BYTE,"mov:g.b",2,{RNINC,RD},2,     {{0xc0,0xf8,RN },{0x80,0xf8,RD }}},
 {94,'m','S','!','E',O_MOV|O_BYTE,"mov:g.b",2,{RS,RNINC},2,     {{0xc0,0xf8,RN },{0x90,0xf8,RS }}},
 {94,'m','I','!','E',O_MOV|O_BYTE,"mov:g.b",2,{IMM8,RNINC},3,   {{0xc0,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
-{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNINC},4,  {{0xc0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNINC},4,  {{0xc8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM8,RNINC},4,   {{0xc8,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 },{0x00,0x00, }}},
+
 {94,'m','E','!','D',O_MOV|O_BYTE,"mov:g.b",2,{RNIND,RD},2,     {{0xd0,0xf8,RN },{0x80,0xf8,RD }}},
 {94,'m','S','!','E',O_MOV|O_BYTE,"mov:g.b",2,{RS,RNIND},2,     {{0xd0,0xf8,RN },{0x90,0xf8,RS }}},
 {94,'m','I','!','E',O_MOV|O_BYTE,"mov:g.b",2,{IMM8,RNIND},3,   {{0xd0,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 }}},
-{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNIND},4,  {{0xd0,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNIND},4,  {{0xd8,0xf8,RN },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM8,RNIND},4,   {{0xd8,0xf8,RN },{0x06,0xff, },{0x00,0x00,IMM8 },{0x00,0x00, }}},
+
 {94,'m','E','!','D',O_MOV|O_BYTE,"mov:g.b",2,{RNIND_D8,RD},3,  {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x80,0xf8,RD }}},
 {94,'m','S','!','E',O_MOV|O_BYTE,"mov:g.b",2,{RS,RNIND_D8},3,  {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x90,0xf8,RS }}},
-{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNIND_D8},5,       {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
-{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNIND_D16},6,      {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+
+
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNIND_D8},5,       {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM8,RNIND_D8},5,        {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x06,0xff, },{0x00,0x00,IMM8 },{0x00,0x00, }}},
+
+
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RNIND_D16},6,      {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM8,RNIND_D16},6,       {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x06,0xff, },{0x00,0x00,IMM8 },{0x00,0x00, }}},
+
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{RNIND_D16,RD},4, {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x80,0xf8,RD }}},
 {93,'m','S','!','E',O_MOV|O_WORD,"mov:g.w",2,{RS,RNIND_D16},4, {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x90,0xf8,RS }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{RNIND_D16,0},4,  {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x1d,0xff, }}},
 {94,'m','E','!','D',O_MOV|O_BYTE,"mov:g.b",2,{IMM8,RD},3,      {{0x04,0xff, },{0x00,0x00,IMM8 },{0x80,0xf8,RD }}},
 {94,'m','E','!','D',O_MOV|O_BYTE,"mov:g.b",2,{ABS8,RD},3,      {{0x05,0xff, },{0x00,0x00,ABS8 },{0x80,0xf8,RD }}},
 {94,'m','S','!','E',O_MOV|O_BYTE,"mov:g.b",2,{RS,ABS8},3,      {{0x05,0xff, },{0x00,0x00,ABS8 },{0x90,0xf8,RS }}},
 {94,'m','I','!','E',O_MOV|O_BYTE,"mov:g.b",2,{IMM8,ABS8},4,    {{0x05,0xff, },{0x00,0x00,ABS8 },{0x06,0xff, },{0x00,0x00,IMM8 }}},
-{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,ABS8},5,   {{0x05,0xff, },{0x00,0x00,ABS8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,ABS8},5,   {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{IMM16,RD},4,     {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x80,0xf8,RD }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1d,0xff, }}},
+
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM8,ABS8},5,    {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x06,0xff, },{0x00,0x00,IMM8 },{0x00,0x00, }}},
+
+
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{IMM16,0},4,      {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x1d,0xff, }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{ABS8,RD},3,      {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x80,0xf8,RD }}},
 {83,'-','E','!','D',O_MOVFPE|O_BYTE,"movfpe.b",2,{ABS16,RD},5, {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x00,0xff, },{0x80,0xf8,RD }}},
 {81,'-','S','!','E',O_MOVTPE|O_BYTE,"movtpe.b",2,{RS,ABS16},5, {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x00,0xff, },{0x90,0xf8,RS }}},
 {94,'m','I','!','E',O_MOV|O_BYTE,"mov:g.b",2,{IMM8,ABS16},5,   {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x06,0xff, },{0x00,0x00,IMM8 }}},
-{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,ABS16},6,  {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM16,ABS16},6,  {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x07,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+
+{93,'m','I','!','E',O_MOV|O_WORD,"mov:g.w",2,{IMM8,ABS16},6,   {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x06,0xff, },{0x00,0x00,IMM8 },{0x00,0x00, }}},
+
 {76,'a','E','!','E',O_NEG|O_BYTE,"neg.b",1,{ABS16,0},4,        {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x14,0xff, }}},
-{56,'s','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1d,0xff, }}},
+{56,'h','E','!','E',O_ROTR|O_BYTE,"rotr.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1d,0xff, }}},
 {93,'m','E','!','D',O_MOV|O_WORD,"mov:g.w",2,{ABS16,RD},4,     {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x80,0xf8,RD }}},
 {93,'m','S','!','E',O_MOV|O_WORD,"mov:g.w",2,{RS,ABS16},4,     {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x90,0xf8,RS }}},
-{78,'s','E','!','D',O_MULXU|O_WORD,"mulxu.w",2,{ABS16,RD},4,   {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
+{78,'p','E','D','D',O_MULXU|O_WORD,"mulxu.w",2,{ABS16,RD},4,   {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0xa8,0xf8,RD }}},
 {75,'a','E','!','E',O_NEG|O_WORD,"neg.w",1,{ABS16,0},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x14,0xff, }}},
-{55,'s','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1d,0xff, }}},
+{55,'h','E','!','E',O_ROTR|O_WORD,"rotr.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1d,0xff, }}},
 {72,'m','E','!','E',O_NOT|O_BYTE,"not.b",1,{ABS16,0},4,        {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x15,0xff, }}},
 {68,'m','E','D','D',O_OR|O_WORD,"or.w",2,{ABS16,RD},4, {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x40,0xf8,RD }}},
 {71,'m','E','!','E',O_NOT|O_WORD,"not.w",1,{ABS16,0},4,        {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x15,0xff, }}},
-{58,'s','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1c,0xff, }}},
-{59,'s','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1c,0xff, }}},
+{58,'h','E','!','E',O_ROTL|O_WORD,"rotl.w",1,{ABS16,0},4,      {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1c,0xff, }}},
+{59,'h','E','!','E',O_ROTL|O_BYTE,"rotl.b",1,{ABS16,0},4,      {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x1c,0xff, }}},
 {125,'a','D','I','!',O_CMP|O_BYTE,"cmp:e.b",2,{IMM8,RD},2,     {{0x40,0xf8,RD },{0x00,0x00,IMM8 }}},
 {123,'a','D','E','!',O_CMP|O_BYTE,"cmp:g.b",2,{RN,RD},2,       {{0xa0,0xf8,RN },{0x70,0xf8,RD }}},
 {123,'a','E','I','!',O_CMP|O_BYTE,"cmp:g.b",2,{IMM8,RN},3,     {{0xa0,0xf8,RN },{0x04,0xff, },{0x00,0x00,IMM8 }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{RN,RD},2,       {{0xa8,0xf8,RN },{0x70,0xf8,RD }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RN},4,    {{0xa0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RN},4,    {{0xa8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {107,'s','E','!','C',O_LDC|O_BYTE,"ldc.b",2,{RN,CRB},2,        {{0xa0,0xf8,RN },{0x88,0xf8,CRB }}},
 {120,'a','D','I','!',O_CMP|O_WORD,"cmp:i.w",2,{IMM16,RD},3,    {{0x48,0xf8,RD },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {117,'s','E','D','D',O_DIVXU|O_BYTE,"divxu.b",2,{RN,RD},2,     {{0xa0,0xf8,RN },{0xb8,0xf8,RD }}},
-{119,'s','D','!','!',O_DAAD|O_UNSZ,"daad",2,{RS,RD},3, {{0xa0,0xf8,RS },{0x00,0xff, },{0xa0,0xf8,RD }}},
+{119,'s','D','!','!',O_DADD|O_UNSZ,"dadd",2,{RS,RD},3, {{0xa0,0xf8,RS },{0x00,0xff, },{0xa0,0xf8,RD }}},
 {115,'s','D','!','!',O_DSUB|O_UNSZ,"dsub",2,{RS,RD},3, {{0xa0,0xf8,RS },{0x00,0xff, },{0xb0,0xf8,RD }}},
 {113,'s','D','!','D',O_EXTS|O_BYTE,"exts.b",1,{RD,0},2,        {{0xa0,0xf8,RD },{0x11,0xff, }}},
 {111,'s','D','!','D',O_EXTU|O_BYTE,"extu.b",1,{RD,0},2,        {{0xa0,0xf8,RD },{0x12,0xff, }}},
@@ -2020,8 +2057,8 @@ h8500_opcode_info h8500_table[]
 {107,'s','E','!','C',O_LDC|O_BYTE,"ldc.b",2,{RNIND_D8,CRB},3,  {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x88,0xf8,CRB }}},
 {107,'s','E','!','C',O_LDC|O_BYTE,"ldc.b",2,{RNIND_D16,CRB},4, {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x88,0xf8,CRB }}},
 {110,'-','B','!','!',O_JMP|O_UNSZ,"jmp",1,{ABS16,0},3, {{0x10,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, }}},
-{110,'-','B','!','!',O_JMP|O_UNSZ,"jmp",1,{RDIND,0},2, {{0x11,0xff, },{0xd0,0xf8,RDIND }}},
-{109,'-','B','!','!',O_JSR|O_UNSZ,"jsr",1,{RDIND,0},2, {{0x11,0xff, },{0xd8,0xf8,RDIND }}},
+{110,'-','B','!','!',O_JMP|O_UNSZ,"jmp",1,{RDIND,0},2, {{0x11,0xff, },{0xd0,0xf8,RD }}},
+{109,'-','B','!','!',O_JSR|O_UNSZ,"jsr",1,{RDIND,0},2, {{0x11,0xff, },{0xd8,0xf8,RD }}},
 {110,'-','B','!','!',O_JMP|O_UNSZ,"jmp",1,{RDIND_D8,0},3,      {{0x11,0xff, },{0xe0,0xf8,RDIND_D8 },{0x00,0x00, }}},
 {109,'-','B','!','!',O_JSR|O_UNSZ,"jsr",1,{RDIND_D8,0},3,      {{0x11,0xff, },{0xe8,0xf8,RDIND_D8 },{0x00,0x00, }}},
 {110,'-','B','!','!',O_JMP|O_UNSZ,"jmp",1,{RDIND_D16,0},4,     {{0x11,0xff, },{0xf0,0xf8,RDIND_D16 },{0x00,0x00, },{0x00,0x00, }}},
@@ -2051,35 +2088,35 @@ h8500_opcode_info h8500_table[]
 {123,'a','D','E','!',O_CMP|O_BYTE,"cmp:g.b",2,{RNDEC,RD},2,    {{0xb0,0xf8,RN },{0x70,0xf8,RD }}},
 {107,'s','E','!','C',O_LDC|O_BYTE,"ldc.b",2,{RNDEC,CRB},2,     {{0xb0,0xf8,RN },{0x88,0xf8,CRB }}},
 {123,'a','E','I','!',O_CMP|O_BYTE,"cmp:g.b",2,{IMM8,RNDEC},3,  {{0xb0,0xf8,RN },{0x04,0xff, },{0x00,0x00,IMM8 }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNDEC},4, {{0xb0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNDEC},4, {{0xb8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{RNDEC,RD},2,    {{0xb8,0xf8,RN },{0x70,0xf8,RD }}},
 {123,'a','D','E','!',O_CMP|O_BYTE,"cmp:g.b",2,{RNINC,RD},2,    {{0xc0,0xf8,RN },{0x70,0xf8,RD }}},
 {123,'a','E','I','!',O_CMP|O_BYTE,"cmp:g.b",2,{IMM8,RNINC},3,  {{0xc0,0xf8,RN },{0x04,0xff, },{0x00,0x00,IMM8 }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNINC},4, {{0xc0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNINC},4, {{0xc8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{RNINC,RD},2,    {{0xc8,0xf8,RN },{0x70,0xf8,RD }}},
 {123,'a','D','E','!',O_CMP|O_BYTE,"cmp:g.b",2,{RNIND,RD},2,    {{0xd0,0xf8,RN },{0x70,0xf8,RD }}},
 {123,'a','E','I','!',O_CMP|O_BYTE,"cmp:g.b",2,{IMM8,RNIND},3,  {{0xd0,0xf8,RN },{0x04,0xff, },{0x00,0x00,IMM8 }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNIND},4, {{0xd0,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNIND},4, {{0xd8,0xf8,RN },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{RNIND,RD},2,    {{0xd8,0xf8,RN },{0x70,0xf8,RD }}},
 {123,'a','D','E','!',O_CMP|O_BYTE,"cmp:g.b",2,{RNIND_D8,RD},3, {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x70,0xf8,RD }}},
 {123,'a','E','I','!',O_CMP|O_BYTE,"cmp:g.b",2,{IMM8,RNIND_D8},4,       {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x04,0xff, },{0x00,0x00,IMM8 }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNIND_D8},5,      {{0xe0,0xf8,RN },{0x00,0x00,DISP8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNIND_D8},5,      {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{RNIND_D8,RD},3, {{0xe8,0xf8,RN },{0x00,0x00,DISP8 },{0x70,0xf8,RD }}},
 {123,'a','D','E','!',O_CMP|O_BYTE,"cmp:g.b",2,{RNIND_D16,RD},4,        {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x70,0xf8,RD }}},
 {123,'a','E','I','!',O_CMP|O_BYTE,"cmp:g.b",2,{IMM8,RNIND_D16},5,      {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x04,0xff, },{0x00,0x00,IMM8 }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNIND_D16},6,     {{0xf0,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RNIND_D16},6,     {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{RNIND_D16,RD},4,        {{0xf8,0xf8,RN },{0x00,0x00,DISP16 },{0x00,0x00, },{0x70,0xf8,RD }}},
 {105,'-','E','!','C',O_LDM|O_UNSZ,"ldm",2,{SPINC,RLIST},2,     {{0x02,0xff, },{0x00,0x00,RLIST }}},
 {123,'a','D','E','!',O_CMP|O_BYTE,"cmp:g.b",2,{IMM8,RD},3,     {{0x04,0xff, },{0x00,0x00,IMM8 },{0x70,0xf8,RD }}},
 {123,'a','D','E','!',O_CMP|O_BYTE,"cmp:g.b",2,{ABS8,RD},3,     {{0x05,0xff, },{0x00,0x00,ABS8 },{0x70,0xf8,RD }}},
 {123,'a','E','I','!',O_CMP|O_BYTE,"cmp:g.b",2,{IMM8,ABS8},4,   {{0x05,0xff, },{0x00,0x00,ABS8 },{0x04,0xff, },{0x00,0x00,IMM8 }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,ABS8},5,  {{0x05,0xff, },{0x00,0x00,ABS8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,ABS8},5,  {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,RD},4,    {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x70,0xf8,RD }}},
 {106,'s','E','!','C',O_LDC|O_WORD,"ldc.w",2,{IMM16,CRW},4,     {{0x0c,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, },{0x88,0xf8,CRW }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{ABS8,RD},3,     {{0x0d,0xff, },{0x00,0x00,ABS8 },{0x70,0xf8,RD }}},
 {123,'a','D','E','!',O_CMP|O_BYTE,"cmp:g.b",2,{ABS16,RD},4,    {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x70,0xf8,RD }}},
 {123,'a','E','I','!',O_CMP|O_BYTE,"cmp:g.b",2,{IMM8,ABS16},5,  {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x04,0xff, },{0x00,0x00,IMM8 }}},
-{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,ABS16},6, {{0x15,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
+{122,'a','E','I','!',O_CMP|O_WORD,"cmp:g.w",2,{IMM16,ABS16},6, {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x05,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {122,'a','D','E','!',O_CMP|O_WORD,"cmp:g.w",2,{ABS16,RD},4,    {{0x1d,0xff, },{0x00,0x00,ABS16 },{0x00,0x00, },{0x70,0xf8,RD }}},
 {104,'-','S','I','!',O_LINK|O_UNSZ,"link",2,{FP,IMM16},3,      {{0x1f,0xff, },{0x00,0x00,IMM16 },{0x00,0x00, }}},
 {104,'-','S','I','!',O_LINK|O_UNSZ,"link",2,{FP,IMM8},2,       {{0x17,0xff, },{0x00,0x00,IMM8 }}},
@@ -2386,34 +2423,34 @@ ABS16,RD  'm','E','D','D'
 RNIND_D16,RD  'm','E','D','D'
 RN,RD  'a','E','D','D'
 RS,RD  '-','X','!','!'
-RN,0  'm','E','!','!'
+RN,0  'a','E','!','!'
 RS,RD  '-','X','!','!'
-RN,0  'm','E','!','!'
+RN,0  'a','E','!','!'
 RNDEC,RD  'a','E','D','D'
-RNDEC,0  'm','E','!','!'
+RNDEC,0  'a','E','!','!'
 RNDEC,RD  'a','E','D','D'
-RNDEC,0  'm','E','!','!'
+RNDEC,0  'a','E','!','!'
 RNINC,RD  'a','E','D','D'
-RNINC,0  'm','E','!','!'
-RNINC,0  'm','E','!','!'
+RNINC,0  'a','E','!','!'
+RNINC,0  'a','E','!','!'
 RNIND,RD  'a','E','D','D'
-RNIND,0  'm','E','!','!'
+RNIND,0  'a','E','!','!'
 RNIND,RD  'a','E','D','D'
-RNIND,0  'm','E','!','!'
-RNIND_D8,0  'm','E','!','!'
+RNIND,0  'a','E','!','!'
+RNIND_D8,0  'a','E','!','!'
 RNIND_D8,RD  'a','E','D','D'
-RNIND_D8,0  'm','E','!','!'
-RNIND_D16,0  'm','E','!','!'
+RNIND_D8,0  'a','E','!','!'
+RNIND_D16,0  'a','E','!','!'
 RNIND_D16,RD  'a','E','D','D'
-RN,0  'm','E','!','!'
-RNIND,0  'm','E','!','!'
-RNDEC,0  'm','E','!','!'
-RNINC,0  'm','E','!','!'
-ABS8,0  'm','E','!','!'
-RNIND_D8,0  'm','E','!','!'
+RN,0  'a','E','!','!'
+RNIND,0  'a','E','!','!'
+RNDEC,0  'a','E','!','!'
+RNINC,0  'a','E','!','!'
+ABS8,0  'a','E','!','!'
+RNIND_D8,0  'a','E','!','!'
 RD,0  'm','D','!','D'
-ABS16,0  'm','E','!','!'
-RNIND_D16,0  'm','E','!','!'
+ABS16,0  'a','E','!','!'
+RNIND_D16,0  'a','E','!','!'
 RN,0  's','E','!','E'
 RN,RD  'a','E','D','D'
 RN,RD  'a','E','D','D'
@@ -2438,7 +2475,7 @@ RNIND_D8,RD  '-','E','D','D'
 RD,0  'm','D','!','D'
 RNIND_D16,RD  '-','E','D','D'
 RNIND_D16,0  's','E','!','E'
-IMM16,0  'm','E','!','!'
+IMM16,0  'a','E','!','!'
 RN,RD  '-','E','D','D'
 RN,RD  'a','E','D','D'
 RN,RD  '-','E','D','D'
@@ -2466,20 +2503,20 @@ RNIND_D16,RD  'a','E','D','D'
 RNIND,RD  '-','E','D','D'
 RNIND_D8,RD  'a','E','D','D'
 RNIND_D16,RD  'a','E','D','D'
-RNIND_D16,0  'm','E','!','!'
+RNIND_D16,0  'a','E','!','!'
 IMM8,RD  'a','E','D','D'
 IMM8,RD  '-','E','D','D'
 IMM8,RD  'm','E','D','D'
 IMM8,CRB  's','E','C','C'
 IMM8,RD  'a','E','D','D'
-IMM8,0  'm','E','!','!'
+IMM8,0  'a','E','!','!'
 IMM8,0  's','E','!','E'
 ABS8,RD  'a','E','D','D'
 ABS8,RD  '-','E','D','D'
 ABS8,RD  'm','E','D','D'
 CRB,ABS8  's','C','!','E'
 ABS8,RD  'a','E','D','D'
-ABS8,0  'm','E','!','!'
+ABS8,0  'a','E','!','!'
 ABS8,0  's','E','!','E'
 RN,RD  '-','E','D','D'
 RNDEC,RD  '-','E','D','D'
@@ -2497,12 +2534,12 @@ IMM16,RD  '-','E','D','D'
 IMM16,RD  'm','E','D','D'
 IMM16,CRW  's','E','C','C'
 IMM16,RD  'a','E','D','D'
-IMM16,0  'm','E','!','!'
+IMM16,0  'a','E','!','!'
 ABS8,RD  'a','E','D','D'
 ABS8,RD  '-','E','D','D'
 ABS8,RD  'm','E','D','D'
 ABS8,RD  'a','E','D','D'
-ABS8,0  'm','E','!','!'
+ABS8,0  'a','E','!','!'
 FP,0  '-','B','!','!'
 ABS16,RD  'a','E','D','D'
 ABS16,RD  '-','E','D','D'
@@ -2527,15 +2564,15 @@ CRW,RNIND_D8  's','C','!','E'
 CRW,ABS16  's','C','!','E'
 CRW,RNIND_D16  's','C','!','E'
 ABS16,RD  'a','E','D','D'
-ABS16,0  'm','E','!','!'
+ABS16,0  'a','E','!','!'
 ABS16,0  's','E','!','E'
 ABS16,RD  'a','E','D','D'
 ABS16,RD  '-','E','D','D'
 ABS16,RD  'm','E','D','D'
 ABS16,RD  'a','E','D','D'
-ABS16,0  'm','E','!','!'
+ABS16,0  'a','E','!','!'
 CRW,RN  's','C','!','E'
-RNIND,0  's','E','!','E'
+RNIND,0  'h','E','!','E'
 CRB,RNDEC  's','C','!','E'
 CRW,RNIND  's','C','!','E'
 CRW,RNINC  's','C','!','E'
@@ -2547,237 +2584,237 @@ CRB,ABS8  's','C','!','E'
 CRB,RNIND_D8  's','C','!','E'
 CRW,ABS8  's','C','!','E'
 CRW,RNIND_D16  's','C','!','E'
-RNIND,0  's','E','!','E'
+RNIND,0  'h','E','!','E'
 CRB,ABS16  's','C','!','E'
 CRB,RNIND_D16  's','C','!','E'
-RN,0  's','E','!','E'
-RNINC,0  's','E','!','E'
+RN,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
 CRW,ABS16  's','C','!','E'
-RN,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-RNINC,0  's','E','!','E'
+RN,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
 CRB,RN  's','C','!','E'
-RN,0  's','E','!','E'
-RN,0  's','E','!','E'
-RN,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RN,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-ABS16,0  's','E','!','E'
-IMM16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-RN,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-IMM8,0  's','E','!','E'
-IMM8,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-IMM16,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-ABS16,0  's','E','!','E'
-ABS16,0  's','E','!','E'
-ABS16,0  's','E','!','E'
-RN,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-IMM16,0  's','E','!','E'
-ABS16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-IMM8,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-IMM16,0  's','E','!','E'
-IMM16,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-ABS16,0  's','E','!','E'
+RN,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
+IMM16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+IMM8,0  'h','E','!','E'
+IMM8,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+IMM16,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+IMM16,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+IMM8,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+IMM16,0  'h','E','!','E'
+IMM16,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
 0,0  '-','!','!','!'
-ABS16,0  's','E','!','E'
-ABS16,0  's','E','!','E'
-RN,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-IMM16,0  's','E','!','E'
-ABS16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-RN,0  's','E','!','E'
-RN,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-IMM8,0  's','E','!','E'
-RN,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-ABS16,0  's','E','!','E'
-IMM16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-RN,0  's','E','!','E'
-RN,0  's','E','!','E'
-RN,0  's','E','!','E'
-RN,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
+ABS16,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+IMM16,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+IMM8,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
+IMM16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
 RS,PCREL8  '-','B','S','S'
-IMM8,0  's','E','!','E'
-IMM8,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-IMM16,0  's','E','!','E'
-RN,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-IMM16,0  's','E','!','E'
-ABS16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-ABS8,0  's','E','!','E'
+IMM8,0  'h','E','!','E'
+IMM8,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+IMM16,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+IMM16,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
 RS,PCREL8  '-','B','S','S'
 RS,PCREL8  '-','B','S','S'
-IMM16,0  's','E','!','E'
-IMM16,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-ABS8,0  's','E','!','E'
+IMM16,0  'h','E','!','E'
+IMM16,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
 IMM16,0  '-','B','!','!'
 IMM8,0  '-','B','!','!'
-ABS16,0  's','E','!','E'
-ABS16,0  's','E','!','E'
-ABS16,0  's','E','!','E'
+ABS16,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
 0,0  '-','B','!','!'
-ABS16,0  's','E','!','E'
-ABS16,0  's','E','!','E'
-ABS16,0  's','E','!','E'
-RN,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-ABS8,0  's','E','!','E'
+ABS16,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
 IMM8,RD  'm','I','!','D'
-ABS16,0  's','E','!','E'
-IMM16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
+ABS16,0  'h','E','!','E'
+IMM16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
 FPIND_D8,RD  'm','E','!','D'
 FPIND_D8,RD  'm','E','!','D'
 RS,FPIND_D8  'm','S','!','E'
 RS,FPIND_D8  'm','S','!','E'
 RN,RD  'm','E','!','D'
-RN,0  's','E','!','E'
+RN,0  'h','E','!','E'
 RS,RNDEC  'm','S','!','E'
-RNIND_D8,0  's','E','!','E'
+RNIND_D8,0  'h','E','!','E'
 IMM16,RD  'm','I','!','D'
 ABS8,RD  'm','E','!','D'
 ABS8,RD  'm','E','!','D'
 RS,ABS8  'm','S','!','E'
 RS,ABS8  'm','S','!','E'
 RN,RD  '-','E','!','D'
-RN,0  's','E','!','E'
+RN,0  'h','E','!','E'
 RN,RD  'm','E','!','D'
 RNDEC,RD  'm','E','!','D'
 RNDEC,RD  '-','E','!','D'
-RN,0  's','E','!','E'
-RNDEC,RD  's','E','!','D'
-RNIND,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-ABS16,0  's','E','!','E'
-IMM16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
+RN,0  'h','E','!','E'
+RNDEC,RD  'p','E','D','D'
+RNIND,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
+IMM16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
 RS,RN  '-','S','!','E'
-RN,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
+RN,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
 RN,RD  'm','E','D','D'
-RN,RD  's','E','!','D'
+RN,RD  'p','E','D','D'
 RN,0  'a','E','!','E'
 RN,0  'm','E','!','E'
-RN,0  's','E','!','E'
+RN,0  'h','E','!','E'
 RN,RD  'm','E','D','D'
-RN,RD  's','E','!','D'
+RN,RD  'p','E','D','D'
 RN,0  'a','E','!','E'
 RN,0  'm','E','!','E'
 RNDEC,RD  'm','E','D','D'
 RS,RNDEC  '-','S','!','E'
-RNDEC,0  's','E','!','E'
+RNDEC,0  'h','E','!','E'
 RNDEC,0  'a','E','!','E'
 RNINC,RD  'm','E','D','D'
-RNINC,0  's','E','!','E'
-RN,0  's','E','!','E'
-RNDEC,0  's','E','!','E'
-RNIND,0  's','E','!','E'
-RNINC,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
-ABS8,0  's','E','!','E'
-IMM16,0  's','E','!','E'
-ABS16,0  's','E','!','E'
-RNIND_D16,0  's','E','!','E'
+RNINC,0  'h','E','!','E'
+RN,0  'h','E','!','E'
+RNDEC,0  'h','E','!','E'
+RNIND,0  'h','E','!','E'
+RNINC,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
+IMM16,0  'h','E','!','E'
+ABS16,0  'h','E','!','E'
+RNIND_D16,0  'h','E','!','E'
 RNDEC,0  'a','E','!','E'
 RNDEC,0  'm','E','!','E'
 RNDEC,RD  'm','E','D','D'
 RNDEC,0  'm','E','!','E'
-RNDEC,0  's','E','!','E'
+RNDEC,0  'h','E','!','E'
 RNINC,0  'a','E','!','E'
 RNINC,0  'm','E','!','E'
 RNINC,RD  'm','E','D','D'
@@ -2785,23 +2822,23 @@ RNINC,0  'a','E','!','E'
 IMM8,CRB  's','I','C','C'
 IMM16,CRW  's','I','C','C'
 RNINC,0  'm','E','!','E'
-RNINC,0  's','E','!','E'
+RNINC,0  'h','E','!','E'
 RNIND,RD  'm','E','D','D'
 RNIND,0  'a','E','!','E'
 RNIND,0  'm','E','!','E'
-RNIND,0  's','E','!','E'
+RNIND,0  'h','E','!','E'
 RNIND,RD  'm','E','D','D'
 RNIND,0  'a','E','!','E'
 RNIND,0  'm','E','!','E'
-RNIND,0  's','E','!','E'
+RNIND,0  'h','E','!','E'
 RNIND_D8,RD  'm','E','D','D'
 RNIND_D8,0  'a','E','!','E'
 RNIND_D8,0  'm','E','!','E'
-RNIND_D8,0  's','E','!','E'
+RNIND_D8,0  'h','E','!','E'
 RNIND_D8,RD  'm','E','D','D'
 RNIND_D8,0  'a','E','!','E'
 RNIND_D8,0  'm','E','!','E'
-RNIND_D8,0  's','E','!','E'
+RNIND_D8,0  'h','E','!','E'
 RNIND_D16,RD  'm','E','D','D'
 RNIND,RD  'm','E','D','D'
 RNDEC,RD  'm','E','D','D'
@@ -2814,18 +2851,18 @@ RNIND_D16,RD  'm','E','D','D'
 RNIND_D16,RD  'm','E','D','D'
 RNIND_D16,0  'a','E','!','E'
 RNIND_D16,0  'm','E','!','E'
-RNIND_D16,0  's','E','!','E'
+RNIND_D16,0  'h','E','!','E'
 ABS24,0  '-','J','!','!'
 IMM8,RD  'm','E','D','D'
 IMM8,CRB  's','I','C','C'
 IMM8,0  'a','E','!','E'
-IMM8,0  's','E','!','E'
+IMM8,0  'h','E','!','E'
 ABS8,RD  'm','E','D','D'
 RN,RD  'm','E','D','D'
 RNIND_D16,RD  'm','E','!','D'
 RNIND_D16,0  'a','E','!','E'
 RNIND_D16,0  'm','E','!','E'
-RNIND_D16,0  's','E','!','E'
+RNIND_D16,0  'h','E','!','E'
 IMM8,0  'm','E','!','E'
 ABS8,0  'a','E','!','E'
 ABS8,0  'm','E','!','E'
@@ -2840,16 +2877,16 @@ IMM16,0  'm','E','!','E'
 RNIND_D16,0  'm','E','!','E'
 IMM8,RNIND_D16  'm','I','!','E'
 0,0  '-','!','!','!'
-ABS8,0  's','E','!','E'
+ABS8,0  'h','E','!','E'
 IMM16,RD  'm','E','D','D'
 IMM16,CRW  's','I','C','C'
 IMM16,0  'a','E','!','E'
 IMM16,0  'm','E','!','E'
-IMM16,0  's','E','!','E'
+IMM16,0  'h','E','!','E'
 ABS8,RD  'm','E','D','D'
 ABS8,0  'a','E','!','E'
 ABS8,0  'm','E','!','E'
-ABS8,0  's','E','!','E'
+ABS8,0  'h','E','!','E'
 RDIND,0  '-','J','!','!'
 RDIND,0  '-','J','!','!'
 IMM8,0  '-','B','!','!'
@@ -2866,37 +2903,37 @@ RNIND_D8,0  'a','E','!','E'
 ABS16,0  'a','E','!','E'
 IMM16,0  'a','E','!','E'
 RNIND_D16,0  'a','E','!','E'
-RNDEC,RD  's','E','!','D'
-RNDEC,0  's','E','!','E'
-RNINC,RD  's','E','!','D'
-RNINC,RD  's','E','!','D'
-RNIND,RD  's','E','!','D'
-RNIND,RD  's','E','!','D'
-RNIND_D8,RD  's','E','!','D'
-RNIND_D8,RD  's','E','!','D'
-RNIND_D8,0  's','E','!','E'
-RNIND_D16,RD  's','E','!','D'
-RNIND_D16,RD  's','E','!','D'
-IMM8,RD  's','E','!','D'
-ABS8,RD  's','E','!','D'
-IMM16,RD  's','E','!','D'
-ABS8,RD  's','E','!','D'
-ABS8,0  's','E','!','E'
+RNDEC,RD  'p','E','D','D'
+RNDEC,0  'h','E','!','E'
+RNINC,RD  'p','E','D','D'
+RNINC,RD  'p','E','D','D'
+RNIND,RD  'p','E','D','D'
+RNIND,RD  'p','E','D','D'
+RNIND_D8,RD  'p','E','D','D'
+RNIND_D8,RD  'p','E','D','D'
+RNIND_D8,0  'h','E','!','E'
+RNIND_D16,RD  'p','E','D','D'
+RNIND_D16,RD  'p','E','D','D'
+IMM8,RD  'p','E','D','D'
+ABS8,RD  'p','E','D','D'
+IMM16,RD  'p','E','D','D'
+ABS8,RD  'p','E','D','D'
+ABS8,0  'h','E','!','E'
 RS,ABS16  'm','S','!','E'
-ABS16,RD  's','E','!','D'
-RN,RD  's','E','!','D'
-RNIND,RD  's','E','!','D'
-RNDEC,RD  's','E','!','D'
-RNINC,RD  's','E','!','D'
-RNIND_D8,RD  's','E','!','D'
-ABS8,RD  's','E','!','D'
-IMM16,RD  's','E','!','D'
-ABS16,RD  's','E','!','D'
-RNIND_D16,RD  's','E','!','D'
+ABS16,RD  'p','E','D','D'
+RN,RD  'p','E','D','D'
+RNIND,RD  'p','E','D','D'
+RNDEC,RD  'p','E','D','D'
+RNINC,RD  'p','E','D','D'
+RNIND_D8,RD  'p','E','D','D'
+ABS8,RD  'p','E','D','D'
+IMM16,RD  'p','E','D','D'
+ABS16,RD  'p','E','D','D'
+RNIND_D16,RD  'p','E','D','D'
 RS,RNINC  '-','S','!','E'
-RNINC,0  's','E','!','E'
+RNINC,0  'h','E','!','E'
 RS,RNIND  '-','S','!','E'
-RNIND,0  's','E','!','E'
+RNIND,0  'h','E','!','E'
 RS,RNIND_D8  '-','S','!','E'
 RS,RNIND_D16  'm','S','!','E'
 RS,RNIND_D16  '-','S','!','E'
@@ -2910,7 +2947,7 @@ RNIND,RD  '-','E','!','D'
 RS,ABS16  '-','S','!','E'
 RS,RNIND_D16  '-','S','!','E'
 RNINC,RD  '-','E','!','D'
-RNIND_D16,0  's','E','!','E'
+RNIND_D16,0  'h','E','!','E'
 ABS16,RD  'm','E','!','D'
 RS,RNIND_D8  '-','S','!','E'
 RNIND_D8,RD  '-','E','!','D'
@@ -2919,7 +2956,7 @@ RNIND_D16,RD  '-','E','!','D'
 IMM8,RD  '-','E','!','D'
 ABS8,RD  '-','E','!','D'
 RN,RD  '-','E','!','D'
-RNINC,0  's','E','!','E'
+RNINC,0  'h','E','!','E'
 RNIND,RD  '-','E','!','D'
 RNDEC,RD  '-','E','!','D'
 IMM8,RD  '-','E','!','D'
@@ -2927,13 +2964,13 @@ ABS8,RD  '-','E','!','D'
 RNIND_D8,RD  '-','E','!','D'
 ABS16,RD  '-','E','!','D'
 RNIND_D16,RD  '-','E','!','D'
-RNIND,0  's','E','!','E'
-RNIND_D8,0  's','E','!','E'
+RNIND,0  'h','E','!','E'
+RNIND_D8,0  'h','E','!','E'
 RS,ABS8  'm','S','!','E'
 RNDEC,RD  'm','E','!','D'
 RNINC,RD  'm','E','!','D'
 ABS8,RD  'm','E','!','D'
-RNDEC,0  's','E','!','E'
+RNDEC,0  'h','E','!','E'
 IMM16,RD  'm','I','!','D'
 RS,RNDEC  'm','S','!','E'
 RS,RNINC  'm','S','!','E'
@@ -2941,8 +2978,8 @@ RNIND,RD  'm','E','!','D'
 RS,RNIND  'm','S','!','E'
 RNIND_D8,RD  'm','E','!','D'
 RS,RNIND_D8  'm','S','!','E'
-IMM8,0  's','E','!','E'
-ABS8,0  's','E','!','E'
+IMM8,0  'h','E','!','E'
+ABS8,0  'h','E','!','E'
 RS,ABS8  'm','S','!','E'
 RNINC,RD  '-','E','!','D'
 IMM8,RNDEC  'm','I','!','E'
@@ -2961,26 +2998,26 @@ IMM16,RNIND_D8  'm','I','!','E'
 IMM16,RNIND_D16  'm','I','!','E'
 RNIND_D16,RD  'm','E','!','D'
 RS,RNIND_D16  'm','S','!','E'
-RNIND_D16,0  's','E','!','E'
+RNIND_D16,0  'h','E','!','E'
 IMM8,RD  'm','E','!','D'
 ABS8,RD  'm','E','!','D'
 RS,ABS8  'm','S','!','E'
 IMM8,ABS8  'm','I','!','E'
 IMM16,ABS8  'm','I','!','E'
 IMM16,RD  'm','E','!','D'
-IMM16,0  's','E','!','E'
+IMM16,0  'h','E','!','E'
 ABS8,RD  'm','E','!','D'
 ABS16,RD  '-','E','!','D'
 RS,ABS16  '-','S','!','E'
 IMM8,ABS16  'm','I','!','E'
 IMM16,ABS16  'm','I','!','E'
 ABS16,0  'a','E','!','E'
-ABS16,0  's','E','!','E'
+ABS16,0  'h','E','!','E'
 ABS16,RD  'm','E','!','D'
 RS,ABS16  'm','S','!','E'
-ABS16,RD  's','E','!','D'
+ABS16,RD  'p','E','D','D'
 ABS16,0  'a','E','!','E'
-ABS16,0  's','E','!','E'
+ABS16,0  'h','E','!','E'
 RS,RNINC  'm','S','!','E'
 RN,RD  'm','E','!','D'
 RS,RNIND  'm','S','!','E'
@@ -3014,10 +3051,10 @@ IMM16,RNIND_D16  'm','I','!','E'
 ABS16,0  'm','E','!','E'
 ABS16,RD  'm','E','D','D'
 ABS16,0  'm','E','!','E'
-ABS16,0  's','E','!','E'
+ABS16,0  'h','E','!','E'
 RS,FPIND_D8  'm','S','!','E'
 FPIND_D8,RD  'm','E','!','D'
-ABS16,0  's','E','!','E'
+ABS16,0  'h','E','!','E'
 IMM8,RD  'm','I','!','D'
 RS,FPIND_D8  'm','S','!','E'
 RS,ABS8  'm','S','!','E'
@@ -3793,7 +3830,7 @@ IMM16,RD  'a','E','D','D'
 QIM,ABS16  'a','I','E','E'
 RNIND_D16,RD  'a','E','D','D'
 */ 
-0,0,0}
+{0,0,0}}
 #endif
 ;
 #endif