PowerPC: Remove PC macro.

1 files changed, 13 insertions, 12 deletions

diff --git a/Source/Core/DolphinQt/Debugger/CodeWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeWidget.cpp
index 60f74e52ad..64465dda00 100644
--- a/Source/Core/DolphinQt/Debugger/CodeWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/CodeWidget.cpp
@@ -451,11 +451,11 @@ void CodeWidget::StepOver()
   if (!CPU::IsStepping())
     return;
 
-  UGeckoInstruction inst = PowerPC::HostRead_Instruction(PC);
+  UGeckoInstruction inst = PowerPC::HostRead_Instruction(PowerPC::ppcState.pc);
   if (inst.LK)
   {
     PowerPC::breakpoints.ClearAllTemporary();
-    PowerPC::breakpoints.Add(PC + 4, true);
+    PowerPC::breakpoints.Add(PowerPC::ppcState.pc + 4, true);
     CPU::EnableStepping(false);
     Core::DisplayMessage(tr("Step over in progress...").toStdString(), 2000);
   }
@@ -495,7 +495,7 @@ void CodeWidget::StepOut()
   // Loop until either the current instruction is a return instruction with no Link flag
   // or a breakpoint is detected so it can step at the breakpoint. If the PC is currently
   // on a breakpoint, skip it.
-  UGeckoInstruction inst = PowerPC::HostRead_Instruction(PC);
+  UGeckoInstruction inst = PowerPC::HostRead_Instruction(PowerPC::ppcState.pc);
   do
   {
     if (WillInstructionReturn(inst))
@@ -507,27 +507,28 @@ void CodeWidget::StepOut()
     if (inst.LK)
     {
       // Step over branches
-      u32 next_pc = PC + 4;
+      u32 next_pc = PowerPC::ppcState.pc + 4;
       do
       {
         PowerPC::SingleStep();
-      } while (PC != next_pc && clock::now() < timeout &&
-               !PowerPC::breakpoints.IsAddressBreakPoint(PC));
+      } while (PowerPC::ppcState.pc != next_pc && clock::now() < timeout &&
+               !PowerPC::breakpoints.IsAddressBreakPoint(PowerPC::ppcState.pc));
     }
     else
     {
       PowerPC::SingleStep();
     }
 
-    inst = PowerPC::HostRead_Instruction(PC);
-  } while (clock::now() < timeout && !PowerPC::breakpoints.IsAddressBreakPoint(PC));
+    inst = PowerPC::HostRead_Instruction(PowerPC::ppcState.pc);
+  } while (clock::now() < timeout &&
+           !PowerPC::breakpoints.IsAddressBreakPoint(PowerPC::ppcState.pc));
 
   PowerPC::SetMode(old_mode);
   CPU::PauseAndLock(false, false);
 
   emit Host::GetInstance()->UpdateDisasmDialog();
 
-  if (PowerPC::breakpoints.IsAddressBreakPoint(PC))
+  if (PowerPC::breakpoints.IsAddressBreakPoint(PowerPC::ppcState.pc))
     Core::DisplayMessage(tr("Breakpoint encountered! Step out aborted.").toStdString(), 2000);
   else if (clock::now() >= timeout)
     Core::DisplayMessage(tr("Step out timed out!").toStdString(), 2000);
@@ -537,19 +538,19 @@ void CodeWidget::StepOut()
 
 void CodeWidget::Skip()
 {
-  PC += 4;
+  PowerPC::ppcState.pc += 4;
   ShowPC();
 }
 
 void CodeWidget::ShowPC()
 {
-  m_code_view->SetAddress(PC, CodeViewWidget::SetAddressUpdate::WithUpdate);
+  m_code_view->SetAddress(PowerPC::ppcState.pc, CodeViewWidget::SetAddressUpdate::WithUpdate);
   Update();
 }
 
 void CodeWidget::SetPC()
 {
-  PC = m_code_view->GetAddress();
+  PowerPC::ppcState.pc = m_code_view->GetAddress();
   Update();
 }