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

Cleanup some unused / duplicate code in threading.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-04-27 17:54:15 -07:00
parent e30dedd46f
commit c8958a253d
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Core/HLE/sceKernelThread.cpp
View file

@ -39,14 +39,6 @@
#include "sceKernelInterrupt.h" #include "sceKernelInterrupt.h"
enum {
ERROR_KERNEL_THREAD_ALREADY_DORMANT = 0x800201a2,
ERROR_KERNEL_THREAD_ALREADY_SUSPEND = 0x800201a3,
ERROR_KERNEL_THREAD_IS_NOT_DORMANT = 0x800201a4,
ERROR_KERNEL_THREAD_IS_NOT_SUSPEND = 0x800201a5,
ERROR_KERNEL_THREAD_IS_NOT_WAIT = 0x800201a6,
};
enum enum
{ {
PSP_THREAD_ATTR_USER = 0x80000000, PSP_THREAD_ATTR_USER = 0x80000000,
@ -100,7 +92,6 @@ public:
p.Do(savedV0); p.Do(savedV0);
p.Do(savedV1); p.Do(savedV1);
p.Do(savedIdRegister); p.Do(savedIdRegister);
p.Do(forceDelete);
p.DoMarker("Callback"); p.DoMarker("Callback");
} }
@ -111,15 +102,6 @@ public:
u32 savedV0; u32 savedV0;
u32 savedV1; u32 savedV1;
u32 savedIdRegister; u32 savedIdRegister;
/*
SceUInt attr;
SceUInt initPattern;
SceUInt currentPattern;
int numWaitThreads;
*/
bool forceDelete;
}; };
// Real PSP struct, don't change the fields // Real PSP struct, don't change the fields
@ -1809,7 +1791,7 @@ int sceKernelStartThread(SceUID threadToStartID, u32 argSize, u32 argBlockPtr)
if (startThread->nt.status != THREADSTATUS_DORMANT) if (startThread->nt.status != THREADSTATUS_DORMANT)
{ {
//Not dormant, WTF? //Not dormant, WTF?
return ERROR_KERNEL_THREAD_IS_NOT_DORMANT; return SCE_KERNEL_ERROR_NOT_DORMANT;
} }
INFO_LOG(HLE, "sceKernelStartThread(thread=%i, argSize=%i, argPtr=%08x)", INFO_LOG(HLE, "sceKernelStartThread(thread=%i, argSize=%i, argPtr=%08x)",
@ -2454,8 +2436,6 @@ u32 __KernelCreateCallback(const char *name, u32 entrypoint, u32 commonArg)
cb->nc.notifyCount = 0; cb->nc.notifyCount = 0;
cb->nc.notifyArg = 0; cb->nc.notifyArg = 0;
cb->forceDelete = false;
return id; return id;
} }
@ -3003,7 +2983,7 @@ void ActionAfterCallback::run(MipsCall &call) {
DEBUG_LOG(HLE, "Left callback %i - %s", cbId, cb->nc.name); DEBUG_LOG(HLE, "Left callback %i - %s", cbId, cb->nc.name);
// Callbacks that don't return 0 are deleted. But should this be done here? // Callbacks that don't return 0 are deleted. But should this be done here?
if (currentMIPS->r[MIPS_REG_V0] != 0 || cb->forceDelete) if (currentMIPS->r[MIPS_REG_V0] != 0)
{ {
DEBUG_LOG(HLE, "ActionAfterCallback::run(): Callback returned non-zero, gets deleted!"); DEBUG_LOG(HLE, "ActionAfterCallback::run(): Callback returned non-zero, gets deleted!");
kernelObjects.Destroy<Callback>(cbId); kernelObjects.Destroy<Callback>(cbId);