Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PowerPC: Parametrize LR macro.

Browse Source
This commit is contained in:
Admiral H. Curtiss committed 2023-01-27 15:22:43 +01:00
1 parent 0f301829d2
commit 0a343007cb
13 files changed
+37 -32
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
+2 -2
View File
@@ -346,7 +346,7 @@ void Interpreter::unknown_instruction(UGeckoInstruction inst)
NOTICE_LOG_FMT(
POWERPC,
"\nIntCPU: Unknown instruction {:08x} at PC = {:08x} last_PC = {:08x} LR = {:08x}\n",
inst.hex, PowerPC::ppcState.pc, last_pc, LR);
inst.hex, PowerPC::ppcState.pc, last_pc, LR(PowerPC::ppcState));
for (int i = 0; i < 32; i += 4)
{
NOTICE_LOG_FMT(POWERPC, "r{}: {:#010x} r{}: {:#010x} r{}: {:#010x} r{}: {:#010x}", i,
@@ -355,7 +355,7 @@ void Interpreter::unknown_instruction(UGeckoInstruction inst)
}
ASSERT_MSG(POWERPC, 0,
"\nIntCPU: Unknown instruction {:08x} at PC = {:08x} last_PC = {:08x} LR = {:08x}\n",
inst.hex, PowerPC::ppcState.pc, last_pc, LR);
inst.hex, PowerPC::ppcState.pc, last_pc, LR(PowerPC::ppcState));
if (Core::System::GetInstance().IsPauseOnPanicMode())
CPU::Break();
}
Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp
+5 -5
View File
@@ -13,7 +13,7 @@
void Interpreter::bx(UGeckoInstruction inst)
{
if (inst.LK)
LR = PowerPC::ppcState.pc + 4;
LR(PowerPC::ppcState) = PowerPC::ppcState.pc + 4;
const auto address = u32(SignExt26(inst.LI << 2));
@@ -42,7 +42,7 @@ void Interpreter::bcx(UGeckoInstruction inst)
if (counter && condition)
{
if (inst.LK)
LR = PowerPC::ppcState.pc + 4;
LR(PowerPC::ppcState) = PowerPC::ppcState.pc + 4;
const auto address = u32(SignExt16(s16(inst.BD << 2)));
@@ -67,7 +67,7 @@ void Interpreter::bcctrx(UGeckoInstruction inst)
{
PowerPC::ppcState.npc = CTR & (~3);
if (inst.LK_3)
LR = PowerPC::ppcState.pc + 4;
LR(PowerPC::ppcState) = PowerPC::ppcState.pc + 4;
}
m_end_block = true;
@@ -84,9 +84,9 @@ void Interpreter::bclrx(UGeckoInstruction inst)
if ((counter & condition) != 0)
{
PowerPC::ppcState.npc = LR & (~3);
PowerPC::ppcState.npc = LR(PowerPC::ppcState) & (~3);
if (inst.LK_3)
LR = PowerPC::ppcState.pc + 4;
LR(PowerPC::ppcState) = PowerPC::ppcState.pc + 4;
}
m_end_block = true;