Merge pull request #3288 from unknownbrackets/reporting

Report a couple unhandled blocks
This commit is contained in:
Henrik Rydgård committed 2013-08-21 01:27:48 -07:00
commit ca4321d376
2 files changed
+11 -9

No files matched your search

+2
View File
@@ -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();
}
+9 -9
View File
@@ -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 <map>
#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;
}