* hppa.h (pa_opcodes): Add initializers to silence compiler.

2 files changed, 273 insertions, 271 deletions

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index f9e6c2e..4e4838c 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,5 +1,7 @@
 Thu Sep 23 07:08:38 1999  Jerry Quinn <jquinn@nortelnetworks.com>
 
+	* hppa.h (pa_opcodes): Add initializers to silence compiler.
+
 	* hppa.h: Update comments about character usage.
 
 Mon Sep 20 03:55:31 1999  Jeffrey A Law  (law@cygnus.com)
diff --git a/include/opcode/hppa.h b/include/opcode/hppa.h
index a9a834a..d937985 100644
--- a/include/opcode/hppa.h
+++ b/include/opcode/hppa.h
@@ -267,27 +267,27 @@ static const struct pa_opcode pa_opcodes[] =
 { "b",		0xe8008000, 0xfc00e000, "lMnXL", pa20, FLAG_STRICT},
 { "b",		0xe800a000, 0xfc00e000, "lnXL", pa20, FLAG_STRICT},
 { "b",		0xe8000000, 0xfc00e000, "lnW,b", pa10, FLAG_STRICT},
-{ "b",		0xe8000000, 0xffe0e000, "nW", pa10}, /* bl foo,r0 */
-{ "ldi",	0x34000000, 0xffe0c000, "j,x", pa10},	/* ldo val(r0),r */
-{ "comib", 	0x84000000, 0xfc000000, "?nn5,b,w", pa10}, /* comib{tf}*/
+{ "b",		0xe8000000, 0xffe0e000, "nW", pa10, 0}, /* bl foo,r0 */
+{ "ldi",	0x34000000, 0xffe0c000, "j,x", pa10, 0},/* ldo val(r0),r */
+{ "comib", 	0x84000000, 0xfc000000, "?nn5,b,w", pa10, 0}, /* comib{tf}*/
 /* This entry is for the disassembler only.  It will never be used by
    assembler.  */
-{ "comib", 	0x8c000000, 0xfc000000, "?nn5,b,w", pa10}, /* comib{tf}*/
-{ "comb",	0x80000000, 0xfc000000, "?nnx,b,w", pa10}, /* comb{tf} */
+{ "comib", 	0x8c000000, 0xfc000000, "?nn5,b,w", pa10, 0}, /* comib{tf}*/
+{ "comb",	0x80000000, 0xfc000000, "?nnx,b,w", pa10, 0}, /* comb{tf} */
 /* This entry is for the disassembler only.  It will never be used by
    assembler.  */
-{ "comb",	0x88000000, 0xfc000000, "?nnx,b,w", pa10}, /* comb{tf} */
-{ "addb",	0xa0000000, 0xfc000000, "?@nx,b,w", pa10}, /* addb{tf} */
+{ "comb",	0x88000000, 0xfc000000, "?nnx,b,w", pa10, 0}, /* comb{tf} */
+{ "addb",	0xa0000000, 0xfc000000, "?@nx,b,w", pa10, 0}, /* addb{tf} */
 /* This entry is for the disassembler only.  It will never be used by
    assembler.  */
-{ "addb",	0xa8000000, 0xfc000000, "?@nx,b,w", pa10},
-{ "addib",	0xa4000000, 0xfc000000, "?@n5,b,w", pa10}, /* addib{tf}*/
+{ "addb",	0xa8000000, 0xfc000000, "?@nx,b,w", pa10, 0},
+{ "addib",	0xa4000000, 0xfc000000, "?@n5,b,w", pa10, 0}, /* addib{tf}*/
 /* This entry is for the disassembler only.  It will never be used by
    assembler.  */
-{ "addib",	0xac000000, 0xfc000000, "?@n5,b,w", pa10}, /* addib{tf}*/
-{ "nop",        0x08000240, 0xffffffff, "", pa10},      /* or 0,0,0 */
-{ "copy",       0x08000240, 0xffe0ffe0, "x,t", pa10},   /* or r,0,t */
-{ "mtsar",      0x01601840, 0xffe0ffff, "x", pa10}, /* mtctl r,cr11 */
+{ "addib",	0xac000000, 0xfc000000, "?@n5,b,w", pa10, 0}, /* addib{tf}*/
+{ "nop",        0x08000240, 0xffffffff, "", pa10, 0},      /* or 0,0,0 */
+{ "copy",       0x08000240, 0xffe0ffe0, "x,t", pa10, 0},   /* or r,0,t */
+{ "mtsar",      0x01601840, 0xffe0ffff, "x", pa10, 0}, /* mtctl r,cr11 */
 
 /* Loads and Stores for integer registers.  */
 { "ldd",        0x0c0000c0, 0xfc001fc0, "cxx(s,b),t", pa20, FLAG_STRICT},
@@ -304,21 +304,21 @@ static const struct pa_opcode pa_opcodes[] =
 { "ldw",        0x4c000000, 0xfc000000, "ccJ(b),x", pa10, FLAG_STRICT},
 { "ldw",        0x5c000004, 0xfc000006, "ccK(s,b),x", pa20, FLAG_STRICT},
 { "ldw",        0x5c000004, 0xfc000006, "ccK(b),x", pa20, FLAG_STRICT},
-{ "ldw",        0x48000000, 0xfc000000, "j(s,b),x", pa10},
-{ "ldw",        0x48000000, 0xfc000000, "j(s,b),x", pa10},
-{ "ldw",        0x48000000, 0xfc000000, "j(b),x", pa10},
+{ "ldw",        0x48000000, 0xfc000000, "j(s,b),x", pa10, 0},
+{ "ldw",        0x48000000, 0xfc000000, "j(s,b),x", pa10, 0},
+{ "ldw",        0x48000000, 0xfc000000, "j(b),x", pa10, 0},
 { "ldh",        0x0c000040, 0xfc001fc0, "cxx(s,b),t", pa10, FLAG_STRICT},
 { "ldh",        0x0c000040, 0xfc001fc0, "cxx(b),t", pa10, FLAG_STRICT},
 { "ldh",	0x0c001040, 0xfc001fc0, "cm5(s,b),t", pa10, FLAG_STRICT},
 { "ldh",	0x0c001040, 0xfc001fc0, "cm5(b),t", pa10, FLAG_STRICT},
-{ "ldh",        0x44000000, 0xfc000000, "j(s,b),x", pa10},
-{ "ldh",        0x44000000, 0xfc000000, "j(b),x", pa10},
+{ "ldh",        0x44000000, 0xfc000000, "j(s,b),x", pa10, 0},
+{ "ldh",        0x44000000, 0xfc000000, "j(b),x", pa10, 0},
 { "ldb",        0x0c000000, 0xfc001fc0, "cxx(s,b),t", pa10, FLAG_STRICT},
 { "ldb",        0x0c000000, 0xfc001fc0, "cxx(b),t", pa10, FLAG_STRICT},
 { "ldb",	0x0c001000, 0xfc001fc0, "cm5(s,b),t", pa10, FLAG_STRICT},
 { "ldb",	0x0c001000, 0xfc001fc0, "cm5(b),t", pa10, FLAG_STRICT},
-{ "ldb",        0x40000000, 0xfc000000, "j(s,b),x", pa10},
-{ "ldb",        0x40000000, 0xfc000000, "j(b),x", pa10},
+{ "ldb",        0x40000000, 0xfc000000, "j(s,b),x", pa10, 0},
+{ "ldb",        0x40000000, 0xfc000000, "j(b),x", pa10, 0},
 { "std",	0x0c0012c0, 0xfc001fc0, "cmx,V(s,b)", pa20, FLAG_STRICT},
 { "std",	0x0c0012c0, 0xfc001fc0, "cmx,V(b)", pa20, FLAG_STRICT},
 { "std",        0x70000000, 0xfc000002, "cqx,#(s,b)", pa20, FLAG_STRICT},
@@ -329,26 +329,26 @@ static const struct pa_opcode pa_opcodes[] =
 { "stw",        0x6c000000, 0xfc000000, "ccx,J(b)", pa10, FLAG_STRICT},
 { "stw",        0x7c000004, 0xfc000006, "ccx,K(s,b)", pa20, FLAG_STRICT},
 { "stw",        0x7c000004, 0xfc000006, "ccx,K(b)", pa20, FLAG_STRICT},
-{ "stw",        0x68000000, 0xfc000000, "x,j(s,b)", pa10},
-{ "stw",        0x68000000, 0xfc000000, "x,j(b)", pa10},
+{ "stw",        0x68000000, 0xfc000000, "x,j(s,b)", pa10, 0},
+{ "stw",        0x68000000, 0xfc000000, "x,j(b)", pa10, 0},
 { "sth",	0x0c001240, 0xfc001fc0, "cmx,V(s,b)", pa10, FLAG_STRICT},
 { "sth",	0x0c001240, 0xfc001fc0, "cmx,V(b)", pa10, FLAG_STRICT},
