Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Don't reschedule while interrupts are disabled.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-03-24 19:43:56 -07:00
parent b2fd023038
commit c9e1b01545
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Core/HLE/sceKernelInterrupt.h
View file

@ -128,6 +128,7 @@ private:
std::map<int, SubIntrHandler> subIntrHandlers; std::map<int, SubIntrHandler> subIntrHandlers;
}; };
bool __InterruptsEnabled();
bool __IsInInterrupt(); bool __IsInInterrupt();
void __InterruptsInit(); void __InterruptsInit();
void __InterruptsDoState(PointerWrap &p); void __InterruptsDoState(PointerWrap &p);

4
Core/HLE/sceKernelThread.cpp
View file

@ -1283,7 +1283,7 @@ Thread *__KernelNextThread() {
void __KernelReSchedule(const char *reason) void __KernelReSchedule(const char *reason)
{ {
// cancel rescheduling when in interrupt or callback, otherwise everything will be fucked up // cancel rescheduling when in interrupt or callback, otherwise everything will be fucked up
if (__IsInInterrupt() || __KernelInCallback()) if (__IsInInterrupt() || __KernelInCallback() || !__InterruptsEnabled())
{ {
reason = "In Interrupt Or Callback"; reason = "In Interrupt Or Callback";
return; return;
@ -1298,7 +1298,7 @@ void __KernelReSchedule(const char *reason)
// Execute any pending events while we're doing scheduling. // Execute any pending events while we're doing scheduling.
CoreTiming::AdvanceQuick(); CoreTiming::AdvanceQuick();
if (__IsInInterrupt() || __KernelInCallback()) if (__IsInInterrupt() || __KernelInCallback() || !__InterruptsEnabled())
{ {
reason = "In Interrupt Or Callback"; reason = "In Interrupt Or Callback";
return; return;