From 262ba4a9197155558a485d08dc9a4b635ee5d14f Mon Sep 17 00:00:00 2001 From: Sour Date: Tue, 13 Aug 2024 21:28:30 +0900 Subject: [PATCH] GBA: Fixed log API issues --- Core/GBA/Debugger/MgbaLogHandler.h | 4 ++-- Core/GBA/GbaMemoryManager.cpp | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Core/GBA/Debugger/MgbaLogHandler.h b/Core/GBA/Debugger/MgbaLogHandler.h index bed01643..8c1228fd 100644 --- a/Core/GBA/Debugger/MgbaLogHandler.h +++ b/Core/GBA/Debugger/MgbaLogHandler.h @@ -38,8 +38,8 @@ public: uint8_t Read(uint32_t addr) { switch(addr & 0x03) { - case 0: return _enabled ? 0x1D : 0x00; - case 1: return _enabled ? 0xEA : 0x00; + case 0: return _enabled ? 0xEA : 0x00; + case 1: return _enabled ? 0x1D : 0x00; default: return 0; } } diff --git a/Core/GBA/GbaMemoryManager.cpp b/Core/GBA/GbaMemoryManager.cpp index 91b26e66..329248b6 100644 --- a/Core/GBA/GbaMemoryManager.cpp +++ b/Core/GBA/GbaMemoryManager.cpp @@ -362,12 +362,7 @@ uint8_t GbaMemoryManager::InternalRead(GbaAccessModeVal mode, uint32_t addr, uin case 0x02: return _extWorkRam[addr & (GbaConsole::ExtWorkRamSize - 1)]; case 0x03: return _intWorkRam[addr & (GbaConsole::IntWorkRamSize - 1)]; - case 0x04: - //registers - if(addr < 0x3FF) { - return ReadRegister(addr); - } - return _state.InternalOpenBus[addr & 0x03]; + case 0x04: return ReadRegister(addr); case 0x05: return _palette[addr & (GbaConsole::PaletteRamSize - 1)]; @@ -535,14 +530,14 @@ uint32_t GbaMemoryManager::ReadRegister(uint32_t addr) case 0x303: return 0; default: - if(addr >= 0xFFF700 && addr <= 0xFFF703) { + if(addr >= 0xFFF780 && addr <= 0xFFF783) { if(_emu->GetSettings()->GetGbaConfig().EnableMgbaLogApi) { return _mgbaLog->Read(addr); } } LogDebug("Read unimplemented register: " + HexUtilities::ToHex32(addr)); - return _state.CartOpenBus[addr & 0x01]; + return _state.InternalOpenBus[addr & 0x01]; } } }