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

Fix up the last revision for Linux. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@655 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-03-01 22:12:19 +00:00
parent f270064b41
commit 7d4a7d3c10
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pcsx2/Linux/LnxSysExec.cpp
View File

@ -18,9 +18,7 @@
#include "Linux.h"
#include "LnxSysExec.h"
#include <sys/mman.h> // needed here? (air)
#include "R5900Exceptions.h"
bool UseGui = true;
@ -261,22 +259,29 @@ void ExecuteCpu()
// Optimization: We hardcode two versions of the EE here -- one for recs and one for ints.
// This is because recs are performance critical, and being able to inline them into the
// function here helps a small bit (not much but every small bit counts!).
if (CHECK_EEREC)
try
{
while (!g_ReturnToGui)
if (CHECK_EEREC)
{
recExecute();
SysUpdate();
while (!g_ReturnToGui)
{
recExecute();
SysUpdate();
}
}
else
{
while (!g_ReturnToGui)
{
Cpu->Execute();
SysUpdate();
}
}
}
else
catch( R5900Exception::BaseExcept& ex )
{
while (!g_ReturnToGui)
{
Cpu->Execute();
SysUpdate();
}
Console::Error( ex.cMessage() );
Console::Error( fmt_string( "(EE) PC: 0x%8.8x \tCycle:0x8.8x", ex.cpuState.pc, ex.cpuState.cycle ).c_str() );
}
}

2
pcsx2/Makefile.am
View File

@ -18,6 +18,6 @@ CDVD.h CDVDiso.h CDVDisodrv.h CDVDlib.h COP0.h Cache.h CdRom.h Common.h Counters
Elfheader.h Exceptions.h GS.h Hw.h IopBios.h IopBios2.h IopCounters.h IopDma.h IopHw.h IopMem.h IopSio2.h Memcpyfast.h \
Memory.h MemoryCard.h Misc.h Patch.h Paths.h Plugins.h PrecompiledHeader.h PsxCommon.h R3000A.h R5900.h R5900OpcodeTables.h \
SPR.h SamplProf.h SaveState.h Sif.h Sifcmd.h Sio.h SafeArray.h Stats.h StringUtils.h System.h Threading.h \
VU.h VUflags.h VUmicro.h VUops.h Vif.h VifDma.h cheatscpp.h vtlb.h NakedAsm.h
VU.h VUflags.h VUmicro.h VUops.h Vif.h VifDma.h cheatscpp.h vtlb.h NakedAsm.h R5900Exceptions.h
SUBDIRS = x86 . DebugTools IPU RDebug tinyxml Linux

2
pcsx2/R5900.cpp
View File

@ -56,7 +56,7 @@ static uint eeWaitCycles = 1024;
bool eeEventTestIsActive = false;
R5900Exception::BaseExcept::~BaseExcept() {}
R5900Exception::BaseExcept::~BaseExcept() throw (){}
// A run-once procedure for initializing the emulation state.
// Can be done anytime after allocating memory, and before calling Cpu->Execute().