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

[Kernel] Fix ArbitrateAddress

Browse source
This commit is contained in:
wheremyfoodat 2022-09-20 16:50:20 +03:00
parent 919951516a
commit 77078f73b3
5 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,7 @@ void Kernel::arbitrateAddress() {
const Handle handle = regs[0];
const u32 address = regs[1];
const u32 type = regs[2];
const s32 value = regs[3];
const s32 value = s32(regs[3]);
const s64 ns = s64(u64(regs[4]) | (u64(regs[5]) << 32));
printf("ArbitrateAddress(Handle = %X, address = %08X, type = %s, value = %d, ns = %lld)\n", handle, address,
@ -50,17 +50,19 @@ void Kernel::arbitrateAddress() {
Helpers::panic("ArbitrateAddres:: Unaligned address");
}
if (value > 4) [[unlikely]] {
if (type > 4) [[unlikely]] {
regs[0] = SVCResult::InvalidEnumValueAlt;
return;
}
// This needs to put the error code in r0 before we change threats
regs[0] = SVCResult::Success;
switch (static_cast<ArbitrationType>(type)) {
// Puts this thread to sleep if word < value until another thread signals the address with the type SIGNAL
case ArbitrationType::WaitIfLess: {
s32 word = static_cast<s32>(mem.read32(address)); // Yes this is meant to be signed
if (word < value) {
Helpers::panic("Needa sleep");
sleepThreadOnArbiter(address);
}
break;
}
@ -68,6 +70,4 @@ void Kernel::arbitrateAddress() {
default:
Helpers::panic("ArbitrateAddress: Unimplemented type %s", arbitrationTypeToString(type));
}
regs[0] = SVCResult::Success;
}