ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ee: always handle manually page that contain thread context 

There are 2 pages that contains a register context to handle Syscall/Interrupt.
Write protection is useless here.

The only purpose is to reduce the number of useless SIGSEGV at the start of a game
This commit is contained in:
Gregory Hainaut 2015-11-12 10:48:30 +01:00
parent e4f407ae7c
commit 50ee00cfe5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcsx2/x86/ix86-32/iR5900-32.cpp
View File

@ -1644,11 +1644,12 @@ static void memory_protect_recompiled_code(u32 startpc, u32 size)
u32 inpage_ptr = HWADDR(startpc); u32 inpage_ptr = HWADDR(startpc);
u32 inpage_sz = size*4; u32 inpage_sz = size*4;
// note: blocks are guaranteed to reside within the confines of a single page. // The kernel context register is stored @ 0x800010C0-0x80001300
// The EENULL thread context register is stored @ 0x81000-....
bool contains_thread_stack = ((startpc >> 12) == 0x81) || ((startpc >> 12) == 0x80001);
const vtlb_ProtectionMode PageType = mmap_GetRamPageInfo( inpage_ptr ); // note: blocks are guaranteed to reside within the confines of a single page.
//const u32 pgsz = std::min(0x1000 - inpage_offs, inpage_sz); const vtlb_ProtectionMode PageType = contains_thread_stack ? ProtMode_Manual : mmap_GetRamPageInfo( inpage_ptr );
const u32 pgsz = inpage_sz;
switch (PageType) switch (PageType)
{ {
@ -1663,11 +1664,11 @@ static void memory_protect_recompiled_code(u32 startpc, u32 size)
case ProtMode_Manual: case ProtMode_Manual:
xMOV( ecx, inpage_ptr ); xMOV( ecx, inpage_ptr );
xMOV( edx, pgsz / 4 ); xMOV( edx, inpage_sz / 4 );
//xMOV( eax, startpc ); // uncomment this to access startpc (as eax) in dyna_block_discard //xMOV( eax, startpc ); // uncomment this to access startpc (as eax) in dyna_block_discard
u32 lpc = inpage_ptr; u32 lpc = inpage_ptr;
u32 stg = pgsz; u32 stg = inpage_sz;
while(stg>0) while(stg>0)
{ {
@ -1686,7 +1687,7 @@ static void memory_protect_recompiled_code(u32 startpc, u32 size)
// (ideally, perhaps, manual_counter should be reset to 0 every few minutes?) // (ideally, perhaps, manual_counter should be reset to 0 every few minutes?)
if (startpc != 0x81fc0 && manual_counter[inpage_ptr >> 12] <= 3) if (!contains_thread_stack && manual_counter[inpage_ptr >> 12] <= 3)
{ {
// Counted blocks add a weighted (by block size) value into manual_page each time they're // Counted blocks add a weighted (by block size) value into manual_page each time they're
// run. If the block gets run a lot, it resets and re-protects itself in the hope // run. If the block gets run a lot, it resets and re-protects itself in the hope
@ -1715,7 +1716,7 @@ static void memory_protect_recompiled_code(u32 startpc, u32 size)
else else
{ {
eeRecPerfLog.Write( "Uncounted Manual block @ 0x%08X : size =%3d page/offs = 0x%05X/0x%03X inpgsz = %d", eeRecPerfLog.Write( "Uncounted Manual block @ 0x%08X : size =%3d page/offs = 0x%05X/0x%03X inpgsz = %d",
startpc, size, inpage_ptr>>12, inpage_ptr&0xfff, pgsz, inpage_sz ); startpc, size, inpage_ptr>>12, inpage_ptr&0xfff, inpage_sz );
} }
break; break;
} }