diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index f0813caf16..e1a8b48a03 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -335,7 +335,7 @@ void __DisplayVblankBeginCallback(SceUID threadID, SceUID prevCallbackId) { } vblankPausedWaits[pauseKey] = vCount + waitData.vcountUnblock; - DEBUG_LOG(SCEDISPLAY, "sceDisplayWaitVblankCB: Suspending vblank wait for callback") + DEBUG_LOG(SCEDISPLAY, "sceDisplayWaitVblankCB: Suspending vblank wait for callback"); } void __DisplayVblankEndCallback(SceUID threadID, SceUID prevCallbackId) { @@ -356,7 +356,7 @@ void __DisplayVblankEndCallback(SceUID threadID, SceUID prevCallbackId) { // Still have to wait a bit longer. vblankWaitingThreads.push_back(WaitVBlankInfo(__KernelGetCurThread(), vcountUnblock - vCount)); - DEBUG_LOG(SCEDISPLAY, "sceDisplayWaitVblankCB: Resuming vblank wait from callback") + DEBUG_LOG(SCEDISPLAY, "sceDisplayWaitVblankCB: Resuming vblank wait from callback"); } // TODO: Also average actualFps diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index 42467ae9c5..97e726a1d3 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -366,7 +366,7 @@ void __IoSyncNotify(u64 userdata, int cyclesLate) { void __IoAsyncBeginCallback(SceUID threadID, SceUID prevCallbackId) { auto result = HLEKernel::WaitBeginCallback(threadID, prevCallbackId, -1); if (result == HLEKernel::WAIT_CB_SUCCESS) { - DEBUG_LOG(SCEIO, "sceIoWaitAsync: Suspending wait for callback") + DEBUG_LOG(SCEIO, "sceIoWaitAsync: Suspending wait for callback"); } else if (result == HLEKernel::WAIT_CB_BAD_WAIT_ID) { WARN_LOG_REPORT(SCEIO, "sceIoWaitAsync: beginning callback with bad wait id?"); } diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index aca52c6793..8307b642f5 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -531,10 +531,10 @@ void WriteVarSymbol(u32 exportAddress, u32 relocAddress, u8 type, bool reverse = // The ABI requires that these come in pairs, at least. if (lastHI16Relocs.empty()) { - ERROR_LOG_REPORT(LOADER, "LO16 without any HI16 variable import at %08x for %08x", relocAddress, exportAddress) + ERROR_LOG_REPORT(LOADER, "LO16 without any HI16 variable import at %08x for %08x", relocAddress, exportAddress); // Try to process at least the low relocation... } else if (lastHI16ExportAddress != exportAddress) { - ERROR_LOG_REPORT(LOADER, "HI16 and LO16 imports do not match at %08x for %08x (should be %08x)", relocAddress, lastHI16ExportAddress, exportAddress) + ERROR_LOG_REPORT(LOADER, "HI16 and LO16 imports do not match at %08x for %08x (should be %08x)", relocAddress, lastHI16ExportAddress, exportAddress); } else { // Process each of the HI16. Usually there's only one. for (auto it = lastHI16Relocs.begin(), end = lastHI16Relocs.end(); it != end; ++it) @@ -1365,7 +1365,7 @@ Module *__KernelLoadModule(u8 *fileptr, SceKernelLMOption *options, std::string size_t size = offsets[6] - offsets[5]; temp = new u8[size]; memcpy(temp, fileptr + offsets[5], size); - INFO_LOG(LOADER, "Elf unaligned, aligning!") + INFO_LOG(LOADER, "Elf unaligned, aligning!"); } module = __KernelLoadELFFromPtr(temp ? temp : fileptr + offsets[5], PSP_GetDefaultLoadAddress(), error_string, &magic); @@ -1621,14 +1621,14 @@ u32 sceKernelLoadModule(const char *name, u32 flags, u32 optionAddr) if (info.name == "BOOT.BIN") { - NOTICE_LOG(LOADER, "Module %s is blacklisted or undecryptable - we try __KernelLoadExec", name) + NOTICE_LOG(LOADER, "Module %s is blacklisted or undecryptable - we try __KernelLoadExec", name); return __KernelLoadExec(name, 0, &error_string); } else { // Module was blacklisted or couldn't be decrypted, which means it's a kernel module we don't want to run.. // Let's just act as if it worked. - NOTICE_LOG(LOADER, "Module %s is blacklisted or undecryptable - we lie about success", name) + NOTICE_LOG(LOADER, "Module %s is blacklisted or undecryptable - we lie about success", name); return 1; } } diff --git a/Core/HLE/sceSas.cpp b/Core/HLE/sceSas.cpp index 84c71b1a59..08a4583bda 100644 --- a/Core/HLE/sceSas.cpp +++ b/Core/HLE/sceSas.cpp @@ -248,7 +248,7 @@ u32 sceSasGetPauseFlag(u32 core) { pauseFlag |= (1 << i); } - DEBUG_LOG(SCESAS, "sceSasGetPauseFlag(%08x)", pauseFlag) + DEBUG_LOG(SCESAS, "sceSasGetPauseFlag(%08x)", pauseFlag); return pauseFlag; } @@ -376,11 +376,11 @@ u32 sceSasSetADSR(u32 core, int voiceNum, int flag, int a, int d, int s, int r) // Create a mask like flag for the invalid values. int invalid = (a < 0 ? 0x1 : 0) | (d < 0 ? 0x2 : 0) | (s < 0 ? 0x4 : 0) | (r < 0 ? 0x8 : 0); if (invalid & flag) { - WARN_LOG_REPORT(SCESAS, "sceSasSetADSR(%08x, %i, %i, %08x, %08x, %08x, %08x): invalid value", core, voiceNum, flag, a, d, s, r) + WARN_LOG_REPORT(SCESAS, "sceSasSetADSR(%08x, %i, %i, %08x, %08x, %08x, %08x): invalid value", core, voiceNum, flag, a, d, s, r); return ERROR_SAS_INVALID_ADSR_RATE; } - DEBUG_LOG(SCESAS, "0=sceSasSetADSR(%08x, %i, %i, %08x, %08x, %08x, %08x)", core, voiceNum, flag, a, d, s, r) + DEBUG_LOG(SCESAS, "0=sceSasSetADSR(%08x, %i, %i, %08x, %08x, %08x, %08x)", core, voiceNum, flag, a, d, s, r); SasVoice &v = sas->voices[voiceNum]; if ((flag & 0x1) != 0) v.envelope.attackRate = a; diff --git a/Core/MIPS/ARM/ArmJit.cpp b/Core/MIPS/ARM/ArmJit.cpp index 3e6d8134b4..450551ba98 100644 --- a/Core/MIPS/ARM/ArmJit.cpp +++ b/Core/MIPS/ARM/ArmJit.cpp @@ -162,7 +162,7 @@ void Jit::EatInstruction(MIPSOpcode op) { ERROR_LOG_REPORT_ONCE(ateDelaySlot, JIT, "Ate a branch op."); } if (js.inDelaySlot) { - ERROR_LOG_REPORT_ONCE(ateInDelaySlot, JIT, "Ate an instruction inside a delay slot.") + ERROR_LOG_REPORT_ONCE(ateInDelaySlot, JIT, "Ate an instruction inside a delay slot."); } js.numInstructions++; diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp index 929481c7ba..e907b56af8 100644 --- a/Core/MIPS/x86/Jit.cpp +++ b/Core/MIPS/x86/Jit.cpp @@ -260,7 +260,7 @@ void Jit::EatInstruction(MIPSOpcode op) ERROR_LOG_REPORT_ONCE(ateDelaySlot, JIT, "Ate a branch op."); } if (js.inDelaySlot) { - ERROR_LOG_REPORT_ONCE(ateInDelaySlot, JIT, "Ate an instruction inside a delay slot.") + ERROR_LOG_REPORT_ONCE(ateInDelaySlot, JIT, "Ate an instruction inside a delay slot."); } CheckJitBreakpoint(js.compilerPC + 4, 0); diff --git a/GPU/Directx9/FramebufferDX9.cpp b/GPU/Directx9/FramebufferDX9.cpp index 92a4bec3a0..aa85937bf6 100644 --- a/GPU/Directx9/FramebufferDX9.cpp +++ b/GPU/Directx9/FramebufferDX9.cpp @@ -948,8 +948,8 @@ void FramebufferManagerDX9::DecimateFBOs() { } if (age > FBO_OLD_AGE) { - INFO_LOG(SCEGE, "Decimating FBO for %08x (%i x %i x %i), age %i", vfb->fb_address, vfb->width, vfb->height, vfb->format, age) - DestroyFramebuf(vfb); + INFO_LOG(SCEGE, "Decimating FBO for %08x (%i x %i x %i), age %i", vfb->fb_address, vfb->width, vfb->height, vfb->format, age); + DestroyFramebuf(vfb); vfbs_.erase(vfbs_.begin() + i--); } } @@ -959,8 +959,8 @@ void FramebufferManagerDX9::DecimateFBOs() { VirtualFramebufferDX9 *vfb = bvfbs_[i]; int age = frameLastFramebufUsed - vfb->last_frame_render; if (age > FBO_OLD_AGE) { - INFO_LOG(SCEGE, "Decimating FBO for %08x (%i x %i x %i), age %i", vfb->fb_address, vfb->width, vfb->height, vfb->format, age) - DestroyFramebuf(vfb); + INFO_LOG(SCEGE, "Decimating FBO for %08x (%i x %i x %i), age %i", vfb->fb_address, vfb->width, vfb->height, vfb->format, age); + DestroyFramebuf(vfb); bvfbs_.erase(bvfbs_.begin() + i--); } } @@ -1006,8 +1006,8 @@ void FramebufferManagerDX9::UpdateFromMemory(u32 addr, int size) { needUnbind = true; DrawPixels(Memory::GetPointer(addr), vfb->format, vfb->fb_stride); } else { - INFO_LOG(SCEGE, "Invalidating FBO for %08x (%i x %i x %i)", vfb->fb_address, vfb->width, vfb->height, vfb->format) - DestroyFramebuf(vfb); + INFO_LOG(SCEGE, "Invalidating FBO for %08x (%i x %i x %i)", vfb->fb_address, vfb->width, vfb->height, vfb->format); + DestroyFramebuf(vfb); vfbs_.erase(vfbs_.begin() + i--); } } diff --git a/GPU/Directx9/VertexDecoderDX9.cpp b/GPU/Directx9/VertexDecoderDX9.cpp index 16f9600195..d60f51e506 100644 --- a/GPU/Directx9/VertexDecoderDX9.cpp +++ b/GPU/Directx9/VertexDecoderDX9.cpp @@ -906,8 +906,9 @@ void VertexDecoderDX9::SetVertexType(u32 fmt) { } decFmt.posoff = decOff; decOff += DecFmtSize(decFmt.posfmt); - } else - ERROR_LOG_REPORT(G3D, "Vertices without position found") + } else { + ERROR_LOG_REPORT(G3D, "Vertices without position found"); + } decFmt.stride = decOff; diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index 84ff3920c9..fb152c5fdb 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -2003,7 +2003,7 @@ void FramebufferManager::DecimateFBOs() { } if (age > FBO_OLD_AGE) { - INFO_LOG(SCEGE, "Decimating FBO for %08x (%i x %i x %i), age %i", vfb->fb_address, vfb->width, vfb->height, vfb->format, age) + INFO_LOG(SCEGE, "Decimating FBO for %08x (%i x %i x %i), age %i", vfb->fb_address, vfb->width, vfb->height, vfb->format, age); DestroyFramebuf(vfb); vfbs_.erase(vfbs_.begin() + i--); } @@ -2024,7 +2024,7 @@ void FramebufferManager::DecimateFBOs() { VirtualFramebuffer *vfb = bvfbs_[i]; int age = frameLastFramebufUsed - vfb->last_frame_render; if (age > FBO_OLD_AGE) { - INFO_LOG(SCEGE, "Decimating FBO for %08x (%i x %i x %i), age %i", vfb->fb_address, vfb->width, vfb->height, vfb->format, age) + INFO_LOG(SCEGE, "Decimating FBO for %08x (%i x %i x %i), age %i", vfb->fb_address, vfb->width, vfb->height, vfb->format, age); DestroyFramebuf(vfb); bvfbs_.erase(bvfbs_.begin() + i--); } @@ -2078,7 +2078,7 @@ void FramebufferManager::UpdateFromMemory(u32 addr, int size, bool safe) { DrawPixels(vfb, 0, 0, Memory::GetPointer(addr | 0x04000000), fmt, vfb->fb_stride, vfb->width, vfb->height); SetColorUpdated(vfb); } else { - INFO_LOG(SCEGE, "Invalidating FBO for %08x (%i x %i x %i)", vfb->fb_address, vfb->width, vfb->height, vfb->format) + INFO_LOG(SCEGE, "Invalidating FBO for %08x (%i x %i x %i)", vfb->fb_address, vfb->width, vfb->height, vfb->format); DestroyFramebuf(vfb); vfbs_.erase(vfbs_.begin() + i--); } diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 815179d682..71908a2d04 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -506,7 +506,7 @@ UI::EventReturn JitCompareScreen::OnRandomVFPUBlock(UI::EventParams &e) { if (MIPSGetInfo(opcode) & IS_VFPU) { char temp[256]; MIPSDisAsm(opcode, addr, temp); - INFO_LOG(HLE, "Stopping VFPU instruction: %s", temp) + INFO_LOG(HLE, "Stopping VFPU instruction: %s", temp); anyVFPU = true; break; }