Merge pull request #1752 from Buddybenj/clean-up

Clean Up
This commit is contained in:
magumagu committed 2015-02-10 11:39:14 -08:00
commit 0f96a0104e
14 files changed
+23 -38

No files matched your search

-4
View File
@@ -10,11 +10,7 @@
DSPEmulator *CreateDSPEmulator(bool HLE)
{
if (HLE)
{
return new DSPHLE();
}
else
{
return new DSPLLE();
}
}
+1 -2
View File
@@ -42,7 +42,6 @@ void CCPU::Run()
while (true)
{
reswitch:
switch (PowerPC::GetState())
{
case PowerPC::CPU_RUNNING:
@@ -60,7 +59,7 @@ reswitch:
if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN)
return;
if (PowerPC::GetState() != PowerPC::CPU_STEPPING)
goto reswitch;
continue;
//3: do a step
PowerPC::SingleStep();
+1 -1
View File
@@ -136,7 +136,7 @@ static void ExceptionThread(mach_port_t port)
mach_msg_header_t *send_msg = nullptr;
mach_msg_size_t send_size = 0;
mach_msg_option_t option = MACH_RCV_MSG;
while (1)
while (true)
{
// If this isn't the first run, send the reply message. Then, receive
// a message: either a mach_exception_raise_state RPC due to
+1 -1
View File
@@ -32,7 +32,7 @@ typedef std::vector<u8> NetWiimote;
#define NETPLAY_VERSION "Dolphin NetPlay 2014-01-08"
const int NETPLAY_INITIAL_GCTIME = 1272737767;
static const int NETPLAY_INITIAL_GCTIME = 1272737767;
// messages
+1 -1
View File
@@ -313,7 +313,7 @@ static void FindFunctionsAfterBLR(PPCSymbolDB *func_db)
{
while (true)
{
// skip zeroes that sometimes pad function to 16 byte boundary (eg. Donkey Kong Country Returns)
// skip zeroes that sometimes pad function to 16 byte boundary (e.g. Donkey Kong Country Returns)
while (Memory::Read_Instruction(location) == 0 && ((location & 0xf) != 0))
location += 4;
if (PPCTables::IsValidInstruction(Memory::Read_Instruction(location)))
+2 -1
View File
@@ -176,7 +176,8 @@ static int GetEmptySlot(std::map<double, int> m)
break;
}
}
if (!found) return i;
if (!found)
return i;
}
return -1;
}