From b70a75776e7ad152cdab86b34c39b1a5b9482184 Mon Sep 17 00:00:00 2001 From: Rohit Nirmal Date: Tue, 28 Oct 2014 21:02:47 -0500 Subject: [PATCH 1/2] DolphinWX: Remove unused variable. --- Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index 35678e43dd..4989cecff0 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -342,7 +342,6 @@ void CCodeWindow::StepOut() PowerPC::CoreMode oldMode = PowerPC::GetMode(); PowerPC::SetMode(PowerPC::MODE_INTERPRETER); UGeckoInstruction inst = Memory::Read_Instruction(PC); - GekkoOPInfo* opinfo = GetOpInfo(inst); while (inst.hex != 0x4e800020 && steps < timeout) // check for blr { if (inst.LK) @@ -361,7 +360,6 @@ void CCodeWindow::StepOut() ++steps; } inst = Memory::Read_Instruction(PC); - opinfo = GetOpInfo(inst); } PowerPC::SingleStep(); From 55f91ecba4ba59c1393744cbe3b0da3a7f5929d9 Mon Sep 17 00:00:00 2001 From: Rohit Nirmal Date: Tue, 28 Oct 2014 21:03:58 -0500 Subject: [PATCH 2/2] DolphinWX: Fix -Wsign-compare warnings. --- Source/Core/DolphinWX/Debugger/WatchView.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Debugger/WatchView.cpp b/Source/Core/DolphinWX/Debugger/WatchView.cpp index ea905a0f71..ec634040a9 100644 --- a/Source/Core/DolphinWX/Debugger/WatchView.cpp +++ b/Source/Core/DolphinWX/Debugger/WatchView.cpp @@ -60,7 +60,7 @@ static void UpdateWatchAddr(int count, u32 value) static void SetWatchName(int count, const std::string value) { - if ((count - 1) < PowerPC::watches.GetWatches().size()) + if ((count - 1) < (int)PowerPC::watches.GetWatches().size()) { PowerPC::watches.UpdateName(count - 1, value); } @@ -91,7 +91,7 @@ static wxString GetValueByRowCol(int row, int col) default: return wxEmptyString; } } - else if (row <= PowerPC::watches.GetWatches().size()) + else if (row <= (int)PowerPC::watches.GetWatches().size()) { if (PowerPC::GetState() != PowerPC::CPU_POWERDOWN) {