empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger: Fixed regression when reading/writing to memory (was causing unwanted sideeffects)

Browse source
This commit is contained in:
Souryo 2017-09-02 18:33:51 -04:00
parent ac119852ef
commit 1ab18f1140
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Core/MemoryManager.cpp
View file

@ -109,8 +109,11 @@ uint8_t MemoryManager::DebugRead(uint16_t addr, bool disableSideEffects)
} else {
IMemoryHandler* handler = _ramReadHandlers[addr];
if(handler) {
if(handler == _mapper.get() && disableSideEffects) {
value = ((BaseMapper*)handler)->DebugReadRAM(addr);
if(disableSideEffects) {
if(handler == _mapper.get()) {
//Only allow reads from prg/chr ram/rom (e.g not ppu, apu, mapper registers, etc.)
value = ((BaseMapper*)handler)->DebugReadRAM(addr);
}
} else {
value = handler->ReadRAM(addr);
}
@ -170,8 +173,11 @@ void MemoryManager::DebugWrite(uint16_t addr, uint8_t value, bool disableSideEff
} else {
IMemoryHandler* handler = _ramReadHandlers[addr];
if(handler) {
if(handler == _mapper.get() && disableSideEffects) {
((BaseMapper*)handler)->DebugWriteRAM(addr, value);
if(disableSideEffects) {
if(handler == _mapper.get()) {
//Only allow writes to prg/chr ram/rom (e.g not ppu, apu, mapper registers, etc.)
((BaseMapper*)handler)->DebugWriteRAM(addr, value);
}
} else {
handler->WriteRAM(addr, value);
}