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
cdriso: support multidisk eboots
[pcsx_rearmed.git]
/
libpcsxcore
/
new_dynarec
/
pcsxmem.c
diff --git
a/libpcsxcore/new_dynarec/pcsxmem.c
b/libpcsxcore/new_dynarec/pcsxmem.c
index
586c760
..
c9fb5a8
100644
(file)
--- a/
libpcsxcore/new_dynarec/pcsxmem.c
+++ b/
libpcsxcore/new_dynarec/pcsxmem.c
@@
-40,7
+40,7
@@
static void map_item(u32 *out, const void *h, u32 flag)
#define IOMEM16(a) (0x1000/4 + (((a) & 0xfff) / 2))
#define IOMEM8(a) (0x1000/4 + 0x1000/2 + ((a) & 0xfff))
#define IOMEM16(a) (0x1000/4 + (((a) & 0xfff) / 2))
#define IOMEM8(a) (0x1000/4 + 0x1000/2 + ((a) & 0xfff))
-
static u8 unmapped
_mem[0x1000];
+
u8 zero
_mem[0x1000];
u32 read_mem_dummy()
{
u32 read_mem_dummy()
{
@@
-77,13
+77,11
@@
static void io_write_sio32(u32 value)
sioWrite8((unsigned char)(value >> 24));
}
sioWrite8((unsigned char)(value >> 24));
}
+#ifndef DRC_DBG
+
static void map_rcnt_rcount0(u32 mode)
{
static void map_rcnt_rcount0(u32 mode)
{
- if (mode & 0x01) { // gate
- map_item(&mem_iortab[IOMEM32(0x1100)], &psxH[0x1000], 0);
- map_item(&mem_iortab[IOMEM16(0x1100)], &psxH[0x1000], 0);
- }
- else if (mode & 0x100) { // pixel clock
+ if (mode & 0x100) { // pixel clock
map_item(&mem_iortab[IOMEM32(0x1100)], rcnt0_read_count_m1, 1);
map_item(&mem_iortab[IOMEM16(0x1100)], rcnt0_read_count_m1, 1);
}
map_item(&mem_iortab[IOMEM32(0x1100)], rcnt0_read_count_m1, 1);
map_item(&mem_iortab[IOMEM16(0x1100)], rcnt0_read_count_m1, 1);
}
@@
-95,11
+93,7
@@
static void map_rcnt_rcount0(u32 mode)
static void map_rcnt_rcount1(u32 mode)
{
static void map_rcnt_rcount1(u32 mode)
{
- if (mode & 0x01) { // gate
- map_item(&mem_iortab[IOMEM32(0x1110)], &psxH[0x1000], 0);
- map_item(&mem_iortab[IOMEM16(0x1110)], &psxH[0x1000], 0);
- }
- else if (mode & 0x100) { // hcnt
+ if (mode & 0x100) { // hcnt
map_item(&mem_iortab[IOMEM32(0x1110)], rcnt1_read_count_m1, 1);
map_item(&mem_iortab[IOMEM16(0x1110)], rcnt1_read_count_m1, 1);
}
map_item(&mem_iortab[IOMEM32(0x1110)], rcnt1_read_count_m1, 1);
map_item(&mem_iortab[IOMEM16(0x1110)], rcnt1_read_count_m1, 1);
}
@@
-125,6
+119,12
@@
static void map_rcnt_rcount2(u32 mode)
}
}
}
}
+#else
+#define map_rcnt_rcount0(mode)
+#define map_rcnt_rcount1(mode)
+#define map_rcnt_rcount2(mode)
+#endif
+
#define make_rcnt_funcs(i) \
static u32 io_rcnt_read_count##i() { return psxRcntRcount(i); } \
static u32 io_rcnt_read_mode##i() { return psxRcntRmode(i); } \
#define make_rcnt_funcs(i) \
static u32 io_rcnt_read_count##i() { return psxRcntRcount(i); } \
static u32 io_rcnt_read_mode##i() { return psxRcntRmode(i); } \
@@
-290,7
+290,7
@@
void new_dyna_pcsx_mem_init(void)
// default/unmapped memhandlers
for (i = 0; i < 0x100000; i++) {
//map_item(&mem_readtab[i], mem_unmrtab, 1);
// default/unmapped memhandlers
for (i = 0; i < 0x100000; i++) {
//map_item(&mem_readtab[i], mem_unmrtab, 1);
- map_l1_mem(mem_readtab, i, 0, 0x1000,
unmapped
_mem);
+ map_l1_mem(mem_readtab, i, 0, 0x1000,
zero
_mem);
map_item(&mem_writetab[i], mem_unmwtab, 1);
}
map_item(&mem_writetab[i], mem_unmwtab, 1);
}