X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flightrec%2Fdisassembler.h;h=a4fc9f507cc3822a512faf203fb83c2dd85feb75;hb=a5d30afeabe63d826d8fc1dc86aedf72cf03b457;hp=ae2af7eafaf99c1f5fafe951581bd00c535abc04;hpb=47e92264b0bcdd851e8b0973cd5036cc6ca8e4ba;p=pcsx_rearmed.git

diff --git a/deps/lightrec/disassembler.h b/deps/lightrec/disassembler.h
index ae2af7ea..a4fc9f50 100644
--- a/deps/lightrec/disassembler.h
+++ b/deps/lightrec/disassembler.h
@@ -8,6 +8,7 @@
 
 #include "debug.h"
 #include "lightrec.h"
+#include "lightrec-config.h"
 
 #ifndef __packed
 #define __packed __attribute__((packed))
@@ -17,25 +18,57 @@
 
 /* Flags for all opcodes */
 #define LIGHTREC_NO_DS		BIT(0)
-#define LIGHTREC_UNLOAD_RS	BIT(1)
-#define LIGHTREC_UNLOAD_RT	BIT(2)
-#define LIGHTREC_UNLOAD_RD	BIT(3)
-#define LIGHTREC_SYNC		BIT(4)
+#define LIGHTREC_SYNC		BIT(1)
 
 /* Flags for load/store opcodes */
-#define LIGHTREC_DIRECT_IO	BIT(5)
-#define LIGHTREC_HW_IO		BIT(6)
-#define LIGHTREC_SMC		BIT(7)
-#define LIGHTREC_NO_INVALIDATE	BIT(8)
+#define LIGHTREC_SMC		BIT(2)
+#define LIGHTREC_NO_INVALIDATE	BIT(3)
+#define LIGHTREC_NO_MASK	BIT(4)
+
+/* I/O mode for load/store opcodes */
+#define LIGHTREC_IO_MODE_LSB	5
+#define LIGHTREC_IO_MODE(x)	((x) << LIGHTREC_IO_MODE_LSB)
+#define LIGHTREC_IO_UNKNOWN	0x0
+#define LIGHTREC_IO_DIRECT	0x1
+#define LIGHTREC_IO_HW		0x2
+#define LIGHTREC_IO_RAM		0x3
+#define LIGHTREC_IO_BIOS	0x4
+#define LIGHTREC_IO_SCRATCH	0x5
+#define LIGHTREC_IO_MASK	LIGHTREC_IO_MODE(0x7)
+#define LIGHTREC_FLAGS_GET_IO_MODE(x) \
+	(((x) & LIGHTREC_IO_MASK) >> LIGHTREC_IO_MODE_LSB)
 
 /* Flags for branches */
-#define LIGHTREC_EMULATE_BRANCH	BIT(5)
-#define LIGHTREC_LOCAL_BRANCH	BIT(6)
+#define LIGHTREC_EMULATE_BRANCH	BIT(2)
+#define LIGHTREC_LOCAL_BRANCH	BIT(3)
 
 /* Flags for div/mult opcodes */
-#define LIGHTREC_NO_LO		BIT(5)
-#define LIGHTREC_NO_HI		BIT(6)
-#define LIGHTREC_NO_DIV_CHECK	BIT(7)
+#define LIGHTREC_NO_LO		BIT(2)
+#define LIGHTREC_NO_HI		BIT(3)
+#define LIGHTREC_NO_DIV_CHECK	BIT(4)
+
+#define LIGHTREC_REG_RS_LSB	26
+#define LIGHTREC_REG_RS(x)	((x) << LIGHTREC_REG_RS_LSB)
+#define LIGHTREC_REG_RS_MASK	LIGHTREC_REG_RS(0x3)
+#define LIGHTREC_FLAGS_GET_RS(x) \
+	(((x) & LIGHTREC_REG_RS_MASK) >> LIGHTREC_REG_RS_LSB)
+
+#define LIGHTREC_REG_RT_LSB	28
+#define LIGHTREC_REG_RT(x)	((x) << LIGHTREC_REG_RT_LSB)
+#define LIGHTREC_REG_RT_MASK	LIGHTREC_REG_RT(0x3)
+#define LIGHTREC_FLAGS_GET_RT(x) \
+	(((x) & LIGHTREC_REG_RT_MASK) >> LIGHTREC_REG_RT_LSB)
+
+#define LIGHTREC_REG_RD_LSB	30
+#define LIGHTREC_REG_RD(x)	((x) << LIGHTREC_REG_RD_LSB)
+#define LIGHTREC_REG_RD_MASK	LIGHTREC_REG_RD(0x3)
+#define LIGHTREC_FLAGS_GET_RD(x) \
+	(((x) & LIGHTREC_REG_RD_MASK) >> LIGHTREC_REG_RD_LSB)
+
+#define LIGHTREC_REG_NOOP	0x0
+#define LIGHTREC_REG_UNLOAD	0x1
+#define LIGHTREC_REG_DISCARD	0x2
+#define LIGHTREC_REG_CLEAN	0x3
 
 struct block;
 
@@ -197,9 +230,61 @@ struct opcode {
 		struct opcode_i i;
 		struct opcode_j j;
 	};
-	u16 flags;
+	u32 flags;
 };
 
 void lightrec_print_disassembly(const struct block *block, const u32 *code);
 
+static inline _Bool op_flag_no_ds(u32 flags)
+{
+	return OPT_SWITCH_DELAY_SLOTS && (flags & LIGHTREC_NO_DS);
+}
+
+static inline _Bool op_flag_sync(u32 flags)
+{
+	return OPT_LOCAL_BRANCHES && (flags & LIGHTREC_SYNC);
+}
+
+static inline _Bool op_flag_smc(u32 flags)
+{
+	return OPT_FLAG_STORES && (flags & LIGHTREC_SMC);
+}
+
+static inline _Bool op_flag_no_invalidate(u32 flags)
+{
+	return (OPT_FLAG_IO || OPT_FLAG_STORES) &&
+		(flags & LIGHTREC_NO_INVALIDATE);
+}
+
+static inline _Bool op_flag_no_mask(u32 flags)
+{
+	return OPT_FLAG_IO && (flags & LIGHTREC_NO_MASK);
+}
+
+static inline _Bool op_flag_emulate_branch(u32 flags)
+{
+	return OPT_DETECT_IMPOSSIBLE_BRANCHES &&
+		(flags & LIGHTREC_EMULATE_BRANCH);
+}
+
+static inline _Bool op_flag_local_branch(u32 flags)
+{
+	return OPT_LOCAL_BRANCHES && (flags & LIGHTREC_LOCAL_BRANCH);
+}
+
+static inline _Bool op_flag_no_lo(u32 flags)
+{
+	return OPT_FLAG_MULT_DIV && (flags & LIGHTREC_NO_LO);
+}
+
+static inline _Bool op_flag_no_hi(u32 flags)
+{
+	return OPT_FLAG_MULT_DIV && (flags & LIGHTREC_NO_HI);
+}
+
+static inline _Bool op_flag_no_div_check(u32 flags)
+{
+	return OPT_FLAG_MULT_DIV && (flags & LIGHTREC_NO_DIV_CHECK);
+}
+
 #endif /* __DISASSEMBLER_H__ */