Merge branch 'master' into dynapand

This commit is contained in:
wheremyfoodat 2023-07-12 21:34:29 +03:00
commit 3a1a612e8b
27 changed files with 318 additions and 212 deletions

View file

@ -96,4 +96,4 @@ void Kernel::readDirectory(u32 messagePointer, Handle directory) {
mem.write32(messagePointer + 4, Result::Success);
mem.write32(messagePointer + 8, count);
}
}

View file

@ -97,11 +97,11 @@ void Kernel::readFile(u32 messagePointer, Handle fileHandle) {
}
else {
for (size_t i = 0; i < bytesRead; i++) {
mem.write8(dataPointer + i, data[i]);
mem.write8(u32(dataPointer + i), data[i]);
}
mem.write32(messagePointer + 4, Result::Success);
mem.write32(messagePointer + 8, bytesRead);
mem.write32(messagePointer + 8, u32(bytesRead));
}
return;
@ -142,7 +142,7 @@ void Kernel::writeFile(u32 messagePointer, Handle fileHandle) {
std::unique_ptr<u8[]> data(new u8[size]);
for (size_t i = 0; i < size; i++) {
data[i] = mem.read8(dataPointer + i);
data[i] = mem.read8(u32(dataPointer + i));
}
IOFile f(file->fd);
@ -153,7 +153,7 @@ void Kernel::writeFile(u32 messagePointer, Handle fileHandle) {
Helpers::panic("Kernel::WriteFile failed");
} else {
mem.write32(messagePointer + 4, Result::Success);
mem.write32(messagePointer + 8, bytesWritten);
mem.write32(messagePointer + 8, u32(bytesWritten));
}
}

View file

@ -286,7 +286,7 @@ int Kernel::wakeupOneThread(u64 waitlist, Handle handle) {
// Get the index of the event in the object's waitlist, write it to r1
for (size_t i = 0; i < t.waitList.size(); i++) {
if (t.waitList[i] == handle) {
t.gprs[1] = i;
t.gprs[1] = u32(i);
break;
}
}
@ -321,7 +321,7 @@ void Kernel::wakeupAllThreads(u64 waitlist, Handle handle) {
// Get the index of the event in the object's waitlist, write it to r1
for (size_t i = 0; i < t.waitList.size(); i++) {
if (t.waitList[i] == handle) {
t.gprs[1] = i;
t.gprs[1] = u32(i);
break;
}
}