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

Implement vm::page_executable (#6330)

Browse source 
Fixes segfaults when attenpting to set segfaults on non-executable memory.
This commit is contained in:
Eladash 2019-08-11 21:04:17 +03:00 • committed by Ivan
parent 94d33003a3
commit 3ce18fd960
5 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -371,6 +371,7 @@ namespace vm
if (flags & page_executable)
{
// TODO
utils::memory_commit(g_exec_addr + addr * 2, size * 2);
}
@ -424,10 +425,12 @@ namespace vm
if (i < end)
{
g_pages[i].flags |= flags_set;
g_pages[i].flags &= ~flags_clear;
new_val = g_pages[i].flags;
new_val |= flags_set;
new_val &= ~flags_clear;
new_val = g_pages[i].flags & (page_readable | page_writable);
g_pages[i].flags.release(new_val);
new_val &= (page_readable | page_writable);
}
if (new_val != start_value)
@ -464,9 +467,14 @@ namespace vm
break;
}
if (g_pages[i].flags & page_executable)
if (size == 0)
{
is_exec = true;
is_exec = !!(g_pages[i].flags & page_executable);
}
else
{
// Must be consistent
verify(HERE), is_exec == !!(g_pages[i].flags & page_executable);
}
size += 4096;