mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-17 11:24:27 +01:00
Use a PSPPointer in lwmutexes.
This commit is contained in:
1 parent
5027e24150
commit
aada48cf15
1 file changed
+19
-20
+19
-20
@@ -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<NativeLwMutexWorkarea> 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<NativeLwMutexWorkarea>(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<NativeLwMutexWorkarea>(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<NativeLwMutexWorkarea>(m->nm.workareaPtr);
|
||||
auto workarea = m->nm.workarea;
|
||||
|
||||
u32 error;
|
||||
for (auto iter = m->waitingThreads.begin(); iter != m->waitingThreads.end(); ++iter)
|
||||
|
||||
Reference in new issue
Block a user