Return more correct errors inside interrupts.

This commit is contained in:
Unknown W. Brackets committed 2013-08-28 22:35:06 -07:00
1 parent 211c2bd955
commit 686d893d5c
3 files changed
+42 -24

No files matched your search

+9 -8
View File
@@ -17,16 +17,17 @@
#include <algorithm>
#include <string>
#include "HLE.h"
#include "../System.h"
#include "../MIPS/MIPS.h"
#include "../MemMap.h"
#include "Core/HLE/HLE.h"
#include "Core/System.h"
#include "Core/MIPS/MIPS.h"
#include "Core/MemMap.h"
#include "Core/CoreTiming.h"
#include "Core/Reporting.h"
#include "sceKernel.h"
#include "sceKernelThread.h"
#include "sceKernelMemory.h"
#include "Core/HLE/sceKernel.h"
#include "Core/HLE/sceKernelThread.h"
#include "Core/HLE/sceKernelInterrupt.h"
#include "Core/HLE/sceKernelMemory.h"
const int TLS_NUM_INDEXES = 16;
@@ -1732,7 +1733,7 @@ int sceKernelAllocateTls(SceUID uid)
// TODO: Allocate downward if PSP_TLS_ATTR_HIGHMEM?
DEBUG_LOG(HLE, "sceKernelAllocateTls(%08x)", uid);
if (!__KernelIsDispatchEnabled())
if (!__KernelIsDispatchEnabled() || __IsInInterrupt())
return 0;
u32 error;