X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flightrec%2Flightrec-private.h;h=56032f50001d12112b7814aeaf6ef8b66b5f948a;hb=13b02197fcb7575646408094d5583ed7391b1153;hp=4eedef272cfedb8d2a15392c952797d87bf1d5c8;hpb=03535202b4b624c534340322646fb7f4062e3f53;p=pcsx_rearmed.git

diff --git a/deps/lightrec/lightrec-private.h b/deps/lightrec/lightrec-private.h
index 4eedef27..56032f50 100644
--- a/deps/lightrec/lightrec-private.h
+++ b/deps/lightrec/lightrec-private.h
@@ -10,13 +10,21 @@
 #include "lightrec-config.h"
 #include "disassembler.h"
 #include "lightrec.h"
+#include "regcache.h"
 
 #if ENABLE_THREADED_COMPILER
 #include <stdatomic.h>
 #endif
 
+#ifdef _MSC_BUILD
+#include <immintrin.h>
+#endif
+
 #define ARRAY_SIZE(x) (sizeof(x) ? sizeof(x) / sizeof((x)[0]) : 0)
 
+#define GENMASK(h, l) \
+	(((uintptr_t)-1 << (l)) & ((uintptr_t)-1 >> (__WORDSIZE - 1 - (h))))
+
 #ifdef __GNUC__
 #	define likely(x)       __builtin_expect(!!(x),1)
 #	define unlikely(x)     __builtin_expect(!!(x),0)
@@ -45,12 +53,26 @@
 
 #define fallthrough do {} while (0) /* fall-through */
 
+#define container_of(ptr, type, member) \
+	((type *)((void *)(ptr) - offsetof(type, member)))
+
+#ifdef _MSC_BUILD
+#	define popcount32(x)	__popcnt(x)
+#	define clz32(x)		_lzcnt_u32(x)
+#	define ctz32(x)		_tzcnt_u32(x)
+#else
+#	define popcount32(x)	__builtin_popcount(x)
+#	define clz32(x)		__builtin_clz(x)
+#	define ctz32(x)		__builtin_ctz(x)
+#endif
+
 /* Flags for (struct block *)->flags */
 #define BLOCK_NEVER_COMPILE	BIT(0)
 #define BLOCK_SHOULD_RECOMPILE	BIT(1)
 #define BLOCK_FULLY_TAGGED	BIT(2)
 #define BLOCK_IS_DEAD		BIT(3)
 #define BLOCK_IS_MEMSET		BIT(4)
+#define BLOCK_NO_OPCODE_LIST	BIT(5)
 
 #define RAM_SIZE	0x200000
 #define BIOS_SIZE	0x80000
@@ -90,9 +112,10 @@ struct block {
 	u32 precompile_date;
 	unsigned int code_size;
 	u16 nb_ops;
-	u8 flags;
 #if ENABLE_THREADED_COMPILER
-	atomic_flag op_list_freed;
+	_Atomic u8 flags;
+#else
+	u8 flags;
 #endif
 };
 
@@ -109,20 +132,17 @@ struct lightrec_branch_target {
 enum c_wrappers {
 	C_WRAPPER_RW,
 	C_WRAPPER_RW_GENERIC,
+	C_WRAPPER_MFC,
 	C_WRAPPER_MTC,
 	C_WRAPPER_CP,
-	C_WRAPPER_SYSCALL,
-	C_WRAPPER_BREAK,
 	C_WRAPPERS_COUNT,
 };
 
 struct lightrec_cstate {
 	struct lightrec_state *state;
 
-	struct jit_node *branches[512];
 	struct lightrec_branch local_branches[512];
 	struct lightrec_branch_target targets[512];
-	unsigned int nb_branches;
 	unsigned int nb_local_branches;
 	unsigned int nb_targets;
 	unsigned int cycles;
@@ -132,6 +152,7 @@ struct lightrec_cstate {
 
 struct lightrec_state {
 	struct lightrec_registers regs;
+	uintptr_t wrapper_regs[NUM_TEMPS];
 	u32 next_pc;
 	u32 current_cycle;
 	u32 target_cycle;
@@ -152,7 +173,7 @@ struct lightrec_state {
 	unsigned int nb_precompile;
 	unsigned int nb_maps;
 	const struct lightrec_mem_map *maps;
-	uintptr_t offset_ram, offset_bios, offset_scratch;
+	uintptr_t offset_ram, offset_bios, offset_scratch, offset_io;
 	_Bool with_32bit_lut;
 	_Bool mirrors_mapped;
 	_Bool invalidate_from_dma_only;
@@ -262,7 +283,8 @@ void lightrec_free_cstate(struct lightrec_cstate *cstate);
 union code lightrec_read_opcode(struct lightrec_state *state, u32 pc);
 
 int lightrec_compile_block(struct lightrec_cstate *cstate, struct block *block);
-void lightrec_free_opcode_list(struct lightrec_state *state, struct block *block);
+void lightrec_free_opcode_list(struct lightrec_state *state,
+			       struct opcode *list);
 
 unsigned int lightrec_cycles_of_opcode(union code code);
 
@@ -281,4 +303,41 @@ static inline s16 s16_max(s16 a, s16 b)
 	return a > b ? a : b;
 }
 
+static inline _Bool block_has_flag(struct block *block, u8 flag)
+{
+#if ENABLE_THREADED_COMPILER
+	return atomic_load_explicit(&block->flags, memory_order_relaxed) & flag;
+#else
+	return block->flags & flag;
+#endif
+}
+
+static inline u8 block_set_flags(struct block *block, u8 mask)
+{
+#if ENABLE_THREADED_COMPILER
+	return atomic_fetch_or_explicit(&block->flags, mask,
+					memory_order_relaxed);
+#else
+	u8 flags = block->flags;
+
+	block->flags |= mask;
+
+	return flags;
+#endif
+}
+
+static inline u8 block_clear_flags(struct block *block, u8 mask)
+{
+#if ENABLE_THREADED_COMPILER
+	return atomic_fetch_and_explicit(&block->flags, ~mask,
+					 memory_order_relaxed);
+#else
+	u8 flags = block->flags;
+
+	block->flags &= ~mask;
+
+	return flags;
+#endif
+}
+
 #endif /* __LIGHTREC_PRIVATE_H__ */