mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-16 17:43:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix vm::check_addr memory state check

Browse Source
This commit is contained in:
Eladash 2019-08-09 22:03:47 +03:00 committed by Ivan
parent 8866a3d6a9
commit 25e47e0de0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Utilities/GDBDebugServer.cpp
View File

@ -541,7 +541,7 @@ bool GDBDebugServer::cmd_read_memory(gdb_cmd & cmd)
std::string result; std::string result;
result.reserve(len * 2); result.reserve(len * 2);
for (u32 i = 0; i < len; ++i) { for (u32 i = 0; i < len; ++i) {
if (vm::check_addr(addr, 1, vm::page_allocated | vm::page_readable)) { if (vm::check_addr(addr)) {
result += to_hexbyte(vm::read8(addr + i)); result += to_hexbyte(vm::read8(addr + i));
} else { } else {
break; break;

2
rpcs3/Emu/Cell/lv2/sys_rsx.cpp
View File

@ -187,7 +187,7 @@ error_code sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 f
for (u32 addr = ea, end = ea + size; addr < end; addr += 0x100000) for (u32 addr = ea, end = ea + size; addr < end; addr += 0x100000)
{ {
if (!vm::check_addr(addr, 1, vm::page_allocated | (addr < 0x20000000 ? 0 : vm::page_1m_size))) if (!vm::check_addr(addr, 1, vm::page_allocated | vm::page_readable | (addr < 0x20000000 ? 0 : vm::page_1m_size)))
{ {
return CELL_EINVAL; return CELL_EINVAL;
} }

2
rpcs3/Emu/Memory/vm.h
View File

@ -52,7 +52,7 @@ namespace vm
bool page_protect(u32 addr, u32 size, u8 flags_test = 0, u8 flags_set = 0, u8 flags_clear = 0); bool page_protect(u32 addr, u32 size, u8 flags_test = 0, u8 flags_set = 0, u8 flags_clear = 0);
// Check flags for specified memory range (unsafe) // Check flags for specified memory range (unsafe)
bool check_addr(u32 addr, u32 size = 1, u8 flags = page_allocated); bool check_addr(u32 addr, u32 size = 1, u8 flags = page_allocated | page_readable);
// Search and map memory in specified memory location (min alignment is 0x10000) // Search and map memory in specified memory location (min alignment is 0x10000)
u32 alloc(u32 size, memory_location_t location, u32 align = 0x10000); u32 alloc(u32 size, memory_location_t location, u32 align = 0x10000);