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 #1557 from lioncash/join 

Core: Join some variable declarations and assignments
This commit is contained in:
comex 2014-11-15 20:53:45 -05:00
parent 5d2ca2dfcc 3eab75bc9c
commit 4e484faf4c
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/DSP/DSPAssembler.cpp
View File

@ -880,9 +880,8 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
}
}
char *opcode = nullptr;
opcode = strtok(ptr, " ");
char *opcode_ext = nullptr;
char* opcode = strtok(ptr, " ");
char* opcode_ext = nullptr;
u32 params_count = 0;
u32 params_count_ext = 0;

6
Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
View File

@ -260,12 +260,8 @@ IWII_IPC_HLE_Device* AccessDeviceByID(u32 _ID)
IWII_IPC_HLE_Device* CreateFileIO(u32 _DeviceID, const std::string& _rDeviceName)
{
// scan device name and create the right one
IWII_IPC_HLE_Device* pDevice = nullptr;
INFO_LOG(WII_IPC_FILEIO, "IOP: Create FileIO %s", _rDeviceName.c_str());
pDevice = new CWII_IPC_HLE_Device_FileIO(_DeviceID, _rDeviceName);
return pDevice;
return new CWII_IPC_HLE_Device_FileIO(_DeviceID, _rDeviceName);
}

3
Source/Core/Core/PowerPC/Jit64/Jit.cpp
View File

@ -543,10 +543,9 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
jit->js.numLoadStoreInst = 0;
jit->js.numFloatingPointInst = 0;
u32 nextPC = em_address;
// Analyze the block, collect all instructions it is made of (including inlining,
// if that is enabled), reorder instructions for optimal performance, and join joinable instructions.
nextPC = analyzer.Analyze(em_address, &code_block, code_buf, blockSize);
u32 nextPC = analyzer.Analyze(em_address, &code_block, code_buf, blockSize);
PPCAnalyst::CodeOp *ops = code_buf->codebuffer;

3
Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp
View File

@ -527,10 +527,9 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
jit->js.numLoadStoreInst = 0;
jit->js.numFloatingPointInst = 0;
u32 nextPC = em_address;
// Analyze the block, collect all instructions it is made of (including inlining,
// if that is enabled), reorder instructions for optimal performance, and join joinable instructions.
nextPC = analyzer.Analyze(em_address, &code_block, code_buf, blockSize);
u32 nextPC = analyzer.Analyze(em_address, &code_block, code_buf, blockSize);
PPCAnalyst::CodeOp *ops = code_buf->codebuffer;