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

Oops, sceKernelCheckThreadStack was already implemented. Let's hope both copies are the same.

Browse source
This commit is contained in:
Henrik Rydgard 2013-03-23 14:41:13 +01:00
parent 38e7a9ed42
commit 84d292010a
4 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/HLE/sceKernel.cpp
View file

@ -655,7 +655,7 @@ const HLEFunction ThreadManForUser[] =
{0x616403ba,WrapI_I<sceKernelTerminateThread>,"sceKernelTerminateThread"},
{0x383f7bcc,WrapI_I<sceKernelTerminateDeleteThread>,"sceKernelTerminateDeleteThread"},
{0x840E8133,WrapI_IU<sceKernelWaitThreadEndCB>,"sceKernelWaitThreadEndCB"},
{0xd13bde95,sceKernelCheckThreadStack,"sceKernelCheckThreadStack"},
{0xd13bde95,WrapI_V<sceKernelCheckThreadStack>,"sceKernelCheckThreadStack"},
{0x94416130,WrapU_UUUU<sceKernelGetThreadmanIdList>,"sceKernelGetThreadmanIdList"},
{0x57CF62DD,WrapU_U<sceKernelGetThreadmanIdType>,"sceKernelGetThreadmanIdType"},

9
Core/HLE/sceKernelInterrupt.cpp
View file

@ -540,13 +540,6 @@ u32 sceKernelMemcpy(u32 dst, u32 src, u32 size)
return dst;
}
// Returns the stack size of the current thread.
u32 sceKernelCheckThreadStack() {
int stackSize = __KernelGetCurThreadStack() - currentMIPS->r[MIPS_REG_SP];
DEBUG_LOG(HLE, "%i = sceKernelCheckThreadStack()", stackSize);
return stackSize;
}
const HLEFunction Kernel_Library[] =
{
{0x092968F4,sceKernelCpuSuspendIntr,"sceKernelCpuSuspendIntr"},
@ -562,7 +555,7 @@ const HLEFunction Kernel_Library[] =
{0x15b6446b,WrapI_UI<sceKernelUnlockLwMutex>, "sceKernelUnlockLwMutex"},
{0xc1734599,WrapI_UU<sceKernelReferLwMutexStatus>, "sceKernelReferLwMutexStatus"},
{0x293b45b8,sceKernelGetThreadId, "sceKernelGetThreadId"},
{0xD13BDE95,WrapU_V<sceKernelCheckThreadStack>, "sceKernelCheckThreadStack"},
{0xD13BDE95,WrapI_V<sceKernelCheckThreadStack>, "sceKernelCheckThreadStack"},
{0x1839852A,WrapU_UUU<sceKernelMemcpy>,"sce_paf_private_memcpy"},
};

8
Core/HLE/sceKernelThread.cpp
View file

@ -1340,18 +1340,18 @@ void __KernelReSchedule(bool doCallbacks, const char *reason)
//////////////////////////////////////////////////////////////////////////
// Thread Management
//////////////////////////////////////////////////////////////////////////
void sceKernelCheckThreadStack()
int sceKernelCheckThreadStack()
{
u32 error;
Thread *t = kernelObjects.Get<Thread>(__KernelGetCurThread(), error);
if (t) {
u32 diff = labs((long)((s64)t->stackBlock - (s64)currentMIPS->r[MIPS_REG_SP]));
u32 diff = labs((long)((s64)t->stackEnd - (s64)currentMIPS->r[MIPS_REG_SP]));
WARN_LOG(HLE, "%i=sceKernelCheckThreadStack()", diff);
RETURN(diff);
return diff;
} else {
// WTF?
ERROR_LOG(HLE, "sceKernelCheckThreadStack() - not on thread");
RETURN(-1);
return -1;
}
}

2
Core/HLE/sceKernelThread.h
View file

@ -46,7 +46,7 @@ u32 sceKernelReferThreadRunStatus(u32 uid, u32 statusPtr);
int sceKernelReleaseWaitThread(SceUID threadID);
void sceKernelChangeCurrentThreadAttr();
int sceKernelRotateThreadReadyQueue(int priority);
u32 sceKernelCheckThreadStack();
int sceKernelCheckThreadStack();
void sceKernelSuspendThread();
void sceKernelResumeThread();
void sceKernelWakeupThread();