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

Fix HOST_CPU for x64 windows

This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2015-07-14 17:31:48 +02:00
parent 8cb6d6578c
commit f3c8e3623d
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/build.h
View File

@ -58,7 +58,11 @@
#ifdef TARGET_WIN86
#define HOST_OS OS_WINDOWS
#if defined(_M_AMD64)
#define HOST_CPU CPU_X64
#else
#define HOST_CPU CPU_X86
#endif
#elif TARGET_PANDORA
#define HOST_OS OS_LINUX
#define HOST_CPU CPU_ARM

18
core/windows/winmain.cpp
View File

@ -126,14 +126,16 @@ int ExeptionHandler(u32 dwCode, void* pExceptionPointers)
return EXCEPTION_CONTINUE_EXECUTION;
}
#if !defined(HOST_NO_REC) && HOST_CPU == CPU_X64
else if ( ngen_Rewrite((unat&)ep->ContextRecord->Eip,*(unat*)ep->ContextRecord->Esp,ep->ContextRecord->Eax) )
{
//remove the call from call stack
ep->ContextRecord->Esp+=4;
//restore the addr from eax to ecx so its valid again
ep->ContextRecord->Ecx=ep->ContextRecord->Eax;
return EXCEPTION_CONTINUE_EXECUTION;
}
/*
else if ( ngen_Rewrite((unat&)ep->ContextRecord->Eip,*(unat*)ep->ContextRecord->Esp,ep->ContextRecord->Eax) )
{
//remove the call from call stack
ep->ContextRecord->Esp+=4;
//restore the addr from eax to ecx so its valid again
ep->ContextRecord->Ecx=ep->ContextRecord->Eax;
return EXCEPTION_CONTINUE_EXECUTION;
}
*/
#endif
else
{