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

Merge pull request #966 from PCSX2/game-starting-too-late-i627-v2 

pcsx2: apply patch when first block is compiled
This commit is contained in:
Gregory Hainaut 2015-11-13 18:50:44 +01:00
parent 2a0cd77eef 330704a5e9
commit 07ec92175f
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@
#include "Elfheader.h"
#include "../DebugTools/Breakpoints.h"
#include "Patch.h"
#if !PCSX2_SEH
# include <csetjmp>
@ -1739,8 +1740,17 @@ static void __fastcall recRecompile( const u32 startpc )
}
// this is the only way patches get applied, doesn't depend on a hack
if (HWADDR(startpc) == ElfEntry)
if (HWADDR(startpc) == ElfEntry) {
xCALL(eeGameStarting);
// Apply patch as soon as possible. Normally it is done in
// eeGameStarting but first block is already compiled.
//
// First tentative was to call eeGameStarting directly (not through the
// recompiler) but it crashes some games (GT4, DMC3). It is either a
// thread issue or linked to the various components reset.
if (EmuConfig.EnablePatches) ApplyPatch(0);
if (EmuConfig.EnableCheats) ApplyCheat(0);
}
g_branch = 0;