X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flightrec%2Fregcache.h;h=abf70532d9dfdb60bb66e5478d5eb24dd91809d1;hb=0e720fb13f7933930608b62854ea8f4a9d97c934;hp=cffbf0533aed9e7a75139fd4bfa7e16145d8b47c;hpb=ba3814c189d3bd2332b66fb6c633a7d028e618fe;p=pcsx_rearmed.git

diff --git a/deps/lightrec/regcache.h b/deps/lightrec/regcache.h
index cffbf053..abf70532 100644
--- a/deps/lightrec/regcache.h
+++ b/deps/lightrec/regcache.h
@@ -8,8 +8,13 @@
 
 #include "lightning-wrapper.h"
 
-#define NUM_REGS (JIT_V_NUM - 1)
-#define LIGHTREC_REG_STATE (JIT_V(JIT_V_NUM - 1))
+#if defined(__sh__)
+#  define NUM_REGS JIT_V_NUM
+#  define LIGHTREC_REG_STATE _GBR
+#else
+#  define NUM_REGS (JIT_V_NUM - 1)
+#  define LIGHTREC_REG_STATE (JIT_V(JIT_V_NUM - 1))
+#endif
 
 #if defined(__powerpc__)
 #  define NUM_TEMPS JIT_R_NUM
@@ -41,12 +46,15 @@ struct regcache;
 u8 lightrec_alloc_reg(struct regcache *cache, jit_state_t *_jit, u8 jit_reg);
 u8 lightrec_alloc_reg_temp(struct regcache *cache, jit_state_t *_jit);
 u8 lightrec_alloc_reg_out(struct regcache *cache, jit_state_t *_jit,
-			  u8 reg, u8 flags);
+			  u16 reg, u8 flags);
 u8 lightrec_alloc_reg_in(struct regcache *cache, jit_state_t *_jit,
-			 u8 reg, u8 flags);
+			 u16 reg, u8 flags);
 
-u8 lightrec_request_reg_in(struct regcache *cache, jit_state_t *_jit,
-			   u8 reg, u8 jit_reg);
+void lightrec_load_imm(struct regcache *cache,
+		       jit_state_t *_jit, u8 jit_reg, u32 pc, u32 imm);
+void lightrec_load_next_pc(struct regcache *cache, jit_state_t *_jit, u8 reg);
+void lightrec_load_next_pc_imm(struct regcache *cache,
+			       jit_state_t *_jit, u32 pc, u32 imm);
 
 s8 lightrec_get_reg_with_value(struct regcache *cache, intptr_t value);
 void lightrec_temp_set_value(struct regcache *cache, u8 jit_reg, intptr_t value);
@@ -55,8 +63,8 @@ u8 lightrec_get_reg_in_flags(struct regcache *cache, u8 jit_reg);
 void lightrec_set_reg_out_flags(struct regcache *cache, u8 jit_reg, u8 flags);
 
 void lightrec_regcache_reset(struct regcache *cache);
+void lightrec_preload_pc(struct regcache *cache, jit_state_t *_jit);
 
-void lightrec_lock_reg(struct regcache *cache, jit_state_t *_jit, u8 jit_reg);
 void lightrec_free_reg(struct regcache *cache, u8 jit_reg);
 void lightrec_free_regs(struct regcache *cache);
 void lightrec_clean_reg(struct regcache *cache, jit_state_t *_jit, u8 jit_reg);
@@ -65,12 +73,13 @@ void lightrec_unload_reg(struct regcache *cache, jit_state_t *_jit, u8 jit_reg);
 void lightrec_storeback_regs(struct regcache *cache, jit_state_t *_jit);
 _Bool lightrec_has_dirty_regs(struct regcache *cache);
 
+_Bool lightrec_reg_is_loaded(struct regcache *cache, u16 reg);
 void lightrec_clean_reg_if_loaded(struct regcache *cache, jit_state_t *_jit,
-				  u8 reg, _Bool unload);
-void lightrec_discard_reg_if_loaded(struct regcache *cache, u8 reg);
+				  u16 reg, _Bool unload);
+void lightrec_discard_reg_if_loaded(struct regcache *cache, u16 reg);
 
 u8 lightrec_alloc_reg_in_address(struct regcache *cache,
-		jit_state_t *_jit, u8 reg, s16 offset);
+		jit_state_t *_jit, u16 reg, s16 offset);
 
 struct native_register * lightrec_regcache_enter_branch(struct regcache *cache);
 void lightrec_regcache_leave_branch(struct regcache *cache,
@@ -79,7 +88,7 @@ void lightrec_regcache_leave_branch(struct regcache *cache,
 struct regcache * lightrec_regcache_init(struct lightrec_state *state);
 void lightrec_free_regcache(struct regcache *cache);
 
-const char * lightrec_reg_name(u8 reg);
+__cnst const char * lightrec_reg_name(u8 reg);
 
 void lightrec_regcache_mark_live(struct regcache *cache, jit_state_t *_jit);