X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.h;h=a69b4a3804fa042ef7bd6aa566e43b5d0d553162;hb=6658ddcf5dec8d6e22363fb435c48dfe4ce1e7f8;hp=222e6fbff213d41fce900b28ca61f9d14e710fb2;hpb=ae602c19f527fbc1f44cdb744cf824d04b8eceb1;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxmem.h b/libpcsxcore/psxmem.h
index 222e6fbf..a69b4a38 100644
--- a/libpcsxcore/psxmem.h
+++ b/libpcsxcore/psxmem.h
@@ -49,6 +49,8 @@ extern "C" {
 
 #endif
 
+#define INVALID_PTR ((void *)-1)
+
 extern s8 *psxM;
 #define psxMs8(mem)		psxM[(mem) & 0x1fffff]
 #define psxMs16(mem)	(SWAP16(*(s16 *)&psxM[(mem) & 0x1fffff]))
@@ -112,7 +114,7 @@ extern s8 *psxH;
 extern u8 **psxMemWLUT;
 extern u8 **psxMemRLUT;
 
-#define PSXM(mem)		(psxMemRLUT[(mem) >> 16] == 0 ? NULL : (u8*)(psxMemRLUT[(mem) >> 16] + ((mem) & 0xffff)))
+#define PSXM(mem)		(psxMemRLUT[(mem) >> 16] == INVALID_PTR ? INVALID_PTR : (u8*)(psxMemRLUT[(mem) >> 16] + ((mem) & 0xffff)))
 #define PSXMs8(mem)		(*(s8 *)PSXM(mem))
 #define PSXMs16(mem)	(SWAP16(*(s16 *)PSXM(mem)))
 #define PSXMs32(mem)	(SWAP32(*(s32 *)PSXM(mem)))
@@ -122,10 +124,6 @@ extern u8 **psxMemRLUT;
 
 #define PSXMu32ref(mem)	(*(u32 *)PSXM(mem))
 
-#if !defined(PSXREC) && (defined(__x86_64__) || defined(__i386__) || defined(__ppc__)) && !defined(NOPSXREC)
-#define PSXREC
-#endif
-
 int psxMemInit();
 void psxMemReset();
 void psxMemShutdown();
@@ -138,19 +136,6 @@ void psxMemWrite16(u32 mem, u16 value);
 void psxMemWrite32(u32 mem, u32 value);
 void *psxMemPointer(u32 mem);
 
-extern u32 event_cycles[6];
-extern u32 next_interupt;
-
-#define new_dyna_set_event(e, c) { \
-	u32 c_ = c; \
-	event_cycles[e] = c_; \
-	if (c_ < next_interupt) { \
-		/*printf("%u: next_interupt %d -> %d\n", psxRegs.cycle, \
-			next_interupt - psxRegs.cycle, c_ - psxRegs.cycle);*/ \
-		next_interupt = c_; \
-	} \
-}
-
 #ifdef __cplusplus
 }
 #endif