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

Fix vm::check_addr usage

Browse source
This commit is contained in:
Nekotekina 2018-04-01 22:13:56 +03:00
parent d871675b3b
commit 402ca480cd
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Utilities/GDBDebugServer.cpp
View file

@ -540,7 +540,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_info_t::page_readable)) { if (vm::check_addr(addr, 1, vm::page_allocated | vm::page_readable)) {
result += to_hexbyte(vm::read8(addr + i)); result += to_hexbyte(vm::read8(addr + i));
} else { } else {
break; break;
@ -566,7 +566,7 @@ bool GDBDebugServer::cmd_write_memory(gdb_cmd & cmd)
u32 len = hex_to_u32(cmd.data.substr(s + 1, s2 - s - 1)); u32 len = hex_to_u32(cmd.data.substr(s + 1, s2 - s - 1));
const char* data_ptr = (cmd.data.c_str()) + s2 + 1; const char* data_ptr = (cmd.data.c_str()) + s2 + 1;
for (u32 i = 0; i < len; ++i) { for (u32 i = 0; i < len; ++i) {
if (vm::check_addr(addr + i, 1, vm::page_info_t::page_writable)) { if (vm::check_addr(addr + i, 1, vm::page_allocated | vm::page_writable)) {
u8 val; u8 val;
int res = sscanf_s(data_ptr, "%02hhX", &val); int res = sscanf_s(data_ptr, "%02hhX", &val);
if (!res) { if (!res) {

4
rpcs3/Emu/Cell/PPUThread.cpp
View file

@ -489,12 +489,12 @@ std::string ppu_thread::dump() const
u32 stack_min = stack_ptr & ~0xfff; u32 stack_min = stack_ptr & ~0xfff;
u32 stack_max = stack_min + 4096; u32 stack_max = stack_min + 4096;
while (stack_min && vm::check_addr(stack_min - 4096, 4096, vm::page_writable)) while (stack_min && vm::check_addr(stack_min - 4096, 4096, vm::page_allocated | vm::page_writable))
{ {
stack_min -= 4096; stack_min -= 4096;
} }
while (stack_max + 4096 && vm::check_addr(stack_max, 4096, vm::page_writable)) while (stack_max + 4096 && vm::check_addr(stack_max, 4096, vm::page_allocated | vm::page_writable))
{ {
stack_max += 4096; stack_max += 4096;
} }

2
rpcs3/Emu/Cell/lv2/sys_gpio.cpp
View file

@ -14,7 +14,7 @@ error_code sys_gpio_get(u64 device_id, vm::ptr<u64> value)
return CELL_ESRCH; return CELL_ESRCH;
} }
if (!vm::check_addr(value.addr(), sizeof(u64), vm::page_writable)) if (!vm::check_addr(value.addr(), sizeof(u64), vm::page_allocated | vm::page_writable))
{ {
return CELL_EFAULT; return CELL_EFAULT;
} }