archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 00:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make vm::_test_map aware of overflow

Browse source 
+ remove vm::find_map 1024mb limit.
This commit is contained in:
Eladash 2020-04-04 12:04:29 +03:00 • committed by Ivan
parent fd09dde911
commit bbbd06dcee
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rpcs3/Emu/Memory/vm.cpp
View file

@ -9,6 +9,7 @@
#include "Utilities/cond.h" #include "Utilities/cond.h"
#include "Utilities/Thread.h" #include "Utilities/Thread.h"
#include "Utilities/VirtualMemory.h" #include "Utilities/VirtualMemory.h"
#include "Utilities/address_range.h"
#include "Utilities/asm.h" #include "Utilities/asm.h"
#include "Emu/CPU/CPUThread.h" #include "Emu/CPU/CPUThread.h"
#include "Emu/Cell/lv2/sys_memory.h" #include "Emu/Cell/lv2/sys_memory.h"
@ -888,14 +889,21 @@ namespace vm
static bool _test_map(u32 addr, u32 size) static bool _test_map(u32 addr, u32 size)
{ {
for (auto& block : g_locations) const auto range = utils::address_range::start_length(addr, size);
{
if (block && block->addr >= addr && block->addr <= addr + size - 1) if (!range.valid())
{ {
return false; return false;
} }
if (block && addr >= block->addr && addr <= block->addr + block->size - 1) for (auto& block : g_locations)
{
if (!block)
{
continue;
}
if (range.overlaps(utils::address_range::start_length(block->addr, block->size)))
{ {
return false; return false;
} }
@ -990,7 +998,7 @@ namespace vm
} }
// Return if size is invalid // Return if size is invalid
if (!size || size > 0x40000000) if (!size)
{ {
return nullptr; return nullptr;
} }