notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: handle upto 64k page size
[pcsx_rearmed.git]
/
libpcsxcore
/
psxmem.h
diff --git
a/libpcsxcore/psxmem.h
b/libpcsxcore/psxmem.h
index
f3c2051
..
f9cc8f0
100644
(file)
--- a/
libpcsxcore/psxmem.h
+++ b/
libpcsxcore/psxmem.h
@@
-125,7
+125,8
@@
static inline void * psxm_lut(u32 mem, int write, u8 **lut)
if (!DISABLE_MEM_LUTS) {
void *ptr = lut[mem >> 16];
if (!DISABLE_MEM_LUTS) {
void *ptr = lut[mem >> 16];
- return ptr == INVALID_PTR ? INVALID_PTR : ptr + (u16)mem;
+ return ptr == INVALID_PTR ? INVALID_PTR
+ : (void *)((uintptr_t)ptr + (u16)mem);
}
if (mem >= 0xa0000000)
}
if (mem >= 0xa0000000)
@@
-177,8
+178,8
@@
void psxMemShutdown();
u8 psxMemRead8 (u32 mem);
u16 psxMemRead16(u32 mem);
u32 psxMemRead32(u32 mem);
u8 psxMemRead8 (u32 mem);
u16 psxMemRead16(u32 mem);
u32 psxMemRead32(u32 mem);
-void psxMemWrite8 (u32 mem, u
8
value);
-void psxMemWrite16(u32 mem, u
16
value);
+void psxMemWrite8 (u32 mem, u
32
value);
+void psxMemWrite16(u32 mem, u
32
value);
void psxMemWrite32(u32 mem, u32 value);
void *psxMemPointer(u32 mem);
void psxMemWrite32(u32 mem, u32 value);
void *psxMemPointer(u32 mem);