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
gpu_neon: try to make the compiler save some callee-save regs
[pcsx_rearmed.git]
/
libpcsxcore
/
psxmem.c
diff --git
a/libpcsxcore/psxmem.c
b/libpcsxcore/psxmem.c
index
52d2759
..
46cee0c
100644
(file)
--- a/
libpcsxcore/psxmem.c
+++ b/
libpcsxcore/psxmem.c
@@
-27,7
+27,8
@@
#include "psxmem_map.h"
#include "r3000a.h"
#include "psxhw.h"
#include "psxmem_map.h"
#include "r3000a.h"
#include "psxhw.h"
-#include "debug.h"
+//#include "debug.h"
+#define DebugCheckBP(...)
#include "memmap.h"
#include "memmap.h"
@@
-136,10
+137,8
@@
int psxMemInit() {
memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
-#ifndef RAM_FIXED
if (psxM == NULL)
psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
if (psxM == NULL)
psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
-#endif
if (psxM == NULL) {
SysMessage(_("mapping main RAM failed"));
return -1;
if (psxM == NULL) {
SysMessage(_("mapping main RAM failed"));
return -1;