diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp index 6cdb610d54..25c1b6bf48 100644 --- a/Core/HLE/HLE.cpp +++ b/Core/HLE/HLE.cpp @@ -443,7 +443,17 @@ void CallSyscall(u32 op) HLEFunc func = moduleDB[modulenum].funcTable[funcnum].func; if (func) { - func(); + // TODO: Move to jit/interp. + u32 flags = moduleDB[modulenum].funcTable[funcnum].flags; + if (flags & HLE_NOT_DISPATCH_SUSPENDED) + { + if (!__KernelIsDispatchEnabled()) + RETURN(SCE_KERNEL_ERROR_CAN_NOT_WAIT); + else + func(); + } + else + func(); if (hleAfterSyscall != HLE_AFTER_NOTHING) hleFinishSyscall(modulenum, funcnum); diff --git a/Core/HLE/HLE.h b/Core/HLE/HLE.h index 3a18cf412f..676bc718a4 100644 --- a/Core/HLE/HLE.h +++ b/Core/HLE/HLE.h @@ -20,14 +20,17 @@ #include "../Globals.h" #include "../MIPS/MIPS.h" -#define STACKTOP 0x09F00000 -#define STACKSIZE 0x10000 - typedef void (* HLEFunc)(); enum { - NOT_IN_INTERRUPT, - NOT_DISPATCH_SUSPENDED, + // The low 8 bits are a value, indicating special jit handling. + // Currently there are none. + + // The remaining 24 bits are flags. + // Don't allow the call within an interrupt. Not yet implemented. + HLE_NOT_IN_INTERRUPT = 1 << 8, + // Don't allow the call if dispatch or interrupts are disabled. + HLE_NOT_DISPATCH_SUSPENDED = 1 << 9, }; struct HLEFunction diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp index a27973bb5c..0636e5eef0 100644 --- a/Core/HLE/sceKernel.cpp +++ b/Core/HLE/sceKernel.cpp @@ -610,8 +610,8 @@ const HLEFunction ThreadManForUser[] = {0x58b1f937,&WrapI_II, "sceKernelPollSema"}, {0xBC6FEBC5,&WrapI_IU, "sceKernelReferSemaStatus"}, {0x3F53E640,&WrapI_II, "sceKernelSignalSema"}, - {0x4E3A1105,&WrapI_IIU, "sceKernelWaitSema"}, - {0x6d212bac,&WrapI_IIU, "sceKernelWaitSemaCB"}, + {0x4E3A1105,&WrapI_IIU, "sceKernelWaitSema", HLE_NOT_DISPATCH_SUSPENDED}, + {0x6d212bac,&WrapI_IIU, "sceKernelWaitSemaCB", HLE_NOT_DISPATCH_SUSPENDED}, {0x60107536,&WrapI_U, "sceKernelDeleteLwMutex"}, {0x19CFF145,&WrapI_UCUIU, "sceKernelCreateLwMutex"}, diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index 220539ba5c..527cd937ac 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -1284,7 +1284,7 @@ Thread *__KernelNextThread() { void __KernelReSchedule(const char *reason) { // cancel rescheduling when in interrupt or callback, otherwise everything will be fucked up - if (__IsInInterrupt() || __KernelInCallback() || !__InterruptsEnabled()) + if (__IsInInterrupt() || __KernelInCallback() || !__KernelIsDispatchEnabled()) { reason = "In Interrupt Or Callback"; return; @@ -1299,7 +1299,7 @@ void __KernelReSchedule(const char *reason) // Execute any pending events while we're doing scheduling. CoreTiming::AdvanceQuick(); - if (__IsInInterrupt() || __KernelInCallback() || !__InterruptsEnabled()) + if (__IsInInterrupt() || __KernelInCallback() || !__KernelIsDispatchEnabled()) { reason = "In Interrupt Or Callback"; return; @@ -1717,6 +1717,12 @@ u32 sceKernelResumeDispatchThread(u32 enabled) return 0; } +bool __KernelIsDispatchEnabled() +{ + // Dispatch can never be enabled when interrupts are disabled. + return dispatchEnabled && __InterruptsEnabled(); +} + int sceKernelRotateThreadReadyQueue(int priority) { DEBUG_LOG(HLE, "sceKernelRotateThreadReadyQueue(%x)", priority); diff --git a/Core/HLE/sceKernelThread.h b/Core/HLE/sceKernelThread.h index 57e62ba419..b1b594bc62 100644 --- a/Core/HLE/sceKernelThread.h +++ b/Core/HLE/sceKernelThread.h @@ -176,6 +176,7 @@ void __KernelStartIdleThreads(); void __KernelReturnFromThread(); // Called as HLE function u32 __KernelGetThreadPrio(SceUID id); bool __KernelThreadSortPriority(SceUID thread1, SceUID thread2); +bool __KernelIsDispatchEnabled(); void __KernelIdle();