RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-01-11 03:00:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

rx/Mappable: support 0 alignment, workaround ERROR_NO_SYSTEM_RESOURCES windows moments

Browse source
This commit is contained in:
DH 2025-12-28 19:22:35 +03:00
parent 5e901ea3b1
commit bda4251f4b
1 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
rx/src/Mappable.cpp
View file

@ -28,12 +28,32 @@ rx::Mappable::CreateMemory(std::size_t size) {
rx::Mappable result;
#ifdef _WIN32
auto handle = CreateFileMapping2(INVALID_HANDLE_VALUE, nullptr,
FILE_MAP_ALL_ACCESS, PAGE_EXECUTE_READWRITE,
SEC_COMMIT, size, nullptr, nullptr, 0);
HANDLE handle = nullptr;
if (!handle) {
return {rx::Mappable{}, std::errc::invalid_argument};
for (std::size_t i = 0; i < 100; ++i) {
handle = CreateFileMapping2(INVALID_HANDLE_VALUE, nullptr,
FILE_MAP_ALL_ACCESS, PAGE_EXECUTE_READWRITE,
SEC_COMMIT, size, nullptr, nullptr, 0);
if (!handle) {
int error = ::GetLastError();
if (error == ERROR_NO_SYSTEM_RESOURCES) {
continue;
}
if (error == ERROR_COMMITMENT_LIMIT) {
return {rx::Mappable{}, std::errc::not_enough_memory};
}
return {rx::Mappable{}, std::errc::invalid_argument};
}
break;
}
if (handle == nullptr) {
return {rx::Mappable{}, std::errc::resource_unavailable_try_again};
}
result.m_handle = handle;
@ -97,6 +117,19 @@ std::errc rx::Mappable::map(rx::AddressRange virtualRange, std::size_t offset,
mem::release(virtualRange, alignment);
if (alignment == 0) {
auto pointer = std::bit_cast<void *>(virtualRange.beginAddress());
auto result = MapViewOfFile3((HANDLE)m_handle, nullptr, pointer, offset,
virtualRange.size(), MEM_REPLACE_PLACEHOLDER,
prot, nullptr, 0);
if (!result) {
return std::errc::invalid_argument;
}
return {};
}
for (std::uintptr_t address = virtualRange.beginAddress();
address < virtualRange.endAddress();
address += alignment, offset += alignment) {