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
Merge branch 'mainline'
[pcsx_rearmed.git]
/
libpcsxcore
/
psxmem.c
diff --git
a/libpcsxcore/psxmem.c
b/libpcsxcore/psxmem.c
index
9e44267
..
62bbe26
100644
(file)
--- a/
libpcsxcore/psxmem.c
+++ b/
libpcsxcore/psxmem.c
@@
-129,8
+129,13
@@
int psxMemInit() {
psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
#ifndef RAM_FIXED
psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
#ifndef RAM_FIXED
+#ifdef __BLACKBERRY_QNX__
+ if (psxM == NULL)
+ psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
+#else
if (psxM == NULL)
psxM = psxMap(0x78000000, 0x00210000, 0, MAP_TAG_RAM);
if (psxM == NULL)
psxM = psxMap(0x78000000, 0x00210000, 0, MAP_TAG_RAM);
+#endif
#endif
if (psxM == NULL) {
SysMessage(_("mapping main RAM failed"));
#endif
if (psxM == NULL) {
SysMessage(_("mapping main RAM failed"));
@@
-198,7
+203,7
@@
void psxMemReset() {
void psxMemShutdown() {
psxUnmap(psxM, 0x00210000, MAP_TAG_RAM);
void psxMemShutdown() {
psxUnmap(psxM, 0x00210000, MAP_TAG_RAM);
- psxUnmap(psxH, 0x1
f80
0000, MAP_TAG_OTHER);
+ psxUnmap(psxH, 0x10000, MAP_TAG_OTHER);
psxUnmap(psxR, 0x80000, MAP_TAG_OTHER);
free(psxMemRLUT);
psxUnmap(psxR, 0x80000, MAP_TAG_OTHER);
free(psxMemRLUT);
@@
-212,8
+217,8
@@
u8 psxMemRead8(u32 mem) {
u32 t;
t = mem >> 16;
u32 t;
t = mem >> 16;
- if (t == 0x1f80) {
- if (
mem < 0x1f8010
00)
+ if (t == 0x1f80
|| t == 0x9f80 || t == 0xbf80
) {
+ if (
(mem & 0xffff) < 0x4
00)
return psxHu8(mem);
else
return psxHwRead8(mem);
return psxHu8(mem);
else
return psxHwRead8(mem);
@@
-237,8
+242,8
@@
u16 psxMemRead16(u32 mem) {
u32 t;
t = mem >> 16;
u32 t;
t = mem >> 16;
- if (t == 0x1f80) {
- if (
mem < 0x1f8010
00)
+ if (t == 0x1f80
|| t == 0x9f80 || t == 0xbf80
) {
+ if (
(mem & 0xffff) < 0x4
00)
return psxHu16(mem);
else
return psxHwRead16(mem);
return psxHu16(mem);
else
return psxHwRead16(mem);
@@
-262,8
+267,8
@@
u32 psxMemRead32(u32 mem) {
u32 t;
t = mem >> 16;
u32 t;
t = mem >> 16;
- if (t == 0x1f80) {
- if (
mem < 0x1f8010
00)
+ if (t == 0x1f80
|| t == 0x9f80 || t == 0xbf80
) {
+ if (
(mem & 0xffff) < 0x4
00)
return psxHu32(mem);
else
return psxHwRead32(mem);
return psxHu32(mem);
else
return psxHwRead32(mem);
@@
-287,8
+292,8
@@
void psxMemWrite8(u32 mem, u8 value) {
u32 t;
t = mem >> 16;
u32 t;
t = mem >> 16;
- if (t == 0x1f80) {
- if (
mem < 0x1f8010
00)
+ if (t == 0x1f80
|| t == 0x9f80 || t == 0xbf80
) {
+ if (
(mem & 0xffff) < 0x4
00)
psxHu8(mem) = value;
else
psxHwWrite8(mem, value);
psxHu8(mem) = value;
else
psxHwWrite8(mem, value);
@@
-314,8
+319,8
@@
void psxMemWrite16(u32 mem, u16 value) {
u32 t;
t = mem >> 16;
u32 t;
t = mem >> 16;
- if (t == 0x1f80) {
- if (
mem < 0x1f8010
00)
+ if (t == 0x1f80
|| t == 0x9f80 || t == 0xbf80
) {
+ if (
(mem & 0xffff) < 0x4
00)
psxHu16ref(mem) = SWAPu16(value);
else
psxHwWrite16(mem, value);
psxHu16ref(mem) = SWAPu16(value);
else
psxHwWrite16(mem, value);
@@
-342,8
+347,8
@@
void psxMemWrite32(u32 mem, u32 value) {
// if ((mem&0x1fffff) == 0x71E18 || value == 0x48088800) SysPrintf("t2fix!!\n");
t = mem >> 16;
// if ((mem&0x1fffff) == 0x71E18 || value == 0x48088800) SysPrintf("t2fix!!\n");
t = mem >> 16;
- if (t == 0x1f80) {
- if (
mem < 0x1f8010
00)
+ if (t == 0x1f80
|| t == 0x9f80 || t == 0xbf80
) {
+ if (
(mem & 0xffff) < 0x4
00)
psxHu32ref(mem) = SWAPu32(value);
else
psxHwWrite32(mem, value);
psxHu32ref(mem) = SWAPu32(value);
else
psxHwWrite32(mem, value);
@@
-400,8
+405,8
@@
void *psxMemPointer(u32 mem) {
u32 t;
t = mem >> 16;
u32 t;
t = mem >> 16;
- if (t == 0x1f80) {
- if (
mem < 0x1f8010
00)
+ if (t == 0x1f80
|| t == 0x9f80 || t == 0xbf80
) {
+ if (
(mem & 0xffff) < 0x4
00)
return (void *)&psxH[mem];
else
return NULL;
return (void *)&psxH[mem];
else
return NULL;