Better support for the h8, and various architecture things

1 files changed, 123 insertions, 141 deletions

diff --git a/include/h8300-opcode.h b/include/h8300-opcode.h
index 930aa27..e59f46e 100755
--- a/include/h8300-opcode.h
+++ b/include/h8300-opcode.h
@@ -58,24 +58,6 @@ Hex1,Hex2,Hex3,Hex4,Hex5,Hex6,Hex7,Hex8,Hex9,HexA,HexB,HexC,HexD,HexE,HexF,
 
 struct code {
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
   op_enum_type nib[9];
 } ;
 
@@ -104,7 +86,7 @@ struct h8_opcode h8_opcodes[]
    BITOP(n, RS8,  name, op00, op01, op10,op11, op20,op21)
 
 #define BRANCH(name, op) \
-{   2,  1, 1,name,{DISP8,E}, { 0x4, op, DISP8,IGNORE,E }}
+{   2,  1, 1,name,{DISP8,E}, { Hex4, op, DISP8,IGNORE,E }}
 
 #define TWOOP(name, op1, op2,op3) \
 { 2,  2, 2, name, {IMM8, RD8,E},	{ op1, RD8, IMM8,IGNORE,E}},\
@@ -114,135 +96,135 @@ struct h8_opcode h8_opcodes[]
 { 2, 1, 1, name, {RS8, E}, { op1, op2, 0, RS8, E}}
 
 #define UNOP3(name, op1, op2, op3) \
