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

NES: fix some peek memory semantics

This commit is contained in:
goyuken 2014-02-27 20:58:00 +00:00
parent f1a81e8462
commit dcb2098055
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,11 +498,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
} }
else if (addr < 0x4000) else if (addr < 0x4000)
{ {
ret = ppu.ReadReg(addr & 7); ret = ppu.PeekReg(addr & 7);
} }
else if (addr < 0x4020) else if (addr < 0x4020)
{ {
ret = ReadReg(addr); //we're not rebasing the register just to keep register names canonical ret = PeekReg(addr); //we're not rebasing the register just to keep register names canonical
} }
else else
{ {

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
View File

@ -403,7 +403,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
var RAM = new MemoryDomain("RAM", 0x800, MemoryDomain.Endian.Little, var RAM = new MemoryDomain("RAM", 0x800, MemoryDomain.Endian.Little,
addr => ram[addr], (addr, value) => ram[addr] = value); addr => ram[addr], (addr, value) => ram[addr] = value);
var SystemBus = new MemoryDomain("System Bus", 0x10000, MemoryDomain.Endian.Little, var SystemBus = new MemoryDomain("System Bus", 0x10000, MemoryDomain.Endian.Little,
addr => ReadMemory((ushort)addr), (addr, value) => ApplySystemBusPoke(addr, value)); addr => PeekMemory((ushort)addr), (addr, value) => ApplySystemBusPoke(addr, value));
var PPUBus = new MemoryDomain("PPU Bus", 0x4000, MemoryDomain.Endian.Little, var PPUBus = new MemoryDomain("PPU Bus", 0x4000, MemoryDomain.Endian.Little,
addr => ppu.ppubus_peek(addr), (addr, value) => ppu.ppubus_write(addr, value)); addr => ppu.ppubus_peek(addr), (addr, value) => ppu.ppubus_write(addr, value));
var CIRAMdomain = new MemoryDomain("CIRAM (nametables)", 0x800, MemoryDomain.Endian.Little, var CIRAMdomain = new MemoryDomain("CIRAM (nametables)", 0x800, MemoryDomain.Endian.Little,