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
Update psxmem.c
[pcsx_rearmed.git]
/
libpcsxcore
/
psxmem.c
diff --git
a/libpcsxcore/psxmem.c
b/libpcsxcore/psxmem.c
index
9e44267
..
cfd880b
100644
(file)
--- a/
libpcsxcore/psxmem.c
+++ b/
libpcsxcore/psxmem.c
@@
-28,7
+28,8
@@
#include "r3000a.h"
#include "psxhw.h"
#include "debug.h"
#include "r3000a.h"
#include "psxhw.h"
#include "debug.h"
-#include <sys/mman.h>
+
+#include "memmap.h"
#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
@@
-41,40
+42,51
@@
void (*psxUnmapHook)(void *ptr, size_t size, enum psxMapTag tag);
void *psxMap(unsigned long addr, size_t size, int is_fixed,
enum psxMapTag tag)
{
void *psxMap(unsigned long addr, size_t size, int is_fixed,
enum psxMapTag tag)
{
+#ifdef LIGHTREC
+ int flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED;
+#else
int flags = MAP_PRIVATE | MAP_ANONYMOUS;
int flags = MAP_PRIVATE | MAP_ANONYMOUS;
- int tried_to_align = 0;
+#endif
+
+ int try_ = 0;
unsigned long mask;
void *req, *ret;
retry:
if (psxMapHook != NULL) {
unsigned long mask;
void *req, *ret;
retry:
if (psxMapHook != NULL) {
- ret = psxMapHook(addr, size, is_fixed, tag);
- goto out;
+ ret = psxMapHook(addr, size, 0, tag);
+ if (ret == NULL)
+ return NULL;
+ }
+ else {
+ /* avoid MAP_FIXED, it overrides existing mappings.. */
+ /* if (is_fixed)
+ flags |= MAP_FIXED; */
+
+ req = (void *)addr;
+ ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0);
+ if (ret == MAP_FAILED)
+ return NULL;
}
}
- if (is_fixed)
- flags |= MAP_FIXED;
-
- req = (void *)addr;
- ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0);
- if (ret == MAP_FAILED)
- return NULL;
-
-out:
if (addr != 0 && ret != (void *)addr) {
SysMessage("psxMap: warning: wanted to map @%08x, got %p\n",
addr, ret);
if (addr != 0 && ret != (void *)addr) {
SysMessage("psxMap: warning: wanted to map @%08x, got %p\n",
addr, ret);
- if (ret != NULL && ((addr ^ (long)ret) & 0x00ffffff)
- && !tried_to_align)
+ if (is_fixed) {
+ psxUnmap(ret, size, tag);
+ return NULL;
+ }
+
+ if (((addr ^ (unsigned long)ret) & ~0xff000000l) && try_ < 2)
{
psxUnmap(ret, size, tag);
// try to use similarly aligned memory instead
// (recompiler needs this)
{
psxUnmap(ret, size, tag);
// try to use similarly aligned memory instead
// (recompiler needs this)
- mask =
(addr - 1) & ~addr & 0x07
ffffff;
- addr = (
unsigned long)(
ret + mask) & ~mask;
- tr
ied_to_align = 1
;
+ mask =
try_ ? 0xffff : 0x
ffffff;
+ addr = (
(unsigned long)
ret + mask) & ~mask;
+ tr
y_++
;
goto retry;
}
}
goto retry;
}
}
@@
-89,7
+101,8
@@
void psxUnmap(void *ptr, size_t size, enum psxMapTag tag)
return;
}
return;
}
- munmap(ptr, size);
+ if (ptr)
+ munmap(ptr, size);
}
s8 *psxM = NULL; // Kernel & User Memory (2 Meg)
}
s8 *psxM = NULL; // Kernel & User Memory (2 Meg)
@@
-127,10
+140,14
@@
int psxMemInit() {
memset(psxMemRLUT, 0, 0x10000 * sizeof(void *));
memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
memset(psxMemRLUT, 0, 0x10000 * sizeof(void *));
memset(psxMemWLUT, 0, 0x10000 * sizeof(void *));
+#ifdef LIGHTREC
+ psxM = psxMap(0x30000000, 0x00210000, 1, MAP_TAG_RAM);
+#else
psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
+#endif
#ifndef RAM_FIXED
if (psxM == NULL)
#ifndef RAM_FIXED
if (psxM == NULL)
- psxM = psxMap(0x7
8
000000, 0x00210000, 0, MAP_TAG_RAM);
+ psxM = psxMap(0x7
7
000000, 0x00210000, 0, MAP_TAG_RAM);
#endif
if (psxM == NULL) {
SysMessage(_("mapping main RAM failed"));
#endif
if (psxM == NULL) {
SysMessage(_("mapping main RAM failed"));
@@
-138,12
+155,18
@@
int psxMemInit() {
}
psxP = &psxM[0x200000];
}
psxP = &psxM[0x200000];
- psxH = psxMap(0x1f800000, 0x10000, 1, MAP_TAG_OTHER);
+#ifdef LIGHTREC
+ psxH = psxMap(0x4f800000, 0x10000, 0, MAP_TAG_OTHER);
+ psxR = psxMap(0x4fc00000, 0x80000, 0, MAP_TAG_OTHER);
+#else
+ psxH = psxMap(0x1f800000, 0x10000, 0, MAP_TAG_OTHER);
psxR = psxMap(0x1fc00000, 0x80000, 0, MAP_TAG_OTHER);
psxR = psxMap(0x1fc00000, 0x80000, 0, MAP_TAG_OTHER);
+#endif
if (psxMemRLUT == NULL || psxMemWLUT == NULL ||
if (psxMemRLUT == NULL || psxMemWLUT == NULL ||
-
psxR == NULL || psxP == NULL || psxH != (void *)0x1f800000
) {
+
psxR == NULL || psxP == NULL || psxH == NULL
) {
SysMessage(_("Error allocating memory!"));
SysMessage(_("Error allocating memory!"));
+ psxMemShutdown();
return -1;
}
return -1;
}
@@
-178,7
+201,7
@@
void psxMemReset() {
char bios[1024];
memset(psxM, 0, 0x00200000);
char bios[1024];
memset(psxM, 0, 0x00200000);
- memset(psxP, 0, 0x00010000);
+ memset(psxP, 0
xff
, 0x00010000);
if (strcmp(Config.Bios, "HLE") != 0) {
sprintf(bios, "%s/%s", Config.BiosDir, Config.Bios);
if (strcmp(Config.Bios, "HLE") != 0) {
sprintf(bios, "%s/%s", Config.BiosDir, Config.Bios);
@@
-197,12
+220,12
@@
void psxMemReset() {
}
void psxMemShutdown() {
}
void psxMemShutdown() {
- psxUnmap(psxM, 0x00210000, MAP_TAG_RAM);
- psxUnmap(psxH, 0x1
f800000, MAP_TAG_OTHER)
;
- psxUnmap(psxR, 0x80000, MAP_TAG_OTHER);
+ psxUnmap(psxM, 0x00210000, MAP_TAG_RAM);
psxM = NULL;
+ psxUnmap(psxH, 0x1
0000, MAP_TAG_OTHER); psxH = NULL
;
+ psxUnmap(psxR, 0x80000, MAP_TAG_OTHER);
psxR = NULL;
- free(psxMemRLUT);
- free(psxMemWLUT);
+ free(psxMemRLUT);
psxMemRLUT = NULL;
+ free(psxMemWLUT);
psxMemWLUT = NULL;
}
static int writeok = 1;
}
static int writeok = 1;
@@
-212,8
+235,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
+260,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
+285,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
+310,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
+337,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
+365,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
+423,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;