The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-12-26 03:01:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Core/SCD] disable access to mirrored areas of PRG-RAM as well when SUB-CPU is not halted (continuing fix for Dungeon Explorer USA)

Browse Source
This commit is contained in:
EkeEke 2015-01-31 18:05:44 +01:00
parent e9e56c56b0
commit c478c6026a
5 changed files with 72 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
builds/genesis_plus_gx_libretro.dll
View File

Binary file not shown.

BIN
builds/genplus_cube.dol
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 MiB

After

Width:  |  Height:  |  Size: 3.7 MiB

BIN
builds/genplus_wii.dol
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 MiB

After

Width:  |  Height:  |  Size: 3.8 MiB

40
core/cd_hw/scd.c
View File

@ -1475,30 +1475,34 @@ int scd_context_load(uint8 *state)
/* PRG-RAM */ /* PRG-RAM */
load_param(scd.prg_ram, sizeof(scd.prg_ram)); load_param(scd.prg_ram, sizeof(scd.prg_ram));
/* PRG-RAM 128k bank mapped to $020000-$03FFFF (resp. $420000-$43FFFF) */
m68k.memory_map[scd.cartridge.boot + 0x02].base = scd.prg_ram + ((scd.regs[0x03>>1].byte.l & 0xc0) << 11);
m68k.memory_map[scd.cartridge.boot + 0x03].base = m68k.memory_map[scd.cartridge.boot + 0x02].base + 0x10000;
/* PRG-RAM can only be accessed from MAIN 68K & Z80 when SUB-CPU is halted (Dungeon Explorer USA version) */ /* PRG-RAM can only be accessed from MAIN 68K & Z80 when SUB-CPU is halted (Dungeon Explorer USA version) */
if ((scd.regs[0x00].byte.l & 0x03) != 0x01) if ((scd.regs[0x00].byte.l & 0x03) != 0x01)
{ {
/* PRG-RAM (128KB bank) is mapped to $020000-$03FFFF (resp. $420000-$43FFFF) */ /* $020000-$03FFFF (resp. $420000-$43FFFF) is mapped to PRG-RAM 128K bank (mirrored every 256 KB) */
m68k.memory_map[scd.cartridge.boot + 0x02].read8 = m68k.memory_map[scd.cartridge.boot + 0x03].read8 = NULL; for (i=scd.cartridge.boot+0x02; i<scd.cartridge.boot+0x20; i+=4)
m68k.memory_map[scd.cartridge.boot + 0x02].read16 = m68k.memory_map[scd.cartridge.boot + 0x03].read16 = NULL; {
m68k.memory_map[scd.cartridge.boot + 0x02].write8 = m68k.memory_map[scd.cartridge.boot + 0x03].write8 = NULL; m68k.memory_map[i].base = m68k.memory_map[i+1].base = scd.prg_ram + ((scd.regs[0x03>>1].byte.l & 0xc0) << 11);
m68k.memory_map[scd.cartridge.boot + 0x02].write16 = m68k.memory_map[scd.cartridge.boot + 0x03].write16 = NULL; m68k.memory_map[i].read8 = m68k.memory_map[i+1].read8 = NULL;
zbank_memory_map[scd.cartridge.boot + 0x02].read = zbank_memory_map[scd.cartridge.boot + 0x03].read = NULL; m68k.memory_map[i].read16 = m68k.memory_map[i+1].read16 = NULL;
zbank_memory_map[scd.cartridge.boot + 0x02].write = zbank_memory_map[scd.cartridge.boot + 0x03].write = NULL; m68k.memory_map[i].write8 = m68k.memory_map[i+1].write8 = NULL;
m68k.memory_map[i].write16 = m68k.memory_map[i+1].write16 = NULL;
zbank_memory_map[i].read = zbank_memory_map[i+1].read = NULL;
zbank_memory_map[i].write = zbank_memory_map[i+1].write = NULL;
}
} }
else else
{ {
/* $020000-$03FFFF (resp. $420000-$43FFFF) is not mapped */ /* $020000-$03FFFF (resp. $420000-$43FFFF) is not mapped (mirrored every 256 KB) */
m68k.memory_map[scd.cartridge.boot + 0x02].read8 = m68k.memory_map[scd.cartridge.boot + 0x03].read8 = m68k_read_bus_8; for (i=scd.cartridge.boot+0x02; i<scd.cartridge.boot+0x20; i+=4)
m68k.memory_map[scd.cartridge.boot + 0x02].read16 = m68k.memory_map[scd.cartridge.boot + 0x03].read16 = m68k_read_bus_16; {
m68k.memory_map[scd.cartridge.boot + 0x02].write8 = m68k.memory_map[scd.cartridge.boot + 0x03].write8 = m68k_unused_w_8; m68k.memory_map[i].base = m68k.memory_map[i+1].base = scd.prg_ram + ((scd.regs[0x03>>1].byte.l & 0xc0) << 11);
m68k.memory_map[scd.cartridge.boot + 0x02].write16 = m68k.memory_map[scd.cartridge.boot + 0x03].write16 = m68k_unused_w_16; m68k.memory_map[i].read8 = m68k.memory_map[i+1].read8 = m68k_read_bus_8;
zbank_memory_map[scd.cartridge.boot + 0x02].read = zbank_memory_map[scd.cartridge.boot + 0x03].read = zbank_unused_r; m68k.memory_map[i].read16 = m68k.memory_map[i+1].read16 = m68k_read_bus_16;
zbank_memory_map[scd.cartridge.boot + 0x02].write = zbank_memory_map[scd.cartridge.boot + 0x03].write = zbank_unused_w; m68k.memory_map[i].write8 = m68k.memory_map[i+1].write8 = m68k_unused_8_w;
m68k.memory_map[i].write16 = m68k.memory_map[i+1].write16 = m68k_unused_16_w;
zbank_memory_map[i].read = zbank_memory_map[i+1].read = zbank_unused_r;
zbank_memory_map[i].write = zbank_memory_map[i+1].write = zbank_unused_w;
}
} }
/* Word-RAM */ /* Word-RAM */

