diff --git a/pcsx2/Memory.h b/pcsx2/Memory.h index f1eebe13a1..1ee45b069c 100644 --- a/pcsx2/Memory.h +++ b/pcsx2/Memory.h @@ -144,55 +144,12 @@ namespace SysMemory #define PSM(mem) (vtlb_GetPhyPtr((mem)&0x1fffffff)) -#define psHs8(mem) (*(s8*)&eeHw[(mem)&0xffff]) -#define psHs16(mem) (*(s16*)&eeHw[(mem)&0xffff]) -#define psHs32(mem) (*(s32*)&eeHw[(mem)&0xffff]) -#define psHs64(mem) (*(s64*)&eeHw[(mem)&0xffff]) #define psHu8(mem) (*(u8*)&eeHw[(mem)&0xffff]) #define psHu16(mem) (*(u16*)&eeHw[(mem)&0xffff]) #define psHu32(mem) (*(u32*)&eeHw[(mem)&0xffff]) #define psHu64(mem) (*(u64*)&eeHw[(mem)&0xffff]) #define psHu128(mem) (*(u128*)&eeHw[(mem)&0xffff]) -#define psMs8(mem) (*(s8*)&eeMem->Main[(mem)&0x1ffffff]) -#define psMs16(mem) (*(s16*)&eeMem->Main[(mem)&0x1ffffff]) -#define psMs32(mem) (*(s32*)&eeMem->Main[(mem)&0x1ffffff]) -#define psMs64(mem) (*(s64*)&eeMem->Main[(mem)&0x1ffffff]) -#define psMu8(mem) (*(u8*)&eeMem->Main[(mem)&0x1ffffff]) -#define psMu16(mem) (*(u16*)&eeMem->Main[(mem)&0x1ffffff]) -#define psMu32(mem) (*(u32*)&eeMem->Main[(mem)&0x1ffffff]) -#define psMu64(mem) (*(u64*)&eeMem->Main[(mem)&0x1ffffff]) - -#define psRs8(mem) (*(s8*)&eeMem->ROM[(mem)&0x3fffff]) -#define psRs16(mem) (*(s16*)&eeMem->ROM[(mem)&0x3fffff]) -#define psRs32(mem) (*(s32*)&eeMem->ROM[(mem)&0x3fffff]) -#define psRs64(mem) (*(s64*)&eeMem->ROM[(mem)&0x3fffff]) -#define psRu8(mem) (*(u8*)&eeMem->ROM[(mem)&0x3fffff]) -#define psRu16(mem) (*(u16*)&eeMem->ROM[(mem)&0x3fffff]) -#define psRu32(mem) (*(u32*)&eeMem->ROM[(mem)&0x3fffff]) -#define psRu64(mem) (*(u64*)&eeMem->ROM[(mem)&0x3fffff]) - -#define psR1s8(mem) (*(s8*)&eeMem->ROM1[(mem)&0x3fffff]) -#define psR1s16(mem) (*(s16*)&eeMem->ROM1[(mem)&0x3fffff]) -#define psR1s32(mem) (*(s32*)&eeMem->ROM1[(mem)&0x3fffff]) -#define psR1s64(mem) (*(s64*)&eeMem->ROM1[(mem)&0x3fffff]) -#define psR1u8(mem) (*(u8*)&eeMem->ROM1[(mem)&0x3fffff]) -#define psR1u16(mem) (*(u16*)&eeMem->ROM1[(mem)&0x3fffff]) -#define psR1u32(mem) (*(u32*)&eeMem->ROM1[(mem)&0x3fffff]) -#define psR1u64(mem) (*(u64*)&eeMem->ROM1[(mem)&0x3fffff]) - -#define psR2s8(mem) (*(s8*)&eeMem->ROM2[(mem)&0x7ffff]) -#define psR2s16(mem) (*(s16*)&eeMem->ROM2[(mem)&0x7ffff]) -#define psR2s32(mem) (*(s32*)&eeMem->ROM2[(mem)&0x7ffff]) -#define psR2s64(mem) (*(s64*)&eeMem->ROM2[(mem)&0x7ffff]) -#define psR2u8(mem) (*(u8*)&eeMem->ROM2[(mem)&0x7ffff]) -#define psR2u16(mem) (*(u16*)&eeMem->ROM2[(mem)&0x7ffff]) -#define psR2u32(mem) (*(u32*)&eeMem->ROM2[(mem)&0x7ffff]) -#define psR2u64(mem) (*(u64*)&eeMem->ROM2[(mem)&0x7ffff]) - -#define psSs32(mem) (*(s32*)&eeMem->Scratch[(mem)&0x3fff]) -#define psSs64(mem) (*(s64*)&eeMem->Scratch[(mem)&0x3fff]) -#define psSs128(mem) (*(s128*)&eeMem->Scratch[(mem)&0x3fff]) #define psSu32(mem) (*(u32*)&eeMem->Scratch[(mem)&0x3fff]) #define psSu64(mem) (*(u64*)&eeMem->Scratch[(mem)&0x3fff]) #define psSu128(mem) (*(u128*)&eeMem->Scratch[(mem)&0x3fff])