X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.h;h=a69b4a3804fa042ef7bd6aa566e43b5d0d553162;hb=6658ddcf5dec8d6e22363fb435c48dfe4ce1e7f8;hp=36b469369d92ddc9c1e7370d84c04498507a7e5f;hpb=87cc59de47301ff0a2e71b5ece28447ec77b0153;p=pcsx_rearmed.git diff --git a/libpcsxcore/psxmem.h b/libpcsxcore/psxmem.h index 36b46936..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,12 +124,6 @@ extern u8 **psxMemRLUT; #define PSXMu32ref(mem) (*(u32 *)PSXM(mem)) -#ifndef PSXREC -#if defined(NEW_DYNAREC) || defined(LIGHTREC) -#define PSXREC -#endif -#endif - int psxMemInit(); void psxMemReset(); void psxMemShutdown();