Skip to content

Fix build: unknown_instruction reads ppc_state before it is declared #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dougchansan wants to merge 1 commit into
base: moderngekko-vendor
Choose a base branch
from
Open

Fix build: unknown_instruction reads ppc_state before it is declared #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "Core/PowerPC/MMU.h"
#include "Core/PowerPC/PPCTables.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/StaticRecomp/StaticRecompCore.h"
#include "Core/System.h"

namespace
Expand Down Expand Up @@ -290,6 +291,9 @@ void Interpreter::unknown_instruction(Interpreter& interpreter, UGeckoInstructio
auto& system = interpreter.m_system;
Core::CPUThreadGuard guard(system);

// Hoisted: the staticrecomp diagnostic block below was inserted above the
// original declaration site and reads ppc_state, so the branch did not build.
const auto& ppc_state = interpreter.m_ppc_state;
const u32 last_pc = interpreter.m_last_pc;
if (g_static_recomp_core && g_static_recomp_core->IsModuleActive())
{
Expand Down Expand Up @@ -337,7 +341,6 @@ void Interpreter::unknown_instruction(Interpreter& interpreter, UGeckoInstructio
Dolphin_Debugger::PrintCallstack(guard, Common::Log::LogType::POWERPC,
Common::Log::LogLevel::LNOTICE);

const auto& ppc_state = interpreter.m_ppc_state;
NOTICE_LOG_FMT(
POWERPC,
"\nIntCPU: Unknown instruction {:08x} at PC = {:08x} last_PC = {:08x} LR = {:08x}\n",
Expand Down