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

Debugger: Fixed disassembly for BRL instruction

Browse source
This commit is contained in:
Sour 2019-03-15 18:15:52 -04:00
parent 9af57723ec
commit b90b273e4b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/Console.cpp
View file

@ -180,7 +180,7 @@ bool Console::LoadRom(VirtualFile romFile, VirtualFile patchFile)
if(spcBios.IsValid()) { if(spcBios.IsValid()) {
spcBios.ReadFile(spcRomData); spcBios.ReadFile(spcRomData);
} else { } else {
MessageManager::Log("[SPC] spc700.rom not found, cannot launch game."); MessageManager::DisplayMessage("SPC", "spc700.rom not found, cannot launch game.");
return false; return false;
} }

8
Core/DisassemblyInfo.cpp
View file

@ -79,8 +79,8 @@ void DisassemblyInfo::GetDisassembly(string &out, uint32_t memoryAddr)
case AddrMode::Sig8: //BRK/COP signature, ignore them case AddrMode::Sig8: //BRK/COP signature, ignore them
case AddrMode::Imp: break; case AddrMode::Imp: break;
case AddrMode::RelLng: str.Write(operand); case AddrMode::RelLng: str.Write(operand); break;
case AddrMode::Rel: str.Write(operand); case AddrMode::Rel: str.Write(operand); break;
case AddrMode::Stk: break; case AddrMode::Stk: break;
case AddrMode::StkRel: str.Write(operand, ",S"); break; case AddrMode::StkRel: str.Write(operand, ",S"); break;
case AddrMode::StkRelIndIdxY: str.Write('(', operand, ",S),Y"); break; case AddrMode::StkRelIndIdxY: str.Write('(', operand, ",S),Y"); break;
@ -106,7 +106,7 @@ uint32_t DisassemblyInfo::GetOperandAddress(uint32_t memoryAddr)
if(_opSize == 2) { if(_opSize == 2) {
opAddr = (memoryAddr & 0xFF0000) | (((int8_t)opAddr + memoryAddr + 2) & 0xFFFF); opAddr = (memoryAddr & 0xFF0000) | (((int8_t)opAddr + memoryAddr + 2) & 0xFFFF);
} else { } else {
opAddr = (memoryAddr & 0xFF0000) | (((int16_t)opAddr + memoryAddr + 2) & 0xFFFF); opAddr = (memoryAddr & 0xFF0000) | (((int16_t)opAddr + memoryAddr + 3) & 0xFFFF);
} }
} }
@ -197,7 +197,7 @@ void DisassemblyInfo::GetEffectiveAddressString(string &out, CpuState &state, Co
int32_t DisassemblyInfo::GetEffectiveAddress(CpuState &state, Console *console) int32_t DisassemblyInfo::GetEffectiveAddress(CpuState &state, Console *console)
{ {
if(_addrMode > AddrMode::ImmM && _addrMode != AddrMode::Acc && _addrMode != AddrMode::Imp && _addrMode != AddrMode::Stk && _addrMode != AddrMode::Rel && _addrMode != AddrMode::RelLng && _addrMode != AddrMode::BlkMov) { if(_addrMode > AddrMode::ImmM && _addrMode != AddrMode::Acc && _addrMode != AddrMode::Imp && _addrMode != AddrMode::Stk && _addrMode != AddrMode::Rel && _addrMode != AddrMode::RelLng && _addrMode != AddrMode::AbsLngJmp && _addrMode != AddrMode::BlkMov) {
DummyCpu cpu(console); DummyCpu cpu(console);
state.PS &= ~(ProcFlags::IndexMode8 | ProcFlags::MemoryMode8); state.PS &= ~(ProcFlags::IndexMode8 | ProcFlags::MemoryMode8);
state.PS |= _flags; state.PS |= _flags;