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

Reset and recompile the current block on constant buffer overflow. (Some other checks should be changed to use this if this isn't immediately reverted.) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1718 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
sudonim1 2009-08-31 20:48:39 +00:00
parent 808537da58
commit 455d0a4c87
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,6 +89,7 @@ static u8* recPtr = NULL;
static u32 *recConstBufPtr = NULL; static u32 *recConstBufPtr = NULL;
EEINST* s_pInstCache = NULL; EEINST* s_pInstCache = NULL;
static u32 s_nInstCacheSize = 0; static u32 s_nInstCacheSize = 0;
static bool recFailed;
static BASEBLOCK* s_pCurBlock = NULL; static BASEBLOCK* s_pCurBlock = NULL;
static BASEBLOCKEX* s_pCurBlockEx = NULL; static BASEBLOCKEX* s_pCurBlockEx = NULL;
@ -354,10 +355,6 @@ u32* recGetImm64(u32 hi, u32 lo)
{ {
DevCon::Status( "EErec: Const Buffer overflow hack..." ); DevCon::Status( "EErec: Const Buffer overflow hack..." );
// TODO: flag an error in recompilation which would reset the recompiler
// immediately and recompile the current block again. There is currently
// no way to do this, so have a last ditch attempt at making things sane
// and return some nonsense if that fails.
for (u32 *p = recConstBuf; p < recConstBuf + RECCONSTBUF_SIZE; p += 2) for (u32 *p = recConstBuf; p < recConstBuf + RECCONSTBUF_SIZE; p += 2)
{ {
if (p[0] == lo && p[1] == hi) { if (p[0] == lo && p[1] == hi) {
@ -366,7 +363,8 @@ u32* recGetImm64(u32 hi, u32 lo)
} }
} }
Console::Error( "EErec: Const Buffer overflow hack failed. Returning nonsense!" ); Console::Notice( "EErec: Const Buffer overflow hack failed. Returning nonsense!" );
recFailed = true;
return recConstBuf; return recConstBuf;
} }
@ -1254,7 +1252,7 @@ void __fastcall dyna_page_reset(u32 start,u32 sz)
mmap_MarkCountedRamPage( start ); mmap_MarkCountedRamPage( start );
} }
void recRecompile( const u32 startpc ) static void recRecompile2( const u32 startpc )
{ {
u32 i = 0; u32 i = 0;
u32 branchTo; u32 branchTo;
@ -1673,6 +1671,22 @@ StartRecomp:
s_pCurBlockEx = NULL; s_pCurBlockEx = NULL;
} }
// wrapper
void recRecompile(u32 startpc)
{
recFailed = false;
recRecompile2(startpc);
if (recFailed) {
recFailed = false;
recResetEE();
recRecompile2(startpc);
}
if (recFailed) {
Console::Error("Unrecoverable recompilation failure.");
*(int*)0 = 42;
}
}
R5900cpu recCpu = { R5900cpu recCpu = {
recAlloc, recAlloc,
recResetEE, recResetEE,