#include "lightrec-private.h"
#include "regcache.h"
-static const char *std_opcodes[] = {
+static const char * const std_opcodes[] = {
[OP_J] = "j ",
[OP_JAL] = "jal ",
[OP_BEQ] = "beq ",
[OP_SWC2] = "swc2 ",
};
-static const char *special_opcodes[] = {
+static const char * const special_opcodes[] = {
[OP_SPECIAL_SLL] = "sll ",
[OP_SPECIAL_SRL] = "srl ",
[OP_SPECIAL_SRA] = "sra ",
[OP_SPECIAL_SLTU] = "sltu ",
};
-static const char *regimm_opcodes[] = {
+static const char * const regimm_opcodes[] = {
[OP_REGIMM_BLTZ] = "bltz ",
[OP_REGIMM_BGEZ] = "bgez ",
[OP_REGIMM_BLTZAL] = "bltzal ",
[OP_REGIMM_BGEZAL] = "bgezal ",
};
-static const char *cp0_opcodes[] = {
+static const char * const cp0_opcodes[] = {
[OP_CP0_MFC0] = "mfc0 ",
[OP_CP0_CFC0] = "cfc0 ",
[OP_CP0_MTC0] = "mtc0 ",
[OP_CP0_RFE] = "rfe",
};
-static const char *cp2_opcodes[] = {
+static const char * const cp2_basic_opcodes[] = {
[OP_CP2_BASIC_MFC2] = "mfc2 ",
[OP_CP2_BASIC_CFC2] = "cfc2 ",
[OP_CP2_BASIC_MTC2] = "mtc2 ",
[OP_CP2_BASIC_CTC2] = "ctc2 ",
};
-static const char *opcode_flags[] = {
+static const char * const cp2_opcodes[] = {
+ [OP_CP2_RTPS] = "rtps ",
+ [OP_CP2_NCLIP] = "nclip ",
+ [OP_CP2_OP] = "op ",
+ [OP_CP2_DPCS] = "dpcs ",
+ [OP_CP2_INTPL] = "intpl ",
+ [OP_CP2_MVMVA] = "mvmva ",
+ [OP_CP2_NCDS] = "ncds ",
+ [OP_CP2_CDP] = "cdp ",
+ [OP_CP2_NCDT] = "ncdt ",
+ [OP_CP2_NCCS] = "nccs ",
+ [OP_CP2_CC] = "cc ",
+ [OP_CP2_NCS] = "ncs ",
+ [OP_CP2_NCT] = "nct ",
+ [OP_CP2_SQR] = "sqr ",
+ [OP_CP2_DCPL] = "dcpl ",
+ [OP_CP2_DPCT] = "dpct ",
+ [OP_CP2_AVSZ3] = "avsz3 ",
+ [OP_CP2_AVSZ4] = "avsz4 ",
+ [OP_CP2_RTPT] = "rtpt ",
+ [OP_CP2_GPF] = "gpf ",
+ [OP_CP2_GPL] = "gpl ",
+ [OP_CP2_NCCT] = "ncct ",
+};
+
+static const char * const mult2_opcodes[] = {
+ "mult2 ", "multu2 ",
+};
+
+static const char * const opcode_flags[] = {
"switched branch/DS",
- "unload Rs",
- "unload Rt",
- "unload Rd",
"sync point",
};
-static const char *opcode_io_flags[] = {
+static const char * const opcode_io_flags[] = {
"self-modifying code",
"no invalidation",
"no mask",
};
-static const char *opcode_io_modes[] = {
+static const char * const opcode_io_modes[] = {
"Memory access",
"I/O access",
"RAM access",
"BIOS access",
"Scratchpad access",
+ "Mapped I/O access"
};
-static const char *opcode_branch_flags[] = {
+static const char * const opcode_branch_flags[] = {
"emulate branch",
"local branch",
};
-static const char *opcode_multdiv_flags[] = {
+static const char * const opcode_multdiv_flags[] = {
"No LO",
"No HI",
"No div check",
};
-static int print_flags(char *buf, size_t len, u16 flags,
- const char **array, size_t array_size,
+static size_t do_snprintf(char *buf, size_t len, bool *first,
+ const char *arg1, const char *arg2)
+{
+ size_t bytes;
+
+ if (*first)
+ bytes = snprintf(buf, len, "(%s%s", arg1, arg2);
+ else
+ bytes = snprintf(buf, len, ", %s%s", arg1, arg2);
+
+ *first = false;
+
+ return bytes;
+}
+
+static const char * const reg_op_token[3] = {
+ "-", "*", "~",
+};
+
+static int print_flags(char *buf, size_t len, const struct opcode *op,
+ const char * const *array, size_t array_size,
bool is_io)
{
const char *flag_name, *io_mode_name;
unsigned int i, io_mode;
size_t count = 0, bytes;
bool first = true;
+ u32 flags = op->flags;
+ unsigned int reg_op;
for (i = 0; i < array_size + ARRAY_SIZE(opcode_flags); i++) {
if (!(flags & BIT(i)))
else
flag_name = array[i - ARRAY_SIZE(opcode_flags)];
- if (first)
- bytes = snprintf(buf, len, "(%s", flag_name);
- else
- bytes = snprintf(buf, len, ", %s", flag_name);
-
- first = false;
+ bytes = do_snprintf(buf, len, &first, "", flag_name);
buf += bytes;
len -= bytes;
count += bytes;
if (io_mode > 0) {
io_mode_name = opcode_io_modes[io_mode - 1];
- if (first)
- bytes = snprintf(buf, len, "(%s", io_mode_name);
- else
- bytes = snprintf(buf, len, ", %s", io_mode_name);
+ bytes = do_snprintf(buf, len, &first, "", io_mode_name);
+ buf += bytes;
+ len -= bytes;
+ count += bytes;
+ }
+ }
+
+ if (OPT_EARLY_UNLOAD) {
+ reg_op = LIGHTREC_FLAGS_GET_RS(flags);
+ if (reg_op) {
+ bytes = do_snprintf(buf, len, &first,
+ reg_op_token[reg_op - 1],
+ lightrec_reg_name(op->i.rs));
+ buf += bytes;
+ len -= bytes;
+ count += bytes;
+ }
+
+ reg_op = LIGHTREC_FLAGS_GET_RT(flags);
+ if (reg_op) {
+ bytes = do_snprintf(buf, len, &first,
+ reg_op_token[reg_op - 1],
+ lightrec_reg_name(op->i.rt));
+ buf += bytes;
+ len -= bytes;
+ count += bytes;
+ }
- first = false;
+ reg_op = LIGHTREC_FLAGS_GET_RD(flags);
+ if (reg_op) {
+ bytes = do_snprintf(buf, len, &first,
+ reg_op_token[reg_op - 1],
+ lightrec_reg_name(op->r.rd));
buf += bytes;
len -= bytes;
count += bytes;
}
static int print_op_special(union code c, char *buf, size_t len,
- const char ***flags_ptr, size_t *nb_flags)
+ const char * const **flags_ptr, size_t *nb_flags)
{
switch (c.r.op) {
case OP_SPECIAL_SLL:
lightrec_reg_name(c.r.rt),
lightrec_reg_name(c.r.rs));
case OP_SPECIAL_JR:
+ *flags_ptr = opcode_branch_flags;
+ *nb_flags = ARRAY_SIZE(opcode_branch_flags);
+ fallthrough;
case OP_SPECIAL_MTHI:
case OP_SPECIAL_MTLO:
return snprintf(buf, len, "%s%s",
static int print_op_cp(union code c, char *buf, size_t len, unsigned int cp)
{
if (cp == 2) {
- switch (c.i.rs) {
- case OP_CP0_MFC0:
- case OP_CP0_CFC0:
- case OP_CP0_MTC0:
- case OP_CP0_CTC0:
+ switch (c.r.op) {
+ case OP_CP2_BASIC:
return snprintf(buf, len, "%s%s,%u",
- cp2_opcodes[c.i.rs],
+ cp2_basic_opcodes[c.i.rs],
lightrec_reg_name(c.i.rt),
c.r.rd);
default:
- return snprintf(buf, len, "cp2 (0x%08x)", c.opcode);
+ return snprintf(buf, len, "%s", cp2_opcodes[c.r.op]);
}
} else {
switch (c.i.rs) {
}
static int print_op(union code c, u32 pc, char *buf, size_t len,
- const char ***flags_ptr, size_t *nb_flags,
+ const char * const **flags_ptr, size_t *nb_flags,
bool *is_io)
{
if (c.opcode == 0)
pc + 4 + ((s16)c.i.imm << 2));
case OP_J:
case OP_JAL:
+ *flags_ptr = opcode_branch_flags;
+ *nb_flags = ARRAY_SIZE(opcode_branch_flags);
return snprintf(buf, len, "%s0x%x",
std_opcodes[c.i.op],
(pc & 0xf0000000) | (c.j.imm << 2));
case OP_BEQ:
+ if (c.i.rs == c.i.rt) {
+ *flags_ptr = opcode_branch_flags;
+ *nb_flags = ARRAY_SIZE(opcode_branch_flags);
+ return snprintf(buf, len, "b 0x%x",
+ pc + 4 + ((s16)c.i.imm << 2));
+ }
+ fallthrough;
case OP_BNE:
case OP_BLEZ:
case OP_BGTZ:
return snprintf(buf, len, "exts %s,%s",
lightrec_reg_name(c.i.rt),
lightrec_reg_name(c.i.rs));
+ case OP_META_MULT2:
+ case OP_META_MULTU2:
+ *flags_ptr = opcode_multdiv_flags;
+ *nb_flags = ARRAY_SIZE(opcode_multdiv_flags);
+ return snprintf(buf, len, "%s%s,%s,%s,%u",
+ mult2_opcodes[c.i.op == OP_META_MULTU2],
+ lightrec_reg_name(get_mult_div_hi(c)),
+ lightrec_reg_name(get_mult_div_lo(c)),
+ lightrec_reg_name(c.r.rs), c.r.op);
default:
return snprintf(buf, len, "unknown (0x%08x)", c.opcode);
}
}
-void lightrec_print_disassembly(const struct block *block, const u32 *code)
+void lightrec_print_disassembly(const struct block *block, const u32 *code_ptr)
{
const struct opcode *op;
- const char **flags_ptr;
+ const char * const *flags_ptr;
size_t nb_flags, count, count2;
char buf[256], buf2[256], buf3[256];
unsigned int i;
- u32 pc, branch_pc;
+ u32 pc, branch_pc, code;
bool is_io;
for (i = 0; i < block->nb_ops; i++) {
op = &block->opcode_list[i];
branch_pc = get_branch_pc(block, i, 0);
pc = block->pc + (i << 2);
+ code = LE32TOH(code_ptr[i]);
- count = print_op((union code)code[i], pc, buf, sizeof(buf),
+ count = print_op((union code)code, pc, buf, sizeof(buf),
&flags_ptr, &nb_flags, &is_io);
flags_ptr = NULL;
count2 = print_op(op->c, branch_pc, buf2, sizeof(buf2),
&flags_ptr, &nb_flags, &is_io);
- if (code[i] == op->c.opcode) {
+ if (code == op->c.opcode) {
*buf2 = '\0';
count2 = 0;
}
- print_flags(buf3, sizeof(buf3), op->flags, flags_ptr, nb_flags,
- is_io);
+ print_flags(buf3, sizeof(buf3), op, flags_ptr, nb_flags, is_io);
printf("0x%08x (0x%x)\t%s%*c%s%*c%s\n", pc, i << 2,
buf, 30 - (int)count, ' ', buf2, 30 - (int)count2, ' ', buf3);
notaz.gp2x.de / pcsx_rearmed.git / blobdiff