X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flightrec%2Flightrec-private.h;h=12e953a2d9bbe6e7e930c177a46e9a212431ebf0;hb=18cdd2ad8875d26bac6661dc3e2a58d357d2a463;hp=56032f50001d12112b7814aeaf6ef8b66b5f948a;hpb=c0c1a5b0163ec977f5cc597a8732e0fce93203f7;p=pcsx_rearmed.git

diff --git a/deps/lightrec/lightrec-private.h b/deps/lightrec/lightrec-private.h
index 56032f50..12e953a2 100644
--- a/deps/lightrec/lightrec-private.h
+++ b/deps/lightrec/lightrec-private.h
@@ -81,6 +81,7 @@
 
 #define REG_LO 32
 #define REG_HI 33
+#define REG_TEMP (offsetof(struct lightrec_state, temp_reg) / sizeof(u32))
 
 /* Definition of jit_state_t (avoids inclusion of <lightning.h>) */
 struct jit_node;
@@ -148,12 +149,16 @@ struct lightrec_cstate {
 	unsigned int cycles;
 
 	struct regcache *reg_cache;
+
+	_Bool no_load_delay;
 };
 
 struct lightrec_state {
 	struct lightrec_registers regs;
-	uintptr_t wrapper_regs[NUM_TEMPS];
+	u32 temp_reg;
 	u32 next_pc;
+	uintptr_t wrapper_regs[NUM_TEMPS];
+	u8 in_delay_slot_n;
 	u32 current_cycle;
 	u32 target_cycle;
 	u32 exit_flags;
@@ -167,10 +172,13 @@ struct lightrec_state {
 	struct reaper *reaper;
 	void *tlsf;
 	void (*eob_wrapper_func)(void);
+	void (*interpreter_func)(void);
+	void (*ds_check_func)(void);
 	void (*memset_func)(void);
 	void (*get_next_block)(void);
 	struct lightrec_ops ops;
 	unsigned int nb_precompile;
+	unsigned int nb_compile;
 	unsigned int nb_maps;
 	const struct lightrec_mem_map *maps;
 	uintptr_t offset_ram, offset_bios, offset_scratch, offset_io;
@@ -180,17 +188,13 @@ struct lightrec_state {
 	void *code_lut[];
 };
 
-u32 lightrec_rw(struct lightrec_state *state, union code op,
-		u32 addr, u32 data, u32 *flags,
-		struct block *block);
+u32 lightrec_rw(struct lightrec_state *state, union code op, u32 addr,
+		u32 data, u32 *flags, struct block *block, u16 offset);
 
 void lightrec_free_block(struct lightrec_state *state, struct block *block);
 
 void remove_from_code_lut(struct blockcache *cache, struct block *block);
 
-enum psx_map
-lightrec_get_map_idx(struct lightrec_state *state, u32 kaddr);
-
 const struct lightrec_mem_map *
 lightrec_get_map(struct lightrec_state *state, void **host, u32 kaddr);
 
@@ -272,7 +276,7 @@ static inline u32 get_branch_pc(const struct block *block, u16 offset, s16 imm)
 	return block->pc + (offset + imm << 2);
 }
 
-void lightrec_mtc(struct lightrec_state *state, union code op, u32 data);
+void lightrec_mtc(struct lightrec_state *state, union code op, u8 reg, u32 data);
 u32 lightrec_mfc(struct lightrec_state *state, union code op);
 void lightrec_rfe(struct lightrec_state *state);
 void lightrec_cp(struct lightrec_state *state, union code op);
@@ -286,7 +290,7 @@ int lightrec_compile_block(struct lightrec_cstate *cstate, struct block *block);
 void lightrec_free_opcode_list(struct lightrec_state *state,
 			       struct opcode *list);
 
-unsigned int lightrec_cycles_of_opcode(union code code);
+__cnst unsigned int lightrec_cycles_of_opcode(union code code);
 
 static inline u8 get_mult_div_lo(union code c)
 {
@@ -340,4 +344,20 @@ static inline u8 block_clear_flags(struct block *block, u8 mask)
 #endif
 }
 
+static inline _Bool can_sign_extend(s32 value, u8 order)
+{
+      return (u32)(value >> order - 1) + 1 < 2;
+}
+
+static inline _Bool can_zero_extend(u32 value, u8 order)
+{
+      return (value >> order) == 0;
+}
+
+static inline const struct opcode *
+get_delay_slot(const struct opcode *list, u16 i)
+{
+	return op_flag_no_ds(list[i].flags) ? &list[i - 1] : &list[i + 1];
+}
+
 #endif /* __LIGHTREC_PRIVATE_H__ */