Remove the old powerpc disassembler, it was bad, the replacement is

at least mostly useable.

1 files changed, 250 insertions, 719 deletions

diff --git a/sys/arch/macppc/macppc/db_disasm.c b/sys/arch/macppc/macppc/db_disasm.c
index 8ddf8d7f479..638fb4dd1a0 100644
--- a/sys/arch/macppc/macppc/db_disasm.c
+++ b/sys/arch/macppc/macppc/db_disasm.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: db_disasm.c,v 1.8 2001/06/12 05:31:44 simonb Exp $	*/
-/*	$OpenBSD: db_disasm.c,v 1.6 2001/09/09 23:18:41 drahn Exp $	*/
+/*	$OpenBSD: db_disasm.c,v 1.7 2001/09/09 23:28:16 drahn Exp $	*/
 /*
  * Copyright (c) 1996 Dale Rahn. All rights reserved.
  *
@@ -42,55 +42,6 @@
 #include <ddb/db_interface.h>
 #include <ddb/db_output.h>
 
-enum function_mask {
-	Op_A    =	0x00000001,
-	Op_B    =	0x00000002,
-	Op_BI   =	0x00000004,
-	Op_BO   =	0x00000008,
-	Op_CRM  =	0x00000010,
-	Op_D    =	0x00000020, /* yes, Op_S and Op_D are the same */
-	Op_S    =	0x00000020,
-	Op_FM   =	0x00000040,
-	Op_IMM  =	0x00000080,
-	Op_LK   =	0x00000100,
-	Op_Rc   =	0x00000200,
-	Op_AA	=	Op_LK | Op_Rc, /* kludge (reduce Op_s) */
-	Op_LKM	=	Op_AA,
-	Op_RcM	=	Op_AA,
-	Op_OE   =	0x00000400,
-	Op_SR   =	0x00000800,
-	Op_TO   =	0x00001000,
-	Op_sign =	0x00002000,
-	Op_const =	0x00004000,
-	Op_SIMM =	Op_const | Op_sign,
-	Op_UIMM =	Op_const,
-	Op_d	=	Op_const | Op_sign,
-	Op_crbA =	0x00008000,
-	Op_crbB =	0x00010000,
-	Op_crbD =	0x00020000,
-	Op_crfD =	0x00040000,
-	Op_crfS =	0x00080000,
-	Op_ds   =	0x00100000,
-	Op_me   =	0x00200000,
-	Op_spr  =	0x00400000,
-	Op_tbr  =	0x00800000,
-
-	Op_L	=	0x01000000,
-	Op_BD	=	0x02000000,
-	Op_LI	=	0x04000000,
-	Op_C	=	0x08000000,
-
-	Op_NB	=	0x10000000,
-
-	Op_sh_mb_sh =	0x20000000,
-	Op_sh   =	0x40000000,
-	Op_SH	=	Op_sh | Op_sh_mb_sh,
-	Op_mb	=	0x80000000,
-	Op_MB	=	Op_mb | Op_sh_mb_sh,
-	Op_ME	=	Op_MB,
-
-};
-
 enum opf {
 	Opf_INVALID,
 	Opf_A,
@@ -179,7 +130,6 @@ struct opcode {
 	char *name;
 	u_int32_t mask;
 	u_int32_t code;
-	enum function_mask func;
 	char *decode_str;
 };
 
@@ -224,289 +174,286 @@ op_class_func *opcodes_base[] = {
  */
 	
 const struct opcode opcodes[] = {
-	{ "tdi",	0xfc000000, 0x08000000, Op_TO | Op_A | Op_SIMM, " %{TO},%{A},%{SIMM}" },
-	{ "twi",	0xfc000000, 0x0c000000, Op_TO | Op_A | Op_SIMM, " %{TO},%{A},%{SIMM}" },
-
-	{ "mulli",	0xfc000000, 0x1c000000, Op_D | Op_A | Op_SIMM, " %{D},%{A},%{SIMM}" },
-	{ "subfic",	0xfc000000, 0x20000000, Op_D | Op_A | Op_SIMM, " %{D},%{A},%{SIMM}" },
-	{ "cmpli",	0xffc00000, 0x28000000, Op_L | Op_A | Op_SIMM, " %{A},%{UIMM}" },
-	{ "cmpli",	0xfc400000, 0x28000000, Op_crfD | Op_L | Op_A | Op_UIMM, " %{crfD}%{A}, %{UIMM}" },
-	{ "cmpi",	0xffc00000, 0x2c000000, Op_L | Op_A | Op_SIMM, " %{A},%{SIMM}"},
-	{ "cmpi",	0xfc400000, 0x2c000000, Op_crfD | Op_L | Op_A | Op_SIMM, " %{crfD}%{A},%{SIMM}" },
-	{ "addic",	0xfc000000, 0x30000000, Op_D | Op_A | Op_SIMM, " %{D},%{A},%{SIMM}" },
-	{ "addic.",	0xfc000000, 0x34000000, Op_D | Op_A | Op_SIMM, " %{D},%{A},%{SIMM}" },
-	{ "addi",	0xfc000000, 0x38000000, Op_D | Op_A | Op_SIMM, " %{D},%{A0}%{SIMM}" },
-	{ "addis",	0xfc000000, 0x3c000000, Op_D | Op_A | Op_SIMM, " %{D},%{A0}%{SIMM}" },
-	{ "sc",		0xffffffff, 0x44000002, 0, "" },
-	{ "b",		0xfc000000, 0x40000000, Op_BO | Op_BI | Op_BD | Op_AA | Op_LK, "%{BO}%{AA}%{LK} %{BI}%{BD}" },
-	{ "b",		0xfc000000, 0x48000000, Op_LI | Op_AA | Op_LK, "%{AA}%{LK} %{LI}" },
-
-	{ "rlwimi",	0xfc000000, 0x50000000, Op_S | Op_A | Op_SH | Op_MB | Op_ME | Op_Rc, "%{RC} %{A},%{S},%{SH},%{MB},%{ME}" },
-	{ "rlwinm",	0xfc000000, 0x54000000, Op_S | Op_A | Op_SH | Op_MB | Op_ME | Op_Rc, "%{RC} %{A},%{S},%{SH},%{MB},%{ME}" },
-	{ "rlwnm",	0xfc000000, 0x5c000000, Op_S | Op_A | Op_SH | Op_MB | Op_ME | Op_Rc, "%{RC} %{A},%{S},%{SH},%{MB},%{ME}" },
-
-	{ "ori",	0xfc000000, 0x60000000, Op_S | Op_A | Op_UIMM, " %{A},%{S},%{UIMM}" },
-	{ "oris",	0xfc000000, 0x64000000, Op_S | Op_A | Op_UIMM, " %{A},%{S},%{UIMM}" },
-	{ "xori",	0xfc000000, 0x68000000, Op_S | Op_A | Op_UIMM, " %{A},%{S},%{UIMM}" },
-	{ "xoris",	0xfc000000, 0x6c000000, Op_S | Op_A | Op_UIMM, " %{A},%{S},%{UIMM}" },
-
-	{ "andi.",	0xfc000000, 0x70000000, Op_S | Op_A | Op_UIMM, " %{A},%{S},%{UIMM}" },
-	{ "andis.",	0xfc000000, 0x74000000, Op_S | Op_A | Op_UIMM, " %{A},%{S},%{UIMM}" },
-
-	{ "lwz",	0xfc000000, 0x80000000, Op_D | Op_A | Op_d, " %{D},%{d}(%{A})" },
-	{ "lwzu",	0xfc000000, 0x84000000, Op_D | Op_A | Op_d, " %{D},%{d}(%{A})" },
-	{ "lbz",	0xfc000000, 0x88000000, Op_D | Op_A | Op_d, " %{D},%{d}(%{A})" },
-	{ "lbzu",	0xfc000000, 0x8c000000, Op_D | Op_A | Op_d, " %{D},%{d}(%{A})" },
-	{ "stw",	0xfc000000, 0x90000000, Op_S | Op_A | Op_d, " %{S},%{d}(%{A})" },
-	{ "stwu",	0xfc000000, 0x94000000, Op_S | Op_A | Op_d, " %{S},%{d}(%{A})" },
-	{ "stb",	0xfc000000, 0x98000000, Op_S | Op_A | Op_d, " %{S},%{d}(%{A})" },
-	{ "stbu",	0xfc000000, 0x9c000000, Op_S | Op_A | Op_d, " %{S},%{d}(%{A})" },
-
-	{ "lhz",	0xfc000000, 0xa0000000, Op_D | Op_A | Op_d, " %{D},%{d}(%{A})" },
-	{ "lhzu",	0xfc000000, 0xa4000000, Op_D | Op_A | Op_d, " %{D},%{d}(%{A})" },
-	{ "lha",	0xfc000000, 0xa8000000, Op_D | Op_A | Op_d, " %{D},%{d}(%{A})" },
-	{ "lhau",	0xfc000000, 0xac000000, Op_D | Op_A | Op_d, " %{D},%{d}(%{A})" },
-	{ "sth",	0xfc000000, 0xb0000000, Op_S | Op_A | Op_d, " %{S},%{d}(%{A})" },
-	{ "sthu",	0xfc000000, 0xb4000000, Op_S | Op_A | Op_d, " %{S},%{d}(%{A})" },
-	{ "lmw",	0xfc000000, 0xb8000000, Op_D | Op_A | Op_d, " %{D},%{d}(%{A})" },
-	{ "stmw",	0xfc000000, 0xbc000000, Op_S | Op_A | Op_d, " %{S},%{d}(%{A})" },
-
-	{ "lfs",	0xfc000000, 0xc0000000, Op_D | Op_A | Op_d, " %{D},%{d}(%{A})" },
-	{ "lfsu",	0xfc000000, 0xc4000000, Op_D | Op_A | Op_d, " %{D},%{d}(%{A})" },
-	{ "lfd",	0xfc000000, 0xc8000000, Op_D | Op_A | Op_d, " %{D},%{d}(%{A})" },
-	{ "lfdu",	0xfc000000, 0xcc000000, Op_D | Op_A | Op_d, " %{D},%{d}(%{A})" },
-
-	{ "stfs",	0xfc000000, 0xd0000000, Op_S | Op_A | Op_d, " %{S},%{d}(%{A})" },
-	{ "stfsu",	0xfc000000, 0xd4000000, Op_S | Op_A | Op_d, " %{S},%{d}(%{A})" },
-	{ "stfd",	0xfc000000, 0xd8000000, Op_S | Op_A | Op_d, " %{S},%{d}(%{A})" },
-	{ "stfdu",	0xfc000000, 0xdc000000, Op_S | Op_A | Op_d, " %{S},%{d}(%{A})" },
-	{ "",		0x0,		0x0, 0, "" }
+	{ "tdi",	0xfc000000, 0x08000000, " %{TO},%{A},%{SIMM}" },
+	{ "twi",	0xfc000000, 0x0c000000, " %{TO},%{A},%{SIMM}" },
+
+	{ "mulli",	0xfc000000, 0x1c000000, " %{D},%{A},%{SIMM}" },
+	{ "subfic",	0xfc000000, 0x20000000, " %{D},%{A},%{SIMM}" },
+	{ "cmpli",	0xff800000, 0x28000000, " %{A},%{UIMM}" },
+	{ "cmpli",	0xfc400000, 0x28000000, " %{crfD}%{A}, %{UIMM}" },
+	{ "cmpi",	0xff800000, 0x2c000000, " %{A},%{SIMM}"},
+	{ "cmpi",	0xfc400000, 0x2c000000, " %{crfD}%{A},%{SIMM}" },
+	{ "addic",	0xfc000000, 0x30000000, " %{D},%{A},%{SIMM}" },
+	{ "addic.",	0xfc000000, 0x34000000, " %{D},%{A},%{SIMM}" },
+	{ "addi",	0xfc000000, 0x38000000, " %{D},%{A0}%{SIMM}" },
+	{ "addis",	0xfc000000, 0x3c000000, " %{D},%{A0}%{SIMM}" },
+	{ "sc",		0xffffffff, 0x44000002, "" },
+	{ "b",		0xfc000000, 0x40000000, "%{BO}%{AA}%{LK} %{BI}%{BD}" },
+	{ "b",		0xfc000000, 0x48000000, "%{AA}%{LK} %{LI}" },
+
+	{ "rlwimi",	0xfc000000, 0x50000000, "%{RC} %{A},%{S},%{SH},%{MB},%{ME}" },
+	{ "rlwinm",	0xfc000000, 0x54000000, "%{RC} %{A},%{S},%{SH},%{MB},%{ME}" },
+	{ "rlwnm",	0xfc000000, 0x5c000000, "%{RC} %{A},%{S},%{SH},%{MB},%{ME}" },
+
+	{ "ori",	0xfc000000, 0x60000000, " %{A},%{S},%{UIMM}" },
+	{ "oris",	0xfc000000, 0x64000000, " %{A},%{S},%{UIMM}" },
+	{ "xori",	0xfc000000, 0x68000000, " %{A},%{S},%{UIMM}" },
+	{ "xoris",	0xfc000000, 0x6c000000, " %{A},%{S},%{UIMM}" },
+
+	{ "andi.",	0xfc000000, 0x70000000, " %{A},%{S},%{UIMM}" },
+	{ "andis.",	0xfc000000, 0x74000000, " %{A},%{S},%{UIMM}" },
+
+	{ "lwz",	0xfc000000, 0x80000000, " %{D},%{d}(%{A})" },
+	{ "lwzu",	0xfc000000, 0x84000000, " %{D},%{d}(%{A})" },
+	{ "lbz",	0xfc000000, 0x88000000, " %{D},%{d}(%{A})" },
+	{ "lbzu",	0xfc000000, 0x8c000000, " %{D},%{d}(%{A})" },
+	{ "stw",	0xfc000000, 0x90000000, " %{S},%{d}(%{A})" },
+	{ "stwu",	0xfc000000, 0x94000000, " %{S},%{d}(%{A})" },
+	{ "stb",	0xfc000000, 0x98000000, " %{S},%{d}(%{A})" },
+	{ "stbu",	0xfc000000, 0x9c000000, " %{S},%{d}(%{A})" },
+
+	{ "lhz",	0xfc000000, 0xa0000000, " %{D},%{d}(%{A})" },
+	{ "lhzu",	0xfc000000, 0xa4000000, " %{D},%{d}(%{A})" },
+	{ "lha",	0xfc000000, 0xa8000000, " %{D},%{d}(%{A})" },
+	{ "lhau",	0xfc000000, 0xac000000, " %{D},%{d}(%{A})" },
+	{ "sth",	0xfc000000, 0xb0000000, " %{S},%{d}(%{A})" },
+	{ "sthu",	0xfc000000, 0xb4000000, " %{S},%{d}(%{A})" },
+	{ "lmw",	0xfc000000, 0xb8000000, " %{D},%{d}(%{A})" },
+	{ "stmw",	0xfc000000, 0xbc000000, " %{S},%{d}(%{A})" },
+
+	{ "lfs",	0xfc000000, 0xc0000000, " %{D},%{d}(%{A})" },
+	{ "lfsu",	0xfc000000, 0xc4000000, " %{D},%{d}(%{A})" },
+	{ "lfd",	0xfc000000, 0xc8000000, " %{D},%{d}(%{A})" },
+	{ "lfdu",	0xfc000000, 0xcc000000, " %{D},%{d}(%{A})" },
+
+	{ "stfs",	0xfc000000, 0xd0000000, " %{S},%{d}(%{A})" },
+	{ "stfsu",	0xfc000000, 0xd4000000, " %{S},%{d}(%{A})" },
+	{ "stfd",	0xfc000000, 0xd8000000, " %{S},%{d}(%{A})" },
+	{ "stfdu",	0xfc000000, 0xdc000000, " %{S},%{d}(%{A})" },
+	{ "",		0x0,		0x0, "" }
 
 };
 /* 13 * 4 = 4c */
 const struct opcode opcodes_13[] = {
 /* 0x13 << 2 */
-	{ "mcrf",	0xfc0007fe, 0x4c000000, Op_crfD | Op_crfS, " %{crfD},%{crfS}" },
-	{ "b",/*bclr*/	0xfc0007fe, 0x4c000020, Op_BO | Op_BI | Op_LK, "%{BO}lr%{LK} %{BI1}" },
-	{ "crnor",	0xfc0007fe, 0x4c000042, Op_crbD | Op_crbA | Op_crbB, " %{crbD},%{crbA},%{crbB}" },
-	{ "rfi",	0xfc0007fe, 0x4c000064, 0, "" },
-	{ "crandc",	0xfc0007fe, 0x4c000102, Op_crbD | Op_crbA | Op_crbB, " %{crbD},%{crbA},%{crbB}" },
-	{ "isync",	0xfc0007fe, 0x4c00012c, 0, "" },
-	{ "crxor",	0xfc0007fe, 0x4c000182, Op_crbD | Op_crbA | Op_crbB, " %{crbD},%{crbA},%{crbB}" },
-	{ "crnand",	0xfc0007fe, 0x4c0001c2, Op_crbD | Op_crbA | Op_crbB, " %{crbD},%{crbA},%{crbB}" },
-	{ "crand",	0xfc0007fe, 0x4c000202, Op_crbD | Op_crbA | Op_crbB, " %{crbD},%{crbA},%{crbB}" },
-	{ "creqv",	0xfc0007fe, 0x4c000242, Op_crbD | Op_crbA | Op_crbB, " %{crbD},%{crbA},%{crbB}" },
-	{ "crorc",	0xfc0007fe, 0x4c000342, Op_crbD | Op_crbA | Op_crbB, " %{crbD},%{crbA},%{crbB}" },
-	{ "cror",	0xfc0007fe, 0x4c000382, Op_crbD | Op_crbA | Op_crbB, " %{crbD},%{crbA},%{crbB}" },
-	{ "b"/*bcctr*/,	0xfc0007fe, 0x4c000420, Op_BO | Op_BI | Op_LK, "%{BO}ctr%{LK} %{BI1}" },
-	{ "",		0x0,		0x0, 0, "" }
+	{ "mcrf",	0xfc0007fe, 0x4c000000, " %{crfD},%{crfS}" },
+	{ "b",/*bclr*/	0xfc0007fe, 0x4c000020, "%{BO}lr%{LK} %{BI1}" },
+	{ "crnor",	0xfc0007fe, 0x4c000042, " %{crbD},%{crbA},%{crbB}" },
+	{ "rfi",	0xfc0007fe, 0x4c000064, "" },
+	{ "crandc",	0xfc0007fe, 0x4c000102, " %{crbD},%{crbA},%{crbB}" },
+	{ "isync",	0xfc0007fe, 0x4c00012c, "" },
+	{ "crxor",	0xfc0007fe, 0x4c000182, " %{crbD},%{crbA},%{crbB}" },
+	{ "crnand",	0xfc0007fe, 0x4c0001c2, " %{crbD},%{crbA},%{crbB}" },
+	{ "crand",	0xfc0007fe, 0x4c000202, " %{crbD},%{crbA},%{crbB}" },
+	{ "creqv",	0xfc0007fe, 0x4c000242, " %{crbD},%{crbA},%{crbB}" },
+	{ "crorc",	0xfc0007fe, 0x4c000342, " %{crbD},%{crbA},%{crbB}" },
+	{ "cror",	0xfc0007fe, 0x4c000382, " %{crbD},%{crbA},%{crbB}" },
+	{ "b"/*bcctr*/,	0xfc0007fe, 0x4c000420, "%{BO}ctr%{LK} %{BI1}" },
+	{ "",		0x0,		0x0, "" }
 };
 
 /* 1e * 4 = 78 */
 const struct opcode opcodes_1e[] = {
-	{ "rldicl",	0xfc00001c, 0x78000000, Op_S | Op_A | Op_sh | Op_mb | Op_Rc, " %{A},%{S},%{sh},%{mb}" },
-	{ "rldicr",	0xfc00001c, 0x78000004, Op_S | Op_A | Op_sh | Op_me | Op_Rc, " %{A},%{S},%{sh},%{mb}" },
-	{ "rldic",	0xfc00001c, 0x78000008, Op_S | Op_A | Op_sh | Op_mb | Op_Rc, " %{A},%{S},%{sh},%{mb}" },
-	{ "rldimi",	0xfc00001c, 0x7800000c, Op_S | Op_A | Op_sh | Op_mb | Op_Rc, " %{A},%{S},%{sh},%{mb}" },
-	{ "rldcl",	0xfc00003e, 0x78000010, Op_S | Op_A | Op_B | Op_mb | Op_Rc, " %{A},%{S},%{B},%{mb}" },
-	{ "rldcr",	0xfc00003e, 0x78000012, Op_S | Op_A | Op_B | Op_me | Op_Rc, " %{A},%{S},%{B},%{mb}" },
-	{ "",		0x0,		0x0, 0, "" }
+	{ "rldicl",	0xfc00001c, 0x78000000, " %{A},%{S},%{sh},%{mb}" },
+	{ "rldicr",	0xfc00001c, 0x78000004, " %{A},%{S},%{sh},%{mb}" },
+	{ "rldic",	0xfc00001c, 0x78000008, " %{A},%{S},%{sh},%{mb}" },
+	{ "rldimi",	0xfc00001c, 0x7800000c, " %{A},%{S},%{sh},%{mb}" },
+	{ "rldcl",	0xfc00003e, 0x78000010, " %{A},%{S},%{B},%{mb}" },
+	{ "rldcr",	0xfc00003e, 0x78000012, " %{A},%{S},%{B},%{mb}" },
+	{ "",		0x0,		0x0, "" }
 };
 
 /* 1f * 4 = 7c */
 const struct opcode opcodes_1f[] = {
 /* 1f << 2 */
-	{ "cmpd",	0xfc2007fe, 0x7c200000, Op_S | Op_A | Op_B | Op_me | Op_Rc, " %{crfD}%{A},%{B}" },
-	{ "cmpw",	0xfc2007fe, 0x7c000000, Op_S | Op_A | Op_B | Op_me | Op_Rc, " %{crfD}%{A},%{B}" },
-	{ "tw",		0xfc0007fe, 0x7c000008, Op_TO | Op_A | Op_B, " %{TO},%{A},%{B}" },
-	{ "subfc",	0xfc0003fe, 0x7c000010, Op_D | Op_A | Op_B | Op_OE | Op_Rc, "%{OE}%{RC} %{D},%{A},%{B}" },
-	{ "mulhdu",	0xfc0007fe, 0x7c000012, Op_D | Op_A | Op_B | Op_Rc, "%{RC} %{D},%{A},%{B}" },
-	{ "addc",	0xfc0003fe, 0x7c000014, Op_D | Op_A | Op_B | Op_OE | Op_Rc, "%{OE}%{RC} %{D},%{A},%{B}" },
-	{ "mulhwu",	0xfc0007fe, 0x7c000016, Op_D | Op_A | Op_B | Op_Rc, "%{RC} %{D},%{A},%{B}" },
-
-	{ "mfcr",	0xfc0007fe, 0x7c000026, Op_D, " %{D}" },
-	{ "lwarx",	0xfc0007fe, 0x7c000028, Op_D | Op_A | Op_B, " %{D},%{A0}%{B}" },
-	{ "ldx",	0xfc0007fe, 0x7c00002a, Op_D | Op_A | Op_B, " %{D},%{A0}%{B}" },
-	{ "lwzx",	0xfc0007fe, 0x7c00002e, Op_D | Op_A | Op_B, " %{D},%{A0}%{B}" },
-	{ "slw",	0xfc0007fe, 0x7c000030, Op_D | Op_A | Op_B | Op_Rc, "%{RC} %{A},%{S},%{B}" },
-	{ "cntlzw",	0xfc0007fe, 0x7c000034, Op_A | Op_S | Op_Rc, "%{RC} %{A},%{S}" },
-	{ "sld",	0xfc0007fe, 0x7c000036, Op_D | Op_A | Op_B | Op_Rc, "%{RC} %{A},%{S},%{B}" },
-	{ "and",	0xfc0007fe, 0x7c000038, Op_S | Op_A | Op_B | Op_Rc, "%{RC} %{A},%{S},%{B}" },
-	{ "cmpld",	0xfc2007fe, 0x7c200040, Op_crfD | Op_A | Op_B, " %{crfD}%{A},%{B}" },
-	{ "cmplw",	0xfc2007fe, 0x7c000040, Op_crfD | Op_A | Op_B, " %{crfD}%{A},%{B}" },
-	{ "subf",	0xfc0003fe, 0x7c000050, Op_D | Op_A | Op_B | Op_OE | Op_Rc, "%{OE}%{RC} %{D},%{A},%{B}" },
-	{ "ldux",	0xfc0007fe, 0x7c00006a, Op_D | Op_A | Op_B, " %{D},%{A},%{B}" },
-	{ "dcbst",	0xfc0007fe, 0x7c00006c, Op_A | Op_B, " %{A0}%{B}" },
-	{ "lwzux",	0xfc0007fe, 0x7c00006e, Op_D | Op_A | Op_B, " %{D},%{A},%{B}" },
-	{ "cntlzd",	0xfc0007fe, 0x7c000074, Op_S | Op_A | Op_S | Op_Rc, "%{RC} %{A},%{S}" },
-	{ "andc",	0xfc0007fe, 0x7c000078, Op_S | Op_A | Op_B | Op_Rc, "%{RC} %{A},%{S},%{B}" },
-	{ "td",		0xfc0007fe, 0x7c000088, Op_TO | Op_A | Op_B, " %{TO},%{A},%{B}" },
-	{ "mulhd",	0xfc0007fe, 0x7c000092, Op_D | Op_A | Op_B | Op_Rc, "%{RC} %{D},%{A},%{B}" },
-	{ "mulhw",	0xfc0007fe, 0x7c000096, Op_D | Op_A | Op_B | Op_Rc, "%{RC} %{D},%{A},%{B}" },
-	{ "mfmsr",	0xfc0007fe, 0x7c0000a6, Op_D, " %{D}" },
-	{ "ldarx",	0xfc0007fe, 0x7c0000a8, Op_D | Op_A | Op_B, " %{D},%{A0}%{B}" },
-	{ "dcbf",	0xfc0007fe, 0x7c0000ac, Op_A | Op_B, " %{A0}%{B}" },
-	{ "lbzx",	0xfc0007fe, 0x7c0000ae, Op_D | Op_A | Op_B, " %{D},%{A0}%{B}" },
-	{ "neg",	0xfc0003fe, 0x7c0000d0, Op_D | Op_A | Op_OE | Op_Rc, "%{OE}%{RC} %{D},%{A}" },
-	{ "lbzux",	0xfc0007fe, 0x7c0000ee, Op_D | Op_A | Op_B, " %{D},%{A},%{B}" },
-	{ "nor",	0xfc0007fe, 0x7c0000f8, Op_S | Op_A | Op_B | Op_Rc, "%{RC} %{A},%{S}" },
-	{ "subfe",	0xfc0003fe, 0x7c000110, Op_D | Op_A | Op_B | Op_OE | Op_Rc, "%{OE}%{RC} %{D},%{A}" },
-	{ "adde",	0xfc0003fe, 0x7c000114, Op_D | Op_A | Op_B | Op_OE | Op_Rc, "%{OE}%{RC} %{D},%{A}" },
-	{ "mtcrf",	0xfc0007fe, 0x7c000120, Op_S | Op_CRM, " %{S},%{CRM}" },
-	{ "mtmsr",	0xfc0007fe, 0x7c000124, Op_S, " %{S}" },
-	{ "stdx",	0xfc0007fe, 0x7c00012a, Op_S | Op_A | Op_B, " %{S},%{A0}%{B}" },
-	{ "stwcx.",	0xfc0007ff, 0x7c00012d, Op_S | Op_A | Op_B, " %{S},%{A},%{B}" },
-	{ "stwx",	0xfc0007fe, 0x7c00012e, Op_S | Op_A | Op_B, " %{S},%{A},%{B}" },
-	{ "stdux",	0xfc0007fe, 0x7c00016a, Op_S | Op_A | Op_B, " %{S},%{A},%{B}" },
-	{ "stwux",	0xfc0007fe, 0x7c00016e, Op_S | Op_A | Op_B, " %{S},%{A},%{B}" },
-	{ "subfze",	0xfc0003fe, 0x7c000190, Op_D | Op_A | Op_OE | Op_Rc, "%{OE}%{RC} %{D},%{A}" },
-	{ "addze",	0xfc0003fe, 0x7c000194, Op_D | Op_A | Op_OE | Op_Rc, "%{OE}%{RC} %{D},%{A}" },
-	{ "mtsr",	0xfc0007fe, 0x7c0001a4, Op_S | Op_SR, " %{SR},%{S}" },
-	{ "stdcx.",	0xfc0007ff, 0x7c0001ad, Op_S | Op_A | Op_B, " %{S},%{A0}%{B}" },
-	{ "stbx",	0xfc0007fe, 0x7c0001ae, Op_S | Op_A | Op_B, " %{S},%{A0}%{B}" },
-	{ "subfme",	0xfc0003fe, 0x7c0001d0, Op_D | Op_A | Op_OE | Op_Rc, "%{OE}%{RC} %{D},%{A}" },
-	{ "mulld",	0xfc0003fe, 0x7c0001d2, Op_D | Op_A | Op_B | Op_OE | Op_Rc, "%{OE}%{RC} %{D},%{A},%{B}" },
-	{ "addme",	0xfc0003fe, 0x7c0001d4, Op_D | Op_A | Op_OE | Op_Rc, "%{OE}%{RC} %{D},%{A}" },
-	{ "mullw",	0xfc0003fe, 0x7c0001d6, Op_D | Op_A | Op_B | Op_OE | Op_Rc, "%{OE}%{RC} %{D},%{A},%{B}" },
-	{ "mtsrin",	0xfc0007fe, 0x7c0001e4, Op_S | Op_B, " %{S},%{B}" },
-	{ "dcbtst",	0xfc0007fe, 0x7c0001ec, Op_A | Op_B, " %{A0}%{B}" },
-	{ "stbux",	0xfc0007fe, 0x7c0001ee, Op_S | Op_A | Op_B, " %{S},%{A},%{B}" },
-	{ "add",	0xfc0003fe, 0x7c000214, Op_D | Op_A | Op_B | Op_OE | Op_Rc, "" },
-	{ "dcbt",	0xfc0007fe, 0x7c00022c, Op_A | Op_B, " %{A0}%{B}" },
-	{ "lhzx",	0xfc0007ff, 0x7c00022e, Op_D | Op_A | Op_B, " %{D},%{A0}%{B}" },
-	{ "eqv",	0xfc0007fe, 0x7c000238, Op_S | Op_A | Op_B | Op_Rc, "%{RC} %{A},%{S},%{B}" },
-	{ "tlbie",	0xfc0007fe, 0x7c000264, Op_B, " %{B}" },
-	{ "eciwx",	0xfc0007fe, 0x7c00026c, Op_D | Op_A | Op_B, " %{D},%{A0}%{B}" },
-	{ "lhzux",	0xfc0007fe, 0x7c00026e, Op_D | Op_A | Op_B, " %{D},%{A},%{B}" },
-	{ "xor",	0xfc0007fe, 0x7c000278, Op_S | Op_A | Op_B | Op_Rc, "%{RC} %{A},%{S},%{B}" },
-	{ "mfspr",	0xfc0007fe, 0x7c0002a6, Op_D | Op_spr, " %{D},%{spr}" },
-	{ "lwax",	0xfc0007fe, 0x7c0002aa, Op_D | Op_A | Op_B, " %{D},%{A0}%{B}" },
-	{ "lhax",	0xfc0007fe, 0x7c0002ae, Op_D | Op_A | Op_B, " %{D},%{A},%{B}" },
-	{ "tlbia",	0xfc0007fe, 0x7c0002e4, 0, "" },
-	{ "mftb",	0xfc0007fe, 0x7c0002e6, Op_D | Op_tbr, " %{D},%{tbr}" },
-	{ "lwaux",	0xfc0007fe, 0x7c0002ea, Op_D | Op_A | Op_B, " %{D},%{A},%{B}" },
-	{ "lhaux",	0xfc0007fe, 0x7c0002ee, Op_D | Op_A | Op_B, " %{D},%{A},%{B}" },
-	{ "sthx",	0xfc0007fe, 0x7c00032e, Op_S | Op_A | Op_B, " %{S},%{A0}%{B}" },
-	{ "orc",	0xfc0007fe, 0x7c000338, Op_S | Op_A | Op_B | Op_Rc, "%{RC} %{A},%{S},%{B}" },
-	{ "ecowx",	0xfc0007fe, 0x7c00036c, Op_S | Op_A | Op_B | Op_Rc, "%{RC} %{S},%{A0}%{B}" },
-	{ "slbie",	0xfc0007fc, 0x7c000364, Op_B, " %{B}" },
-	{ "sthux",	0xfc0007fe, 0x7c00036e, Op_S | Op_A | Op_B, " %{S},%{A0}%{B}" },
-	{ "or",		0xfc0007fe, 0x7c000378, Op_S | Op_A | Op_B | Op_Rc, "%{RC} %{A},%{S},%{B}" },
-	{ "divdu",	0xfc0003fe, 0x7c000392, Op_D | Op_A | Op_B | Op_OE | Op_Rc, "%{OE}%{RC} %{S},%{A},%{B}" },
-	{ "divwu",	0xfc0003fe, 0x7c000396, Op_D | Op_A | Op_B | Op_OE | Op_Rc, "%{OE}%{RC} %{S},%{A},%{B}" },
-	{ "mtspr",	0xfc0007fe, 0x7c0003a6, Op_S | Op_spr, " %{spr},%{S}" },
-	{ "dcbi",	0xfc0007fe, 0x7c0003ac, Op_A | Op_B, " %{A0}%{B}" },
-	{ "nand",	0xfc0007fe, 0x7c0003b8, Op_S | Op_A | Op_B | Op_Rc, "%{RC} %{A},%{S},%{B}" },
-	{ "divd",	0xfc0003fe, 0x7c0003d2, Op_S | Op_A | Op_B | Op_OE | Op_Rc, "%{OE}%{RC} %{S},%{A},%{B}" },
-	{ "divw",	0xfc0003fe, 0x7c0003d6, Op_S | Op_A | Op_B | Op_OE | Op_Rc, "%{OE}%{RC} %{S},%{A},%{B}" },
-	{ "slbia",	0xfc0003fe, 0x7c0003e4, Op_S | Op_A | Op_B | Op_OE | Op_Rc, "%{OE}%{RC} %{S},%{A},%{B}" },
-	{ "mcrxr",	0xfc0007fe, 0x7c000400, Op_crfD, "crfD1" },
-	{ "lswx",	0xfc0007fe, 0x7c00042a, Op_D | Op_A | Op_B, " %{D},%{A0}%{B}" },
-	{ "lwbrx",	0xfc0007fe, 0x7c00042c, Op_D | Op_A | Op_B, " %{D},%{A0}%{B}" },
-	{ "lfsx",	0xfc0007fe, 0x7c00042e, Op_D | Op_A | Op_B, " %{D},%{A},%{B}" },
-	{ "srw",	0xfc0007fe, 0x7c000430, Op_S | Op_A | Op_B | Op_Rc, "%{RC} %{A},%{S},%{B}" },
-	{ "srd",	0xfc0007fe, 0x7c000436, Op_S | Op_A | Op_B | Op_Rc, "%{RC} %{A},%{S},%{B}" },
-	{ "tlbsync",	0xffffffff, 0x7c00046c, 0, "" },
-	{ "lfsux",	0xfc0007fe, 0x7c00046e, Op_D | Op_A | Op_B, " %{D},%{A},%{B}" },
-	{ "mfsr",	0xfc0007fe, 0x7c0004a6, Op_D | Op_SR, " %{D},%{SR}" },
-	{ "lswi",	0xfc0007fe, 0x7c0004aa, Op_D | Op_A | Op_NB, " %{D},%{A},%{NB}" },
-	{ "sync",	0xfc0007fe, 0x7c0004ac, 0, "" },
-	{ "lfdx",	0xfc0007fe, 0x7c0004ae, Op_D | Op_A | Op_B, " %{D},%{A},%{B}" },
-	{ "lfdux",	0xfc0007fe, 0x7c0004ee, Op_D | Op_A | Op_B, " %{D},%{A},%{B}" },
-	{ "mfsrin",	0xfc0007fe, 0x7c000526, Op_D | Op_B, "" },
-	{ "stswx",	0xfc0007fe, 0x7c00052a, Op_S | Op_A | Op_B, " %{S},%{A0}%{B}" },
-	{ "stwbrx",	0xfc0007fe, 0x7c00052c, Op_S | Op_A | Op_B, " %{S},%{A0}%{B}" },
-	{ "stfsx",	0xfc0007fe, 0x7c00052e, Op_S | Op_A | Op_B, " %{S},%{A0}%{B}" },
-	{ "stfsux",	0xfc0007fe, 0x7c00056e, Op_S | Op_A | Op_B, " %{S},%{A},%{B}" },
-	{ "stswi",	0xfc0007fe, 0x7c0005aa, Op_S | Op_A | Op_NB, "%{S},%{A0}%{NB}" },
-	{ "stfdx",	0xfc0007fe, 0x7c0005ae, Op_S | Op_A | Op_B, " %{S},%{A0}%{B}" },
-	{ "stfdux",	0xfc0007fe, 0x7c0005ee, Op_S | Op_A | Op_B, " %{S},%{A},%{B}" },
-	{ "lhbrx",	0xfc0007fe, 0x7c00062c, Op_D | Op_A | Op_B, " %{D},%{A0}%{B}" },
-	{ "sraw",	0xfc0007fe, 0x7c000630, Op_S | Op_A | Op_B, " %{A},%{S},%{B}" },
-	{ "srad",	0xfc0007fe, 0x7c000634, Op_S | Op_A | Op_B | Op_Rc, "%{RC} %{A},%{S},%{B}" },
-	{ "srawi",	0xfc0007fe, 0x7c000670, Op_S | Op_A | Op_B | Op_Rc, "%{RC} %{A},%{SH}" },
-	{ "sradi",	0xfc0007fc, 0x7c000674, Op_S | Op_A | Op_sh, " %{A},%{S},%{sh}" },
-	{ "eieio",	0xfc0007fe, 0x7c0006ac, 0, "" }, /* MASK? */
-	{ "sthbrx",	0xfc0007fe, 0x7c00072c, Op_S | Op_A | Op_B, " %{S},%{A0}%{B}" },
-	{ "extsh",	0xfc0007fe, 0x7c000734, Op_S | Op_A | Op_Rc, "%{RC} %{A},%{S}" },
-	{ "extsb",	0xfc0007fe, 0x7c000774, Op_S | Op_A | Op_Rc, "%{RC} %{A},%{S}" },
-	{ "icbi",	0xfc0007fe, 0x7c0007ac, Op_A | Op_B, " %{A0}%{B}" },
-
-	{ "stfiwx",	0xfc0007fe, 0x7c0007ae, Op_S | Op_A | Op_B, " %{S},%{A0}%{B}" },
-	{ "extsw",	0xfc0007fe, 0x7c0007b4, Op_S | Op_A | Op_Rc, "%{RC} %{A},%{S}" },
-	{ "dcbz",	0xfc0007fe, 0x7c0007ec, Op_A | Op_B, " %{A0}%{B}" },
+	{ "cmpd",	0xfc2007fe, 0x7c200000, " %{crfD}%{A},%{B}" },
+	{ "cmpw",	0xfc2007fe, 0x7c000000, " %{crfD}%{A},%{B}" },
+	{ "tw",		0xfc0007fe, 0x7c000008, " %{TO},%{A},%{B}" },
+	{ "subfc",	0xfc0003fe, 0x7c000010, "%{OE}%{RC} %{D},%{A},%{B}" },
+	{ "mulhdu",	0xfc0007fe, 0x7c000012, "%{RC} %{D},%{A},%{B}" },
+	{ "addc",	0xfc0003fe, 0x7c000014, "%{OE}%{RC} %{D},%{A},%{B}" },
+	{ "mulhwu",	0xfc0007fe, 0x7c000016, "%{RC} %{D},%{A},%{B}" },
+
+	{ "mfcr",	0xfc0007fe, 0x7c000026, " %{D}" },
+	{ "lwarx",	0xfc0007fe, 0x7c000028, " %{D},%{A0}%{B}" },
+	{ "ldx",	0xfc0007fe, 0x7c00002a, " %{D},%{A0}%{B}" },
+	{ "lwzx",	0xfc0007fe, 0x7c00002e, " %{D},%{A0}%{B}" },
+	{ "slw",	0xfc0007fe, 0x7c000030, "%{RC} %{A},%{S},%{B}" },
+	{ "cntlzw",	0xfc0007fe, 0x7c000034, "%{RC} %{A},%{S}" },
+	{ "sld",	0xfc0007fe, 0x7c000036, "%{RC} %{A},%{S},%{B}" },
+	{ "and",	0xfc0007fe, 0x7c000038, "%{RC} %{A},%{S},%{B}" },
+	{ "cmpld",	0xfc2007fe, 0x7c200040, " %{crfD}%{A},%{B}" },
+	{ "cmplw",	0xfc2007fe, 0x7c000040, " %{crfD}%{A},%{B}" },
+	{ "subf",	0xfc0003fe, 0x7c000050, "%{OE}%{RC} %{D},%{A},%{B}" },
+	{ "ldux",	0xfc0007fe, 0x7c00006a, " %{D},%{A},%{B}" },
+	{ "dcbst",	0xfc0007fe, 0x7c00006c, " %{A0}%{B}" },
+	{ "lwzux",	0xfc0007fe, 0x7c00006e, " %{D},%{A},%{B}" },
+	{ "cntlzd",	0xfc0007fe, 0x7c000074, "%{RC} %{A},%{S}" },
+	{ "andc",	0xfc0007fe, 0x7c000078, "%{RC} %{A},%{S},%{B}" },
+	{ "td",		0xfc0007fe, 0x7c000088, " %{TO},%{A},%{B}" },
+	{ "mulhd",	0xfc0007fe, 0x7c000092, "%{RC} %{D},%{A},%{B}" },
+	{ "mulhw",	0xfc0007fe, 0x7c000096, "%{RC} %{D},%{A},%{B}" },
+	{ "mfmsr",	0xfc0007fe, 0x7c0000a6, " %{D}" },
+	{ "ldarx",	0xfc0007fe, 0x7c0000a8, " %{D},%{A0}%{B}" },
+	{ "dcbf",	0xfc0007fe, 0x7c0000ac, " %{A0}%{B}" },
+	{ "lbzx",	0xfc0007fe, 0x7c0000ae, " %{D},%{A0}%{B}" },
+	{ "neg",	0xfc0003fe, 0x7c0000d0, "%{OE}%{RC} %{D},%{A}" },
+	{ "lbzux",	0xfc0007fe, 0x7c0000ee, " %{D},%{A},%{B}" },
+	{ "nor",	0xfc0007fe, 0x7c0000f8, "%{RC} %{A},%{S}" },
+	{ "subfe",	0xfc0003fe, 0x7c000110, "%{OE}%{RC} %{D},%{A}" },
+	{ "adde",	0xfc0003fe, 0x7c000114, "%{OE}%{RC} %{D},%{A}" },
+	{ "mtcrf",	0xfc0007fe, 0x7c000120, " %{S},%{CRM}" },
+	{ "mtmsr",	0xfc0007fe, 0x7c000124, " %{S}" },
+	{ "stdx",	0xfc0007fe, 0x7c00012a, " %{S},%{A0}%{B}" },
+	{ "stwcx.",	0xfc0007ff, 0x7c00012d, " %{S},%{A},%{B}" },
+	{ "stwx",	0xfc0007fe, 0x7c00012e, " %{S},%{A},%{B}" },
+	{ "stdux",	0xfc0007fe, 0x7c00016a, " %{S},%{A},%{B}" },
+	{ "stwux",	0xfc0007fe, 0x7c00016e, " %{S},%{A},%{B}" },
+	{ "subfze",	0xfc0003fe, 0x7c000190, "%{OE}%{RC} %{D},%{A}" },
+	{ "addze",	0xfc0003fe, 0x7c000194, "%{OE}%{RC} %{D},%{A}" },
+	{ "mtsr",	0xfc0007fe, 0x7c0001a4, " %{SR},%{S}" },
+	{ "stdcx.",	0xfc0007ff, 0x7c0001ad, " %{S},%{A0}%{B}" },
+	{ "stbx",	0xfc0007fe, 0x7c0001ae, " %{S},%{A0}%{B}" },
+	{ "subfme",	0xfc0003fe, 0x7c0001d0, "%{OE}%{RC} %{D},%{A}" },
+	{ "mulld",	0xfc0003fe, 0x7c0001d2, "%{OE}%{RC} %{D},%{A},%{B}" },
+	{ "addme",	0xfc0003fe, 0x7c0001d4, "%{OE}%{RC} %{D},%{A}" },
+	{ "mullw",	0xfc0003fe, 0x7c0001d6, "%{OE}%{RC} %{D},%{A},%{B}" },
+	{ "mtsrin",	0xfc0007fe, 0x7c0001e4, " %{S},%{B}" },
+	{ "dcbtst",	0xfc0007fe, 0x7c0001ec, " %{A0}%{B}" },
+	{ "stbux",	0xfc0007fe, 0x7c0001ee, " %{S},%{A},%{B}" },
+	{ "add",	0xfc0003fe, 0x7c000214, "" },
+	{ "dcbt",	0xfc0007fe, 0x7c00022c, " %{A0}%{B}" },
+	{ "lhzx",	0xfc0007ff, 0x7c00022e, " %{D},%{A0}%{B}" },
+	{ "eqv",	0xfc0007fe, 0x7c000238, "%{RC} %{A},%{S},%{B}" },
+	{ "tlbie",	0xfc0007fe, 0x7c000264, " %{B}" },
+	{ "eciwx",	0xfc0007fe, 0x7c00026c, " %{D},%{A0}%{B}" },
+	{ "lhzux",	0xfc0007fe, 0x7c00026e, " %{D},%{A},%{B}" },
+	{ "xor",	0xfc0007fe, 0x7c000278, "%{RC} %{A},%{S},%{B}" },
+	{ "mfspr",	0xfc0007fe, 0x7c0002a6, " %{D},%{spr}" },
+	{ "lwax",	0xfc0007fe, 0x7c0002aa, " %{D},%{A0}%{B}" },
+	{ "lhax",	0xfc0007fe, 0x7c0002ae, " %{D},%{A},%{B}" },
+	{ "tlbia",	0xfc0007fe, 0x7c0002e4, "" },
+	{ "mftb",	0xfc0007fe, 0x7c0002e6, " %{D},%{tbr}" },
+	{ "lwaux",	0xfc0007fe, 0x7c0002ea, " %{D},%{A},%{B}" },
+	{ "lhaux",	0xfc0007fe, 0x7c0002ee, " %{D},%{A},%{B}" },
+	{ "sthx",	0xfc0007fe, 0x7c00032e, " %{S},%{A0}%{B}" },
+	{ "orc",	0xfc0007fe, 0x7c000338, "%{RC} %{A},%{S},%{B}" },
+	{ "ecowx",	0xfc0007fe, 0x7c00036c, "%{RC} %{S},%{A0}%{B}" },
+	{ "slbie",	0xfc0007fc, 0x7c000364, " %{B}" },
+	{ "sthux",	0xfc0007fe, 0x7c00036e, " %{S},%{A0}%{B}" },
+	{ "or",		0xfc0007fe, 0x7c000378, "%{RC} %{A},%{S},%{B}" },
+	{ "divdu",	0xfc0003fe, 0x7c000392, "%{OE}%{RC} %{S},%{A},%{B}" },
+	{ "divwu",	0xfc0003fe, 0x7c000396, "%{OE}%{RC} %{S},%{A},%{B}" },
+	{ "mtspr",	0xfc0007fe, 0x7c0003a6, " %{spr},%{S}" },
+	{ "dcbi",	0xfc0007fe, 0x7c0003ac, " %{A0}%{B}" },
+	{ "nand",	0xfc0007fe, 0x7c0003b8, "%{RC} %{A},%{S},%{B}" },
+	{ "divd",	0xfc0003fe, 0x7c0003d2, "%{OE}%{RC} %{S},%{A},%{B}" },
+	{ "divw",	0xfc0003fe, 0x7c0003d6, "%{OE}%{RC} %{S},%{A},%{B}" },
+	{ "slbia",	0xfc0003fe, 0x7c0003e4, "%{OE}%{RC} %{S},%{A},%{B}" },
+	{ "mcrxr",	0xfc0007fe, 0x7c000400, "crfD1" },
+	{ "lswx",	0xfc0007fe, 0x7c00042a, " %{D},%{A0}%{B}" },
+	{ "lwbrx",	0xfc0007fe, 0x7c00042c, " %{D},%{A0}%{B}" },
+	{ "lfsx",	0xfc0007fe, 0x7c00042e, " %{D},%{A},%{B}" },
+	{ "srw",	0xfc0007fe, 0x7c000430, "%{RC} %{A},%{S},%{B}" },
+	{ "srd",	0xfc0007fe, 0x7c000436, "%{RC} %{A},%{S},%{B}" },
+	{ "tlbsync",	0xffffffff, 0x7c00046c, "" },
+	{ "lfsux",	0xfc0007fe, 0x7c00046e, " %{D},%{A},%{B}" },
+	{ "mfsr",	0xfc0007fe, 0x7c0004a6, " %{D},%{SR}" },
+	{ "lswi",	0xfc0007fe, 0x7c0004aa, " %{D},%{A},%{NB}" },
+	{ "sync",	0xfc0007fe, 0x7c0004ac, "" },
+	{ "lfdx",	0xfc0007fe, 0x7c0004ae, " %{D},%{A},%{B}" },
+	{ "lfdux",	0xfc0007fe, 0x7c0004ee, " %{D},%{A},%{B}" },
+	{ "mfsrin",	0xfc0007fe, 0x7c000526, "" },
+	{ "stswx",	0xfc0007fe, 0x7c00052a, " %{S},%{A0}%{B}" },
+	{ "stwbrx",	0xfc0007fe, 0x7c00052c, " %{S},%{A0}%{B}" },
+	{ "stfsx",	0xfc0007fe, 0x7c00052e, " %{S},%{A0}%{B}" },
+	{ "stfsux",	0xfc0007fe, 0x7c00056e, " %{S},%{A},%{B}" },
+	{ "stswi",	0xfc0007fe, 0x7c0005aa, "%{S},%{A0}%{NB}" },
+	{ "stfdx",	0xfc0007fe, 0x7c0005ae, " %{S},%{A0}%{B}" },
+	{ "stfdux",	0xfc0007fe, 0x7c0005ee, " %{S},%{A},%{B}" },
+	{ "lhbrx",	0xfc0007fe, 0x7c00062c, " %{D},%{A0}%{B}" },
+	{ "sraw",	0xfc0007fe, 0x7c000630, " %{A},%{S},%{B}" },
+	{ "srad",	0xfc0007fe, 0x7c000634, "%{RC} %{A},%{S},%{B}" },
+	{ "srawi",	0xfc0007fe, 0x7c000670, "%{RC} %{A},%{SH}" },
+	{ "sradi",	0xfc0007fc, 0x7c000674, " %{A},%{S},%{sh}" },
+	{ "eieio",	0xfc0007fe, 0x7c0006ac, "" }, /* MASK? */
+	{ "sthbrx",	0xfc0007fe, 0x7c00072c, " %{S},%{A0}%{B}" },
+	{ "extsh",	0xfc0007fe, 0x7c000734, "%{RC} %{A},%{S}" },
+	{ "extsb",	0xfc0007fe, 0x7c000774, "%{RC} %{A},%{S}" },
+	{ "icbi",	0xfc0007fe, 0x7c0007ac, " %{A0}%{B}" },
+
+	{ "stfiwx",	0xfc0007fe, 0x7c0007ae, " %{S},%{A0}%{B}" },
+	{ "extsw",	0xfc0007fe, 0x7c0007b4, "%{RC} %{A},%{S}" },
+	{ "dcbz",	0xfc0007fe, 0x7c0007ec, " %{A0}%{B}" },
 	{ "",		0x0,		0x0, 0, }
 };
 
 /* 3a * 4 = e8 */
 const struct opcode opcodes_3a[] = {
-	{ "ld",		0xfc000003, 0xe8000000, Op_D | Op_A | Op_ds, " %{D},${ds}${A}" },
-	{ "ldu",	0xfc000003, 0xe8000001, Op_D | Op_A | Op_ds, " %{D},${ds}${A}" },
-	{ "lwa",	0xfc000003, 0xe8000002, Op_D | Op_A | Op_ds, " %{D},${ds}${A}" },
-	{ "",		0x0,		0x0, 0, "" }
+	{ "ld",		0xfc000003, 0xe8000000, " %{D},${ds}${A}" },
+	{ "ldu",	0xfc000003, 0xe8000001, " %{D},${ds}${A}" },
+	{ "lwa",	0xfc000003, 0xe8000002, " %{D},${ds}${A}" },
+	{ "",		0x0,		0x0, "" }
 };
 /* 3b * 4 = ec */
 const struct opcode opcodes_3b[] = {
-	{ "fdivs",	0xfc00003e, 0xec000024, Op_D | Op_A | Op_B | Op_Rc, "%{RC} f%{D},f%{A},f%{B}" },
-	{ "fsubs",	0xfc00003e, 0xec000028, Op_D | Op_A | Op_B | Op_Rc, "%{RC} f%{D},f%{A},f%{B}" },
-
-	{ "fadds",	0xfc00003e, 0xec00002a, Op_D | Op_A | Op_B | Op_Rc, "%{RC} f%{D},f%{A},f%{B}" },
-	{ "fsqrts",	0xfc00003e, 0xec00002c, Op_D | Op_B | Op_Rc, "" },
-	{ "fres",	0xfc00003e, 0xec000030, Op_D | Op_B | Op_Rc, "" },
-	{ "fmuls",	0xfc00003e, 0xec000032, Op_D | Op_A | Op_C | Op_Rc, "%{RC} f%{D},f%{A},f%{C}" },
-	{ "fmsubs",	0xfc00003e, 0xec000038, Op_D | Op_A | Op_B | Op_C | Op_Rc, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
-	{ "fmadds",	0xfc00003e, 0xec00003a, Op_D | Op_A | Op_B | Op_C | Op_Rc, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
-	{ "fnmsubs",	0xfc00003e, 0xec00003c, Op_D | Op_A | Op_B | Op_C | Op_Rc, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
-	{ "fnmadds",	0xfc00003e, 0xec00003e, Op_D | Op_A | Op_B | Op_C | Op_Rc, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
-	{ "",		0x0,		0x0, 0, "" }
+	{ "fdivs",	0xfc00003e, 0xec000024, "%{RC} f%{D},f%{A},f%{B}" },
+	{ "fsubs",	0xfc00003e, 0xec000028, "%{RC} f%{D},f%{A},f%{B}" },
+
+	{ "fadds",	0xfc00003e, 0xec00002a, "%{RC} f%{D},f%{A},f%{B}" },
+	{ "fsqrts",	0xfc00003e, 0xec00002c, "" },
+	{ "fres",	0xfc00003e, 0xec000030, "" },
+	{ "fmuls",	0xfc00003e, 0xec000032, "%{RC} f%{D},f%{A},f%{C}" },
+	{ "fmsubs",	0xfc00003e, 0xec000038, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
+	{ "fmadds",	0xfc00003e, 0xec00003a, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
+	{ "fnmsubs",	0xfc00003e, 0xec00003c, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
+	{ "fnmadds",	0xfc00003e, 0xec00003e, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
+	{ "",		0x0,		0x0, "" }
 };
 /* 3e * 4 = f8 */
 const struct opcode opcodes_3e[] = {
-	{ "std",	0xfc000003, 0xf8000000, Op_S | Op_A | Op_ds, " %{D},${ds}${A}" },
-	{ "stdu",	0xfc000003, 0xf8000001, Op_S | Op_A | Op_ds, " %{D},${ds}${A}" },
-	{ "",		0x0,		0x0, 0, "" }
+	{ "std",	0xfc000003, 0xf8000000, " %{D},${ds}${A}" },
+	{ "stdu",	0xfc000003, 0xf8000001, " %{D},${ds}${A}" },
+	{ "",		0x0,		0x0, "" }
 };
 
 /* 3f * 4 = fc */
 const struct opcode opcodes_3f[] = {
-	{ "fcmpu",	0xfc0007fe, 0xfc000000, Op_crfD | Op_A | Op_B, " %{crfD},f%{A},f%{B}" },
-	{ "frsp",	0xfc0007fe, 0xfc000018, Op_D | Op_B | Op_Rc, "%{RC} f%{D},f%{B}" },
-	{ "fctiw",	0xfc0007fe, 0xfc00001c, Op_D | Op_B | Op_Rc, "%{RC} f%{D},f%{B}" },
-	{ "fctiwz",	0xfc0007fe, 0xfc00001e, Op_D | Op_B | Op_Rc, "%{RC} f%{D},f%{B}" },
-
-	{ "fdiv",	0xfc00003e, 0xfc000024, Op_D | Op_A | Op_B | Op_Rc, "%{RC} f%{D},f%{A},f%{B}" },
-	{ "fsub",	0xfc00003e, 0xfc000028, Op_D | Op_A | Op_B | Op_Rc, "%{RC} f%{D},f%{A},f%{B}" },
-	{ "fadd",	0xfc00003e, 0xfc00002a, Op_D | Op_A | Op_B | Op_Rc, "%{RC} f%{D},f%{A},f%{B}" },
-	{ "fsqrt",	0xfc00003e, 0xfc00002c, Op_D | Op_B | Op_Rc, "%{RC} f%{D},f%{B}" },
-	{ "fsel",	0xfc00003e, 0xfc00002e, Op_D | Op_A | Op_B | Op_C | Op_Rc, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
-	{ "fmul",	0xfc00003e, 0xfc000032, Op_D | Op_A | Op_C | Op_Rc, "%{RC} f%{D},f%{A},f%{C}" },
-	{ "frsqrte",	0xfc00003e, 0xfc000034, Op_D | Op_B | Op_Rc, "%{RC} f%{D},f%{B}" },
-	{ "fmsub",	0xfc00003e, 0xfc000038, Op_D | Op_A | Op_B | Op_C | Op_Rc, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
-	{ "fmadd",	0xfc00003e, 0xfc00003a, Op_D | Op_A | Op_B | Op_C | Op_Rc, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
-	{ "fnmsub",	0xfc00003e, 0xfc00003c, Op_D | Op_A | Op_B | Op_C | Op_Rc, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
-	{ "fnmadd",	0xfc00003e, 0xfc00003e, Op_D | Op_A | Op_B | Op_C | Op_Rc, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
-
-	{ "fcmpo",	0xfc0007fe, 0xfc000040, Op_crfD | Op_A | Op_B, "%{RC} f%{D},f%{A},f%{C}" },
-	{ "mtfsb1",	0xfc0007fe, 0xfc00004c, Op_crfD | Op_Rc, "%{RC} f%{D},f%{A},f%{C}" },
-	{ "fneg",	0xfc0007fe, 0xfc000050, Op_D | Op_B | Op_Rc, "%{RC} f%{D},f%{A},f%{C}" },
-	{ "mcrfs",	0xfc0007fe, 0xfc000080, Op_D | Op_B | Op_Rc, "%{RC} f%{D},f%{A},f%{C}" },
-	{ "mtfsb0",	0xfc0007fe, 0xfc00008c, Op_crfD | Op_Rc, "%{RC} %{crfD},f%{C}" },
-	{ "fmr",	0xfc0007fe, 0xfc000090, Op_D | Op_B | Op_Rc, "%{RC} f%{D},f%{B}" },
-	{ "mtfsfi",	0xfc0007fe, 0xfc00010c, Op_crfD | Op_IMM | Op_Rc, "%{RC} %{crfD},f%{C},%{IMM}" },
-
-	{ "fnabs",	0xfc0007fe, 0xfc000110, Op_D | Op_B | Op_Rc, "%{RC} f%{D},f%{B}" },
-	{ "fabs",	0xfc0007fe, 0xfc000210, Op_D | Op_B | Op_Rc, "%{RC} f%{D},f%{B}" },
-	{ "mffs",	0xfc0007fe, 0xfc00048e, Op_D | Op_B | Op_Rc, "%{RC} f%{D},f%{B}" },
-	{ "mtfsf",	0xfc0007fe, 0xfc00058e, Op_FM | Op_B | Op_Rc, "%{RC} %{FM},f%{B}" },
-	{ "fctid",	0xfc0007fe, 0xfc00065c, Op_D | Op_B | Op_Rc, "%{RC} f%{D},f%{B}" },
-	{ "fctidz",	0xfc0007fe, 0xfc00065e, Op_D | Op_B | Op_Rc, "%{RC} f%{D},f%{B}" },
-	{ "fcfid",	0xfc0007fe, 0xfc00069c, Op_D | Op_B | Op_Rc, "%{RC} f%{D},f%{B}" },
-	{ "",		0x0,		0x0, 0, "" }
+	{ "fcmpu",	0xfc0007fe, 0xfc000000, " %{crfD},f%{A},f%{B}" },
+	{ "frsp",	0xfc0007fe, 0xfc000018, "%{RC} f%{D},f%{B}" },
+	{ "fctiw",	0xfc0007fe, 0xfc00001c, "%{RC} f%{D},f%{B}" },
+	{ "fctiwz",	0xfc0007fe, 0xfc00001e, "%{RC} f%{D},f%{B}" },
+
+	{ "fdiv",	0xfc00003e, 0xfc000024, "%{RC} f%{D},f%{A},f%{B}" },
+	{ "fsub",	0xfc00003e, 0xfc000028, "%{RC} f%{D},f%{A},f%{B}" },
+	{ "fadd",	0xfc00003e, 0xfc00002a, "%{RC} f%{D},f%{A},f%{B}" },
+	{ "fsqrt",	0xfc00003e, 0xfc00002c, "%{RC} f%{D},f%{B}" },
+	{ "fsel",	0xfc00003e, 0xfc00002e, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
+	{ "fmul",	0xfc00003e, 0xfc000032, "%{RC} f%{D},f%{A},f%{C}" },
+	{ "frsqrte",	0xfc00003e, 0xfc000034, "%{RC} f%{D},f%{B}" },
+	{ "fmsub",	0xfc00003e, 0xfc000038, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
+	{ "fmadd",	0xfc00003e, 0xfc00003a, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
+	{ "fnmsub",	0xfc00003e, 0xfc00003c, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
+	{ "fnmadd",	0xfc00003e, 0xfc00003e, "%{RC} f%{D},f%{A},f%{C},f%{B}" },
+
+	{ "fcmpo",	0xfc0007fe, 0xfc000040, "%{RC} f%{D},f%{A},f%{C}" },
+	{ "mtfsb1",	0xfc0007fe, 0xfc00004c, "%{RC} f%{D},f%{A},f%{C}" },
+	{ "fneg",	0xfc0007fe, 0xfc000050, "%{RC} f%{D},f%{A},f%{C}" },
+	{ "mcrfs",	0xfc0007fe, 0xfc000080, "%{RC} f%{D},f%{A},f%{C}" },
+	{ "mtfsb0",	0xfc0007fe, 0xfc00008c, "%{RC} %{crfD},f%{C}" },
+	{ "fmr",	0xfc0007fe, 0xfc000090, "%{RC} f%{D},f%{B}" },
+	{ "mtfsfi",	0xfc0007fe, 0xfc00010c, "%{RC} %{crfD},f%{C},%{IMM}" },
+
+	{ "fnabs",	0xfc0007fe, 0xfc000110, "%{RC} f%{D},f%{B}" },
+	{ "fabs",	0xfc0007fe, 0xfc000210, "%{RC} f%{D},f%{B}" },
+	{ "mffs",	0xfc0007fe, 0xfc00048e, "%{RC} f%{D},f%{B}" },
+	{ "mtfsf",	0xfc0007fe, 0xfc00058e, "%{RC} %{FM},f%{B}" },
+	{ "fctid",	0xfc0007fe, 0xfc00065c, "%{RC} f%{D},f%{B}" },
+	{ "fctidz",	0xfc0007fe, 0xfc00065e, "%{RC} f%{D},f%{B}" },
+	{ "fcfid",	0xfc0007fe, 0xfc00069c, "%{RC} f%{D},f%{B}" },
+	{ "",		0x0,		0x0, "" }
 };
 
-/*
-typedef void (op_class_func) (instr_t);
-*/
 void
 op_ill(u_int32_t addr, instr_t instr)
 {
@@ -1055,415 +1002,6 @@ disasm_fields(u_int32_t addr, const struct opcode *popcode, instr_t instr, char
 	}
 	*poutput = '\0';
 }
-#if 0
-void disasm_fieldsO(u_int32_t addr, const struct opcode *popcode, instr_t instr, char *disasm_str);
-
-void
-disasm_fieldsO(u_int32_t addr, const struct opcode *popcode, instr_t instr, char *disasm_str)
-{
-	char * pstr;
-	enum function_mask func;
-	char *name;
-	db_expr_t offset;
-
-	pstr = disasm_str;
-
-	func =  popcode->func;
-	if (func & Op_OE) {
-		u_int OE;
-		/* also for Op_S (they are the same) */
-		OE = extract_field(instr, 31 - 21, 1);
-		if (OE) {
-			pstr += sprintf (pstr, "o");
-		}
-		func &= ~Op_D;
-	}
-	switch  (func & Op_LKM) {
-	case Op_Rc:
-		if (instr & 0x1) {
-			pstr += sprintf (pstr,". ");
-		}
-		break;
-	case Op_AA:
-		if (instr & 0x2) {
-			pstr += sprintf (pstr,"a");
-		}
-	case Op_LK:
-		if (instr & 0x1) {
-			pstr += sprintf (pstr,"l ");
-		}
-		break;
-	default:
-		func &= ~Op_LKM;
-	}
-	pstr += sprintf (pstr, " ");
-	if (func & Op_D) {
-		u_int D;
-		/* also for Op_S (they are the same) */
-		D = extract_field(instr, 31 - 10, 5);
-		pstr += sprintf (pstr, "r%d, ", D);
-		func &= ~Op_D;
-	}
-	if (func & Op_crbD) {
-		u_int crbD;
-		crbD = extract_field(instr, 31 - 10, 5);
-		pstr += sprintf (pstr, "crb%d, ", crbD);
-		func &= ~Op_crbD;
-	}
-	if (func & Op_crfD) {
-		u_int crfD;
-		crfD = extract_field(instr, 31 - 8, 3);
-		pstr += sprintf (pstr, "crf%d, ", crfD);
-		func &= ~Op_crfD;
-	}
-	if (func & Op_L) {
-		u_int L;
-		L = extract_field(instr, 31 - 10, 1);
-		if (L) {
-			pstr += sprintf (pstr, "L, ");
-		}
-		func &= ~Op_L;
-	}
-	if (func & Op_FM) {
-		u_int FM;
-		FM = extract_field(instr, 31 - 10, 8);
-		pstr += sprintf (pstr, "%d, ", FM);
-		func &= ~Op_FM;
-	}
-	if (func & Op_TO) {
-		u_int TO;
-		TO = extract_field(instr, 31 - 10, 1);
-		pstr += sprintf (pstr, "%d, ", TO);
-		func &= ~Op_TO;
-	}
-	if (func & Op_crfS) {
-		u_int crfS;
-		crfS = extract_field(instr, 31 - 13, 3);
-		pstr += sprintf (pstr, "%d, ", crfS);
-		func &= ~Op_crfS;
-	}
-	if (func & Op_BO) {
-		u_int BO;
-		BO = extract_field(instr, 31 - 10, 5);
-		pstr += sprintf (pstr ,"%d, ", BO);
-		func &= ~Op_BO;
-	}
-	if (func & Op_A) {
-		u_int A;
-		A = extract_field(instr, 31 - 15, 5);
-		pstr += sprintf (pstr, "r%d, ", A);
-		func &= ~Op_A;
-	}
-	if (func & Op_B) {
-		u_int B;
-		B = extract_field(instr, 31 - 20, 5);
-		pstr += sprintf (pstr, "r%d, ", B);
-		func &= ~Op_B;
-	}
-	if (func & Op_C) {
-		u_int C;
-		C = extract_field(instr, 31 - 25, 5);
-		pstr += sprintf (pstr, "r%d, ", C);
-		func &= ~Op_C;
-	}
-	if (func & Op_BI) {
-		u_int BI;
-		BI = extract_field(instr, 31 - 10, 5);
-		pstr += sprintf (pstr, "%d, ", BI);
-		func &= ~Op_BI;
-	}
-	if (func & Op_crbA) {
-		u_int crbA;
-		crbA = extract_field(instr, 31 - 15, 5);
-		pstr += sprintf (pstr, "%d, ", crbA);
-		func &= ~Op_crbA;
-	}
-	if (func & Op_crbB) {
-		u_int crbB;
-		crbB = extract_field(instr, 31 - 20, 5);
-		pstr += sprintf (pstr, "%d, ", crbB);
-		func &= ~Op_crbB;
-	}
-	if (func & Op_CRM) {
-		u_int CRM;
-		CRM = extract_field(instr, 31 - 19, 8);
-		pstr += sprintf (pstr, "0x%x, ", CRM);
-		func &= ~Op_CRM;
-	}
-	if (func & Op_LI) {
-		u_int LI;
-		LI = extract_field(instr, 31 - 29, 24);
-		LI = LI << 2;
-		if (LI & 0x04000000) {
-			LI &= ~0x7ffffff;
-		}
-		if ((instr & (1 << 1)) == 0) {
-			/* CHECK AA bit */
-			LI = addr + LI;
-		}
-		db_find_sym_and_offset(LI, &name, &offset);
-		if (name) {
-			pstr += sprintf (pstr, "0x%x (%s+0x%x)", addr + LI,
-				name, offset);
-		} else {
-			pstr += sprintf (pstr, "0x%x", addr + LI);
-		}
-		func &= ~Op_LI;
-	}
-	switch (func & Op_SIMM) {
-		u_int IMM;
-	case Op_SIMM: /* same as Op_d */
-		IMM = extract_field(instr, 31 - 31, 16);
-		if (IMM & 0x8000) {
-			pstr += sprintf (pstr, "-");
-		}
-			/* no break */
-		func &= ~Op_SIMM;
-	case Op_UIMM:
-		IMM = extract_field(instr, 31 - 31, 16);
-		pstr += sprintf (pstr, "0x%x, ", IMM);
-		func &= ~Op_UIMM;
-		break;
-	default:
-	}
-	if (func & Op_BD ) {
-		u_int BD;
-		BD = extract_field(instr, 31 - 29, 14);
-		BD = BD << 2;
-		if (BD & 0x00008000) {
-			BD &= ~0x00007fff;
-		}
-		if ((instr & (1 << 1)) == 0) {
-			/* CHECK AA bit */
-			BD = addr + BD;
-		}
-		db_find_sym_and_offset(BD, &name, &offset);
-		if (name) {
-			pstr += sprintf (pstr, "0x%x (%s+0x%x)", addr + BD,
-				name, offset);
-		} else {
-			pstr += sprintf (pstr, "0x%x", addr + BD);
-		}
-		func &= ~Op_BD;
-	}
-	if (func & Op_ds ) {
-		u_int ds;
-		ds = extract_field(instr, 31 - 29, 14) << 2;
-		pstr += sprintf (pstr, "0x%x, ", ds);
-		func &= ~Op_ds;
-	}
-	if (func & Op_spr ) {
-		u_int spr;
-		u_int sprl;
-		u_int sprh;
-		char *reg;
-		sprl = extract_field(instr, 31 - 15, 5);
-		sprh = extract_field(instr, 31 - 20, 5);
-		spr = sprh << 5 | sprl;
-
-		/* this table could be written better */
-		switch (spr) {
-		case 	1:
-			reg = "xer";
-			break;
-		case 	8:
-			reg = "lr";
-			break;
-		case 	9:
-			reg = "ctr";
-			break;
-		case 	18:
-			reg = "dsisr";
-			break;
-		case 	19:
-			reg = "dar";
-			break;
-		case 	22:
-			reg = "dec";
-			break;
-		case 	25:
-			reg = "sdr1";
-			break;
-		case 	26:
-			reg = "srr0";
-			break;
-		case 	27:
-			reg = "srr1";
-			break;
-		case 	272:
-			reg = "SPRG0";
-			break;
-		case 	273:
-			reg = "SPRG1";
-			break;
-		case 	274:
-			reg = "SPRG3";
-			break;
-		case 	275:
-			reg = "SPRG3";
-			break;
-		case 	280:
-			reg = "asr";
-			break;
-		case 	282:
-			reg = "aer";
-			break;
-		case 	287:
-			reg = "pvr";
-			break;
-		case 	528:
-			reg = "ibat0u";
-			break;
-		case 	529:
-			reg = "ibat0l";
-			break;
-		case 	530:
-			reg = "ibat1u";
-			break;
-		case 	531:
-			reg = "ibat1l";
-			break;
-		case 	532:
-			reg = "ibat2u";
-			break;
-		case 	533:
-			reg = "ibat2l";
-			break;
-		case 	534:
-			reg = "ibat3u";
-			break;
-		case 	535:
-			reg = "ibat3l";
-			break;
-		case 	536:
-			reg = "dbat0u";
-			break;
-		case 	537:
-			reg = "dbat0l";
-			break;
-		case 	538:
-			reg = "dbat1u";
-			break;
-		case 	539:
-			reg = "dbat1l";
-			break;
-		case 	540:
-			reg = "dbat2u";
-			break;
-		case 	541:
-			reg = "dbat2l";
-			break;
-		case 	542:
-			reg = "dbat3u";
-			break;
-		case 	543:
-			reg = "dbat3l";
-			break;
-		case 	1013:
-			reg = "dabr";
-			break;
-		default:
-			reg = 0;
-		}
-		if (reg == 0) {
-			pstr += sprintf (pstr, ", spr%d", spr);
-		} else {
-			pstr += sprintf (pstr, ", %s", reg);
-		}
-		func &= ~Op_spr;
-	}
-
-	if (func & Op_me) {
-		u_int me, mel, meh;
-		mel = extract_field(instr, 31 - 25, 4);
-		meh = extract_field(instr, 31 - 26, 1);
-		me = meh << 4 | mel;
-		pstr += sprintf (pstr, ", 0x%x", me);
-		func &= ~Op_me;
-	}
-	if ((func & Op_MB ) && (func & Op_sh_mb_sh)) {
-		u_int MB;
-		u_int ME;
-		MB = extract_field(instr, 31 - 20, 5);
-		pstr += sprintf (pstr, ", %d", MB);
-		ME = extract_field(instr, 31 - 25, 5);
-		pstr += sprintf (pstr, ", %d", ME);
-	}
-	if ((func & Op_SH ) && (func & Op_sh_mb_sh)) {
-		u_int SH;
-		SH = extract_field(instr, 31 - 20, 5);
-		pstr += sprintf (pstr, ", %d", SH);
-	}
-	if ((func & Op_sh ) && ! (func & Op_sh_mb_sh)) {
-		u_int sh, shl, shh;
-		shl = extract_field(instr, 31 - 19, 4);
-		shh = extract_field(instr, 31 - 20, 1);
-		sh = shh << 4 | shl;
-		pstr += sprintf (pstr, ", %d", sh);
-	}
-	if ((func & Op_mb ) && ! (func & Op_sh_mb_sh)) {
-		u_int mb, mbl, mbh;
-		mbl = extract_field(instr, 31 - 25, 4);
-		mbh = extract_field(instr, 31 - 26, 1);
-		mb = mbh << 4 | mbl;
-		pstr += sprintf (pstr, ", %d", mb);
-	}
-	if ((func & Op_me ) && ! (func & Op_sh_mb_sh)) {
-		u_int me, mel, meh;
-		mel = extract_field(instr, 31 - 25, 4);
-		meh = extract_field(instr, 31 - 26, 1);
-		me = meh << 4 | mel;
-		pstr += sprintf (pstr, ", %d", me);
-	}
-	if (func & Op_tbr ) {
-		u_int tbr;
-		u_int tbrl;
-		u_int tbrh;
-		char *reg;
-		tbrl = extract_field(instr, 31 - 15, 5);
-		tbrh = extract_field(instr, 31 - 20, 5);
-		tbr = tbrh << 5 | tbrl;
-
-		switch (tbr) {
-		case 268:
-			reg = "tbl";
-			break;
-		case 269:
-			reg = "tbu";
-			break;
-		default:
-			reg = 0;
-		}
-		if (reg == 0) {
-			pstr += sprintf (pstr, ", [unknown tbr %d ]", tbr);
-		} else {
-			pstr += sprintf (pstr, ", %s", reg);
-		}
-		func &= ~Op_tbr;
-	}
-	if (func & Op_SR) {
-		u_int SR;
-		SR = extract_field(instr, 31 - 15, 3);
-		pstr += sprintf (pstr, ", sr%d", SR);
-		func &= ~Op_SR;
-	}
-	if (func & Op_NB) {
-		u_int NB;
-		NB = extract_field(instr, 31 - 20, 5);
-		if (NB == 0 ) {
-			NB=32;
-		}
-		pstr += sprintf (pstr, ", %d", NB);
-		func &= ~Op_SR;
-	}
-	if (func & Op_IMM) {
-		u_int IMM;
-		IMM = extract_field(instr, 31 - 19, 4);
-		pstr += sprintf (pstr, ", %d", IMM);
-		func &= ~Op_SR;
-	}
-}
-#endif
 
 void
 op_base(u_int32_t addr, instr_t instr)
@@ -1520,9 +1058,6 @@ dis_ppc(u_int32_t addr, const struct opcode *opcodeset, instr_t instr)
 	int found = 0;
 	int i;
 	char disasm_str[30];
-	/*
-	char disasm_str1[30];
-	*/
 
 	for (   i=0, op = &opcodeset[0];
 		found == 0 && op->mask != 0;
@@ -1531,10 +1066,6 @@ dis_ppc(u_int32_t addr, const struct opcode *opcodeset, instr_t instr)
 		if ((instr & op->mask) == op->code) {
 			found = 1;
 			disasm_fields(addr, op, instr, disasm_str);
-			/*
-			disasm_fieldsO(addr, op, instr, disasm_str1);
-			db_printf("%s[%s][%s] ",op->name, disasm_str, disasm_str1);
-			*/
 			db_printf("%s%s",op->name, disasm_str);
 			return;
 		}