-{ "sth",        0x64000000, 0xfc000000, "x,j(s,b)", pa10},
-{ "sth",        0x64000000, 0xfc000000, "x,j(b)", pa10},
+{ "sth",        0x64000000, 0xfc000000, "x,j(s,b)", pa10, 0},
+{ "sth",        0x64000000, 0xfc000000, "x,j(b)", pa10, 0},
 { "stb",	0x0c001200, 0xfc001fc0, "cmx,V(s,b)", pa10, FLAG_STRICT},
 { "stb",	0x0c001200, 0xfc001fc0, "cmx,V(b)", pa10, FLAG_STRICT},
-{ "stb",        0x60000000, 0xfc000000, "x,j(s,b)", pa10},
-{ "stb",        0x60000000, 0xfc000000, "x,j(b)", pa10},
-{ "ldwm",       0x4c000000, 0xfc000000, "j(s,b),x", pa10},
-{ "ldwm",       0x4c000000, 0xfc000000, "j(b),x", pa10},
-{ "stwm",       0x6c000000, 0xfc000000, "x,j(s,b)", pa10},
-{ "stwm",       0x6c000000, 0xfc000000, "x,j(b)", pa10},
-{ "ldwx",       0x0c000080, 0xfc001fc0, "cxx(s,b),t", pa10},
-{ "ldwx",       0x0c000080, 0xfc001fc0, "cxx(b),t", pa10},
-{ "ldhx",       0x0c000040, 0xfc001fc0, "cxx(s,b),t", pa10},
-{ "ldhx",       0x0c000040, 0xfc001fc0, "cxx(b),t", pa10},
-{ "ldbx",       0x0c000000, 0xfc001fc0, "cxx(s,b),t", pa10},
-{ "ldbx",       0x0c000000, 0xfc001fc0, "cxx(b),t", pa10},
+{ "stb",        0x60000000, 0xfc000000, "x,j(s,b)", pa10, 0},
+{ "stb",        0x60000000, 0xfc000000, "x,j(b)", pa10, 0},
+{ "ldwm",       0x4c000000, 0xfc000000, "j(s,b),x", pa10, 0},
+{ "ldwm",       0x4c000000, 0xfc000000, "j(b),x", pa10, 0},
+{ "stwm",       0x6c000000, 0xfc000000, "x,j(s,b)", pa10, 0},
+{ "stwm",       0x6c000000, 0xfc000000, "x,j(b)", pa10, 0},
+{ "ldwx",       0x0c000080, 0xfc001fc0, "cxx(s,b),t", pa10, 0},
+{ "ldwx",       0x0c000080, 0xfc001fc0, "cxx(b),t", pa10, 0},
+{ "ldhx",       0x0c000040, 0xfc001fc0, "cxx(s,b),t", pa10, 0},
+{ "ldhx",       0x0c000040, 0xfc001fc0, "cxx(b),t", pa10, 0},
+{ "ldbx",       0x0c000000, 0xfc001fc0, "cxx(s,b),t", pa10, 0},
+{ "ldbx",       0x0c000000, 0xfc001fc0, "cxx(b),t", pa10, 0},
 { "ldwa",       0x0c000180, 0xfc00dfc0, "cxx(b),t", pa10, FLAG_STRICT},
 { "ldwa",	0x0c001180, 0xfc00dfc0, "cm5(b),t", pa10, FLAG_STRICT},
 { "ldcw",       0x0c0001c0, 0xfc001fc0, "cxx(s,b),t", pa10, FLAG_STRICT},
@@ -366,65 +366,65 @@ static const struct pa_opcode pa_opcodes[] =
 { "ldcd",	0x0c001140, 0xfc001fc0, "cm5(b),t", pa20, FLAG_STRICT},
 { "stda",	0x0c0013c0, 0xfc001fc0, "cmx,V(s,b)", pa20, FLAG_STRICT},
 { "stda",	0x0c0013c0, 0xfc001fc0, "cmx,V(b)", pa20, FLAG_STRICT},
-{ "ldwax",      0x0c000180, 0xfc00dfc0, "cxx(b),t", pa10},
-{ "ldcwx",      0x0c0001c0, 0xfc001fc0, "cxx(s,b),t", pa10},
-{ "ldcwx",      0x0c0001c0, 0xfc001fc0, "cxx(b),t", pa10},
-{ "ldws",	0x0c001080, 0xfc001fc0, "cm5(s,b),t", pa10},
-{ "ldws",	0x0c001080, 0xfc001fc0, "cm5(b),t", pa10},
-{ "ldhs",	0x0c001040, 0xfc001fc0, "cm5(s,b),t", pa10},
-{ "ldhs",	0x0c001040, 0xfc001fc0, "cm5(b),t", pa10},
-{ "ldbs",	0x0c001000, 0xfc001fc0, "cm5(s,b),t", pa10},
-{ "ldbs",	0x0c001000, 0xfc001fc0, "cm5(b),t", pa10},
-{ "ldwas",	0x0c001180, 0xfc00dfc0, "cm5(b),t", pa10},
-{ "ldcws",	0x0c0011c0, 0xfc001fc0, "cm5(s,b),t", pa10},
-{ "ldcws",	0x0c0011c0, 0xfc001fc0, "cm5(b),t", pa10},
-{ "stws",	0x0c001280, 0xfc001fc0, "cmx,V(s,b)", pa10},
-{ "stws",	0x0c001280, 0xfc001fc0, "cmx,V(b)", pa10},
-{ "sths",	0x0c001240, 0xfc001fc0, "cmx,V(s,b)", pa10},
-{ "sths",	0x0c001240, 0xfc001fc0, "cmx,V(b)", pa10},
-{ "stbs",	0x0c001200, 0xfc001fc0, "cmx,V(s,b)", pa10},
-{ "stbs",	0x0c001200, 0xfc001fc0, "cmx,V(b)", pa10},
-{ "stwas",	0x0c001380, 0xfc00dfc0, "cmx,V(b)", pa10},
+{ "ldwax",      0x0c000180, 0xfc00dfc0, "cxx(b),t", pa10, 0},
+{ "ldcwx",      0x0c0001c0, 0xfc001fc0, "cxx(s,b),t", pa10, 0},
+{ "ldcwx",      0x0c0001c0, 0xfc001fc0, "cxx(b),t", pa10, 0},
+{ "ldws",	0x0c001080, 0xfc001fc0, "cm5(s,b),t", pa10, 0},
+{ "ldws",	0x0c001080, 0xfc001fc0, "cm5(b),t", pa10, 0},
+{ "ldhs",	0x0c001040, 0xfc001fc0, "cm5(s,b),t", pa10, 0},
+{ "ldhs",	0x0c001040, 0xfc001fc0, "cm5(b),t", pa10, 0},
+{ "ldbs",	0x0c001000, 0xfc001fc0, "cm5(s,b),t", pa10, 0},
+{ "ldbs",	0x0c001000, 0xfc001fc0, "cm5(b),t", pa10, 0},
+{ "ldwas",	0x0c001180, 0xfc00dfc0, "cm5(b),t", pa10, 0},
+{ "ldcws",	0x0c0011c0, 0xfc001fc0, "cm5(s,b),t", pa10, 0},
+{ "ldcws",	0x0c0011c0, 0xfc001fc0, "cm5(b),t", pa10, 0},
+{ "stws",	0x0c001280, 0xfc001fc0, "cmx,V(s,b)", pa10, 0},
+{ "stws",	0x0c001280, 0xfc001fc0, "cmx,V(b)", pa10, 0},
+{ "sths",	0x0c001240, 0xfc001fc0, "cmx,V(s,b)", pa10, 0},
+{ "sths",	0x0c001240, 0xfc001fc0, "cmx,V(b)", pa10, 0},
+{ "stbs",	0x0c001200, 0xfc001fc0, "cmx,V(s,b)", pa10, 0},
+{ "stbs",	0x0c001200, 0xfc001fc0, "cmx,V(b)", pa10, 0},
+{ "stwas",	0x0c001380, 0xfc00dfc0, "cmx,V(b)", pa10, 0},
 { "stdby",	0x0c001340, 0xfc001fc0, "csx,V(s,b)", pa20, FLAG_STRICT},
 { "stdby",	0x0c001340, 0xfc001fc0, "csx,V(b)", pa20, FLAG_STRICT},
-{ "stbys",	0x0c001300, 0xfc001fc0, "csx,V(s,b)", pa10},
-{ "stbys",	0x0c001300, 0xfc001fc0, "csx,V(b)", pa10},
+{ "stbys",	0x0c001300, 0xfc001fc0, "csx,V(s,b)", pa10, 0},
+{ "stbys",	0x0c001300, 0xfc001fc0, "csx,V(b)", pa10, 0},
 
 /* Immediate instructions.  */
-{ "ldo",	0x34000000, 0xfc00c000, "j(b),x", pa10},
-{ "ldil",	0x20000000, 0xfc000000, "k,b", pa10},
-{ "addil",	0x28000000, 0xfc000000, "k,b,Z", pa10},
-{ "addil",	0x28000000, 0xfc000000, "k,b", pa10},
+{ "ldo",	0x34000000, 0xfc00c000, "j(b),x", pa10, 0},
+{ "ldil",	0x20000000, 0xfc000000, "k,b", pa10, 0},
+{ "addil",	0x28000000, 0xfc000000, "k,b,Z", pa10, 0},
+{ "addil",	0x28000000, 0xfc000000, "k,b", pa10, 0},
 
 /* Branching instructions. */
