ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1433 from rohit-n/fix-warnings 

DolphinWX: Fix a few warnings.
This commit is contained in:
comex 2014-10-29 17:23:56 -04:00
parent d2990bc70a 55f91ecba4
commit eb22adf24a
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Debugger/CodeWindow.cpp
View File

@ -342,7 +342,6 @@ void CCodeWindow::StepOut()
PowerPC::CoreMode oldMode = PowerPC::GetMode(); PowerPC::CoreMode oldMode = PowerPC::GetMode();
PowerPC::SetMode(PowerPC::MODE_INTERPRETER); PowerPC::SetMode(PowerPC::MODE_INTERPRETER);
UGeckoInstruction inst = Memory::Read_Instruction(PC); UGeckoInstruction inst = Memory::Read_Instruction(PC);
GekkoOPInfo* opinfo = GetOpInfo(inst);
while (inst.hex != 0x4e800020 && steps < timeout) // check for blr while (inst.hex != 0x4e800020 && steps < timeout) // check for blr
{ {
if (inst.LK) if (inst.LK)
@ -361,7 +360,6 @@ void CCodeWindow::StepOut()
++steps; ++steps;
} }
inst = Memory::Read_Instruction(PC); inst = Memory::Read_Instruction(PC);
opinfo = GetOpInfo(inst);
} }
PowerPC::SingleStep(); PowerPC::SingleStep();

4
Source/Core/DolphinWX/Debugger/WatchView.cpp
View File

@ -60,7 +60,7 @@ static void UpdateWatchAddr(int count, u32 value)
static void SetWatchName(int count, const std::string 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); PowerPC::watches.UpdateName(count - 1, value);
} }
@ -91,7 +91,7 @@ static wxString GetValueByRowCol(int row, int col)
default: return wxEmptyString; default: return wxEmptyString;
} }
} }
else if (row <= PowerPC::watches.GetWatches().size()) else if (row <= (int)PowerPC::watches.GetWatches().size())
{ {
if (PowerPC::GetState() != PowerPC::CPU_POWERDOWN) if (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)
{ {