diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 46be2697e449..6a836e93ac2f 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -4790,7 +4790,7 @@ bool spu_thread::process_mfc_cmd() getllar_spin_count = 0; getllar_busy_waiting_switch = umax; - u64 ntime; + u64 ntime = 0; rsx::reservation_lock rsx_lock(addr, 128); for (u64 i = 0; i != umax; [&]() @@ -4896,7 +4896,7 @@ bool spu_thread::process_mfc_cmd() // Avoid logging useless commands if there is no reservation const bool dump = g_cfg.core.mfc_debug && raddr; - const bool is_spurs_task_wait = pc == 0x11e4 && spurs_addr != -0x80u; + const bool is_spurs_task_wait = pc == 0x11e4 && spurs_addr != 0u - 0x80u; if (!is_spurs_task_wait || spurs_addr != raddr || spurs_waited) { @@ -5570,6 +5570,8 @@ s64 spu_thread::get_ch_value(u32 ch) thread_ctrl::wait_on(state, old); } + + fmt::throw_exception("Unreachable"); // Fix unannotated fallthrough warning } case MFC_RdTagStat: diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp index d6124407f0ad..cb865b5b5ce1 100644 --- a/rpcs3/main.cpp +++ b/rpcs3/main.cpp @@ -256,7 +256,7 @@ struct fatal_error_listener final : logs::listener void log(u64 /*stamp*/, const logs::message& msg, const std::string& prefix, const std::string& text) override { - if (msg <= logs::level::fatal) + if (msg == logs::level::fatal) { std::string _msg = "RPCS3: "; @@ -288,11 +288,8 @@ struct fatal_error_listener final : logs::listener OutputDebugStringA(_msg.c_str()); } #endif - if (msg == logs::level::fatal) - { - // Pause emulation if fatal error encountered - Emu.Pause(true); - } + // Pause emulation if fatal error encountered + Emu.Pause(true); } } };