-{ "bl",		0xe8000000, 0xfc00e000, "nW,b", pa10},
-{ "gate",	0xe8002000, 0xfc00e000, "nW,b", pa10},
-{ "blr",	0xe8004000, 0xfc00e001, "nx,b", pa10},
-{ "bv",		0xe800c000, 0xfc00fffd, "nx(b)", pa10},
-{ "bv",		0xe800c000, 0xfc00fffd, "n(b)", pa10},
+{ "bl",		0xe8000000, 0xfc00e000, "nW,b", pa10, 0},
+{ "gate",	0xe8002000, 0xfc00e000, "nW,b", pa10, 0},
+{ "blr",	0xe8004000, 0xfc00e001, "nx,b", pa10, 0},
+{ "bv",		0xe800c000, 0xfc00fffd, "nx(b)", pa10, 0},
+{ "bv",		0xe800c000, 0xfc00fffd, "n(b)", pa10, 0},
 { "bve",	0xe800f001, 0xfc00ffff, "lMn(b)L", pa20, FLAG_STRICT},
 { "bve",	0xe800f000, 0xfc00ffff, "ln(b)L", pa20, FLAG_STRICT},
 { "bve",	0xe800d001, 0xfc00ffff, "Bn(b)", pa20, FLAG_STRICT},
 { "bve",	0xe800d000, 0xfc00ffff, "n(b)", pa20, FLAG_STRICT},
 { "be",		0xe4000000, 0xfc000000, "lnz(S,b)", pa10, FLAG_STRICT},
 { "be",		0xe0000000, 0xfc000000, "nz(S,b)", pa10, FLAG_STRICT},
-{ "be",		0xe0000000, 0xfc000000, "nz(S,b)", pa10},
-{ "ble",	0xe4000000, 0xfc000000, "nz(S,b)", pa10},
-{ "movb",	0xc8000000, 0xfc000000, "?ynx,b,w", pa10},
-{ "movib",	0xcc000000, 0xfc000000, "?yn5,b,w", pa10},
-{ "combt",	0x80000000, 0xfc000000, "?tnx,b,w", pa10},
-{ "combf",	0x88000000, 0xfc000000, "?tnx,b,w", pa10},
-{ "comibt",	0x84000000, 0xfc000000, "?tn5,b,w", pa10},
-{ "comibf",	0x8c000000, 0xfc000000, "?tn5,b,w", pa10},
-{ "addbt",	0xa0000000, 0xfc000000, "?dnx,b,w", pa10},
-{ "addbf",	0xa8000000, 0xfc000000, "?dnx,b,w", pa10},
-{ "addibt",	0xa4000000, 0xfc000000, "?dn5,b,w", pa10},
-{ "addibf",	0xac000000, 0xfc000000, "?dn5,b,w", pa10},
+{ "be",		0xe0000000, 0xfc000000, "nz(S,b)", pa10, 0},
+{ "ble",	0xe4000000, 0xfc000000, "nz(S,b)", pa10, 0},
+{ "movb",	0xc8000000, 0xfc000000, "?ynx,b,w", pa10, 0},
+{ "movib",	0xcc000000, 0xfc000000, "?yn5,b,w", pa10, 0},
+{ "combt",	0x80000000, 0xfc000000, "?tnx,b,w", pa10, 0},
+{ "combf",	0x88000000, 0xfc000000, "?tnx,b,w", pa10, 0},
+{ "comibt",	0x84000000, 0xfc000000, "?tn5,b,w", pa10, 0},
+{ "comibf",	0x8c000000, 0xfc000000, "?tn5,b,w", pa10, 0},
+{ "addbt",	0xa0000000, 0xfc000000, "?dnx,b,w", pa10, 0},
+{ "addbf",	0xa8000000, 0xfc000000, "?dnx,b,w", pa10, 0},
+{ "addibt",	0xa4000000, 0xfc000000, "?dn5,b,w", pa10, 0},
+{ "addibf",	0xac000000, 0xfc000000, "?dn5,b,w", pa10, 0},
 { "bb",		0xc0006000, 0xffe06000, "?Bnx,!,w", pa20, FLAG_STRICT}, 
 { "bb",		0xc4006000, 0xfc006000, "?Bnx,Q,w", pa20, FLAG_STRICT}, 
 { "bb",		0xc0004000, 0xffe06000, "?bnx,!,w", pa10, FLAG_STRICT}, 
-{ "bb",		0xc4004000, 0xfc004000, "?bnx,Q,w", pa10}, 
-{ "bvb",	0xc0004000, 0xffe04000, "?bnx,w", pa10},
+{ "bb",		0xc4004000, 0xfc004000, "?bnx,Q,w", pa10, 0}, 
+{ "bvb",	0xc0004000, 0xffe04000, "?bnx,w", pa10, 0},
 { "clrbts",	0xe8004005, 0xffffffff, "", pa20, FLAG_STRICT},
 { "popbts",	0xe8004005, 0xfffff007, "$", pa20, FLAG_STRICT},
 { "pushnom",	0xe8004001, 0xffffffff, "", pa20, FLAG_STRICT},
@@ -434,70 +434,70 @@ static const struct pa_opcode pa_opcodes[] =
 
 { "cmpclr",     0x080008a0, 0xfc000fe0, "?Sx,b,t", pa20, FLAG_STRICT},
 { "cmpclr",     0x08000880, 0xfc000fe0, "?sx,b,t", pa10, FLAG_STRICT},
-{ "comclr",     0x08000880, 0xfc000fe0, "?sx,b,t", pa10},
+{ "comclr",     0x08000880, 0xfc000fe0, "?sx,b,t", pa10, 0},
 { "or",         0x08000260, 0xfc000fe0, "?Lx,b,t", pa20, FLAG_STRICT},
-{ "or",         0x08000240, 0xfc000fe0, "?lx,b,t", pa10},
+{ "or",         0x08000240, 0xfc000fe0, "?lx,b,t", pa10, 0},
 { "xor",        0x080002a0, 0xfc000fe0, "?Lx,b,t", pa20, FLAG_STRICT},
-{ "xor",        0x08000280, 0xfc000fe0, "?lx,b,t", pa10},
+{ "xor",        0x08000280, 0xfc000fe0, "?lx,b,t", pa10, 0},
 { "and",        0x08000220, 0xfc000fe0, "?Lx,b,t", pa20, FLAG_STRICT},
-{ "and",        0x08000200, 0xfc000fe0, "?lx,b,t", pa10},
+{ "and",        0x08000200, 0xfc000fe0, "?lx,b,t", pa10, 0},
 { "andcm",      0x08000020, 0xfc000fe0, "?Lx,b,t", pa20, FLAG_STRICT},
-{ "andcm",      0x08000000, 0xfc000fe0, "?lx,b,t", pa10},
+{ "andcm",      0x08000000, 0xfc000fe0, "?lx,b,t", pa10, 0},
 { "uxor",       0x080003a0, 0xfc000fe0, "?Ux,b,t", pa20, FLAG_STRICT},
-{ "uxor",       0x08000380, 0xfc000fe0, "?ux,b,t", pa10},
+{ "uxor",       0x08000380, 0xfc000fe0, "?ux,b,t", pa10, 0},
 { "uaddcm",     0x080009a0, 0xfc000fa0, "cT?Ux,b,t", pa20, FLAG_STRICT},
 { "uaddcm",     0x08000980, 0xfc000fa0, "cT?ux,b,t", pa10, FLAG_STRICT},
-{ "uaddcm",     0x08000980, 0xfc000fe0, "?ux,b,t", pa10},
-{ "uaddcmt",    0x080009c0, 0xfc000fe0, "?ux,b,t", pa10},
+{ "uaddcm",     0x08000980, 0xfc000fe0, "?ux,b,t", pa10, 0},
+{ "uaddcmt",    0x080009c0, 0xfc000fe0, "?ux,b,t", pa10, 0},
 { "dcor",       0x08000ba0, 0xfc1f0fa0, "ci?Ub,t", pa20, FLAG_STRICT},
 { "dcor",       0x08000b80, 0xfc1f0fa0, "ci?ub,t", pa10, FLAG_STRICT},
-{ "dcor",       0x08000b80, 0xfc1f0fe0, "?ub,t",   pa10},
-{ "idcor",      0x08000bc0, 0xfc1f0fe0, "?ub,t",   pa10},
+{ "dcor",       0x08000b80, 0xfc1f0fe0, "?ub,t",   pa10, 0},
+{ "idcor",      0x08000bc0, 0xfc1f0fe0, "?ub,t",   pa10, 0},
 { "addi",       0xb0000000, 0xfc000000, "ct?ai,b,x", pa10, FLAG_STRICT},
 { "addi",       0xb4000000, 0xfc000000, "cv?ai,b,x", pa10, FLAG_STRICT},
