X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flightrec%2Fdisassembler.c;h=f687d28c5cd1ee346479d56512641c7c3596cc22;hb=2ec79b77bf0925c69ece6e51fc219a1e783aa432;hp=1a217bc28e2788901674359d423de915c11e39a0;hpb=ba3814c189d3bd2332b66fb6c633a7d028e618fe;p=pcsx_rearmed.git

diff --git a/deps/lightrec/disassembler.c b/deps/lightrec/disassembler.c
index 1a217bc2..f687d28c 100644
--- a/deps/lightrec/disassembler.c
+++ b/deps/lightrec/disassembler.c
@@ -120,6 +120,13 @@ static const char * const cp2_opcodes[] = {
 	[OP_CP2_NCCT]		= "ncct    ",
 };
 
+static const char * const meta_opcodes[] = {
+	[OP_META_MOV]		= "move    ",
+	[OP_META_EXTC]		= "extc    ",
+	[OP_META_EXTS]		= "exts    ",
+	[OP_META_COM]		= "com     ",
+};
+
 static const char * const mult2_opcodes[] = {
 	"mult2   ", "multu2  ",
 };
@@ -133,6 +140,7 @@ static const char * const opcode_io_flags[] = {
 	"self-modifying code",
 	"no invalidation",
 	"no mask",
+	"load delay",
 };
 
 static const char * const opcode_io_modes[] = {
@@ -295,7 +303,7 @@ static int print_op_special(union code c, char *buf, size_t len,
 		return snprintf(buf, len, "%s%s,%s",
 				special_opcodes[c.r.op],
 				lightrec_reg_name(c.r.rd),
-				lightrec_reg_name(c.r.rt));
+				lightrec_reg_name(c.r.rs));
 	case OP_SPECIAL_SYSCALL:
 	case OP_SPECIAL_BREAK:
 		return snprintf(buf, len, "%s", special_opcodes[c.r.op]);
@@ -444,18 +452,11 @@ static int print_op(union code c, u32 pc, char *buf, size_t len,
 				lightrec_reg_name(c.i.rt),
 				(s16)c.i.imm,
 				lightrec_reg_name(c.i.rs));
-	case OP_META_MOV:
-		return snprintf(buf, len, "move    %s,%s",
-				lightrec_reg_name(c.r.rd),
-				lightrec_reg_name(c.r.rs));
-	case OP_META_EXTC:
-		return snprintf(buf, len, "extc    %s,%s",
-				lightrec_reg_name(c.i.rt),
-				lightrec_reg_name(c.i.rs));
-	case OP_META_EXTS:
-		return snprintf(buf, len, "exts    %s,%s",
-				lightrec_reg_name(c.i.rt),
-				lightrec_reg_name(c.i.rs));
+	case OP_META:
+		return snprintf(buf, len, "%s%s,%s",
+				meta_opcodes[c.m.op],
+				lightrec_reg_name(c.m.rd),
+				lightrec_reg_name(c.m.rs));
 	case OP_META_MULT2:
 	case OP_META_MULTU2:
 		*flags_ptr = opcode_multdiv_flags;