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

pcsx2-ee: properly set the running variable 

Fix exception propagation. Behavior is now equivalent to Windows.
This commit is contained in:
Gregory Hainaut 2015-10-28 13:47:52 +01:00
parent 2194685d76
commit 17e3c570ba
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/vtlb.cpp
View File

@ -410,13 +410,7 @@ static __ri void vtlb_Miss(u32 addr,u32 mode)
throw Exception::CancelInstruction(); throw Exception::CancelInstruction();
} }
// The exception terminate the program on linux which is very annoying
// Just disable it for the moment
#ifdef __linux__
if (0)
#else
if( IsDevBuild ) if( IsDevBuild )
#endif
Cpu->ThrowCpuException( R5900Exception::TLBMiss( addr, !!mode ) ); Cpu->ThrowCpuException( R5900Exception::TLBMiss( addr, !!mode ) );
else else
{ {

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

@ -837,6 +837,7 @@ static void recExecute()
if( !setjmp( m_SetJmp_StateCheck ) ) if( !setjmp( m_SetJmp_StateCheck ) )
{ {
eeRecIsReset = false; eeRecIsReset = false;
ScopedBool executing(eeCpuExecuting);
// Important! Most of the console logging and such has cancel points in it. This is great // Important! Most of the console logging and such has cancel points in it. This is great
// in Windows, where SEH lets us safely kill a thread from anywhere we want. This is bad // in Windows, where SEH lets us safely kill a thread from anywhere we want. This is bad