Skip to content

Commit

Permalink
Misc: Remove unused ps macros from Memory.h
Browse files Browse the repository at this point in the history
The psHu64, psHu128 and psSu64 macros are also unused, but are kept for completeness.
  • Loading branch information
DaZombieKiller committed Apr 23, 2024
1 parent f437aa4 commit 6dcfe69
Showing 1 changed file with 0 additions and 43 deletions.
43 changes: 0 additions & 43 deletions pcsx2/Memory.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)&(CHECK_EXTRAMEM?0x7ffffff:0x1ffffff)])
#define psMs16(mem) (*(s16*)&eeMem->Main[(mem)&(CHECK_EXTRAMEM?0x7ffffff:0x1ffffff)])
#define psMs32(mem) (*(s32*)&eeMem->Main[(mem)&(CHECK_EXTRAMEM?0x7ffffff:0x1ffffff)])
#define psMs64(mem) (*(s64*)&eeMem->Main[(mem)&(CHECK_EXTRAMEM?0x7ffffff:0x1ffffff)])
#define psMu8(mem) (*(u8*)&eeMem->Main[(mem)&(CHECK_EXTRAMEM?0x7ffffff:0x1ffffff)])
#define psMu16(mem) (*(u16*)&eeMem->Main[(mem)&(CHECK_EXTRAMEM?0x7ffffff:0x1ffffff)])
#define psMu32(mem) (*(u32*)&eeMem->Main[(mem)&(CHECK_EXTRAMEM?0x7ffffff:0x1ffffff)])
#define psMu64(mem) (*(u64*)&eeMem->Main[(mem)&(CHECK_EXTRAMEM?0x7ffffff: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])
Expand Down

0 comments on commit 6dcfe69

Please sign in to comment.