mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 08:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rpcs3/Emu/Memory/vm.cpp
View File

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