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

Z80 - don't assume FetchMemory exists

This commit is contained in:
adelikat 2015-12-20 11:22:24 -05:00
parent 23b3784123
commit 538f0160d2
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BizHawk.Emulation.Cores/CPUs/Z80/Z80A.cs
View File

@ -56,7 +56,12 @@ namespace BizHawk.Emulation.Cores.Components.Z80
MemoryCallbacks.CallReads(addr);
}
return FetchMemory(addr, true);
if (FetchMemory != null)
{
return FetchMemory(addr, true);
}
return ReadMemory(addr);
}
public byte FetchMemoryWrapper(ushort addr)
@ -66,7 +71,12 @@ namespace BizHawk.Emulation.Cores.Components.Z80
MemoryCallbacks.CallReads(addr);
}
return FetchMemory(addr, false);
if (FetchMemory != null)
{
return FetchMemory(addr, false);
}
return ReadMemory(addr);
}
public void WriteMemoryWrapper(ushort addr, byte value)