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

EE-rec: Don't jump directly to C++ function 

On linux, it breaks the 16B stack alignment requirement.

2 dispatchers were added to handle the call to the function. It avoid
any performance impact and remove the extra inlined asm

Fix #506
This commit is contained in:
Gregory Hainaut 2015-10-23 19:39:39 +02:00
parent 40b5195f0e
commit ccea764556
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -361,6 +361,8 @@ void recCall( void (*func)() )
// ===================================================================================================== // =====================================================================================================
static void __fastcall recRecompile( const u32 startpc ); static void __fastcall recRecompile( const u32 startpc );
static void __fastcall dyna_block_discard(u32 start,u32 sz);
static void __fastcall dyna_page_reset(u32 start,u32 sz);
static u32 s_store_ebp, s_store_esp; static u32 s_store_ebp, s_store_esp;
@ -375,6 +377,8 @@ static DynGenFunc* JITCompile = NULL;
static DynGenFunc* JITCompileInBlock = NULL; static DynGenFunc* JITCompileInBlock = NULL;
static DynGenFunc* EnterRecompiledCode = NULL; static DynGenFunc* EnterRecompiledCode = NULL;
static DynGenFunc* ExitRecompiledCode = NULL; static DynGenFunc* ExitRecompiledCode = NULL;
static DynGenFunc* DispatchBlockDiscard = NULL;
static DynGenFunc* DispatchPageReset = NULL;
static void recEventTest() static void recEventTest()
{ {
@ -533,6 +537,22 @@ static DynGenFunc* _DynGen_EnterRecompiledCode()
return (DynGenFunc*)retval; return (DynGenFunc*)retval;
} }
static DynGenFunc* _DynGen_DispatchBlockDiscard()
{
u8* retval = xGetPtr();
xCALL(dyna_block_discard);
xJMP(ExitRecompiledCode);
return (DynGenFunc*)retval;
}
static DynGenFunc* _DynGen_DispatchPageReset()
{
u8* retval = xGetPtr();
xCALL(dyna_page_reset);
xJMP(ExitRecompiledCode);
return (DynGenFunc*)retval;
}
static void _DynGen_Dispatchers() static void _DynGen_Dispatchers()
{ {
// In case init gets called multiple times: // In case init gets called multiple times:
@ -549,9 +569,11 @@ static void _DynGen_Dispatchers()
xCALL( recEventTest ); xCALL( recEventTest );
DispatcherReg = _DynGen_DispatcherReg(); DispatcherReg = _DynGen_DispatcherReg();
JITCompile = _DynGen_JITCompile(); JITCompile = _DynGen_JITCompile();
JITCompileInBlock = _DynGen_JITCompileInBlock(); JITCompileInBlock = _DynGen_JITCompileInBlock();
EnterRecompiledCode = _DynGen_EnterRecompiledCode(); EnterRecompiledCode = _DynGen_EnterRecompiledCode();
DispatchBlockDiscard = _DynGen_DispatchBlockDiscard();
DispatchPageReset = _DynGen_DispatchPageReset();
HostSys::MemProtectStatic( eeRecDispatchers, PageAccess_ExecOnly() ); HostSys::MemProtectStatic( eeRecDispatchers, PageAccess_ExecOnly() );
@ -561,7 +583,6 @@ static void _DynGen_Dispatchers()
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
// //
static void __fastcall dyna_block_discard(u32 start,u32 sz);
static __ri void ClearRecLUT(BASEBLOCK* base, int memsize) static __ri void ClearRecLUT(BASEBLOCK* base, int memsize)
{ {
@ -1625,15 +1646,6 @@ void __fastcall dyna_block_discard(u32 start,u32 sz)
{ {
eeRecPerfLog.Write( Color_StrongGray, "Clearing Manual Block @ 0x%08X [size=%d]", start, sz*4); eeRecPerfLog.Write( Color_StrongGray, "Clearing Manual Block @ 0x%08X [size=%d]", start, sz*4);
recClear(start, sz); recClear(start, sz);
// Stack trick: This function was invoked via a direct jmp, so manually pop the
// EBP/stackframe before issuing a RET, else esp/ebp will be incorrect.
#ifdef _MSC_VER
__asm leave __asm jmp [ExitRecompiledCode]
#else
__asm__ __volatile__( "leave\n jmp *%[exitRec]\n" : : [exitRec] "m" (ExitRecompiledCode) : );
#endif
} }
// called when a page under manual protection has been run enough times to be a candidate // called when a page under manual protection has been run enough times to be a candidate
@ -1644,12 +1656,6 @@ void __fastcall dyna_page_reset(u32 start,u32 sz)
recClear(start & ~0xfffUL, 0x400); recClear(start & ~0xfffUL, 0x400);
manual_counter[start >> 12]++; manual_counter[start >> 12]++;
mmap_MarkCountedRamPage( start ); mmap_MarkCountedRamPage( start );
#ifdef _MSC_VER
__asm leave __asm jmp [ExitRecompiledCode]
#else
__asm__ __volatile__( "leave\n jmp *%[exitRec]\n" : : [exitRec] "m" (ExitRecompiledCode) : );
#endif
} }
// Skip MPEG Game-Fix // Skip MPEG Game-Fix
@ -2075,7 +2081,7 @@ StartRecomp:
while(stg>0) while(stg>0)
{ {
xCMP( ptr32[PSM(lpc)], *(u32*)PSM(lpc) ); xCMP( ptr32[PSM(lpc)], *(u32*)PSM(lpc) );
xJNE( dyna_block_discard ); xJNE(DispatchBlockDiscard);
stg -= 4; stg -= 4;
lpc += 4; lpc += 4;
@ -2108,7 +2114,7 @@ StartRecomp:
// that the current amount of recompilation is fairly cheap). // that the current amount of recompilation is fairly cheap).
xADD(ptr16[&manual_page[inpage_ptr >> 12]], sz); xADD(ptr16[&manual_page[inpage_ptr >> 12]], sz);
xJC( dyna_page_reset ); xJC(DispatchPageReset);
// note: clearcnt is measured per-page, not per-block! // note: clearcnt is measured per-page, not per-block!
ConsoleColorScope cs( Color_Gray ); ConsoleColorScope cs( Color_Gray );