-{ "addi",       0xb4000000, 0xfc000800, "?ai,b,x", pa10},
-{ "addio",      0xb4000800, 0xfc000800, "?ai,b,x", pa10},
-{ "addit",      0xb0000000, 0xfc000800, "?ai,b,x", pa10},
-{ "addito",     0xb0000800, 0xfc000800, "?ai,b,x", pa10},
+{ "addi",       0xb4000000, 0xfc000800, "?ai,b,x", pa10, 0},
+{ "addio",      0xb4000800, 0xfc000800, "?ai,b,x", pa10, 0},
+{ "addit",      0xb0000000, 0xfc000800, "?ai,b,x", pa10, 0},
+{ "addito",     0xb0000800, 0xfc000800, "?ai,b,x", pa10, 0},
 { "add",        0x08000720, 0xfc0007e0, "cY?Ax,b,t", pa20, FLAG_STRICT},
 { "add",        0x08000700, 0xfc0007e0, "cy?ax,b,t", pa10, FLAG_STRICT},
 { "add",        0x08000220, 0xfc0003e0, "ca?Ax,b,t", pa20, FLAG_STRICT},
 { "add",        0x08000200, 0xfc0003e0, "ca?ax,b,t", pa10, FLAG_STRICT},
-{ "add",        0x08000600, 0xfc000fe0, "?ax,b,t", pa10},
-{ "addl",       0x08000a00, 0xfc000fe0, "?ax,b,t", pa10},
-{ "addo",       0x08000e00, 0xfc000fe0, "?ax,b,t", pa10},
-{ "addc",       0x08000700, 0xfc000fe0, "?ax,b,t", pa10},
-{ "addco",      0x08000f00, 0xfc000fe0, "?ax,b,t", pa10},
+{ "add",        0x08000600, 0xfc000fe0, "?ax,b,t", pa10, 0},
+{ "addl",       0x08000a00, 0xfc000fe0, "?ax,b,t", pa10, 0},
+{ "addo",       0x08000e00, 0xfc000fe0, "?ax,b,t", pa10, 0},
+{ "addc",       0x08000700, 0xfc000fe0, "?ax,b,t", pa10, 0},
+{ "addco",      0x08000f00, 0xfc000fe0, "?ax,b,t", pa10, 0},
 { "sub",        0x080004e0, 0xfc0007e0, "ct?Sx,b,t", pa20, FLAG_STRICT},
 { "sub",        0x080004c0, 0xfc0007e0, "ct?sx,b,t", pa10, FLAG_STRICT},
 { "sub",        0x08000520, 0xfc0007e0, "cB?Sx,b,t", pa20, FLAG_STRICT},
 { "sub",        0x08000500, 0xfc0007e0, "cb?sx,b,t", pa10, FLAG_STRICT},
 { "sub",        0x08000420, 0xfc0007e0, "cv?Sx,b,t", pa20, FLAG_STRICT},
 { "sub",        0x08000400, 0xfc0007e0, "cv?sx,b,t", pa10, FLAG_STRICT},
-{ "sub",        0x08000400, 0xfc000fe0, "?sx,b,t", pa10},
-{ "subo",       0x08000c00, 0xfc000fe0, "?sx,b,t", pa10},
-{ "subb",       0x08000500, 0xfc000fe0, "?sx,b,t", pa10},
-{ "subbo",      0x08000d00, 0xfc000fe0, "?sx,b,t", pa10},
-{ "subt",       0x080004c0, 0xfc000fe0, "?sx,b,t", pa10},
-{ "subto",      0x08000cc0, 0xfc000fe0, "?sx,b,t", pa10},
-{ "ds",         0x08000440, 0xfc000fe0, "?sx,b,t", pa10},
+{ "sub",        0x08000400, 0xfc000fe0, "?sx,b,t", pa10, 0},
+{ "subo",       0x08000c00, 0xfc000fe0, "?sx,b,t", pa10, 0},
+{ "subb",       0x08000500, 0xfc000fe0, "?sx,b,t", pa10, 0},
+{ "subbo",      0x08000d00, 0xfc000fe0, "?sx,b,t", pa10, 0},
+{ "subt",       0x080004c0, 0xfc000fe0, "?sx,b,t", pa10, 0},
+{ "subto",      0x08000cc0, 0xfc000fe0, "?sx,b,t", pa10, 0},
+{ "ds",         0x08000440, 0xfc000fe0, "?sx,b,t", pa10, 0},
 { "subi",       0x94000000, 0xfc000000, "cv?si,b,x", pa10, FLAG_STRICT},
-{ "subi",       0x94000000, 0xfc000800, "?si,b,x", pa10},
-{ "subio",      0x94000800, 0xfc000800, "?si,b,x", pa10},
+{ "subi",       0x94000000, 0xfc000800, "?si,b,x", pa10, 0},
+{ "subio",      0x94000800, 0xfc000800, "?si,b,x", pa10, 0},
 { "cmpiclr",    0x90000800, 0xfc000800, "?Si,b,x", pa20, FLAG_STRICT},
 { "cmpiclr",    0x90000000, 0xfc000800, "?si,b,x", pa10, FLAG_STRICT},
-{ "comiclr",    0x90000000, 0xfc000800, "?si,b,x", pa10},
+{ "comiclr",    0x90000000, 0xfc000800, "?si,b,x", pa10, 0},
 { "shladd",     0x08000220, 0xfc000320, "ca?Ax,.,b,t", pa20, FLAG_STRICT},
 { "shladd",     0x08000200, 0xfc000320, "ca?ax,.,b,t", pa10, FLAG_STRICT},
-{ "sh1add",     0x08000640, 0xfc000fe0, "?ax,b,t", pa10},
-{ "sh1addl",    0x08000a40, 0xfc000fe0, "?ax,b,t", pa10},
-{ "sh1addo",    0x08000e40, 0xfc000fe0, "?ax,b,t", pa10},
-{ "sh2add",     0x08000680, 0xfc000fe0, "?ax,b,t", pa10},
-{ "sh2addl",    0x08000a80, 0xfc000fe0, "?ax,b,t", pa10},
-{ "sh2addo",    0x08000e80, 0xfc000fe0, "?ax,b,t", pa10},
-{ "sh3add",     0x080006c0, 0xfc000fe0, "?ax,b,t", pa10},
-{ "sh3addl",    0x08000ac0, 0xfc000fe0, "?ax,b,t", pa10},
-{ "sh3addo",    0x08000ec0, 0xfc000fe0, "?ax,b,t", pa10},
+{ "sh1add",     0x08000640, 0xfc000fe0, "?ax,b,t", pa10, 0},
+{ "sh1addl",    0x08000a40, 0xfc000fe0, "?ax,b,t", pa10, 0},
+{ "sh1addo",    0x08000e40, 0xfc000fe0, "?ax,b,t", pa10, 0},
+{ "sh2add",     0x08000680, 0xfc000fe0, "?ax,b,t", pa10, 0},
+{ "sh2addl",    0x08000a80, 0xfc000fe0, "?ax,b,t", pa10, 0},
+{ "sh2addo",    0x08000e80, 0xfc000fe0, "?ax,b,t", pa10, 0},
+{ "sh3add",     0x080006c0, 0xfc000fe0, "?ax,b,t", pa10, 0},
+{ "sh3addl",    0x08000ac0, 0xfc000fe0, "?ax,b,t", pa10, 0},
+{ "sh3addo",    0x08000ec0, 0xfc000fe0, "?ax,b,t", pa10, 0},
 
 /* Subword Operation Instructions */
 
@@ -519,16 +519,16 @@ static const struct pa_opcode pa_opcodes[] =
 { "shrpd",      0xd0000400, 0xfc001400, "?Xx,b,~,t", pa20, FLAG_STRICT},
 { "shrpw",      0xd0000000, 0xfc001fe0, "?xx,b,!,t", pa10, FLAG_STRICT},
 { "shrpw",      0xd0000800, 0xfc001c00, "?xx,b,p,t", pa10, FLAG_STRICT},
-{ "vshd",       0xd0000000, 0xfc001fe0, "?xx,b,t", pa10},
-{ "shd",        0xd0000800, 0xfc001c00, "?xx,b,p,t", pa10},
+{ "vshd",       0xd0000000, 0xfc001fe0, "?xx,b,t", pa10, 0},
+{ "shd",        0xd0000800, 0xfc001c00, "?xx,b,p,t", pa10, 0},
 { "extrd",      0xd0001200, 0xfc001ae0, "cS?Xb,!,%,x", pa20, FLAG_STRICT},
 { "extrd",      0xd8000000, 0xfc000000, "cS?Xb,q,|,x", pa20, FLAG_STRICT},
 { "extrw",      0xd0001000, 0xfc001be0, "cS?xb,!,T,x", pa10, FLAG_STRICT},
 { "extrw",      0xd0001800, 0xfc001800, "cS?xb,P,T,x", pa10, FLAG_STRICT},
