Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-05 22:55:41 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

More address arbiter fixes

Browse source
This commit is contained in:
wheremyfoodat 2025-02-12 02:46:08 +02:00 • committed by GitHub
parent 59dd4433cf
commit ee24158d32
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/kernel/address_arbiter.cpp
View file

@ -106,8 +106,9 @@ void Kernel::signalArbiter(u32 waitingAddress, s32 threadCount) {
// Wake threads with the highest priority threads being woken up first
for (auto index : threadIndices) {
Thread& t = threads[index];
if (t.status == ThreadStatus::WaitArbiter && t.waitingAddress == waitingAddress) {
if ((t.status == ThreadStatus::WaitArbiter || t.status == ThreadStatus::WaitArbiterTimeout) && t.waitingAddress == waitingAddress) {
t.status = ThreadStatus::Ready;
t.gprs[0] = Result::Success; // Return that the arbiter was actually signalled and that we didn't timeout
count += 1;
// Check if we've reached the max number of. If count < 0 then all threads are released.

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

@ -327,11 +327,6 @@ int Kernel::wakeupOneThread(u64 waitlist, Handle handle) {
}
break;
case ThreadStatus::WaitArbiterTimeout:
t.status = ThreadStatus::Ready;
t.gprs[0] = Result::Success; // The thread did not timeout, so write success to r0
break;
case ThreadStatus::WaitSyncAll:
Helpers::panic("WakeupOneThread: Thread on WaitSyncAll");
break;
@ -366,11 +361,6 @@ void Kernel::wakeupAllThreads(u64 waitlist, Handle handle) {
}
}
break;
case ThreadStatus::WaitArbiterTimeout:
t.status = ThreadStatus::Ready;
t.gprs[0] = Result::Success; // The thread did not timeout, so write success to r0
break;
case ThreadStatus::WaitSyncAll:
Helpers::panic("WakeupAllThreads: Thread on WaitSyncAll");