RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2025-12-06 07:12:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

vm: protect: allow unaligned addresses

Browse source
This commit is contained in:
DH 2024-11-03 18:40:23 +03:00
parent 410683ef36
commit 837cca331c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rpcsx/vm.cpp
View file

@ -1003,9 +1003,12 @@ bool vm::protect(void *addr, std::uint64_t size, std::int32_t prot) {
std::println("vm::protect(addr = {}, len = {}, prot = {})", addr, size,
mapProtToString(prot));
size = rx::alignUp(size, kPageSize);
auto pages = (size + (kPageSize - 1)) >> kPageShift;
auto address = reinterpret_cast<std::uint64_t>(addr);
auto endAddress = address + size;
address = rx::alignDown(address, kPageSize);
endAddress = rx::alignUp(endAddress, kPageSize);
size = endAddress - address;
auto pages = size >> kPageShift;
if (address < kMinAddress || address >= kMaxAddress || size > kMaxAddress ||
address > kMaxAddress - size) {
std::println(stderr, "Memory error: protect out of memory");
@ -1037,7 +1040,8 @@ bool vm::protect(void *addr, std::uint64_t size, std::int32_t prot) {
} else if (prot >> 4) {
std::println(stderr, "ignoring mapping {:x}-{:x}", address, address + size);
}
return ::mprotect(addr, size, prot & kMapProtCpuAll) == 0;
return ::mprotect(std::bit_cast<void *>(address), size,
prot & kMapProtCpuAll) == 0;
}
static std::int32_t getPageProtectionImpl(std::uint64_t address) {