-{ "vextru",     0xd0001000, 0xfc001fe0, "?xb,T,x", pa10},
-{ "vextrs",     0xd0001400, 0xfc001fe0, "?xb,T,x", pa10},
-{ "extru",      0xd0001800, 0xfc001c00, "?xb,P,T,x", pa10},
-{ "extrs",      0xd0001c00, 0xfc001c00, "?xb,P,T,x", pa10},
+{ "vextru",     0xd0001000, 0xfc001fe0, "?xb,T,x", pa10, 0},
+{ "vextrs",     0xd0001400, 0xfc001fe0, "?xb,T,x", pa10, 0},
+{ "extru",      0xd0001800, 0xfc001c00, "?xb,P,T,x", pa10, 0},
+{ "extrs",      0xd0001c00, 0xfc001c00, "?xb,P,T,x", pa10, 0},
 { "depd",       0xd4000200, 0xfc001ae0, "cz?Xx,!,%,b", pa20, FLAG_STRICT},
 { "depd",       0xf0000000, 0xfc000000, "cz?Xx,~,|,b", pa20, FLAG_STRICT},
 { "depdi",      0xd4001200, 0xfc001ae0, "cz?X5,!,%,b", pa20, FLAG_STRICT},
@@ -537,105 +537,105 @@ static const struct pa_opcode pa_opcodes[] =
 { "depw",       0xd4000800, 0xfc001800, "cz?xx,p,T,b", pa10, FLAG_STRICT},
 { "depwi",      0xd4001000, 0xfc001be0, "cz?x5,!,T,b", pa10, FLAG_STRICT},
 { "depwi",      0xd4001800, 0xfc001800, "cz?x5,p,T,b", pa10, FLAG_STRICT},
-{ "zvdep",      0xd4000000, 0xfc001fe0, "?xx,T,b", pa10},
-{ "vdep",       0xd4000400, 0xfc001fe0, "?xx,T,b", pa10},
-{ "zdep",       0xd4000800, 0xfc001c00, "?xx,p,T,b", pa10},
-{ "dep",        0xd4000c00, 0xfc001c00, "?xx,p,T,b", pa10},
-{ "zvdepi",     0xd4001000, 0xfc001fe0, "?x5,T,b", pa10},
-{ "vdepi",      0xd4001400, 0xfc001fe0, "?x5,T,b", pa10},
-{ "zdepi",      0xd4001800, 0xfc001c00, "?x5,p,T,b", pa10},
-{ "depi",       0xd4001c00, 0xfc001c00, "?x5,p,T,b", pa10},
+{ "zvdep",      0xd4000000, 0xfc001fe0, "?xx,T,b", pa10, 0},
+{ "vdep",       0xd4000400, 0xfc001fe0, "?xx,T,b", pa10, 0},
+{ "zdep",       0xd4000800, 0xfc001c00, "?xx,p,T,b", pa10, 0},
+{ "dep",        0xd4000c00, 0xfc001c00, "?xx,p,T,b", pa10, 0},
+{ "zvdepi",     0xd4001000, 0xfc001fe0, "?x5,T,b", pa10, 0},
+{ "vdepi",      0xd4001400, 0xfc001fe0, "?x5,T,b", pa10, 0},
+{ "zdepi",      0xd4001800, 0xfc001c00, "?x5,p,T,b", pa10, 0},
+{ "depi",       0xd4001c00, 0xfc001c00, "?x5,p,T,b", pa10, 0},
 
 /* System Control Instructions */
 
-{ "break",      0x00000000, 0xfc001fe0, "r,A", pa10},
+{ "break",      0x00000000, 0xfc001fe0, "r,A", pa10, 0},
 { "rfi",        0x00000c00, 0xffffff1f, "cr", pa10, FLAG_STRICT},
-{ "rfi",        0x00000c00, 0xffffffff, "", pa10},
-{ "rfir",       0x00000ca0, 0xffffffff, "", pa11},
+{ "rfi",        0x00000c00, 0xffffffff, "", pa10, 0},
+{ "rfir",       0x00000ca0, 0xffffffff, "", pa11, 0},
 { "ssm",        0x00000d60, 0xfc00ffe0, "U,t", pa20, FLAG_STRICT},
-{ "ssm",        0x00000d60, 0xffe0ffe0, "R,t", pa10},
+{ "ssm",        0x00000d60, 0xffe0ffe0, "R,t", pa10, 0},
 { "rsm",        0x00000e60, 0xfc00ffe0, "U,t", pa20, FLAG_STRICT},
-{ "rsm",        0x00000e60, 0xffe0ffe0, "R,t", pa10},
-{ "mtsm",       0x00001860, 0xffe0ffff, "x", pa10},
-{ "ldsid",      0x000010a0, 0xfc1f3fe0, "(s,b),t", pa10},
-{ "ldsid",      0x000010a0, 0xfc1f3fe0, "(b),t", pa10},
-{ "mtsp",       0x00001820, 0xffe01fff, "x,S", pa10},
-{ "mtctl",      0x00001840, 0xfc00ffff, "x,^", pa10},
+{ "rsm",        0x00000e60, 0xffe0ffe0, "R,t", pa10, 0},
+{ "mtsm",       0x00001860, 0xffe0ffff, "x", pa10, 0},
+{ "ldsid",      0x000010a0, 0xfc1f3fe0, "(s,b),t", pa10, 0},
+{ "ldsid",      0x000010a0, 0xfc1f3fe0, "(b),t", pa10, 0},
+{ "mtsp",       0x00001820, 0xffe01fff, "x,S", pa10, 0},
+{ "mtctl",      0x00001840, 0xfc00ffff, "x,^", pa10, 0},
 { "mtsarcm",    0x016018C0, 0xffe0ffff, "x", pa20, FLAG_STRICT},
 { "mfia",       0x000014A0, 0xffffffe0, "t", pa20, FLAG_STRICT},
-{ "mfsp",       0x000004a0, 0xffff1fe0, "S,t", pa10},
+{ "mfsp",       0x000004a0, 0xffff1fe0, "S,t", pa10, 0},
 { "mfctl",      0x016048a0, 0xffffffe0, "cW!,t", pa20, FLAG_STRICT},
-{ "mfctl",      0x000008a0, 0xfc1fffe0, "^,t", pa10},
-{ "sync",       0x00000400, 0xffffffff, "", pa10},
-{ "syncdma",    0x00100400, 0xffffffff, "", pa10},
+{ "mfctl",      0x000008a0, 0xfc1fffe0, "^,t", pa10, 0},
+{ "sync",       0x00000400, 0xffffffff, "", pa10, 0},
+{ "syncdma",    0x00100400, 0xffffffff, "", pa10, 0},
 { "probe",      0x04001180, 0xfc003fa0, "cw(s,b),x,t", pa10, FLAG_STRICT},
 { "probe",      0x04001180, 0xfc003fa0, "cw(b),x,t", pa10, FLAG_STRICT},
 { "probei",     0x04003180, 0xfc003fa0, "cw(s,b),R,t", pa10, FLAG_STRICT},
 { "probei",     0x04003180, 0xfc003fa0, "cw(b),R,t", pa10, FLAG_STRICT},
-{ "prober",     0x04001180, 0xfc003fe0, "(s,b),x,t", pa10},
-{ "prober",     0x04001180, 0xfc003fe0, "(b),x,t", pa10},
-{ "proberi",    0x04003180, 0xfc003fe0, "(s,b),R,t", pa10},
-{ "proberi",    0x04003180, 0xfc003fe0, "(b),R,t", pa10},
-{ "probew",     0x040011c0, 0xfc003fe0, "(s,b),x,t", pa10},
-{ "probew",     0x040011c0, 0xfc003fe0, "(b),x,t", pa10},
-{ "probewi",    0x040031c0, 0xfc003fe0, "(s,b),R,t", pa10},
-{ "probewi",    0x040031c0, 0xfc003fe0, "(b),R,t", pa10},
-{ "lpa",        0x04001340, 0xfc003fc0, "cZx(s,b),t", pa10},
-{ "lpa",        0x04001340, 0xfc003fc0, "cZx(b),t", pa10},
-{ "lha",        0x04001300, 0xfc003fc0, "cZx(s,b),t", pa10},
-{ "lha",        0x04001300, 0xfc003fc0, "cZx(b),t", pa10},
-{ "lci",        0x04001300, 0xfc003fe0, "x(s,b),t", pa10},
-{ "lci",        0x04001300, 0xfc003fe0, "x(b),t", pa10},
+{ "prober",     0x04001180, 0xfc003fe0, "(s,b),x,t", pa10, 0},
+{ "prober",     0x04001180, 0xfc003fe0, "(b),x,t", pa10, 0},
+{ "proberi",    0x04003180, 0xfc003fe0, "(s,b),R,t", pa10, 0},
+{ "proberi",    0x04003180, 0xfc003fe0, "(b),R,t", pa10, 0},
+{ "probew",     0x040011c0, 0xfc003fe0, "(s,b),x,t", pa10, 0},
+{ "probew",     0x040011c0, 0xfc003fe0, "(b),x,t", pa10, 0},
+{ "probewi",    0x040031c0, 0xfc003fe0, "(s,b),R,t", pa10, 0},
+{ "probewi",    0x040031c0, 0xfc003fe0, "(b),R,t", pa10, 0},
+{ "lpa",        0x04001340, 0xfc003fc0, "cZx(s,b),t", pa10, 0},
+{ "lpa",        0x04001340, 0xfc003fc0, "cZx(b),t", pa10, 0},
+{ "lha",        0x04001300, 0xfc003fc0, "cZx(s,b),t", pa10, 0},
+{ "lha",        0x04001300, 0xfc003fc0, "cZx(b),t", pa10, 0},
+{ "lci",        0x04001300, 0xfc003fe0, "x(s,b),t", pa10, 0},
+{ "lci",        0x04001300, 0xfc003fe0, "x(b),t", pa10, 0},
 { "pdtlb",      0x04001600, 0xfc003fdf, "cLcZx(s,b)", pa20, FLAG_STRICT},
 { "pdtlb",      0x04001600, 0xfc003fdf, "cLcZx(b)", pa20, FLAG_STRICT},
