Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-22 13:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CPU: Clean up exception disassembly dumping

Browse source
This commit is contained in:
Connor McLaughlin 2019-10-04 15:35:35 +10:00
parent 8362b8e43b
commit 1aa846e0f8
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/cpu_core.cpp
View file

@ -229,23 +229,14 @@ u32 Core::GetExceptionVector(Exception excode) const
void Core::RaiseException(Exception excode) void Core::RaiseException(Exception excode)
{ {
#ifdef Y_BUILD_CONFIG_RELEASE
if (excode == Exception::RI)
{
// Invalid op.
Log_DevPrintf("Invalid instruction at 0x%08X", m_current_instruction_pc);
DisassembleAndPrint(m_current_instruction_pc, 4, 0);
}
#endif
RaiseException(excode, m_current_instruction_pc, m_current_instruction_in_branch_delay_slot, RaiseException(excode, m_current_instruction_pc, m_current_instruction_in_branch_delay_slot,
m_current_instruction_was_branch_taken, m_current_instruction.cop.cop_n); m_current_instruction_was_branch_taken, m_current_instruction.cop.cop_n);
} }
void Core::RaiseException(Exception excode, u32 EPC, bool BD, bool BT, u8 CE) void Core::RaiseException(Exception excode, u32 EPC, bool BD, bool BT, u8 CE)
{ {
Log_DevPrintf("Exception %u at 0x%08X (epc=0x%08X, BD=%s, CE=%u)", static_cast<u32>(excode), m_current_instruction_pc, Log_DebugPrintf("Exception %u at 0x%08X (epc=0x%08X, BD=%s, CE=%u)", static_cast<u32>(excode),
EPC, BD ? "true" : "false", ZeroExtend32(CE)); m_current_instruction_pc, EPC, BD ? "true" : "false", ZeroExtend32(CE));
#ifdef Y_BUILD_CONFIG_DEBUG #ifdef Y_BUILD_CONFIG_DEBUG
DisassembleAndPrint(m_current_instruction_pc, 4, 0); DisassembleAndPrint(m_current_instruction_pc, 4, 0);
#endif #endif
@ -523,6 +514,14 @@ void Core::Execute()
if (DispatchInterrupts() || !FetchInstruction()) if (DispatchInterrupts() || !FetchInstruction())
continue; continue;
#if 0 // GTE flag test debugging
if (m_current_instruction_pc == 0x8002cdf4)
{
if (m_regs.v1 != m_regs.v0)
printf("Got %08X Expected? %08X\n", m_regs.v1, m_regs.v0);
}
#endif
// execute the instruction we previously fetched // execute the instruction we previously fetched
ExecuteInstruction(); ExecuteInstruction();