From 72ce41f41cecde34ed5a5481152ab0b48ccfb72e Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Wed, 21 Aug 2013 01:10:30 -0700 Subject: [PATCH] Report a couple unhandled blocks. --- Core/HLE/sceKernelMemory.cpp | 2 ++ Core/HLE/scePower.cpp | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Core/HLE/sceKernelMemory.cpp b/Core/HLE/sceKernelMemory.cpp index 48ab2bdffb..7505823a2e 100644 --- a/Core/HLE/sceKernelMemory.cpp +++ b/Core/HLE/sceKernelMemory.cpp @@ -272,6 +272,7 @@ void sceKernelAllocateFpl() RETURN(0); } else { // TODO: Should block! + ERROR_LOG_REPORT(HLE, "sceKernelAllocateFpl: should block"); RETURN(0); } @@ -302,6 +303,7 @@ void sceKernelAllocateFplCB() RETURN(0); } else { // TODO: Should block and process callbacks! + ERROR_LOG_REPORT(HLE, "sceKernelAllocateFplCB: should block"); __KernelCheckCallbacks(); } diff --git a/Core/HLE/scePower.cpp b/Core/HLE/scePower.cpp index 8a2fac8527..af36162fb1 100644 --- a/Core/HLE/scePower.cpp +++ b/Core/HLE/scePower.cpp @@ -15,15 +15,15 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include -#include "HLE.h" -#include "../MIPS/MIPS.h" -#include "../CoreTiming.h" -#include "ChunkFile.h" - -#include "scePower.h" -#include "sceKernelThread.h" +#include "Common/ChunkFile.h" +#include "Core/HLE/HLE.h" +#include "Core/CoreTiming.h" +#include "Core/Reporting.h" #include "Core/Config.h" +#include "Core/HLE/scePower.h" +#include "Core/HLE/sceKernelThread.h" + const int PSP_POWER_ERROR_TAKEN_SLOT = 0x80000020; const int PSP_POWER_ERROR_SLOTS_FULL = 0x80000022; const int PSP_POWER_ERROR_PRIVATE_SLOT = 0x80000023; @@ -204,7 +204,7 @@ int sceKernelVolatileMemTryLock(int type, int paddr, int psize) { INFO_LOG(HLE,"sceKernelVolatileMemTryLock(%i, %08x, %i) - success", type, paddr, psize); volatileMemLocked = true; } else { - ERROR_LOG(HLE, "sceKernelVolatileMemTryLock(%i, %08x, %i) - already locked!", type, paddr, psize); + ERROR_LOG_REPORT(HLE, "sceKernelVolatileMemTryLock(%i, %08x, %i) - already locked!", type, paddr, psize); return ERROR_POWER_VMEM_IN_USE; } @@ -222,7 +222,7 @@ int sceKernelVolatileMemUnlock(int type) { INFO_LOG(HLE,"sceKernelVolatileMemUnlock(%i)", type); volatileMemLocked = false; } else { - ERROR_LOG(HLE, "sceKernelVolatileMemUnlock(%i) FAILED - not locked", type); + ERROR_LOG_REPORT(HLE, "sceKernelVolatileMemUnlock(%i) FAILED - not locked", type); } return 0; }