-{ "pdtlb",      0x04001200, 0xfc003fdf, "cZx(s,b)", pa10},
-{ "pdtlb",      0x04001200, 0xfc003fdf, "cZx(b)", pa10},
+{ "pdtlb",      0x04001200, 0xfc003fdf, "cZx(s,b)", pa10, 0},
+{ "pdtlb",      0x04001200, 0xfc003fdf, "cZx(b)", pa10, 0},
 { "pitlb",      0x04000600, 0xfc001fdf, "cLcZx(S,b)", pa20, FLAG_STRICT},
 { "pitlb",      0x04000600, 0xfc001fdf, "cLcZx(b)", pa20, FLAG_STRICT},
-{ "pitlb",      0x04000200, 0xfc001fdf, "cZx(S,b)", pa10},
-{ "pitlb",      0x04000200, 0xfc001fdf, "cZx(b)", pa10},
-{ "pdtlbe",     0x04001240, 0xfc003fdf, "cZx(s,b)", pa10},
-{ "pdtlbe",     0x04001240, 0xfc003fdf, "cZx(b)", pa10},
-{ "pitlbe",     0x04000240, 0xfc001fdf, "cZx(S,b)", pa10},
-{ "pitlbe",     0x04000240, 0xfc001fdf, "cZx(b)", pa10},
-{ "idtlba",     0x04001040, 0xfc003fff, "x,(s,b)", pa10},
-{ "idtlba",     0x04001040, 0xfc003fff, "x,(b)", pa10},
-{ "iitlba",     0x04000040, 0xfc001fff, "x,(S,b)", pa10},
-{ "iitlba",     0x04000040, 0xfc001fff, "x,(b)", pa10},
-{ "idtlbp",     0x04001000, 0xfc003fff, "x,(s,b)", pa10},
-{ "idtlbp",     0x04001000, 0xfc003fff, "x,(b)", pa10},
-{ "iitlbp",     0x04000000, 0xfc001fff, "x,(S,b)", pa10},
-{ "iitlbp",     0x04000000, 0xfc001fff, "x,(b)", pa10},
-{ "pdc",        0x04001380, 0xfc003fdf, "cZx(s,b)", pa10},
-{ "pdc",        0x04001380, 0xfc003fdf, "cZx(b)", pa10},
-{ "fdc",        0x04001280, 0xfc003fdf, "cZx(s,b)", pa10},
-{ "fdc",        0x04001280, 0xfc003fdf, "cZx(b)", pa10},
-{ "fic",        0x04000280, 0xfc001fdf, "cZx(S,b)", pa10},
-{ "fic",        0x04000280, 0xfc001fdf, "cZx(b)", pa10},
-{ "fdce",       0x040012c0, 0xfc003fdf, "cZx(s,b)", pa10},
-{ "fdce",       0x040012c0, 0xfc003fdf, "cZx(b)", pa10},
-{ "fice",       0x040002c0, 0xfc001fdf, "cZx(S,b)", pa10},
-{ "fice",       0x040002c0, 0xfc001fdf, "cZx(b)", pa10},
-{ "diag",       0x14000000, 0xfc000000, "D", pa10},
+{ "pitlb",      0x04000200, 0xfc001fdf, "cZx(S,b)", pa10, 0},
+{ "pitlb",      0x04000200, 0xfc001fdf, "cZx(b)", pa10, 0},
+{ "pdtlbe",     0x04001240, 0xfc003fdf, "cZx(s,b)", pa10, 0},
+{ "pdtlbe",     0x04001240, 0xfc003fdf, "cZx(b)", pa10, 0},
+{ "pitlbe",     0x04000240, 0xfc001fdf, "cZx(S,b)", pa10, 0},
+{ "pitlbe",     0x04000240, 0xfc001fdf, "cZx(b)", pa10, 0},
+{ "idtlba",     0x04001040, 0xfc003fff, "x,(s,b)", pa10, 0},
+{ "idtlba",     0x04001040, 0xfc003fff, "x,(b)", pa10, 0},
+{ "iitlba",     0x04000040, 0xfc001fff, "x,(S,b)", pa10, 0},
+{ "iitlba",     0x04000040, 0xfc001fff, "x,(b)", pa10, 0},
+{ "idtlbp",     0x04001000, 0xfc003fff, "x,(s,b)", pa10, 0},
+{ "idtlbp",     0x04001000, 0xfc003fff, "x,(b)", pa10, 0},
+{ "iitlbp",     0x04000000, 0xfc001fff, "x,(S,b)", pa10, 0},
+{ "iitlbp",     0x04000000, 0xfc001fff, "x,(b)", pa10, 0},
+{ "pdc",        0x04001380, 0xfc003fdf, "cZx(s,b)", pa10, 0},
+{ "pdc",        0x04001380, 0xfc003fdf, "cZx(b)", pa10, 0},
+{ "fdc",        0x04001280, 0xfc003fdf, "cZx(s,b)", pa10, 0},
+{ "fdc",        0x04001280, 0xfc003fdf, "cZx(b)", pa10, 0},
+{ "fic",        0x04000280, 0xfc001fdf, "cZx(S,b)", pa10, 0},
+{ "fic",        0x04000280, 0xfc001fdf, "cZx(b)", pa10, 0},
+{ "fdce",       0x040012c0, 0xfc003fdf, "cZx(s,b)", pa10, 0},
+{ "fdce",       0x040012c0, 0xfc003fdf, "cZx(b)", pa10, 0},
+{ "fice",       0x040002c0, 0xfc001fdf, "cZx(S,b)", pa10, 0},
+{ "fice",       0x040002c0, 0xfc001fdf, "cZx(b)", pa10, 0},
+{ "diag",       0x14000000, 0xfc000000, "D", pa10, 0},
 { "idtlbt",     0x04001800, 0xfc00ffff, "x,b", pa20, FLAG_STRICT},
 { "iitlbt",     0x04000800, 0xfc00ffff, "x,b", pa20, FLAG_STRICT},
 
 /* These may be specific to certain versions of the PA.  Joel claimed
    they were 72000 (7200?) specific.  However, I'm almost certain the
    mtcpu/mfcpu were undocumented, but available in the older 700 machines.  */
-{ "mtcpu",      0x14001600, 0xfc00ffff, "x,^"},
-{ "mfcpu",      0x14001A00, 0xfc00ffff, "^,x"},
-{ "tocen",      0x14403600, 0xffffffff, ""},
-{ "tocdis",     0x14401620, 0xffffffff, ""},
-{ "shdwgr",     0x14402600, 0xffffffff, ""},
-{ "grshdw",     0x14400620, 0xffffffff, ""},
+{ "mtcpu",      0x14001600, 0xfc00ffff, "x,^", pa10, 0},
+{ "mfcpu",      0x14001A00, 0xfc00ffff, "^,x", pa10, 0},
+{ "tocen",      0x14403600, 0xffffffff, "", pa10, 0},
+{ "tocdis",     0x14401620, 0xffffffff, "", pa10, 0},
+{ "shdwgr",     0x14402600, 0xffffffff, "", pa10, 0},
+{ "grshdw",     0x14400620, 0xffffffff, "", pa10, 0},
 
 /* gfw and gfr are not in the HP PA 1.1 manual, but they are in either
    the Timex FPU or the Mustang ERS (not sure which) manual.  */
-{ "gfw",	0x04001680, 0xfc003fdf, "cZx(s,b)", pa11},
-{ "gfw",	0x04001680, 0xfc003fdf, "cZx(b)", pa11},
-{ "gfr",	0x04001a80, 0xfc003fdf, "cZx(s,b)", pa11},
-{ "gfr",	0x04001a80, 0xfc003fdf, "cZx(b)", pa11},
+{ "gfw",	0x04001680, 0xfc003fdf, "cZx(s,b)", pa11, 0},
+{ "gfw",	0x04001680, 0xfc003fdf, "cZx(b)", pa11, 0},
+{ "gfr",	0x04001a80, 0xfc003fdf, "cZx(s,b)", pa11, 0},
+{ "gfr",	0x04001a80, 0xfc003fdf, "cZx(b)", pa11, 0},
 
 /* Floating Point Coprocessor Instructions */
  