88
core/mem68k.c
View File

@ -646,7 +646,7 @@ void ctrl_io_write_byte(unsigned int address, unsigned int data)
case 0x01: /* SUB-CPU control */ case 0x01: /* SUB-CPU control */
{ {
unsigned int status = s68k.cpu_stopped; unsigned int halted = s68k.stopped;
/* RESET bit */ /* RESET bit */
if (data & 0x01) if (data & 0x01)
@ -676,31 +676,37 @@ void ctrl_io_write_byte(unsigned int address, unsigned int data)
s68k_pulse_halt(); s68k_pulse_halt();
} }
/* check if SUB-CPU status has changed */ /* check if SUB-CPU halt status has changed */
if (s68k.cpu_stopped != status) if (s68k.stopped != halted)
{ {
unsigned int base = scd.cartridge.boot; int i;
/* PRG-RAM can only be accessed from MAIN 68K & Z80 when SUB-CPU is halted (Dungeon Explorer USA version) */ /* PRG-RAM can only be accessed from MAIN 68K & Z80 when SUB-CPU is halted (Dungeon Explorer USA version) */
if (s68k.cpu_stopped & STOP_LEVEL_HALT) if ((data & 0x03) != 0x01)
{ {
/* PRG-RAM (128KB bank) is mapped to $020000-$03FFFF (resp. $420000-$43FFFF) */ /* $020000-$03FFFF (resp. $420000-$43FFFF) is mapped to PRG-RAM 128K bank (mirrored every 256 KB) */
m68k.memory_map[base + 0x02].read8 = m68k.memory_map[base + 0x03].read8 = NULL; for (i=scd.cartridge.boot+0x02; i<scd.cartridge.boot+0x20; i+=4)
m68k.memory_map[base + 0x02].read16 = m68k.memory_map[base + 0x03].read16 = NULL; {
m68k.memory_map[base + 0x02].write8 = m68k.memory_map[base + 0x03].write8 = NULL; m68k.memory_map[i].read8 = m68k.memory_map[i+1].read8 = NULL;
m68k.memory_map[base + 0x02].write16 = m68k.memory_map[base + 0x03].write16 = NULL; m68k.memory_map[i].read16 = m68k.memory_map[i+1].read16 = NULL;
zbank_memory_map[base + 0x02].read = zbank_memory_map[base + 0x03].read = NULL; m68k.memory_map[i].write8 = m68k.memory_map[i+1].write8 = NULL;
zbank_memory_map[base + 0x02].write = zbank_memory_map[base + 0x03].write = NULL; m68k.memory_map[i].write16 = m68k.memory_map[i+1].write16 = NULL;
zbank_memory_map[i].read = zbank_memory_map[i+1].read = NULL;
zbank_memory_map[i].write = zbank_memory_map[i+1].write = NULL;
}
} }
else else
{ {
/* $020000-$03FFFF (resp. $420000-$43FFFF) is not mapped */ /* $020000-$03FFFF (resp. $420000-$43FFFF) is not mapped (mirrored every 256 KB) */
m68k.memory_map[base + 0x02].read8 = m68k.memory_map[base + 0x03].read8 = m68k_read_bus_8; for (i=scd.cartridge.boot+0x02; i<scd.cartridge.boot+0x20; i+=4)
m68k.memory_map[base + 0x02].read16 = m68k.memory_map[base + 0x03].read16 = m68k_read_bus_16; {
m68k.memory_map[base + 0x02].write8 = m68k.memory_map[base + 0x03].write8 = m68k_unused_w_8; m68k.memory_map[i].read8 = m68k.memory_map[i+1].read8 = m68k_read_bus_8;
m68k.memory_map[base + 0x02].write16 = m68k.memory_map[base + 0x03].write16 = m68k_unused_w_16; m68k.memory_map[i].read16 = m68k.memory_map[i+1].read16 = m68k_read_bus_16;
zbank_memory_map[base + 0x02].read = zbank_memory_map[base + 0x03].read = zbank_unused_r; m68k.memory_map[i].write8 = m68k.memory_map[i+1].write8 = m68k_unused_8_w;
zbank_memory_map[base + 0x02].write = zbank_memory_map[base + 0x03].write = zbank_unused_w; m68k.memory_map[i].write16 = m68k.memory_map[i+1].write16 = m68k_unused_16_w;
zbank_memory_map[i].read = zbank_memory_map[i+1].read = zbank_unused_r;
zbank_memory_map[i].write = zbank_memory_map[i+1].write = zbank_unused_w;
}
} }
} }
@ -872,7 +878,7 @@ void ctrl_io_write_word(unsigned int address, unsigned int data)
{ {
case 0x00: /* SUB-CPU interrupt & control */ case 0x00: /* SUB-CPU interrupt & control */
{ {
unsigned int status = s68k.cpu_stopped; unsigned int halted = s68k.stopped;
/* RESET bit */ /* RESET bit */
if (data & 0x01) if (data & 0x01)
@ -902,31 +908,37 @@ void ctrl_io_write_word(unsigned int address, unsigned int data)
s68k_pulse_halt(); s68k_pulse_halt();
} }
/* check if SUB-CPU status has changed */ /* check if SUB-CPU halt status has changed */
if (s68k.cpu_stopped != status) if (s68k.stopped != halted)
{ {
unsigned int base = scd.cartridge.boot; int i;
/* PRG-RAM can only be accessed from MAIN 68K & Z80 when SUB-CPU is halted (Dungeon Explorer USA version) */ /* PRG-RAM can only be accessed from MAIN 68K & Z80 when SUB-CPU is halted (Dungeon Explorer USA version) */
if (s68k.cpu_stopped & STOP_LEVEL_HALT) if ((data & 0x03) != 0x01)
{ {
/* PRG-RAM (128KB bank) is mapped to $020000-$03FFFF (resp. $420000-$43FFFF) */ /* $020000-$03FFFF (resp. $420000-$43FFFF) is mapped to PRG-RAM 128K bank (mirrored every 256 KB) */
m68k.memory_map[base + 0x02].read8 = m68k.memory_map[base + 0x03].read8 = NULL; for (i=scd.cartridge.boot+0x02; i<scd.cartridge.boot+0x20; i+=4)
m68k.memory_map[base + 0x02].read16 = m68k.memory_map[base + 0x03].read16 = NULL; {
m68k.memory_map[base + 0x02].write8 = m68k.memory_map[base + 0x03].write8 = NULL; m68k.memory_map[i].read8 = m68k.memory_map[i+1].read8 = NULL;
m68k.memory_map[base + 0x02].write16 = m68k.memory_map[base + 0x03].write16 = NULL; m68k.memory_map[i].read16 = m68k.memory_map[i+1].read16 = NULL;
zbank_memory_map[base + 0x02].read = zbank_memory_map[base + 0x03].read = NULL; m68k.memory_map[i].write8 = m68k.memory_map[i+1].write8 = NULL;
zbank_memory_map[base + 0x02].write = zbank_memory_map[base + 0x03].write = NULL; m68k.memory_map[i].write16 = m68k.memory_map[i+1].write16 = NULL;
zbank_memory_map[i].read = zbank_memory_map[i+1].read = NULL;
zbank_memory_map[i].write = zbank_memory_map[i+1].write = NULL;
}
} }
else else
{ {
/* $020000-$03FFFF (resp. $420000-$43FFFF) is not mapped */ /* $020000-$03FFFF (resp. $420000-$43FFFF) is not mapped (mirrored every 256 KB) */
m68k.memory_map[base + 0x02].read8 = m68k.memory_map[base + 0x03].read8 = m68k_read_bus_8; for (i=scd.cartridge.boot+0x02; i<scd.cartridge.boot+0x20; i+=4)
m68k.memory_map[base + 0x02].read16 = m68k.memory_map[base + 0x03].read16 = m68k_read_bus_16; {
m68k.memory_map[base + 0x02].write8 = m68k.memory_map[base + 0x03].write8 = m68k_unused_w_8; m68k.memory_map[i].read8 = m68k.memory_map[i+1].read8 = m68k_read_bus_8;
m68k.memory_map[base + 0x02].write16 = m68k.memory_map[base + 0x03].write16 = m68k_unused_w_16; m68k.memory_map[i].read16 = m68k.memory_map[i+1].read16 = m68k_read_bus_16;
zbank_memory_map[base + 0x02].read = zbank_memory_map[base + 0x03].read = zbank_unused_r; m68k.memory_map[i].write8 = m68k.memory_map[i+1].write8 = m68k_unused_8_w;
zbank_memory_map[base + 0x02].write = zbank_memory_map[base + 0x03].write = zbank_unused_w; m68k.memory_map[i].write16 = m68k.memory_map[i+1].write16 = m68k_unused_16_w;
zbank_memory_map[i].read = zbank_memory_map[i+1].read = zbank_unused_r;
zbank_memory_map[i].write = zbank_memory_map[i+1].write = zbank_unused_w;
}
} }
} }