X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flightrec%2Flightrec.c;h=be4da10f44ba7872fd8e9b827e676b4f4847dfa2;hb=13b02197fcb7575646408094d5583ed7391b1153;hp=43636b2ad6767a193c63928d3817ddf485231729;hpb=8622c9dcd0abc62601ff6c64f93f9294c520ed58;p=pcsx_rearmed.git

diff --git a/deps/lightrec/lightrec.c b/deps/lightrec/lightrec.c
index 43636b2a..be4da10f 100644
--- a/deps/lightrec/lightrec.c
+++ b/deps/lightrec/lightrec.c
@@ -28,9 +28,6 @@
 #include <stddef.h>
 #include <string.h>
 
-#define GENMASK(h, l) \
-	(((uintptr_t)-1 << (l)) & ((uintptr_t)-1 >> (__WORDSIZE - 1 - (h))))
-
 static struct block * lightrec_precompile_block(struct lightrec_state *state,
 						u32 pc);
 static bool lightrec_block_is_fully_tagged(const struct block *block);
@@ -107,7 +104,7 @@ static void lightrec_swl(struct lightrec_state *state,
 			 u32 opcode, void *host, u32 addr, u32 data)
 {
 	unsigned int shift = addr & 0x3;
-	unsigned int mask = GENMASK(31, (shift + 1) * 8);
+	unsigned int mask = shift < 3 ? GENMASK(31, (shift + 1) * 8) : 0;
 	u32 old_data;
 
 	/* Align to 32 bits */
@@ -171,7 +168,7 @@ static u32 lightrec_lwr(struct lightrec_state *state,
 			u32 opcode, void *host, u32 addr, u32 data)
 {
 	unsigned int shift = addr & 0x3;
-	unsigned int mask = GENMASK(31, 32 - shift * 8);
+	unsigned int mask = shift ? GENMASK(31, 32 - shift * 8) : 0;
 	u32 old_data;
 
 	/* Align to 32 bits */
@@ -1423,7 +1420,7 @@ int lightrec_compile_block(struct lightrec_cstate *cstate,
 			pr_debug("Branch at offset 0x%x will be emulated\n",
 				 i << 2);
 
-			lightrec_emit_eob(cstate, block, i, false);
+			lightrec_emit_eob(cstate, block, i);
 			skip_next = !op_flag_no_ds(elm->flags);
 		} else {
 			lightrec_rec_opcode(cstate, block, i);