@@ -667,52 +667,52 @@ static const struct pa_opcode pa_opcodes[] =
 { "fstd",       0x2c001200, 0xfc001fc0, "cmft,5(b)", pa10, FLAG_STRICT},
 { "fstd",       0x70000002, 0xfc000002, "cqx,#(s,b)", pa20, FLAG_STRICT},
 { "fstd",       0x70000002, 0xfc000002, "cqx,#(b)", pa20, FLAG_STRICT},
-{ "fldwx",      0x24000000, 0xfc001f80, "cxx(s,b),fT", pa10},
-{ "fldwx",      0x24000000, 0xfc001f80, "cxx(b),fT", pa10},
-{ "flddx",      0x2c000000, 0xfc001fc0, "cxx(s,b),ft", pa10},
-{ "flddx",      0x2c000000, 0xfc001fc0, "cxx(b),ft", pa10},
-{ "fstwx",      0x24000200, 0xfc001f80, "cxfT,x(s,b)", pa10},
-{ "fstwx",      0x24000200, 0xfc001f80, "cxfT,x(b)", pa10},
-{ "fstdx",      0x2c000200, 0xfc001fc0, "cxft,x(s,b)", pa10},
-{ "fstdx",      0x2c000200, 0xfc001fc0, "cxft,x(b)", pa10},
-{ "fstqx",      0x3c000200, 0xfc001fc0, "cxft,x(s,b)", pa10},
-{ "fstqx",      0x3c000200, 0xfc001fc0, "cxft,x(b)", pa10},
-{ "fldws",      0x24001000, 0xfc001f80, "cm5(s,b),fT", pa10},
-{ "fldws",      0x24001000, 0xfc001f80, "cm5(b),fT", pa10},
-{ "fldds",      0x2c001000, 0xfc001fc0, "cm5(s,b),ft", pa10},
-{ "fldds",      0x2c001000, 0xfc001fc0, "cm5(b),ft", pa10},
-{ "fstws",      0x24001200, 0xfc001f80, "cmfT,5(s,b)", pa10},
-{ "fstws",      0x24001200, 0xfc001f80, "cmfT,5(b)", pa10},
-{ "fstds",      0x2c001200, 0xfc001fc0, "cmft,5(s,b)", pa10},
-{ "fstds",      0x2c001200, 0xfc001fc0, "cmft,5(b)", pa10},
-{ "fstqs",      0x3c001200, 0xfc001fc0, "cmft,5(s,b)", pa10},
-{ "fstqs",      0x3c001200, 0xfc001fc0, "cmft,5(b)", pa10},
-{ "fadd",       0x30000600, 0xfc00e7e0, "Ffa,fb,fT", pa10},
-{ "fadd",       0x38000600, 0xfc00e720, "IfA,fB,fT", pa10},
-{ "fsub",       0x30002600, 0xfc00e7e0, "Ffa,fb,fT", pa10},
-{ "fsub",       0x38002600, 0xfc00e720, "IfA,fB,fT", pa10},
-{ "fmpy",       0x30004600, 0xfc00e7e0, "Ffa,fb,fT", pa10},
-{ "fmpy",       0x38004600, 0xfc00e720, "IfA,fB,fT", pa10},
-{ "fdiv",       0x30006600, 0xfc00e7e0, "Ffa,fb,fT", pa10},
-{ "fdiv",       0x38006600, 0xfc00e720, "IfA,fB,fT", pa10},
-{ "fsqrt",      0x30008000, 0xfc1fe7e0, "Ffa,fT", pa10},
-{ "fsqrt",      0x38008000, 0xfc1fe720, "FfA,fT", pa10},
-{ "fabs",       0x30006000, 0xfc1fe7e0, "Ffa,fT", pa10},
-{ "fabs",       0x38006000, 0xfc1fe720, "FfA,fT", pa10},
-{ "frem",       0x30008600, 0xfc00e7e0, "Ffa,fb,fT", pa10},
-{ "frem",       0x38008600, 0xfc00e720, "FfA,fB,fT", pa10},
-{ "frnd",       0x3000a000, 0xfc1fe7e0, "Ffa,fT", pa10},
-{ "frnd",       0x3800a000, 0xfc1fe720, "FfA,fT", pa10},
-{ "fcpy",       0x30004000, 0xfc1fe7e0, "Ffa,fT", pa10},
-{ "fcpy",       0x38004000, 0xfc1fe720, "FfA,fT", pa10},
-{ "fcnvff",     0x30000200, 0xfc1f87e0, "FGfa,fT", pa10},
-{ "fcnvff",     0x38000200, 0xfc1f8720, "FGfA,fT", pa10},
-{ "fcnvxf",     0x30008200, 0xfc1f87e0, "FGfa,fT", pa10},
-{ "fcnvxf",     0x38008200, 0xfc1f8720, "FGfA,fT", pa10},
-{ "fcnvfx",     0x30010200, 0xfc1f87e0, "FGfa,fT", pa10},
-{ "fcnvfx",     0x38010200, 0xfc1f8720, "FGfA,fT", pa10},
-{ "fcnvfxt",    0x30018200, 0xfc1f87e0, "FGfa,fT", pa10},
-{ "fcnvfxt",    0x38018200, 0xfc1f8720, "FGfA,fT", pa10},
+{ "fldwx",      0x24000000, 0xfc001f80, "cxx(s,b),fT", pa10, 0},
+{ "fldwx",      0x24000000, 0xfc001f80, "cxx(b),fT", pa10, 0},
+{ "flddx",      0x2c000000, 0xfc001fc0, "cxx(s,b),ft", pa10, 0},
+{ "flddx",      0x2c000000, 0xfc001fc0, "cxx(b),ft", pa10, 0},
+{ "fstwx",      0x24000200, 0xfc001f80, "cxfT,x(s,b)", pa10, 0},
+{ "fstwx",      0x24000200, 0xfc001f80, "cxfT,x(b)", pa10, 0},
+{ "fstdx",      0x2c000200, 0xfc001fc0, "cxft,x(s,b)", pa10, 0},
+{ "fstdx",      0x2c000200, 0xfc001fc0, "cxft,x(b)", pa10, 0},
+{ "fstqx",      0x3c000200, 0xfc001fc0, "cxft,x(s,b)", pa10, 0},
+{ "fstqx",      0x3c000200, 0xfc001fc0, "cxft,x(b)", pa10, 0},
+{ "fldws",      0x24001000, 0xfc001f80, "cm5(s,b),fT", pa10, 0},
+{ "fldws",      0x24001000, 0xfc001f80, "cm5(b),fT", pa10, 0},
+{ "fldds",      0x2c001000, 0xfc001fc0, "cm5(s,b),ft", pa10, 0},
+{ "fldds",      0x2c001000, 0xfc001fc0, "cm5(b),ft", pa10, 0},
+{ "fstws",      0x24001200, 0xfc001f80, "cmfT,5(s,b)", pa10, 0},
+{ "fstws",      0x24001200, 0xfc001f80, "cmfT,5(b)", pa10, 0},
+{ "fstds",      0x2c001200, 0xfc001fc0, "cmft,5(s,b)", pa10, 0},
+{ "fstds",      0x2c001200, 0xfc001fc0, "cmft,5(b)", pa10, 0},
+{ "fstqs",      0x3c001200, 0xfc001fc0, "cmft,5(s,b)", pa10, 0},
+{ "fstqs",      0x3c001200, 0xfc001fc0, "cmft,5(b)", pa10, 0},
+{ "fadd",       0x30000600, 0xfc00e7e0, "Ffa,fb,fT", pa10, 0},
+{ "fadd",       0x38000600, 0xfc00e720, "IfA,fB,fT", pa10, 0},
+{ "fsub",       0x30002600, 0xfc00e7e0, "Ffa,fb,fT", pa10, 0},
+{ "fsub",       0x38002600, 0xfc00e720, "IfA,fB,fT", pa10, 0},
+{ "fmpy",       0x30004600, 0xfc00e7e0, "Ffa,fb,fT", pa10, 0},
+{ "fmpy",       0x38004600, 0xfc00e720, "IfA,fB,fT", pa10, 0},
+{ "fdiv",       0x30006600, 0xfc00e7e0, "Ffa,fb,fT", pa10, 0},
+{ "fdiv",       0x38006600, 0xfc00e720, "IfA,fB,fT", pa10, 0},
+{ "fsqrt",      0x30008000, 0xfc1fe7e0, "Ffa,fT", pa10, 0},
+{ "fsqrt",      0x38008000, 0xfc1fe720, "FfA,fT", pa10, 0},
+{ "fabs",       0x30006000, 0xfc1fe7e0, "Ffa,fT", pa10, 0},
+{ "fabs",       0x38006000, 0xfc1fe720, "FfA,fT", pa10, 0},
+{ "frem",       0x30008600, 0xfc00e7e0, "Ffa,fb,fT", pa10, 0},
+{ "frem",       0x38008600, 0xfc00e720, "FfA,fB,fT", pa10, 0},
+{ "frnd",       0x3000a000, 0xfc1fe7e0, "Ffa,fT", pa10, 0},
+{ "frnd",       0x3800a000, 0xfc1fe720, "FfA,fT", pa10, 0},
+{ "fcpy",       0x30004000, 0xfc1fe7e0, "Ffa,fT", pa10, 0},
+{ "fcpy",       0x38004000, 0xfc1fe720, "FfA,fT", pa10, 0},
+{ "fcnvff",     0x30000200, 0xfc1f87e0, "FGfa,fT", pa10, 0},
+{ "fcnvff",     0x38000200, 0xfc1f8720, "FGfA,fT", pa10, 0},
+{ "fcnvxf",     0x30008200, 0xfc1f87e0, "FGfa,fT", pa10, 0},
+{ "fcnvxf",     0x38008200, 0xfc1f8720, "FGfA,fT", pa10, 0},
+{ "fcnvfx",     0x30010200, 0xfc1f87e0, "FGfa,fT", pa10, 0},
+{ "fcnvfx",     0x38010200, 0xfc1f8720, "FGfA,fT", pa10, 0},
+{ "fcnvfxt",    0x30018200, 0xfc1f87e0, "FGfa,fT", pa10, 0},
+{ "fcnvfxt",    0x38018200, 0xfc1f8720, "FGfA,fT", pa10, 0},
 { "fmpyfadd",   0xb8000000, 0xfc000020, "IfA,fB,fC,fT", pa20, FLAG_STRICT},
 { "fmpynfadd",  0xb8000020, 0xfc000020, "IfA,fB,fC,fT", pa20, FLAG_STRICT},
 { "fneg",       0x3000c000, 0xfc1fe7e0, "Ffa,fT", pa20, FLAG_STRICT},
