Author: jhibbits
Date: Fri Dec 23 03:42:38 2016
New Revision: 310449
URL: https://svnweb.freebsd.org/changeset/base/310449
Log:
MFC r309309,r310150:
Bring the powerpc DDB disassembler into the 21st century
Modified:
stable/11/sys/powerpc/powerpc/db_disasm.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/powerpc/powerpc/db_disasm.c
==============================================================================
--- stable/11/sys/powerpc/powerpc/db_disasm.c Fri Dec 23 03:35:39 2016
(r310448)
+++ stable/11/sys/powerpc/powerpc/db_disasm.c Fri Dec 23 03:42:38 2016
(r310449)
@@ -1,13 +1,14 @@
-/* $FreeBSD$ */
-/* $NetBSD: db_disasm.c,v 1.12 2002/01/05 22:07:26 jhawk Exp $ */
+/* $NetBSD: db_disasm.c,v 1.28 2013/07/04 23:00:23 joerg Exp $ */
/* $OpenBSD: db_disasm.c,v 1.2 1996/12/28 06:21:48 rahnds Exp $ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/systm.h>
#include <machine/db_machdep.h>
-#include <machine/trap.h>
#include <ddb/ddb.h>
#include <ddb/db_access.h>
@@ -20,11 +21,13 @@ enum function_mask {
Op_B = 0x00000002,
Op_BI = 0x00000004,
Op_BO = 0x00000008,
+ Op_BC = Op_BI | Op_BO,
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_D = 0x00000020,
+ Op_ST = 0x00000020, /* Op_S for store-operations, same as D */
+ Op_S = 0x00000040, /* S-field is swapped with A-field */
+ Op_FM = Op_D | Op_S, /* kludge (reduce Op_s) */
+ Op_dA = 0x00000080,
Op_LK = 0x00000100,
Op_Rc = 0x00000200,
Op_AA = Op_LK | Op_Rc, /* kludge (reduce Op_s) */
@@ -37,10 +40,10 @@ enum function_mask {
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_WS = Op_crbB, /* kludge, same field as crbB */
+ Op_rSH = Op_crbB, /* kludge, same field as crbB */
Op_crbD = 0x00020000,
Op_crfD = 0x00040000,
Op_crfS = 0x00080000,
@@ -50,7 +53,7 @@ enum function_mask {
Op_dcr = Op_spr, /* out of bits - cheat with Op_spr */
Op_tbr = 0x00800000,
- Op_L = 0x01000000,
+ Op_BP = 0x01000000,
Op_BD = 0x02000000,
Op_LI = 0x04000000,
Op_C = 0x08000000,
@@ -67,7 +70,7 @@ enum function_mask {
};
struct opcode {
- char *name;
+ const char *name;
u_int32_t mask;
u_int32_t code;
enum function_mask func;
@@ -78,7 +81,7 @@ typedef void (op_class_func) (instr_t, v
u_int32_t extract_field(u_int32_t value, u_int32_t base, u_int32_t width);
void disasm_fields(const struct opcode *popcode, instr_t instr, vm_offset_t
loc,
- char *disasm_str);
+ char *disasm_str, size_t slen);
void dis_ppc(const struct opcode *opcodeset, instr_t instr, vm_offset_t loc);
op_class_func op_ill, op_base;
@@ -89,7 +92,7 @@ op_class_func op_cl_x3e, op_cl_x3f;
op_class_func *opcodes_base[] = {
/*x00*/ op_ill, op_ill, op_base, op_ill,
/*x04*/ op_ill, op_ill, op_ill, op_base,
-/*x08*/ op_base, op_base, op_ill, op_base,
+/*x08*/ op_base, op_base, op_base, op_base,
/*x0C*/ op_base, op_base, op_base/*XXX*/, op_base/*XXX*/,
/*x10*/ op_base, op_base, op_base, op_cl_x13,
/*x14*/ op_base, op_base, op_ill, op_base,
@@ -118,14 +121,16 @@ const struct opcode opcodes[] = {
{ "twi", 0xfc000000, 0x0c000000, Op_TO | Op_A | Op_SIMM },
{ "mulli", 0xfc000000, 0x1c000000, Op_D | Op_A | Op_SIMM },
{ "subfic", 0xfc000000, 0x20000000, Op_D | Op_A | Op_SIMM },
- { "cmpli", 0xfc000000, 0x28000000, Op_crfD | Op_L | Op_A | Op_SIMM
},
- { "cmpi", 0xfc000000, 0x2c000000, Op_crfD | Op_L | Op_A | Op_SIMM
},
+ { "cmplwi", 0xfc200000, 0x28000000, Op_crfD | Op_A | Op_SIMM },
+ { "cmpldi", 0xfc200000, 0x28200000, Op_crfD | Op_A | Op_SIMM },
+ { "cmpwi", 0xfc200000, 0x2c000000, Op_crfD | Op_A | Op_SIMM },
+ { "cmpdi", 0xfc200000, 0x2c200000, Op_crfD | Op_A | Op_SIMM },
{ "addic", 0xfc000000, 0x30000000, Op_D | Op_A | Op_SIMM },
{ "addic.", 0xfc000000, 0x34000000, Op_D | Op_A | Op_SIMM },
{ "addi", 0xfc000000, 0x38000000, Op_D | Op_A | Op_SIMM },
{ "addis", 0xfc000000, 0x3c000000, Op_D | Op_A | Op_SIMM },
- { "bc", 0xfc000000, 0x40000000, Op_BO | Op_BI | Op_BD | Op_AA |
Op_LK },
- { "sc", 0xffffffff, 0x44000002, Op_BO | Op_BI | Op_BD | Op_AA |
Op_LK },
+ { "b", 0xfc000000, 0x40000000, Op_BC | Op_BD | Op_AA | Op_LK
}, /* bc */
+ { "sc", 0xffffffff, 0x44000002, 0 },
{ "b", 0xfc000000, 0x48000000, Op_LI | Op_AA | Op_LK },
{ "rlwimi", 0xfc000000, 0x50000000, Op_S | Op_A | Op_SH | Op_MB |
Op_ME | Op_Rc },
@@ -140,33 +145,33 @@ const struct opcode opcodes[] = {
{ "andi.", 0xfc000000, 0x70000000, Op_S | Op_A | Op_UIMM },
{ "andis.", 0xfc000000, 0x74000000, Op_S | Op_A | Op_UIMM },
- { "lwz", 0xfc000000, 0x80000000, Op_D | Op_A | Op_d },
- { "lwzu", 0xfc000000, 0x84000000, Op_D | Op_A | Op_d },
- { "lbz", 0xfc000000, 0x88000000, Op_D | Op_A | Op_d },
- { "lbzu", 0xfc000000, 0x8c000000, Op_D | Op_A | Op_d },
- { "stw", 0xfc000000, 0x90000000, Op_S | Op_A | Op_d },
- { "stwu", 0xfc000000, 0x94000000, Op_S | Op_A | Op_d },
- { "stb", 0xfc000000, 0x98000000, Op_S | Op_A | Op_d },
- { "stbu", 0xfc000000, 0x9c000000, Op_S | Op_A | Op_d },
-
- { "lhz", 0xfc000000, 0xa0000000, Op_D | Op_A | Op_d },
- { "lhzu", 0xfc000000, 0xa4000000, Op_D | Op_A | Op_d },
- { "lha", 0xfc000000, 0xa8000000, Op_D | Op_A | Op_d },
- { "lhau", 0xfc000000, 0xac000000, Op_D | Op_A | Op_d },
- { "sth", 0xfc000000, 0xb0000000, Op_S | Op_A | Op_d },
- { "sthu", 0xfc000000, 0xb4000000, Op_S | Op_A | Op_d },
- { "lmw", 0xfc000000, 0xb8000000, Op_D | Op_A | Op_d },
- { "stmw", 0xfc000000, 0xbc000000, Op_S | Op_A | Op_d },
-
- { "lfs", 0xfc000000, 0xc0000000, Op_D | Op_A | Op_d },
- { "lfsu", 0xfc000000, 0xc4000000, Op_D | Op_A | Op_d },
- { "lfd", 0xfc000000, 0xc8000000, Op_D | Op_A | Op_d },
- { "lfdu", 0xfc000000, 0xcc000000, Op_D | Op_A | Op_d },
-
- { "stfs", 0xfc000000, 0xd0000000, Op_S | Op_A | Op_d },
- { "stfsu", 0xfc000000, 0xd4000000, Op_S | Op_A | Op_d },
- { "stfd", 0xfc000000, 0xd8000000, Op_S | Op_A | Op_d },
- { "stfdu", 0xfc000000, 0xdc000000, Op_S | Op_A | Op_d },
+ { "lwz", 0xfc000000, 0x80000000, Op_D | Op_dA },
+ { "lwzu", 0xfc000000, 0x84000000, Op_D | Op_dA },
+ { "lbz", 0xfc000000, 0x88000000, Op_D | Op_dA },
+ { "lbzu", 0xfc000000, 0x8c000000, Op_D | Op_dA },
+ { "stw", 0xfc000000, 0x90000000, Op_ST | Op_dA },
+ { "stwu", 0xfc000000, 0x94000000, Op_ST | Op_dA },
+ { "stb", 0xfc000000, 0x98000000, Op_ST | Op_dA },
+ { "stbu", 0xfc000000, 0x9c000000, Op_ST | Op_dA },
+
+ { "lhz", 0xfc000000, 0xa0000000, Op_D | Op_dA },
+ { "lhzu", 0xfc000000, 0xa4000000, Op_D | Op_dA },
+ { "lha", 0xfc000000, 0xa8000000, Op_D | Op_dA },
+ { "lhau", 0xfc000000, 0xac000000, Op_D | Op_dA },
+ { "sth", 0xfc000000, 0xb0000000, Op_ST | Op_dA },
+ { "sthu", 0xfc000000, 0xb4000000, Op_ST | Op_dA },
+ { "lmw", 0xfc000000, 0xb8000000, Op_D | Op_dA },
+ { "stmw", 0xfc000000, 0xbc000000, Op_ST | Op_dA },
+
+ { "lfs", 0xfc000000, 0xc0000000, Op_D | Op_dA },
+ { "lfsu", 0xfc000000, 0xc4000000, Op_D | Op_dA },
+ { "lfd", 0xfc000000, 0xc8000000, Op_D | Op_dA },
+ { "lfdu", 0xfc000000, 0xcc000000, Op_D | Op_dA },
+
+ { "stfs", 0xfc000000, 0xd0000000, Op_ST | Op_dA },
+ { "stfsu", 0xfc000000, 0xd4000000, Op_ST | Op_dA },
+ { "stfd", 0xfc000000, 0xd8000000, Op_ST | Op_dA },
+ { "stfdu", 0xfc000000, 0xdc000000, Op_ST | Op_dA },
{ "", 0x0, 0x0, 0 }
};
@@ -174,10 +179,10 @@ const struct opcode opcodes[] = {
const struct opcode opcodes_13[] = {
/* 0x13 << 2 */
{ "mcrf", 0xfc0007fe, 0x4c000000, Op_crfD | Op_crfS },
- { "bclr", 0xfc0007fe, 0x4c000020, Op_BO | Op_BI | Op_LK },
+ { "b", 0xfc0007fe, 0x4c000020, Op_BC | Op_LK }, /* bclr */
{ "crnor", 0xfc0007fe, 0x4c000042, Op_crbD | Op_crbA | Op_crbB },
{ "rfi", 0xfc0007fe, 0x4c000064, 0 },
- { "crandc", 0xfc0007fe, 0x4c000102, Op_BO | Op_BI | Op_LK },
+ { "crandc", 0xfc0007fe, 0x4c000102, Op_crbD | Op_crbA | Op_crbB },
{ "isync", 0xfc0007fe, 0x4c00012c, 0 },
{ "crxor", 0xfc0007fe, 0x4c000182, Op_crbD | Op_crbA | Op_crbB },
{ "crnand", 0xfc0007fe, 0x4c0001c2, Op_crbD | Op_crbA | Op_crbB },
@@ -185,7 +190,7 @@ const struct opcode opcodes_13[] = {
{ "creqv", 0xfc0007fe, 0x4c000242, Op_crbD | Op_crbA | Op_crbB },
{ "crorc", 0xfc0007fe, 0x4c000342, Op_crbD | Op_crbA | Op_crbB },
{ "cror", 0xfc0007fe, 0x4c000382, Op_crbD | Op_crbA | Op_crbB },
- { "bcctr", 0xfc0007fe, 0x4c000420, Op_BO | Op_BI | Op_LK },
+ { "b", 0xfc0007fe, 0x4c000420, Op_BC | Op_LK }, /* bcctr */
{ "", 0x0, 0x0, 0 }
};
@@ -203,12 +208,16 @@ const struct opcode opcodes_1e[] = {
/* 1f * 4 = 7c */
const struct opcode opcodes_1f[] = {
/* 1f << 2 */
- { "cmp", 0xfc0007fe, 0x7c000000, Op_S | Op_A | Op_B | Op_me |
Op_Rc },
+ { "cmpw", 0xfc2007fe, 0x7c000000, Op_crfD | Op_A | Op_B },
+ { "cmpd", 0xfc2007fe, 0x7c200000, Op_crfD | Op_A | Op_B },
{ "tw", 0xfc0007fe, 0x7c000008, Op_TO | Op_A | Op_B },
{ "subfc", 0xfc0003fe, 0x7c000010, Op_D | Op_A | Op_B | Op_OE |
Op_Rc },
{ "mulhdu", 0xfc0007fe, 0x7c000012, Op_D | Op_A | Op_B | Op_Rc },
{ "addc", 0xfc0003fe, 0x7c000014, Op_D | Op_A | Op_B | Op_OE |
Op_Rc },
{ "mulhwu", 0xfc0007fe, 0x7c000016, Op_D | Op_A | Op_B | Op_Rc },
+ { "isellt", 0xfc0007ff, 0x7c00001e, Op_D | Op_A | Op_B },
+ { "iselgt", 0xfc0007ff, 0x7c00005e, Op_D | Op_A | Op_B },
+ { "iseleq", 0xfc0007ff, 0x7c00009e, Op_D | Op_A | Op_B },
{ "mfcr", 0xfc0007fe, 0x7c000026, Op_D },
{ "lwarx", 0xfc0007fe, 0x7c000028, Op_D | Op_A | Op_B },
@@ -218,7 +227,8 @@ const struct opcode opcodes_1f[] = {
{ "cntlzw", 0xfc0007fe, 0x7c000034, Op_D | Op_A | Op_Rc },
{ "sld", 0xfc0007fe, 0x7c000036, Op_D | Op_A | Op_B | Op_Rc },
{ "and", 0xfc0007fe, 0x7c000038, Op_D | Op_A | Op_B | Op_Rc },
- { "cmpl", 0xfc0007fe, 0x7c000040, Op_crfD | Op_L | Op_A | Op_B },
+ { "cmplw", 0xfc2007fe, 0x7c000040, Op_crfD | Op_A | Op_B },
+ { "cmpld", 0xfc2007fe, 0x7c200040, Op_crfD | Op_A | Op_B },
{ "subf", 0xfc0003fe, 0x7c000050, Op_D | Op_A | Op_B | Op_OE |
Op_Rc },
{ "ldux", 0xfc0007fe, 0x7c00006a, Op_D | Op_A | Op_B },
{ "dcbst", 0xfc0007fe, 0x7c00006c, Op_A | Op_B },
@@ -240,24 +250,24 @@ const struct opcode opcodes_1f[] = {
{ "adde", 0xfc0003fe, 0x7c000114, Op_D | Op_A | Op_B | Op_OE |
Op_Rc },
{ "mtcrf", 0xfc0007fe, 0x7c000120, Op_S | Op_CRM },
{ "mtmsr", 0xfc0007fe, 0x7c000124, Op_S },
- { "stdx", 0xfc0007fe, 0x7c00012a, Op_S | Op_A | Op_B },
- { "stwcx.", 0xfc0007ff, 0x7c00012d, Op_S | Op_A | Op_B },
- { "stwx", 0xfc0007fe, 0x7c00012e, Op_S | Op_A | Op_B },
- { "wrteei", 0xfc0003fe, 0x7c000146 }, /* XXX: out of flags! */
- { "stdux", 0xfc0007fe, 0x7c00016a, Op_S | Op_A | Op_B },
- { "stwux", 0xfc0007fe, 0x7c00016e, Op_S | Op_A | Op_B },
+ { "stdx", 0xfc0007fe, 0x7c00012a, Op_ST | Op_A | Op_B },
+ { "stwcx.", 0xfc0007ff, 0x7c00012d, Op_ST | Op_A | Op_B },
+ { "stwx", 0xfc0007fe, 0x7c00012e, Op_ST | Op_A | Op_B },
+ { "wrteei", 0xfc0003fe, 0x7c000146, 0 }, /* XXX: out of flags! */
+ { "stdux", 0xfc0007fe, 0x7c00016a, Op_ST | Op_A | Op_B },
+ { "stwux", 0xfc0007fe, 0x7c00016e, Op_ST | Op_A | Op_B },
{ "subfze", 0xfc0003fe, 0x7c000190, Op_D | Op_A | Op_OE | Op_Rc },
{ "addze", 0xfc0003fe, 0x7c000194, Op_D | Op_A | Op_OE | Op_Rc },
{ "mtsr", 0xfc0007fe, 0x7c0001a4, Op_S | Op_SR },
- { "stdcx.", 0xfc0007ff, 0x7c0001ad, Op_S | Op_A | Op_B },
- { "stbx", 0xfc0007fe, 0x7c0001ae, Op_S | Op_A | Op_B },
+ { "stdcx.", 0xfc0007ff, 0x7c0001ad, Op_ST | Op_A | Op_B },
+ { "stbx", 0xfc0007fe, 0x7c0001ae, Op_ST | Op_A | Op_B },
{ "subfme", 0xfc0003fe, 0x7c0001d0, Op_D | Op_A | Op_OE | Op_Rc },
{ "mulld", 0xfc0003fe, 0x7c0001d2, Op_D | Op_A | Op_B | Op_OE |
Op_Rc },
{ "addme", 0xfc0003fe, 0x7c0001d4, Op_D | Op_A | Op_OE | Op_Rc },
{ "mullw", 0xfc0003fe, 0x7c0001d6, Op_D | Op_A | Op_B | Op_OE |
Op_Rc },
{ "mtsrin", 0xfc0007fe, 0x7c0001e4, Op_S | Op_B },
{ "dcbtst", 0xfc0007fe, 0x7c0001ec, Op_A | Op_B },
- { "stbux", 0xfc0007fe, 0x7c0001ee, Op_S | Op_A | Op_B },
+ { "stbux", 0xfc0007fe, 0x7c0001ee, Op_ST | Op_A | Op_B },
{ "add", 0xfc0003fe, 0x7c000214, Op_D | Op_A | Op_B | Op_OE |
Op_Rc },
{ "dcbt", 0xfc0007fe, 0x7c00022c, Op_A | Op_B },
{ "lhzx", 0xfc0007ff, 0x7c00022e, Op_D | Op_A | Op_B },
@@ -274,11 +284,11 @@ const struct opcode opcodes_1f[] = {
{ "mftb", 0xfc0007fe, 0x7c0002e6, Op_D | Op_tbr },
{ "lwaux", 0xfc0007fe, 0x7c0002ea, Op_D | Op_A | Op_B },
{ "lhaux", 0xfc0007fe, 0x7c0002ee, Op_D | Op_A | Op_B },
- { "sthx", 0xfc0007fe, 0x7c00032e, Op_S | Op_A | Op_B },
+ { "sthx", 0xfc0007fe, 0x7c00032e, Op_ST | Op_A | Op_B },
{ "orc", 0xfc0007fe, 0x7c000338, Op_S | Op_A | Op_B | Op_Rc },
- { "ecowx", 0xfc0007fe, 0x7c00036c, Op_S | Op_A | Op_B | Op_Rc },
+ { "ecowx", 0xfc0007fe, 0x7c00036c, Op_ST | Op_A | Op_B | Op_Rc },
{ "slbie", 0xfc0007fc, 0x7c000364, Op_B },
- { "sthux", 0xfc0007fe, 0x7c00036e, Op_S | Op_A | Op_B },
+ { "sthux", 0xfc0007fe, 0x7c00036e, Op_ST | Op_A | Op_B },
{ "or", 0xfc0007fe, 0x7c000378, Op_S | Op_A | Op_B | Op_Rc },
{ "mtdcr", 0xfc0007fe, 0x7c000386, Op_S | Op_dcr },
{ "divdu", 0xfc0003fe, 0x7c000392, Op_D | Op_A | Op_B | Op_OE |
Op_Rc },
@@ -304,27 +314,27 @@ const struct opcode opcodes_1f[] = {
{ "lfdx", 0xfc0007fe, 0x7c0004ae, Op_D | Op_A | Op_B },
{ "lfdux", 0xfc0007fe, 0x7c0004ee, Op_D | Op_A | Op_B },
{ "mfsrin", 0xfc0007fe, 0x7c000526, Op_D | Op_B },
- { "stswx", 0xfc0007fe, 0x7c00052a, Op_S | Op_A | Op_B },
- { "stwbrx", 0xfc0007fe, 0x7c00052c, Op_S | Op_A | Op_B },
- { "stfsx", 0xfc0007fe, 0x7c00052e, Op_S | Op_A | Op_B },
- { "stfsux", 0xfc0007fe, 0x7c00056e, Op_S | Op_A | Op_B },
- { "stswi", 0xfc0007fe, 0x7c0005aa, Op_S | Op_A | Op_NB },
- { "stfdx", 0xfc0007fe, 0x7c0005ae, Op_S | Op_A | Op_B },
- { "stfdux", 0xfc0007fe, 0x7c0005ee, Op_S | Op_A | Op_B },
+ { "stswx", 0xfc0007fe, 0x7c00052a, Op_ST | Op_A | Op_B },
+ { "stwbrx", 0xfc0007fe, 0x7c00052c, Op_ST | Op_A | Op_B },
+ { "stfsx", 0xfc0007fe, 0x7c00052e, Op_ST | Op_A | Op_B },
+ { "stfsux", 0xfc0007fe, 0x7c00056e, Op_ST | Op_A | Op_B },
+ { "stswi", 0xfc0007fe, 0x7c0005aa, Op_ST | Op_A | Op_NB },
+ { "stfdx", 0xfc0007fe, 0x7c0005ae, Op_ST | Op_A | Op_B },
+ { "stfdux", 0xfc0007fe, 0x7c0005ee, Op_ST | Op_A | Op_B },
{ "lhbrx", 0xfc0007fe, 0x7c00062c, Op_D | Op_A | Op_B },
{ "sraw", 0xfc0007fe, 0x7c000630, Op_S | Op_A | Op_B },
{ "srad", 0xfc0007fe, 0x7c000634, Op_S | Op_A | Op_B | Op_Rc },
- { "srawi", 0xfc0007fe, 0x7c000670, Op_S | Op_A | Op_B | Op_Rc },
+ { "srawi", 0xfc0007fe, 0x7c000670, Op_S | Op_A | Op_rSH | Op_Rc },
{ "sradi", 0xfc0007fc, 0x7c000674, Op_S | Op_A | Op_sh },
{ "eieio", 0xfc0007fe, 0x7c0006ac, 0 },
{ "tlbsx", 0xfc0007fe, 0x7c000724, Op_S | Op_A | Op_B | Op_Rc },
- { "sthbrx", 0xfc0007fe, 0x7c00072c, Op_S | Op_A | Op_B },
- { "extsh", 0xfc0007fe, 0x7c000734, Op_S | Op_A | Op_B | Op_Rc },
+ { "sthbrx", 0xfc0007fe, 0x7c00072c, Op_ST | Op_A | Op_B },
+ { "extsh", 0xfc0007fe, 0x7c000734, Op_S | Op_A | Op_Rc },
{ "tlbre", 0xfc0007fe, 0x7c000764, Op_D | Op_A | Op_WS },
{ "extsb", 0xfc0007fe, 0x7c000774, Op_S | Op_A | Op_Rc },
{ "icbi", 0xfc0007fe, 0x7c0007ac, Op_A | Op_B },
{ "tlbwe", 0xfc0007fe, 0x7c0007a4, Op_S | Op_A | Op_WS },
- { "stfiwx", 0xfc0007fe, 0x7c0007ae, Op_S | Op_A | Op_B },
+ { "stfiwx", 0xfc0007fe, 0x7c0007ae, Op_ST | Op_A | Op_B },
{ "extsw", 0xfc0007fe, 0x7c0007b4, Op_S | Op_A | Op_Rc },
{ "dcbz", 0xfc0007fe, 0x7c0007ec, Op_A | Op_B },
{ "", 0x0, 0x0, 0 }
@@ -354,8 +364,8 @@ const struct opcode opcodes_3b[] = {
};
/* 3e * 4 = f8 */
const struct opcode opcodes_3e[] = {
- { "std", 0xfc000003, 0xf8000000, Op_S | Op_A | Op_ds },
- { "stdu", 0xfc000003, 0xf8000001, Op_S | Op_A | Op_ds },
+ { "std", 0xfc000003, 0xf8000000, Op_ST | Op_A | Op_ds },
+ { "stdu", 0xfc000003, 0xf8000001, Op_ST | Op_A | Op_ds },
{ "", 0x0, 0x0, 0 }
};
@@ -384,7 +394,7 @@ const struct opcode opcodes_3f[] = {
{ "mcrfs", 0xfc0007fe, 0xfc000080, Op_D | Op_B | Op_Rc },
{ "mtfsb0", 0xfc0007fe, 0xfc00008c, Op_crfD | Op_Rc },
{ "fmr", 0xfc0007fe, 0xfc000090, Op_D | Op_B | Op_Rc },
- { "mtfsfi", 0xfc0007fe, 0xfc00010c, Op_crfD | Op_IMM | Op_Rc },
+ { "mtfsfi", 0xfc0007fe, 0xfc00010c, 0 }, /* XXX: out of flags! */
{ "fnabs", 0xfc0007fe, 0xfc000110, Op_D | Op_B | Op_Rc },
{ "fabs", 0xfc0007fe, 0xfc000210, Op_D | Op_B | Op_Rc },
@@ -399,10 +409,11 @@ const struct opcode opcodes_3f[] = {
struct specialreg {
int reg;
- char *name;
+ const char *name;
};
const struct specialreg sprregs[] = {
+ { 0x000, "mq" },
{ 0x001, "xer" },
{ 0x008, "lr" },
{ 0x009, "ctr" },
@@ -412,7 +423,11 @@ const struct specialreg sprregs[] = {
{ 0x019, "sdr1" },
{ 0x01a, "srr0" },
{ 0x01b, "srr1" },
+#ifdef BOOKE_PPC4XX
{ 0x100, "usprg0" },
+#else
+ { 0x100, "vrsave" },
+#endif
{ 0x110, "sprg0" },
{ 0x111, "sprg1" },
{ 0x112, "sprg2" },
@@ -442,6 +457,22 @@ const struct specialreg sprregs[] = {
{ 0x21d, "dbat2l" },
{ 0x21e, "dbat3u" },
{ 0x21f, "dbat3l" },
+ { 0x230, "ibat4u" },
+ { 0x231, "ibat4l" },
+ { 0x232, "ibat5u" },
+ { 0x233, "ibat5l" },
+ { 0x234, "ibat6u" },
+ { 0x235, "ibat6l" },
+ { 0x236, "ibat7u" },
+ { 0x237, "ibat7l" },
+ { 0x238, "dbat4u" },
+ { 0x239, "dbat4l" },
+ { 0x23a, "dbat5u" },
+ { 0x23b, "dbat5l" },
+ { 0x23c, "dbat6u" },
+ { 0x23d, "dbat6l" },
+ { 0x23e, "dbat7u" },
+ { 0x23f, "dbat7l" },
{ 0x3b0, "zpr" },
{ 0x3b1, "pid" },
{ 0x3b3, "ccr0" },
@@ -463,12 +494,22 @@ const struct specialreg sprregs[] = {
{ 0x3db, "pit" },
{ 0x3de, "srr2" },
{ 0x3df, "srr3" },
+#ifdef BOOKE_PPC4XX
{ 0x3f0, "dbsr" },
{ 0x3f2, "dbcr0" },
{ 0x3f4, "iac1" },
{ 0x3f5, "iac2" },
{ 0x3f6, "dac1" },
{ 0x3f7, "dac2" },
+#else
+ { 0x3f0, "hid0" },
+ { 0x3f1, "hid1" },
+ { 0x3f2, "iabr" },
+ { 0x3f3, "hid2" },
+ { 0x3f5, "dabr" },
+ { 0x3f6, "msscr0" },
+ { 0x3f7, "msscr1" },
+#endif
{ 0x3f9, "l2cr" },
{ 0x3fa, "dccr" },
{ 0x3fb, "iccr" },
@@ -553,6 +594,11 @@ const struct specialreg dcrregs[] = {
{ 0, NULL }
};
+static const char *condstr[8] = {
+ "ge", "le", "ne", "ns", "lt", "gt", "eq", "so"
+};
+
+
void
op_ill(instr_t instr, vm_offset_t loc)
{
@@ -570,154 +616,267 @@ const struct opcode * search_op(const st
void
disasm_fields(const struct opcode *popcode, instr_t instr, vm_offset_t loc,
- char *disasm_str)
+ char *disasm_str, size_t slen)
{
char * pstr;
enum function_mask func;
+ int len;
+
+#define ADD_LEN(s) do { \
+ len = (s); \
+ slen -= len; \
+ pstr += len; \
+ } while(0)
+#define APP_PSTR(fmt, arg) ADD_LEN(snprintf(pstr, slen, (fmt), (arg)))
+#define APP_PSTRS(fmt) ADD_LEN(snprintf(pstr, slen, "%s", (fmt)))
pstr = disasm_str;
func = popcode->func;
+ if (func & Op_BC) {
+ u_int BO, BI;
+ BO = extract_field(instr, 31 - 10, 5);
+ BI = extract_field(instr, 31 - 15, 5);
+ func &= ~Op_BC;
+ if (BO & 4) {
+ /* standard, no decrement */
+ if (BO & 16) {
+ if (popcode->code == 0x40000000) {
+ APP_PSTRS("c");
+ func |= Op_BO | Op_BI;
+ }
+ }
+ else {
+ APP_PSTRS(condstr[((BO & 8) >> 1) + (BI & 3)]);
+ if (BI >= 4)
+ func |= Op_crfS;
+ }
+ }
+ else {
+ /* decrement and branch */
+ if (BO & 2)
+ APP_PSTRS("dz");
+ else
+ APP_PSTRS("dnz");
+ if ((BO & 24) == 0)
+ APP_PSTRS("f");
+ else if ((BO & 24) == 8)
+ APP_PSTRS("t");
+ else
+ func |= Op_BI;
+ }
+ if (popcode->code == 0x4c000020)
+ APP_PSTRS("lr");
+ else if (popcode->code == 0x4c000420)
+ APP_PSTRS("ctr");
+ if ((BO & 20) != 20 && (func & Op_BO) == 0)
+ func |= Op_BP; /* branch prediction hint */
+ }
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");
+ APP_PSTRS("o");
}
func &= ~Op_OE;
}
switch (func & Op_LKM) {
case Op_Rc:
- if (instr & 0x1) {
- pstr += sprintf(pstr, ".");
- }
+ if (instr & 0x1)
+ APP_PSTRS(".");
break;
case Op_AA:
+ if (instr & 0x1)
+ APP_PSTRS("l");
if (instr & 0x2) {
- pstr += sprintf(pstr, "a");
+ APP_PSTRS("a");
loc = 0; /* Absolute address */
}
+ break;
case Op_LK:
- if (instr & 0x1) {
- pstr += sprintf(pstr, "l");
- }
+ if (instr & 0x1)
+ APP_PSTRS("l");
break;
default:
func &= ~Op_LKM;
}
- pstr += sprintf(pstr, "\t");
+ if (func & Op_BP) {
+ int y;
+ y = (instr & 0x200000) != 0;
+ if (popcode->code == 0x40000000) {
+ int BD;
+ BD = extract_field(instr, 31 - 29, 14);
+ BD = BD << 18;
+ BD = BD >> 16;
+ BD += loc;
+ if ((vm_offset_t)BD < loc)
+ y ^= 1;
+ }
+ APP_PSTR("%c", y ? '+' : '-');
+ func &= ~Op_BP;
+ }
+ APP_PSTRS("\t");
/* XXX: special cases here, out of flags in a 32bit word. */
if (strcmp(popcode->name, "wrteei") == 0) {
int E;
E = extract_field(instr, 31 - 16, 5);
- pstr += sprintf(pstr, "%d", E);
+ APP_PSTR("%d", E);
return;
}
+ else if (strcmp(popcode->name, "mtfsfi") == 0) {
+ u_int UI;
+ UI = extract_field(instr, 31 - 8, 3);
+ APP_PSTR("crf%u, ", UI);
+ UI = extract_field(instr, 31 - 19, 4);
+ APP_PSTR("0x%x", UI);
+ }
/* XXX: end of special cases here. */
- if (func & Op_D) {
+ if ((func & Op_FM) == Op_FM) {
+ u_int FM;
+ FM = extract_field(instr, 31 - 14, 8);
+ APP_PSTR("0x%x, ", FM);
+ func &= ~Op_FM;
+ }
+ if (func & Op_D) { /* Op_ST is the same */
u_int D;
- /* also for Op_S (they are the same) */
D = extract_field(instr, 31 - 10, 5);
- pstr += sprintf(pstr, "r%d, ", D);
+ APP_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);
+ APP_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);
+ APP_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);
+ APP_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);
+ APP_PSTR("crf%d, ", crfS);
func &= ~Op_crfS;
}
+ if (func & Op_CRM) {
+ u_int CRM;
+ CRM = extract_field(instr, 31 - 19, 8);
+ APP_PSTR("0x%x, ", CRM);
+ func &= ~Op_CRM;
+ }
if (func & Op_BO) {
u_int BO;
BO = extract_field(instr, 31 - 10, 5);
- pstr += sprintf(pstr, "%d, ", BO);
+ APP_PSTR("%d, ", BO);
func &= ~Op_BO;
}
+ if (func & Op_BI) {
+ u_int BI;
+ BI = extract_field(instr, 31 - 15, 5);
+ APP_PSTR("%d, ", BI);
+ func &= ~Op_BI;
+ }
+ if (func & Op_dA) { /* register A indirect with displacement */
+ u_int A;
+ A = extract_field(instr, 31 - 31, 16);
+ if (A & 0x8000) {
+ APP_PSTRS("-");
+ A = 0x10000-A;
+ }
+ APP_PSTR("0x%x", A);
+ A = extract_field(instr, 31 - 15, 5);
+ APP_PSTR("(r%d)", A);
+ func &= ~Op_dA;
+ }
+ if (func & Op_spr) {
+ u_int spr;
+ u_int sprl;
+ u_int sprh;
+ const struct specialreg *regs;
+ int i;
+ sprl = extract_field(instr, 31 - 15, 5);
+ sprh = extract_field(instr, 31 - 20, 5);
+ spr = sprh << 5 | sprl;
+
+ /* ugly hack - out of bitfields in the function mask */
+ if (popcode->name[2] == 'd') /* m.Dcr */
+ regs = dcrregs;
+ else
+ regs = sprregs;
+ for (i = 0; regs[i].name != NULL; i++)
+ if (spr == regs[i].reg)
+ break;
+ if (regs[i].name == NULL)
+ APP_PSTR("[unknown special reg (%d)]", spr);
+ else
+ APP_PSTR("%s", regs[i].name);
+
+ if (popcode->name[1] == 't') /* spr is destination */
+ APP_PSTRS(", ");
+ func &= ~Op_spr;
+ }
+ if (func & Op_SR) {
+ u_int SR;
+ SR = extract_field(instr, 31 - 15, 3);
+ APP_PSTR("sr%d", SR);
+ if (popcode->name[1] == 't') /* SR is destination */
+ APP_PSTRS(", ");
+ func &= ~Op_SR;
+ }
if (func & Op_A) {
u_int A;
A = extract_field(instr, 31 - 15, 5);
- pstr += sprintf(pstr, "r%d, ", A);
+ APP_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_S) {
+ u_int D;
+ D = extract_field(instr, 31 - 10, 5);
+ APP_PSTR("r%d, ", D);
+ func &= ~Op_S;
}
if (func & Op_C) {
u_int C;
C = extract_field(instr, 31 - 25, 5);
- pstr += sprintf(pstr, "r%d, ", C);
+ APP_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_B) {
+ u_int B;
+ B = extract_field(instr, 31 - 20, 5);
+ APP_PSTR("r%d", B);
+ func &= ~Op_B;
}
if (func & Op_crbA) {
u_int crbA;
crbA = extract_field(instr, 31 - 15, 5);
- pstr += sprintf(pstr, "%d, ", crbA);
+ APP_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);
+ APP_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) {
int LI;
LI = extract_field(instr, 31 - 29, 24);
- /* Need to sign extend and shift up 2, then add addr */
LI = LI << 8;
LI = LI >> 6;
LI += loc;
- pstr += sprintf (pstr, "0x%x, ", LI);
+ APP_PSTR("0x%x", LI);
func &= ~Op_LI;
}
switch (func & Op_SIMM) {
@@ -725,7 +884,7 @@ disasm_fields(const struct opcode *popco
case Op_SIMM: /* same as Op_d */
IMM = extract_field(instr, 31 - 31, 16);
if (IMM & 0x8000) {
- pstr += sprintf(pstr, "-");
+ APP_PSTRS("-");
IMM = 0x10000-IMM;
}
func &= ~Op_SIMM;
@@ -735,95 +894,74 @@ disasm_fields(const struct opcode *popco
func &= ~Op_UIMM;
goto common;
common:
- pstr += sprintf(pstr, "0x%x", IMM);
+ APP_PSTR("0x%x", IMM);
break;
default:
- break;
+ ;
}
if (func & Op_BD) {
- u_int BD;
+ int BD;
BD = extract_field(instr, 31 - 29, 14);
- pstr += sprintf(pstr, "0x%x, ", BD);
+ BD = BD << 18;
+ BD = BD >> 16;
+ BD += loc;
+ /* Need to sign extend and shift up 2, then add addr */
+ APP_PSTR("0x%x", 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);
+ APP_PSTR("0x%x", ds);
func &= ~Op_ds;
}
- if (func & Op_spr) {
- u_int spr;
- u_int sprl;
- u_int sprh;
- const struct specialreg *regs;
- int i;
- sprl = extract_field(instr, 31 - 15, 5);
- sprh = extract_field(instr, 31 - 20, 5);
- spr = sprh << 5 | sprl;
-
- /* ugly hack - out of bitfields in the function mask */
- if (popcode->name[2] == 'd') /* m.Dcr */
- regs = dcrregs;
- else
- regs = sprregs;
- for (i = 0; regs[i].name != NULL; i++)
- if (spr == regs[i].reg)
- break;
- if (regs[i].reg == 0)
- pstr += sprintf(pstr, "[unknown special reg (%d)]",
spr);
- else
- pstr += sprintf(pstr, "%s", regs[i].name);
- 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);
+ APP_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);
+ APP_PSTR("%d", SH);
+ }
+ if ((func & Op_MB) && (func & Op_sh_mb_sh)) {
+ u_int MB;
+ u_int ME;
+ MB = extract_field(instr, 31 - 25, 5);
+ APP_PSTR(", %d", MB);
+ ME = extract_field(instr, 31 - 30, 5);
+ APP_PSTR(", %d", ME);
}
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);
+ APP_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);
+ APP_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);
+ APP_PSTR(", %d", me);
}
if (func & Op_tbr) {
u_int tbr;
u_int tbrl;
u_int tbrh;
- char *reg;
+ const char *reg;
tbrl = extract_field(instr, 31 - 15, 5);
tbrh = extract_field(instr, 31 - 20, 5);
tbr = tbrh << 5 | tbrl;
@@ -839,31 +977,22 @@ disasm_fields(const struct opcode *popco
reg = NULL;
}
if (reg == NULL)
- pstr += sprintf(pstr, ", [unknown tbr %d ]", tbr);
+ APP_PSTR(", [unknown tbr %d ]", tbr);
else
- pstr += sprintf(pstr, ", %s", reg);
+ APP_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);
+ APP_PSTR(", %d", NB);
func &= ~Op_SR;
}
+#undef ADD_LEN
+#undef APP_PSTR
+#undef APP_PSTRS
}
void
@@ -920,14 +1049,15 @@ dis_ppc(const struct opcode *opcodeset,
const struct opcode *op;
int found = 0;
int i;
- char disasm_str[30];
+ char disasm_str[80];
for (i = 0, op = &opcodeset[0];
found == 0 && op->mask != 0;
i++, op = &opcodeset[i]) {
if ((instr & op->mask) == op->code) {
found = 1;
- disasm_fields(op, instr, loc, disasm_str);
+ disasm_fields(op, instr, loc, disasm_str,
+ sizeof disasm_str);
db_printf("%s%s\n", op->name, disasm_str);
return;
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
