X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flightrec%2Fdisassembler.h;h=a19588a1c5b08e536be242e12b96c01ecf89b033;hb=0096868ecb1c7403b76847010d4fb6a1a827110b;hp=a4fc9f507cc3822a512faf203fb83c2dd85feb75;hpb=03535202b4b624c534340322646fb7f4062e3f53;p=pcsx_rearmed.git

diff --git a/deps/lightrec/disassembler.h b/deps/lightrec/disassembler.h
index a4fc9f50..a19588a1 100644
--- a/deps/lightrec/disassembler.h
+++ b/deps/lightrec/disassembler.h
@@ -20,13 +20,17 @@
 #define LIGHTREC_NO_DS		BIT(0)
 #define LIGHTREC_SYNC		BIT(1)
 
+/* Flags for LUI, ORI, ADDIU */
+#define LIGHTREC_MOVI		BIT(2)
+
 /* Flags for load/store opcodes */
 #define LIGHTREC_SMC		BIT(2)
 #define LIGHTREC_NO_INVALIDATE	BIT(3)
 #define LIGHTREC_NO_MASK	BIT(4)
+#define LIGHTREC_LOAD_DELAY	BIT(5)
 
 /* I/O mode for load/store opcodes */
-#define LIGHTREC_IO_MODE_LSB	5
+#define LIGHTREC_IO_MODE_LSB	6
 #define LIGHTREC_IO_MODE(x)	((x) << LIGHTREC_IO_MODE_LSB)
 #define LIGHTREC_IO_UNKNOWN	0x0
 #define LIGHTREC_IO_DIRECT	0x1
@@ -34,6 +38,7 @@
 #define LIGHTREC_IO_RAM		0x3
 #define LIGHTREC_IO_BIOS	0x4
 #define LIGHTREC_IO_SCRATCH	0x5
+#define LIGHTREC_IO_DIRECT_HW	0x6
 #define LIGHTREC_IO_MASK	LIGHTREC_IO_MODE(0x7)
 #define LIGHTREC_FLAGS_GET_IO_MODE(x) \
 	(((x) & LIGHTREC_IO_MASK) >> LIGHTREC_IO_MODE_LSB)
@@ -106,10 +111,12 @@ enum standard_opcodes {
 	OP_LWC2			= 0x32,
 	OP_SWC2			= 0x3a,
 
-	OP_META_MOV		= 0x16,
+	OP_META			= 0x3c,
 
-	OP_META_EXTC		= 0x17,
-	OP_META_EXTS		= 0x18,
+	OP_META_MULT2		= 0x19,
+	OP_META_MULTU2		= 0x1a,
+	OP_META_LWU		= 0x1b,
+	OP_META_SWU		= 0x1c,
 };
 
 enum special_opcodes {
@@ -160,6 +167,28 @@ enum cp0_opcodes {
 
 enum cp2_opcodes {
 	OP_CP2_BASIC		= 0x00,
+	OP_CP2_RTPS		= 0x01,
+	OP_CP2_NCLIP		= 0x06,
+	OP_CP2_OP		= 0x0c,
+	OP_CP2_DPCS		= 0x10,
+	OP_CP2_INTPL		= 0x11,
+	OP_CP2_MVMVA		= 0x12,
+	OP_CP2_NCDS		= 0x13,
+	OP_CP2_CDP		= 0x14,
+	OP_CP2_NCDT		= 0x16,
+	OP_CP2_NCCS		= 0x1b,
+	OP_CP2_CC		= 0x1c,
+	OP_CP2_NCS		= 0x1e,
+	OP_CP2_NCT		= 0x20,
+	OP_CP2_SQR		= 0x28,
+	OP_CP2_DCPL		= 0x29,
+	OP_CP2_DPCT		= 0x2a,
+	OP_CP2_AVSZ3		= 0x2d,
+	OP_CP2_AVSZ4		= 0x2e,
+	OP_CP2_RTPT		= 0x30,
+	OP_CP2_GPF		= 0x3d,
+	OP_CP2_GPL		= 0x3e,
+	OP_CP2_NCCT		= 0x3f,
 };
 
 enum cp2_basic_opcodes {
@@ -169,6 +198,15 @@ enum cp2_basic_opcodes {
 	OP_CP2_BASIC_CTC2	= 0x06,
 };
 
+enum meta_opcodes {
+	OP_META_MOV		= 0x00,
+
+	OP_META_EXTC		= 0x01,
+	OP_META_EXTS		= 0x02,
+
+	OP_META_COM		= 0x03,
+};
+
 struct opcode_r {
 #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 	u32 zero :6;
@@ -211,12 +249,31 @@ struct opcode_j {
 #endif
 } __packed;
 
+struct opcode_m {
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+	u32 meta :6;
+	u32 rs   :5;
+	u32 rt   :5;
+	u32 rd   :5;
+	u32 imm  :6;
+	u32 op   :5;
+#else
+	u32 op   :5;
+	u32 imm  :6;
+	u32 rd   :5;
+	u32 rt   :5;
+	u32 rs   :5;
+	u32 meta :6;
+#endif
+};
+
 union code {
 	/* Keep in sync with struct opcode */
 	u32 opcode;
 	struct opcode_r r;
 	struct opcode_i i;
 	struct opcode_j j;
+	struct opcode_m m;
 };
 
 struct opcode {
@@ -229,10 +286,16 @@ struct opcode {
 		struct opcode_r r;
 		struct opcode_i i;
 		struct opcode_j j;
+		struct opcode_m m;
 	};
 	u32 flags;
 };
 
+struct opcode_list {
+	u16 nb_ops;
+	struct opcode ops[];
+};
+
 void lightrec_print_disassembly(const struct block *block, const u32 *code);
 
 static inline _Bool op_flag_no_ds(u32 flags)
@@ -247,13 +310,12 @@ static inline _Bool op_flag_sync(u32 flags)
 
 static inline _Bool op_flag_smc(u32 flags)
 {
-	return OPT_FLAG_STORES && (flags & LIGHTREC_SMC);
+	return OPT_FLAG_IO && (flags & LIGHTREC_SMC);
 }
 
 static inline _Bool op_flag_no_invalidate(u32 flags)
 {
-	return (OPT_FLAG_IO || OPT_FLAG_STORES) &&
-		(flags & LIGHTREC_NO_INVALIDATE);
+	return OPT_FLAG_IO && (flags & LIGHTREC_NO_INVALIDATE);
 }
 
 static inline _Bool op_flag_no_mask(u32 flags)
@@ -261,6 +323,11 @@ static inline _Bool op_flag_no_mask(u32 flags)
 	return OPT_FLAG_IO && (flags & LIGHTREC_NO_MASK);
 }
 
+static inline _Bool op_flag_load_delay(u32 flags)
+{
+	return OPT_HANDLE_LOAD_DELAYS && (flags & LIGHTREC_LOAD_DELAY);
+}
+
 static inline _Bool op_flag_emulate_branch(u32 flags)
 {
 	return OPT_DETECT_IMPOSSIBLE_BRANCHES &&