diff --git a/src/pse/cpu_core.cpp b/src/pse/cpu_core.cpp index ddb5ef9e1..0f2b4c43a 100644 --- a/src/pse/cpu_core.cpp +++ b/src/pse/cpu_core.cpp @@ -6,7 +6,7 @@ Log_SetChannel(CPU::Core); namespace CPU { -u32 TRACE_EXECUTION = 0; +bool TRACE_EXECUTION = false; Core::Core() = default; @@ -456,8 +456,8 @@ void Core::Execute() { while (m_downcount >= 0) { - m_pending_ticks += 3; - m_downcount -= 3; + m_pending_ticks += 2; + m_downcount -= 2; // now executing the instruction we previously fetched const Instruction inst = m_next_instruction; @@ -512,8 +512,8 @@ void Core::ExecuteInstruction(Instruction inst) } #endif - if (TRACE_EXECUTION == 1) - PrintInstruction(inst.bits, m_current_instruction_pc, nullptr); + if (TRACE_EXECUTION) + PrintInstruction(inst.bits, m_current_instruction_pc, this); switch (inst.op) { @@ -1109,9 +1109,6 @@ void Core::ExecuteInstruction(Instruction inst) UnreachableCode(); break; } - - if (TRACE_EXECUTION == 2) - PrintInstruction(inst.bits, m_current_instruction_pc, this); } void Core::ExecuteCop0Instruction(Instruction inst) diff --git a/src/pse/cpu_core.h b/src/pse/cpu_core.h index a48d8ccf9..4848572bc 100644 --- a/src/pse/cpu_core.h +++ b/src/pse/cpu_core.h @@ -137,7 +137,7 @@ private: GTE::Core m_cop2; }; -extern u32 TRACE_EXECUTION; +extern bool TRACE_EXECUTION; } // namespace CPU diff --git a/src/pse/mdec.cpp b/src/pse/mdec.cpp index 4b8b10057..a76a2d071 100644 --- a/src/pse/mdec.cpp +++ b/src/pse/mdec.cpp @@ -222,7 +222,7 @@ void MDEC::HandleDecodeMacroblockCommand() while (src != src_end) { src = DecodeMonoMacroblock(src, src_end); - Log_InfoPrint("Decoded mono macroblock"); + Log_DevPrintf("Decoded mono macroblock"); } } else @@ -231,7 +231,7 @@ void MDEC::HandleDecodeMacroblockCommand() { u32 old_offs = static_cast(src - temp.data()); src = DecodeColoredMacroblock(src, src_end); - Log_InfoPrintf("Decoded colour macroblock, ptr was %u, now %u", old_offs, static_cast(src - temp.data())); + Log_DevPrintf("Decoded colour macroblock, ptr was %u, now %u", old_offs, static_cast(src - temp.data())); } } } diff --git a/src/pse/pad.h b/src/pse/pad.h index 3067d9cc0..6ca20bde7 100644 --- a/src/pse/pad.h +++ b/src/pse/pad.h @@ -34,7 +34,7 @@ public: private: static constexpr u32 NUM_SLOTS = 2; - static constexpr u32 TRANSFER_TICKS = 550; + static constexpr u32 TRANSFER_TICKS = 750; enum class State : u32 {