ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "IPL rom mapping optimization." 

This reverts commit 7dd2f760f7.
This commit is contained in:
Brandon Wright 2019-02-27 18:28:48 -06:00
parent ef70758053
commit 9a44626686
5 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apu/bapu/smp/core.cpp
View File

@ -27,19 +27,19 @@ void SMP::op_io(unsigned clocks) {
uint8 SMP::op_read(uint16 addr) {
tick();
if((addr & 0xfff0) == 0x00f0) return mmio_read(addr);
if(addr >= 0xffc0 && status.iplrom_enable) return iplrom[addr & 0x3f];
return apuram[addr];
}
void SMP::op_write(uint16 addr, uint8 data) {
tick();
if((addr & 0xfff0) == 0x00f0 || addr >= 0xffc0)
mmio_write(addr, data);
else
apuram[addr] = data;
if((addr & 0xfff0) == 0x00f0) mmio_write(addr, data);
apuram[addr] = data; //all writes go to RAM, even MMIO writes
}
uint8 SMP::op_readpc() {
tick();
if (regs.pc >= 0xffc0 && status.iplrom_enable) return iplrom[regs.pc++ & 0x3f];
return apuram[regs.pc++];
}

27
apu/bapu/smp/memory.cpp
View File

@ -8,6 +8,7 @@ void SMP::port_write(unsigned addr, unsigned data) {
unsigned SMP::mmio_read(unsigned addr) {
switch(addr) {
case 0xf2:
return status.dsp_addr;
@ -50,31 +51,10 @@ unsigned SMP::mmio_read(unsigned addr) {
}
void SMP::mmio_write(unsigned addr, unsigned data) {
if (addr >= 0xffc0)
{
if (status.iplrom_enable)
highmem[addr & 0x3f] = data;
else
apuram[addr] = data;
return;
}
switch(addr) {
case 0xf1:
if (((data & 0x80) > 0) != status.iplrom_enable) {
if (status.iplrom_enable)
{
status.iplrom_enable = false;
memcpy(&apuram[0xffc0], highmem, 64);
}
else
{
status.iplrom_enable = true;
memcpy(highmem, &apuram[0xffc0], 64);
memcpy(&apuram[0xffc0], iplrom, 64);
}
}
status.iplrom_enable = data & 0x80;
if(data & 0x30) {
if(data & 0x20) {
@ -142,7 +122,6 @@ void SMP::mmio_write(unsigned addr, unsigned data) {
case 0xfc:
timer2.target = data;
break;
}
apuram[addr] = data; //all writes go to RAM, even MMIO writes
}
}

2
apu/bapu/smp/smp.cpp
View File

@ -50,8 +50,6 @@ void SMP::reset() {
//$00f1
status.iplrom_enable = true;
memcpy(highmem, iplrom, 64);
memcpy(&apuram[0xffc0], iplrom, 64);
//$00f2
status.dsp_addr = 0x00;

1
apu/bapu/smp/smp.hpp
View File

@ -1,7 +1,6 @@
class SMP : public Processor {
public:
static const uint8 iplrom[64];
uint8 highmem[64];
uint8 *apuram;
unsigned port_read(unsigned port);

11
apu/bapu/smp/smp_state.cpp
View File

@ -73,11 +73,6 @@ void SMP::save_spc (uint8 *block) {
void SMP::save_state(uint8 **block) {
uint8 *ptr = *block;
memcpy(ptr, apuram, 64 * 1024);
if (status.iplrom_enable)
{
memcpy (&ptr[0xffc0], highmem, 64);
}
ptr += 64 * 1024;
#undef INT32
@ -166,12 +161,6 @@ void SMP::load_state(uint8 **block) {
INT32(status.iplrom_enable);
if (status.iplrom_enable)
{
memcpy(highmem, &apuram[0xffc0], 64);
memcpy(&apuram[0xffc0], iplrom, 64);
}
INT32(status.dsp_addr);
INT32(status.ram00f8);