@@ -723,15 +723,15 @@ static const struct pa_opcode pa_opcodes[] =
 { "fcnv",       0x38000200, 0xfc1c0720, "FGfA,fT", pa20, FLAG_STRICT},
 { "fcmp",       0x30000400, 0xfc0007e0, "F?ffa,fb,h", pa20, FLAG_STRICT},
 { "fcmp",       0x38000400, 0xfc000720, "I?ffA,fB,h", pa20, FLAG_STRICT},
-{ "fcmp",       0x30000400, 0xfc00e7e0, "F?ffa,fb", pa10},
-{ "fcmp",       0x38000400, 0xfc00e720, "I?ffA,fB", pa10},
-{ "xmpyu",	0x38004700, 0xfc00e720, "fX,fB,fT", pa11},
-{ "fmpyadd",	0x18000000, 0xfc000000, "Hfi,fj,fk,fl,fm", pa11},
-{ "fmpysub",	0x98000000, 0xfc000000, "Hfi,fj,fk,fl,fm", pa11},
+{ "fcmp",       0x30000400, 0xfc00e7e0, "F?ffa,fb", pa10, 0},
+{ "fcmp",       0x38000400, 0xfc00e720, "I?ffA,fB", pa10, 0},
+{ "xmpyu",	0x38004700, 0xfc00e720, "fX,fB,fT", pa11, 0},
+{ "fmpyadd",	0x18000000, 0xfc000000, "Hfi,fj,fk,fl,fm", pa11, 0},
+{ "fmpysub",	0x98000000, 0xfc000000, "Hfi,fj,fk,fl,fm", pa11, 0},
 { "ftest",      0x30002420, 0xffffffe0, ",=", pa20, FLAG_STRICT},
 { "ftest",      0x30000420, 0xffff1fff, "m", pa20, FLAG_STRICT},
-{ "ftest",      0x30002420, 0xffffffff, "", pa10},
-{ "fid",        0x30000000, 0xffffffff, "", pa11},
+{ "ftest",      0x30002420, 0xffffffff, "", pa10, 0},
+{ "fid",        0x30000000, 0xffffffff, "", pa11, 0},
 
 /* Performance Monitor Instructions */
 
@@ -740,27 +740,27 @@ static const struct pa_opcode pa_opcodes[] =
 
 /* Assist Instructions */
 
-{ "spop0",      0x10000000, 0xfc000600, "v,ON", pa10},
-{ "spop1",      0x10000200, 0xfc000600, "v,oNt", pa10},
-{ "spop2",      0x10000400, 0xfc000600, "v,1Nb", pa10},
-{ "spop3",      0x10000600, 0xfc000600, "v,0Nx,b", pa10},
-{ "copr",       0x30000000, 0xfc000000, "u,2N", pa10},
-{ "cldwx",      0x24000000, 0xfc001e00, "ucxx(s,b),t", pa10},
-{ "cldwx",      0x24000000, 0xfc001e00, "ucxx(b),t", pa10},
-{ "clddx",      0x2c000000, 0xfc001e00, "ucxx(s,b),t", pa10},
-{ "clddx",      0x2c000000, 0xfc001e00, "ucxx(b),t", pa10},
-{ "cstwx",      0x24000200, 0xfc001e00, "ucxt,x(s,b)", pa10},
-{ "cstwx",      0x24000200, 0xfc001e00, "ucxt,x(b)", pa10},
-{ "cstdx",      0x2c000200, 0xfc001e00, "ucxt,x(s,b)", pa10},
-{ "cstdx",      0x2c000200, 0xfc001e00, "ucxt,x(b)", pa10},
-{ "cldws",      0x24001000, 0xfc001e00, "ucm5(s,b),t", pa10},
-{ "cldws",      0x24001000, 0xfc001e00, "ucm5(b),t", pa10},
-{ "cldds",      0x2c001000, 0xfc001e00, "ucm5(s,b),t", pa10},
-{ "cldds",      0x2c001000, 0xfc001e00, "ucm5(b),t", pa10},
-{ "cstws",      0x24001200, 0xfc001e00, "ucmt,5(s,b)", pa10},
-{ "cstws",      0x24001200, 0xfc001e00, "ucmt,5(b)", pa10},
-{ "cstds",      0x2c001200, 0xfc001e00, "ucmt,5(s,b)", pa10},
-{ "cstds",      0x2c001200, 0xfc001e00, "ucmt,5(b)", pa10},
+{ "spop0",      0x10000000, 0xfc000600, "v,ON", pa10, 0},
+{ "spop1",      0x10000200, 0xfc000600, "v,oNt", pa10, 0},
+{ "spop2",      0x10000400, 0xfc000600, "v,1Nb", pa10, 0},
+{ "spop3",      0x10000600, 0xfc000600, "v,0Nx,b", pa10, 0},
+{ "copr",       0x30000000, 0xfc000000, "u,2N", pa10, 0},
+{ "cldwx",      0x24000000, 0xfc001e00, "ucxx(s,b),t", pa10, 0},
+{ "cldwx",      0x24000000, 0xfc001e00, "ucxx(b),t", pa10, 0},
+{ "clddx",      0x2c000000, 0xfc001e00, "ucxx(s,b),t", pa10, 0},
+{ "clddx",      0x2c000000, 0xfc001e00, "ucxx(b),t", pa10, 0},
+{ "cstwx",      0x24000200, 0xfc001e00, "ucxt,x(s,b)", pa10, 0},
+{ "cstwx",      0x24000200, 0xfc001e00, "ucxt,x(b)", pa10, 0},
+{ "cstdx",      0x2c000200, 0xfc001e00, "ucxt,x(s,b)", pa10, 0},
+{ "cstdx",      0x2c000200, 0xfc001e00, "ucxt,x(b)", pa10, 0},
+{ "cldws",      0x24001000, 0xfc001e00, "ucm5(s,b),t", pa10, 0},
+{ "cldws",      0x24001000, 0xfc001e00, "ucm5(b),t", pa10, 0},
+{ "cldds",      0x2c001000, 0xfc001e00, "ucm5(s,b),t", pa10, 0},
+{ "cldds",      0x2c001000, 0xfc001e00, "ucm5(b),t", pa10, 0},
+{ "cstws",      0x24001200, 0xfc001e00, "ucmt,5(s,b)", pa10, 0},
+{ "cstws",      0x24001200, 0xfc001e00, "ucmt,5(b)", pa10, 0},
+{ "cstds",      0x2c001200, 0xfc001e00, "ucmt,5(s,b)", pa10, 0},
+{ "cstds",      0x2c001200, 0xfc001e00, "ucmt,5(b)", pa10, 0},
 { "cldw",       0x24000000, 0xfc001e00, "ucxx(s,b),t", pa10, FLAG_STRICT},
 { "cldw",       0x24000000, 0xfc001e00, "ucxx(b),t", pa10, FLAG_STRICT},
 { "cldw",       0x24001000, 0xfc001e00, "ucm5(s,b),t", pa10, FLAG_STRICT},