From e3262fc0a4f0a8413d803abe4f86712e4187fb29 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Mon, 4 Jan 2021 23:41:19 +1000 Subject: [PATCH] CPU: Compile fix for debug builds --- src/core/bus.cpp | 2 +- src/core/cpu_core.cpp | 2 +- src/core/cpu_core.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/bus.cpp b/src/core/bus.cpp index 4bb8948f2..53ab5e072 100644 --- a/src/core/bus.cpp +++ b/src/core/bus.cpp @@ -886,7 +886,7 @@ ALWAYS_INLINE static TickCount DoEXP2Access(u32 offset, u32& value) { Log_InfoPrintf("TTY: %s", m_tty_line_buffer.c_str()); #ifdef _DEBUG - if (CPU::LOG_EXECUTION) + if (CPU::IsTraceEnabled()) CPU::WriteToExecutionLog("TTY: %s\n", m_tty_line_buffer.c_str()); #endif } diff --git a/src/core/cpu_core.cpp b/src/core/cpu_core.cpp index 09e542ae4..f759d6578 100644 --- a/src/core/cpu_core.cpp +++ b/src/core/cpu_core.cpp @@ -248,7 +248,7 @@ void RaiseException(u32 CAUSE_bits, u32 EPC) g_state.cop0_regs.EPC, g_state.cop0_regs.cause.BD ? "true" : "false", g_state.cop0_regs.cause.CE.GetValue()); DisassembleAndPrint(g_state.current_instruction_pc, 4, 0); - if (LOG_EXECUTION) + if (s_trace_to_log) { CPU::WriteToExecutionLog("Exception %u at 0x%08X (epc=0x%08X, BD=%s, CE=%u)\n", static_cast(g_state.cop0_regs.cause.Excode.GetValue()), diff --git a/src/core/cpu_core.h b/src/core/cpu_core.h index 30e99a542..c91991537 100644 --- a/src/core/cpu_core.h +++ b/src/core/cpu_core.h @@ -182,6 +182,5 @@ bool AddStepOverBreakpoint(); bool AddStepOutBreakpoint(u32 max_instructions_to_search = 1000); extern bool TRACE_EXECUTION; -extern bool LOG_EXECUTION; } // namespace CPU