From aada48cf15ce63cd7cc50c06652111fdb905b8d0 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 2 Jun 2013 15:17:24 -0700 Subject: [PATCH] Use a PSPPointer in lwmutexes. --- Core/HLE/sceKernelMutex.cpp | 39 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/Core/HLE/sceKernelMutex.cpp b/Core/HLE/sceKernelMutex.cpp index c0f75b7ba4..3c63eb960f 100644 --- a/Core/HLE/sceKernelMutex.cpp +++ b/Core/HLE/sceKernelMutex.cpp @@ -82,22 +82,6 @@ struct Mutex : public KernelObject }; -struct NativeLwMutex -{ - SceSize size; - char name[KERNELOBJECT_MAX_NAME_LENGTH + 1]; - SceUInt attr; - SceUID uid; - u32 workareaPtr; - int initialCount; - // Not kept up to date. - int currentCount; - // Not kept up to date. - SceUID lockThread; - // Not kept up to date. - int numWaitThreads; -}; - struct NativeLwMutexWorkarea { int lockLevel; @@ -120,6 +104,22 @@ struct NativeLwMutexWorkarea } }; +struct NativeLwMutex +{ + SceSize size; + char name[KERNELOBJECT_MAX_NAME_LENGTH + 1]; + SceUInt attr; + SceUID uid; + PSPPointer workarea; + int initialCount; + // Not kept up to date. + int currentCount; + // Not kept up to date. + SceUID lockThread; + // Not kept up to date. + int numWaitThreads; +}; + struct LwMutex : public KernelObject { const char *GetName() {return nm.name;} @@ -732,7 +732,7 @@ int sceKernelCreateLwMutex(u32 workareaPtr, const char *name, u32 attr, int init mutex->nm.name[KERNELOBJECT_MAX_NAME_LENGTH] = 0; mutex->nm.attr = attr; mutex->nm.uid = id; - mutex->nm.workareaPtr = workareaPtr; + mutex->nm.workarea = workareaPtr; mutex->nm.initialCount = initialCount; auto workarea = Memory::GetStruct(workareaPtr); workarea->init(); @@ -990,8 +990,7 @@ void __KernelLwMutexEndCallback(SceUID threadID, SceUID prevCallbackId, u32 &ret // TODO: Don't wake up if __KernelCurHasReadyCallbacks()? // Attempt to unlock. - auto workarea = Memory::GetStruct(mutex->nm.workareaPtr); - if (mutex->nm.lockThread == -1 && __KernelUnlockLwMutexForThread(mutex, workarea, threadID, error, 0)) + if (mutex->nm.lockThread == -1 && __KernelUnlockLwMutexForThread(mutex, mutex->nm.workarea, threadID, error, 0)) return; // We only check if it timed out if it couldn't unlock. @@ -1150,7 +1149,7 @@ int __KernelReferLwMutexStatus(SceUID uid, u32 infoPtr) if (Memory::Read_U32(infoPtr) != 0) { - auto workarea = Memory::GetStruct(m->nm.workareaPtr); + auto workarea = m->nm.workarea; u32 error; for (auto iter = m->waitingThreads.begin(); iter != m->waitingThreads.end(); ++iter)