Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-06-08 20:11:39 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Kernel & APT] Mutexes v0.1

Browse source
This commit is contained in:
wheremyfoodat 2022-11-17 00:29:02 +02:00
parent 41e01bbdd4
commit 3c55d88fab
7 changed files with 51 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/kernel/events.cpp
View file

@ -79,7 +79,7 @@ void Kernel::waitSynchronization1() {
}
if (!isWaitable(object)) [[unlikely]] {
Helpers::panic("Tried to wait on a non waitable object. Type: %s, handle: %X\n", kernelObjectTypeToString(object->type), handle);
Helpers::panic("Tried to wait on a non waitable object. Type: %s, handle: %X\n", object->getTypeName(), handle);
}
regs[0] = SVCResult::Success;
@ -124,7 +124,7 @@ void Kernel::waitSynchronizationN() {
}
if (!isWaitable(object)) [[unlikely]] {
Helpers::panic("Tried to wait on a non waitable object. Type: %s, handle: %X\n", kernelObjectTypeToString(object->type), handle);
Helpers::panic("Tried to wait on a non waitable object. Type: %s, handle: %X\n", object->getTypeName(), handle);
}
}

15
src/core/kernel/threads.cpp
View file

@ -137,6 +137,18 @@ Handle Kernel::makeThread(u32 entrypoint, u32 initialSP, u32 priority, s32 id, u
return ret;
}
Handle Kernel::makeMutex(bool locked) {
Handle ret = makeObject(KernelObjectType::Mutex);
objects[ret].data = new Mutex(locked);
// If the mutex is initially locked, store the index of the thread that owns it
if (locked) {
objects[ret].getData<Mutex>()->ownerThread = currentThreadIndex;
}
return ret;
}
void Kernel::sleepThreadOnArbiter(u32 waitingAddress) {
Thread& t = threads[currentThreadIndex];
t.status = ThreadStatus::WaitArbiter;
@ -260,10 +272,9 @@ void Kernel::setThreadPriority() {
void Kernel::createMutex() {
bool locked = regs[1] != 0;
// Helpers::panic("CreateMutex (initially locked: %s)\n", locked ? "yes" : "no");
regs[0] = SVCResult::Success;
regs[1] = makeObject(KernelObjectType::Mutex);
regs[1] = makeMutex(locked);
}
void Kernel::releaseMutex() {