diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-11-15 20:21:35 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-11-15 20:21:35 -0500 |
| commit | 3eab75bc9c3a7ae8bb17a883ae39abd283436e07 (patch) | |
| tree | d8cd800dcfd5984a89b0b0eeaf52a494e4aedaff /Source/Core | |
| parent | 43b8749c6086aaabbf241875b34c3d7a43f6a112 (diff) | |
Core: Join some variable declarations and assignments
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/DSP/DSPAssembler.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/Core/PowerPC/Jit64/Jit.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp | 3 |
4 files changed, 5 insertions, 12 deletions
diff --git a/Source/Core/Core/DSP/DSPAssembler.cpp b/Source/Core/Core/DSP/DSPAssembler.cpp index fb614af399..1406dd8194 100644 --- a/Source/Core/Core/DSP/DSPAssembler.cpp +++ b/Source/Core/Core/DSP/DSPAssembler.cpp @@ -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; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp index 69c5022ef9..0042db0d75 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp @@ -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); } diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index 8de45ae981..044529b175 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -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; diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp index 65f86d92cf..acb57f8a14 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp @@ -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; |