-{	2, 1, 1, name , {RS8, E}, {op1, op2, op3, RS8, E}}
+{2, 1, 1, name , {RS8, E}, {op1, op2, op3, RS8, E}}
 
 #define WTWOP(name, op1, op2) \
 {2, 2, 1, name, {RS16, RD16, E}, { op1, op2, RS16, RD16, E}}
 
 = 
 {
-  TWOOP("add.b", 0x8,	0x0,0x8),
-  WTWOP("add.w", 0x0, 0x9),
-    { 2,  2, 1, "adds", {KBIT,RD16|B30, E},{0x0, 0xb, KBIT, RD16|B30, E}},
-  TWOOP("addx", 0x9,0x0,0xe),
-  TWOOP("and", 0xe,0x1,0x6),
-    {  2,  2, 1, "andc",	{IMM8, CCR, E},	{ 0x0, 0x6, IMM8,IGNORE, E}},
-  BITOP(3,IMM3|B30, "band", 0x7, 0x6, 0x7, 0xc,  0x7, 0xe),
-  BRANCH("bra",	0x0),
-  BRANCH("bt",	0x0),
-  BRANCH("brn",	0x1),
-  BRANCH("bf",	0x1),
-  BRANCH("bhi",	0x2),
-  BRANCH("bls",	0x3),
-  BRANCH("bcc",	0x4),
-  BRANCH("bhs",	0x4),
-  BRANCH("bcs",	0x5),
-  BRANCH("blo",	0x5),
-  BRANCH("bne",	0x6),
-  BRANCH("beq",	0x7),
-  BRANCH("bvc",	0x8),
-  BRANCH("bvs",	0x9),
-  BRANCH("bpl",	0xa),
-  BRANCH("bmi",	0xb),
-  BRANCH("bge",	0xc),
-  BRANCH("blt",	0xd),
-  BRANCH("bgt",	0xe),
-  BRANCH("ble",	0xf),
-  EBITOP(6,IMM3|B30,"bclr", 0x6, 0x2, 0x7, 0xd, 0x7, 0xf),
-  BITOP(3,IMM3|B31,"biand", 0x7, 0x6, 0x7, 0xc, 0x7, 0xe),
-  BITOP(3,IMM3|B31, "bild",	0x7, 0x7,0x7, 0xc, 0x7, 0xe),
-  BITOP(3,IMM3|B31, "bior",	0x7, 0x4,0x7, 0xc, 0x7, 0xe),
-  BITOP(3,IMM3|B31, "bist",	0x6, 0x7,0x7, 0xd, 0x7, 0xe),
-  BITOP(3,IMM3|B31, "bixor",	0x7, 0x5,0x7, 0xc, 0x7, 0xe),
-  BITOP(3,IMM3|B30, "bld",	0x7, 0x7,0x7, 0xc, 0x7, 0xe),
-  EBITOP(6,IMM3|B30,"bnot", 0x6, 0x1, 0x7, 0xd, 0x7, 0xf),
-  BITOP(3,IMM3|B30,"bor",	0x7, 0x4,0x7, 0xc, 0x7, 0xe),
-  EBITOP(6,IMM3|B30,"bset",	0x6, 0x0,0x7, 0xd, 0x7, 0xf),
-    {  2,  1, 1, "bsr",{DISP8, E},{ 0x5, 0x5, DISP8,IGNORE, E}},
-  BITOP(3,IMM3|B30, "bst",	0x6, 0x7,0x7, 0xd, 0x7, 0xf),
-  EBITOP(6,IMM3|B30, "btst",	0x6, 0x3,0x7, 0xc, 0x7, 0xe),
-  BITOP(3,IMM3|B30, "bxor",	0x7,0x5,0x7, 0xc, 0x7, 0xe),
-  TWOOP( "cmp.b",0xa, 0x1, 0xc),
-  WTWOP( "cmp.w",0x1,0xd),
-  UNOP(   "daa",0x0, 0xf),
-  UNOP(   "das",0x1, 0xf),
-  UNOP(   "dec",0x1, 0xa),
-    {  2,  2, 1, "divxu",{RS8, RD16|B30, E}, { 0x5, 0x1, RS8, RD16|B30, E}},
-    {  4,  0, 1, "eepmov",{ E}, {0x7, 0xb, 0x5, 0xc, 0x5, 0x9, 0x8, 0xf,E}},
-  UNOP(   "inc",	0x0, 0xa),
-    {  2,  1, 3, "jmp",{RSIND|B30, E}, {0x5, 0x9, RSIND|B30, 0x0, E}},
-    {  4,  1, 3, "jmp",{ABS16SRC, E}, {0x5, 0xa, 0x0, 0x0, ABS16SRC, IGNORE,IGNORE,IGNORE,E}},
-    {  2,  1, 3, "jmp",{MEMIND, E}, {0x5, 0xb, MEMIND,IGNORE, E}},
-    {  2,  1, 3, "jsr",{RSIND|B30, E}, {0x5, 0xd, RSIND|B30, 0x0, E}},
-    {  4,  1, 3, "jsr",{ABS16SRC, E}, {0x5, 0xe, 0x0, 0x0, ABS16SRC,IGNORE,IGNORE,IGNORE, E}},
-    {  2,  1, 3, "jsr",{MEMIND, E}, {0x5, 0xf, MEMIND, IGNORE,E}},
-    {  2,  2, 2, "ldc",	{IMM8, CCR, E}, { 0x0, 0x7, IMM8,IGNORE, E}},
-    {  2,  2, 2, "ldc",	{RS8, CCR, E},	{ 0x0, 0x3, 0x0, RS8, E}},
-
-    {  2,  2,13,  "mov.b",	{RS8, RD8, E},	{ 0x0, 0xc, RS8, RD8, E}},
-    {  2,  2,13,  "mov.b",	{IMM8, RD8, E},	{ 0xf, RD8, IMM8,IGNORE, E}},
-    {  2,  2,13,  "mov.b",	{RSIND|B30,RD8, E},	{ 0x6, 0x8, RSIND|B30, RD8, E}},
-    {  4,  2,13,  "mov.b",	{DISPSRC,RD8, E},	{ 0x6, 0xe, DISPREG|B30, RD8, DISPSRC, IGNORE, IGNORE, IGNORE, E}} ,
-    {  2,  2,13,  "mov.b",	{RSINC|B30, RD8, E},	{ 0x6, 0xc, RSINC|B30, RD8, E}},
-
-    {  4,  2,13,  "mov.b",	{ABS16SRC, RD8, E},	{ 0x6, 0xa, 0x0, RD8,ABS16SRC, IGNORE,IGNORE,IGNORE,E}},
-    {  2,  2,13,  "mov.b",	{ABS8SRC, RD8, E},	{ 0x2, RD8, ABS8SRC,IGNORE, E}},
-    {  2,  2,13,  "mov.b", 	{RS8, RDIND|B30, E},	{ 0x6, 0x8, RDIND|B31, RS8, E}},
-    {  4,  2,13,  "mov.b",	{RS8, DISPDST, E},	{ 0x6, 0xe, DISPREG|B31, RS8,DISPDST, IGNORE, IGNORE, IGNORE, E}},
-    {  2,  2,13,  "mov.b",	{RS8, RDDEC|B30, E},	{ 0x6, 0xc, RDDEC|B30, RS8, E}},
+  TWOOP("add.b", Hex8,	Hex0,Hex8),
+  WTWOP("add.w", Hex0, Hex9),
+    { 2,  2, 1, "adds", {KBIT,RD16|B30, E},{Hex0, HexB, KBIT, RD16|B30, E}},
+  TWOOP("addx", Hex9,Hex0,HexE),
+  TWOOP("and", HexE,Hex1,Hex6),
+    {  2,  2, 1, "andc",	{IMM8, CCR, E},	{ Hex0, Hex6, IMM8,IGNORE, E}},
+  BITOP(3,IMM3|B30, "band", Hex7, Hex6, Hex7, HexC,  Hex7, HexE),
+  BRANCH("bra",	Hex0),
+  BRANCH("bt",	Hex0),
+  BRANCH("brn",	Hex1),
+  BRANCH("bf",	Hex1),
+  BRANCH("bhi",	Hex2),
+  BRANCH("bls",	Hex3),
+  BRANCH("bcc",	Hex4),
+  BRANCH("bhs",	Hex4),
+  BRANCH("bcs",	Hex5),
+  BRANCH("blo",	Hex5),
+  BRANCH("bne",	Hex6),
+  BRANCH("beq",	Hex7),
+  BRANCH("bvc",	Hex8),
+  BRANCH("bvs",	Hex9),
+  BRANCH("bpl",	HexA),
+  BRANCH("bmi",	HexB),
+  BRANCH("bge",	HexC),
+  BRANCH("blt",	HexD),
+  BRANCH("bgt",	HexE),
+  BRANCH("ble",	HexF),
+  EBITOP(6,IMM3|B30,"bclr", Hex6, Hex2, Hex7, HexD, Hex7, HexF),
+  BITOP(3,IMM3|B31,"biand", Hex7, Hex6, Hex7, HexC, Hex7, HexE),
+  BITOP(3,IMM3|B31, "bild",	Hex7, Hex7,Hex7, HexC, Hex7, HexE),
+  BITOP(3,IMM3|B31, "bior",	Hex7, Hex4,Hex7, HexC, Hex7, HexE),
+  BITOP(3,IMM3|B31, "bist",	Hex6, Hex7,Hex7, HexD, Hex7, HexE),
+  BITOP(3,IMM3|B31, "bixor",	Hex7, Hex5,Hex7, HexC, Hex7, HexE),
+  BITOP(3,IMM3|B30, "bld",	Hex7, Hex7,Hex7, HexC, Hex7, HexE),
+  EBITOP(6,IMM3|B30,"bnot", Hex6, Hex1, Hex7, HexD, Hex7, HexF),
+  BITOP(3,IMM3|B30,"bor",	Hex7, Hex4,Hex7, HexC, Hex7, HexE),
+  EBITOP(6,IMM3|B30,"bset",	Hex6, Hex0,Hex7, HexD, Hex7, HexF),
+    {  2,  1, 1, "bsr",{DISP8, E},{ Hex5, Hex5, DISP8,IGNORE, E}},
+  BITOP(3,IMM3|B30, "bst",	Hex6, Hex7,Hex7, HexD, Hex7, HexF),
+  EBITOP(6,IMM3|B30, "btst",	Hex6, Hex3,Hex7, HexC, Hex7, HexE),
+  BITOP(3,IMM3|B30, "bxor",	Hex7,Hex5,Hex7, HexC, Hex7, HexE),
+  TWOOP( "cmp.b",HexA, Hex1, HexC),
+  WTWOP( "cmp.w",Hex1,HexD),
+  UNOP(   "daa",Hex0, HexF),
+  UNOP(   "das",Hex1, HexF),
+  UNOP(   "dec",Hex1, HexA),
+    {  2,  2, 1, "divxu",{RS8, RD16|B30, E}, { Hex5, Hex1, RS8, RD16|B30, E}},
+    {  4,  0, 1, "eepmov",{ E}, {Hex7, HexB, Hex5, HexC, Hex5, Hex9, Hex8, HexF,E}},
+  UNOP(   "inc",	Hex0, HexA),
+    {  2,  1, 3, "jmp",{RSIND|B30, E}, {Hex5, Hex9, RSIND|B30, Hex0, E}},
+    {  4,  1, 3, "jmp",{ABS16SRC, E}, {Hex5, HexA, Hex0, Hex0, ABS16SRC, IGNORE,IGNORE,IGNORE,E}},
+    {  2,  1, 3, "jmp",{MEMIND, E}, {Hex5, HexB, MEMIND,IGNORE, E}},
+    {  2,  1, 3, "jsr",{RSIND|B30, E}, {Hex5, HexD, RSIND|B30, Hex0, E}},
+    {  4,  1, 3, "jsr",{ABS16SRC, E}, {Hex5, HexE, Hex0, Hex0, ABS16SRC,IGNORE,IGNORE,IGNORE, E}},
+    {  2,  1, 3, "jsr",{MEMIND, E}, {Hex5, HexF, MEMIND, IGNORE,E}},
+    {  2,  2, 2, "ldc",	{IMM8, CCR, E}, { Hex0, Hex7, IMM8,IGNORE, E}},
+    {  2,  2, 2, "ldc",	{RS8, CCR, E},	{ Hex0, Hex3, Hex0, RS8, E}},
+
+    {  2,  2,13,  "mov.b",	{RS8, RD8, E},	{ Hex0, HexC, RS8, RD8, E}},
+    {  2,  2,13,  "mov.b",	{IMM8, RD8, E},	{ HexF, RD8, IMM8,IGNORE, E}},
+    {  2,  2,13,  "mov.b",	{RSIND|B30,RD8, E},	{ Hex6, Hex8, RSIND|B30, RD8, E}},
+    {  4,  2,13,  "mov.b",	{DISPSRC,RD8, E},	{ Hex6, HexE, DISPREG|B30, RD8, DISPSRC, IGNORE, IGNORE, IGNORE, E}} ,
+    {  2,  2,13,  "mov.b",	{RSINC|B30, RD8, E},	{ Hex6, HexC, RSINC|B30, RD8, E}},
+
+    {  4,  2,13,  "mov.b",	{ABS16SRC, RD8, E},	{ Hex6, HexA, Hex0, RD8,ABS16SRC, IGNORE,IGNORE,IGNORE,E}},
+    {  2,  2,13,  "mov.b",	{ABS8SRC, RD8, E},	{ Hex2, RD8, ABS8SRC,IGNORE, E}},
+    {  2,  2,13,  "mov.b", 	{RS8, RDIND|B30, E},	{ Hex6, Hex8, RDIND|B31, RS8, E}},
+    {  4,  2,13,  "mov.b",	{RS8, DISPDST, E},	{ Hex6, HexE, DISPREG|B31, RS8,DISPDST, IGNORE, IGNORE, IGNORE, E}},
+    {  2,  2,13,  "mov.b",	{RS8, RDDEC|B30, E},	{ Hex6, HexC, RDDEC|B30, RS8, E}},
 /* Put the 16 bit one in first so it matches first */
-    {  4,  2,13,  "mov.b",	{RS8, ABS16DST, E},	{ 0x6, 0xa, 0x8, RS8, ABS16DST,IGNORE,IGNORE,IGNORE, E}},
-    {  2,  2,13,  "mov.b",	{RS8, ABS8DST, E},	{ 0x3, RS8, ABS8DST,IGNORE, E}},
-    {  2,  2,11,  "mov.w",	{RS16|B30, RD16|B30, E},{ 0x0, 0xd, RS16|B30, RD16|B30, E}},
-    {  4,  2,11,  "mov.w",	{IMM16, RD16|B30, E},	{ 0x7, 0x9, 0x0, RD16|B30, IMM16,IGNORE,IGNORE,IGNORE, E}},
-    {  2,  2,11,  "mov.w",	{RSIND|B30,RD16|B30, E},{ 0x6, 0x9, RSIND|B30, RD16|B30, E}},
-    {  4,  2,11,  "mov.w",	{DISPSRC,RD16|B30, E},	{ 0x6, 0xf, DISPREG|B30, RD16|B30, DISPSRC, IGNORE, IGNORE, IGNORE,E}} ,
-    {  2,  2,11,  "mov.w",	{RSINC|B30, RD16|B30, E},	{ 0x6, 0xd, RSINC|B30, RD16|B30, E}},
-    {  4,  2,11,  "mov.w",	{ABS16SRC, RD16|B30, E},	{ 0x6, 0xb, 0x0, RD16|B30,ABS16SRC,IGNORE,IGNORE,IGNORE, E}},
-    {  2,  2,11,  "mov.w", 	{RS16|B30, RDIND|B30, E},{ 0x6, 0x9, RDIND|B31, RS16|B30, E}},
-    {  4,  2,11,  "mov.w",	{RS16|B30, DISPDST, E},	{ 0x6, 0xf, DISPREG|B31, RS16|B30,DISPDST, IGNORE,IGNORE,IGNORE,E}},
-    {  2,  2,11,  "mov.w",	{RS16|B30, RDDEC|B30, E},{ 0x6, 0xd, RDDEC|B31, RS16|B30, E}},
-    {  4,  2,11,  "mov.w",	{RS16|B30, ABS16DST, E},	{ 0x6, 0xb, 0x8, RS16|B30, ABS16DST, IGNORE, IGNORE, IGNORE, E}},
-
-
-    {  4,  2,1,  "movfpe",	{ABS16SRC, RD8, E},	{ 0x6, 0xa, 0x4, RD8, ABS16SRC,IGNORE,IGNORE,IGNORE, E}},
-    {  4,  2,1,  "movtpe",	{RS8, ABS16DST, E},	{ 0x6, 0xa, 0xc, RS8, ABS16DST,IGNORE,IGNORE,IGNORE, E}},
-    {  2,  2,1,  "mulxu",	{RS8, RD16|B30, E},	{ 0x5, 0x0, RS8, RD16|B30, E}},
-    {  2,  1,1,  "neg",	{RS8, E},		{ 0x1, 0x7, 0x8, RS8, E}},
-    {  2,  0,1,  "nop",	{E},		{ 0x0, 0x0, 0x0, 0x0,E}},
-    {  2,  1,1,  "not",	{RS8,E},		{ 0x1, 0x7, 0x0, RS8,E}},
-  TWOOP("or", 0xc, 0x1, 0x4),
-    {  2,  2,1,    "orc",	{IMM8, CCR,E},	{ 0x0, 0x4, IMM8,IGNORE,E}},
-    {  2,  1,1,  "pop",	{RS16|B30,E},		{ 0x6, 0xd, 0x7, RS16|B30,E}},
-    {  2,  1,1,  "push",	{RS16|B30,E},		{ 0x6, 0xd, 0xf, RS16|B30,E}},
-  UNOP3(  "rotl",0x1, 0x2,0x8),
-  UNOP3(  "rotr",0x1, 0x3, 0x8),
-  UNOP3(  "rotxl",0x1, 0x2, 0x0),
-  UNOP3(  "rotxr",0x1, 0x3, 0x0),
-    {  2,  0, 1, "rte",	{E},		{ 0x5, 0x6, 0x7, 0x0,E}},
-    {  2,  0, 1, "rts",	{E},		{ 0x5, 0x4, 0x7, 0x0,E}},
-  UNOP3(   "shal",	0x1, 0x00, 0x08),
-  UNOP3(    "shar",	0x1, 0x1, 0x8),
-  UNOP3(    "shll",	0x1, 0x0, 0x0),
-  UNOP3(    "shlr",	0x1, 0x1, 0x0),
-    {  2,  0, 1, "sleep",	{E},		{ 0x0, 0x1, 0x8, 0x0,E}},
-    {  2,  2, 1, "stc",	{CCR, RD8,E},	{ 0x0, 0x2, 0x0, RD8,E}},
-    {  2,  2, 1, "sub.b",	{RS8,RD8,E},	{ 0x1, 0x8, RS8, RD8,E}},
-    {  2,  2, 1, "sub.w",	{RS16|B30, RD16|B30,E}, 	{0x1, 0x9, RS16|B30, RD16|B30,E}},
-    {  2,  2, 1, "subs",	{KBIT,RD16|B30,E},	{ 0x1, 0xb, KBIT, RD16|B30,E}},
-  TWOOP("subx",0xb, 0x1, 0xe),
-  TWOOP("xor", 0xd, 0x1, 0x5), 
-    {  2,  2,  1,"xorc",	{IMM8, CCR,E}, { 0x0, 0x5, IMM8,IGNORE,E}},
-    {  2,  0,1,  "bad 52",	{E, IMM8},		{ 0x5, 0x2, IMM8, IGNORE,E}},
-    {  2,  0,1,  "bad 53",	{E, IMM8},		{ 0x5, 0x3, IMM8, IGNORE,E}},
-    {  2,  0,1,  "bad 57",	{E, IMM8},		{ 0x5, 0x7, IMM8, IGNORE,E}},
-    {  2,  0,1,  "bad 58",	{E, IMM8},		{ 0x5, 0x8, IMM8, IGNORE,E}},
-    {  2,  0,1,  "bad 64",	{E, IMM8},		{ 0x6, 0x4, IMM8, IGNORE,E}},
-    {  2,  0,1,  "bad 65",	{E, IMM8},		{ 0x6, 0x5, IMM8, IGNORE,E}},
-    {  2,  0,1,  "bad 66",	{E, IMM8},		{ 0x6, 0x6, IMM8, IGNORE,E}},
-    {  2,  0,1,  "bad 78",	{E, IMM8},		{ 0x7, 0x8, IMM8, IGNORE,E}},
-    {  2,  0,1,  "bad 7a",	{E, IMM8},		{ 0x7, 0xa, IMM8, IGNORE,E}},
-    {  2,  0,1,  "bad 5c",	{E, IMM8},		{ 0x5, 0xc, IMM8, IGNORE,E}},
+    {  4,  2,13,  "mov.b",	{RS8, ABS16DST, E},	{ Hex6, HexA, Hex8, RS8, ABS16DST,IGNORE,IGNORE,IGNORE, E}},
+    {  2,  2,13,  "mov.b",	{RS8, ABS8DST, E},	{ Hex3, RS8, ABS8DST,IGNORE, E}},
+    {  2,  2,11,  "mov.w",	{RS16|B30, RD16|B30, E},{ Hex0, HexD, RS16|B30, RD16|B30, E}},
+    {  4,  2,11,  "mov.w",	{IMM16, RD16|B30, E},	{ Hex7, Hex9, Hex0, RD16|B30, IMM16,IGNORE,IGNORE,IGNORE, E}},
+    {  2,  2,11,  "mov.w",	{RSIND|B30,RD16|B30, E},{ Hex6, Hex9, RSIND|B30, RD16|B30, E}},
+    {  4,  2,11,  "mov.w",	{DISPSRC,RD16|B30, E},	{ Hex6, HexF, DISPREG|B30, RD16|B30, DISPSRC, IGNORE, IGNORE, IGNORE,E}} ,
+    {  2,  2,11,  "mov.w",	{RSINC|B30, RD16|B30, E},	{ Hex6, HexD, RSINC|B30, RD16|B30, E}},
+    {  4,  2,11,  "mov.w",	{ABS16SRC, RD16|B30, E},	{ Hex6, HexB, Hex0, RD16|B30,ABS16SRC,IGNORE,IGNORE,IGNORE, E}},
+    {  2,  2,11,  "mov.w", 	{RS16|B30, RDIND|B30, E},{ Hex6, Hex9, RDIND|B31, RS16|B30, E}},
+    {  4,  2,11,  "mov.w",	{RS16|B30, DISPDST, E},	{ Hex6, HexF, DISPREG|B31, RS16|B30,DISPDST, IGNORE,IGNORE,IGNORE,E}},
+    {  2,  2,11,  "mov.w",	{RS16|B30, RDDEC|B30, E},{ Hex6, HexD, RDDEC|B31, RS16|B30, E}},
+    {  4,  2,11,  "mov.w",	{RS16|B30, ABS16DST, E},	{ Hex6, HexB, Hex8, RS16|B30, ABS16DST, IGNORE, IGNORE, IGNORE, E}},
+
+
+    {  4,  2,1,  "movfpe",	{ABS16SRC, RD8, E},	{ Hex6, HexA, Hex4, RD8, ABS16SRC,IGNORE,IGNORE,IGNORE, E}},
+    {  4,  2,1,  "movtpe",	{RS8, ABS16DST, E},	{ Hex6, HexA, HexC, RS8, ABS16DST,IGNORE,IGNORE,IGNORE, E}},
+    {  2,  2,1,  "mulxu",	{RS8, RD16|B30, E},	{ Hex5, Hex0, RS8, RD16|B30, E}},
+    {  2,  1,1,  "neg",	{RS8, E},		{ Hex1, Hex7, Hex8, RS8, E}},
+    {  2,  0,1,  "nop",	{E},		{ Hex0, Hex0, Hex0, Hex0,E}},
+    {  2,  1,1,  "not",	{RS8,E},		{ Hex1, Hex7, Hex0, RS8,E}},
+  TWOOP("or", HexC, Hex1, Hex4),
+    {  2,  2,1,    "orc",	{IMM8, CCR,E},	{ Hex0, Hex4, IMM8,IGNORE,E}},
+    {  2,  1,1,  "pop",	{RS16|B30,E},		{ Hex6, HexD, Hex7, RS16|B30,E}},
+    {  2,  1,1,  "push",	{RS16|B30,E},		{ Hex6, HexD, HexF, RS16|B30,E}},
+  UNOP3(  "rotl",Hex1, Hex2,Hex8),
+  UNOP3(  "rotr",Hex1, Hex3, Hex8),
+  UNOP3(  "rotxl",Hex1, Hex2, Hex0),
+  UNOP3(  "rotxr",Hex1, Hex3, Hex0),
+    {  2,  0, 1, "rte",	{E},		{ Hex5, Hex6, Hex7, Hex0,E}},
+    {  2,  0, 1, "rts",	{E},		{ Hex5, Hex4, Hex7, Hex0,E}},
+  UNOP3(   "shal",	Hex1, Hex0, Hex8),
+  UNOP3(    "shar",	Hex1, Hex1, Hex8),
+  UNOP3(    "shll",	Hex1, Hex0, Hex0),
+  UNOP3(    "shlr",	Hex1, Hex1, Hex0),
+    {  2,  0, 1, "sleep",	{E},		{ Hex0, Hex1, Hex8, Hex0,E}},
+    {  2,  2, 1, "stc",	{CCR, RD8,E},	{ Hex0, Hex2, Hex0, RD8,E}},
+    {  2,  2, 1, "sub.b",	{RS8,RD8,E},	{ Hex1, Hex8, RS8, RD8,E}},
+    {  2,  2, 1, "sub.w",	{RS16|B30, RD16|B30,E}, 	{Hex1, Hex9, RS16|B30, RD16|B30,E}},
+    {  2,  2, 1, "subs",	{KBIT,RD16|B30,E},	{ Hex1, HexB, KBIT, RD16|B30,E}},
+  TWOOP("subx",HexB, Hex1, HexE),
+  TWOOP("xor", HexD, Hex1, Hex5), 
+    {  2,  2,  1,"xorc",	{IMM8, CCR,E}, { Hex0, Hex5, IMM8,IGNORE,E}},
+    {  2,  0,1,  "bad 52",	{E, IMM8},		{ Hex5, Hex2, IMM8, IGNORE,E}},
+    {  2,  0,1,  "bad 53",	{E, IMM8},		{ Hex5, Hex3, IMM8, IGNORE,E}},
+    {  2,  0,1,  "bad 57",	{E, IMM8},		{ Hex5, Hex7, IMM8, IGNORE,E}},
+    {  2,  0,1,  "bad 58",	{E, IMM8},		{ Hex5, Hex8, IMM8, IGNORE,E}},
+    {  2,  0,1,  "bad 64",	{E, IMM8},		{ Hex6, Hex4, IMM8, IGNORE,E}},
+    {  2,  0,1,  "bad 65",	{E, IMM8},		{ Hex6, Hex5, IMM8, IGNORE,E}},
+    {  2,  0,1,  "bad 66",	{E, IMM8},		{ Hex6, Hex6, IMM8, IGNORE,E}},
+    {  2,  0,1,  "bad 78",	{E, IMM8},		{ Hex7, Hex8, IMM8, IGNORE,E}},
+    {  2,  0,1,  "bad 7a",	{E, IMM8},		{ Hex7, HexA, IMM8, IGNORE,E}},
+    {  2,  0,1,  "bad 5c",	{E, IMM8},		{ Hex5, HexC, IMM8, IGNORE,E}},
 
   0
   }