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

NESHawk: Implement new findings related to cpu register accesses, fix nanjing board

This commit is contained in:
alyosha-tas 2021-12-08 16:29:36 -05:00
parent 5f51174f1c
commit c8ef579b8f
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NanJing.cs
View File

@ -140,7 +140,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{
if (addr < 0x2000)
{
if ((reg1 & 0x80) != 0 && NES.ppu.ppur.status.rendering)
if ((reg1 & 0x80) != 0 && NES.ppu.ppur.status.rendering && NES.ppu.PPUON)
{
if (NES.ppu.ppur.status.sl <= 128)
Vram[addr & 0xfff] = value;

30
src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs
View File

@ -1016,11 +1016,35 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
else if (addr < 0x4020)
{
ret = ReadReg(addr); // we're not rebasing the register just to keep register names canonical
// oam dma access board memory if cpu is not accessing registers
// this means that OAM DMA can actually access memory that the cpu cannot
if (oam_dma_exec)
{
if ((cpu.PC >= 0x4000) && (cpu.PC < 0x4020))
{
ret = ReadReg(addr);
}
else
{
ret = Board.ReadExp(addr - 0x4000);
}
}
else
{
ret = ReadReg(addr);
}
}
else if (addr < 0x6000)
{
ret = Board.ReadExp(addr - 0x4000);
// oam dma will access registers if cpu is accessing them
if (oam_dma_exec && ((oam_dma_addr & 0xFF00) == 0x4000) && (cpu.PC >= 0x4000) && (cpu.PC < 0x4020))
{
ret = ReadReg(addr & 0x401F);
}
else
{
ret = Board.ReadExp(addr - 0x4000);
}
}
else
{
@ -1082,7 +1106,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
else if (addr < 0x4020)
{
WriteReg(addr, value); //we're not rebasing the register just to keep register names canonical
WriteReg(addr, value);
}
else if (addr < 0x6000)
{