From 25e47e0de02ef3b73ae9abb2f273a40612362ef4 Mon Sep 17 00:00:00 2001 From: Eladash Date: Fri, 9 Aug 2019 22:03:47 +0300 Subject: [PATCH] Fix vm::check_addr memory state check --- Utilities/GDBDebugServer.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_rsx.cpp | 2 +- rpcs3/Emu/Memory/vm.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Utilities/GDBDebugServer.cpp b/Utilities/GDBDebugServer.cpp index 708241fc62..44f2791349 100644 --- a/Utilities/GDBDebugServer.cpp +++ b/Utilities/GDBDebugServer.cpp @@ -541,7 +541,7 @@ bool GDBDebugServer::cmd_read_memory(gdb_cmd & cmd) std::string result; result.reserve(len * 2); 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)); } else { break; diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp index 19ef5f9aae..ce71dfd2b9 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp @@ -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) { - 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; } diff --git a/rpcs3/Emu/Memory/vm.h b/rpcs3/Emu/Memory/vm.h index 71cfeb7f56..eee8d564ad 100644 --- a/rpcs3/Emu/Memory/vm.h +++ b/rpcs3/Emu/Memory/vm.h @@ -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); // 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) u32 alloc(u32 size, memory_location_t location, u32 align = 0x10000);