Added options to enable/disable Block Merging and DList Cache into game specific settings.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6203 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nodchip
2010-09-14 13:50:25 +00:00
parent 4ec8f97154
commit 412ce56f83
7 changed files with 41 additions and 2 deletions

View File

@ -48,6 +48,7 @@ SCoreStartupParameter::SCoreStartupParameter()
bEnableCheats(false),
bRunCompareServer(false), bRunCompareClient(false),
bMMU(false), bMMUBAT(false), iTLBHack(0), bAlternateRFI(false),
bMergeBlocks(false),
SelectedLanguage(0), bWii(false),
bConfirmStop(false), bHideCursor(false),
bAutoHideCursor(false), bUsePanicHandlers(true),
@ -74,6 +75,7 @@ void SCoreStartupParameter::LoadDefaults()
bMMUBAT = false;
iTLBHack = 0;
bAlternateRFI = false;
bMergeBlocks = false;
SelectedLanguage = 0;
bWii = false;

View File

@ -74,6 +74,7 @@ struct SCoreStartupParameter
bool bUseFastMem;
bool bLockThreads;
bool bEnableCheats;
bool bMergeBlocks;
bool bRunCompareServer;
bool bRunCompareClient;

View File

@ -24,6 +24,7 @@
#include "PPCSymbolDB.h"
#include "SignatureDB.h"
#include "PPCAnalyst.h"
#include "../ConfigManager.h"
// Analyzes PowerPC code in memory to find functions
// After running, for each function we will know what functions it calls
@ -454,6 +455,10 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa, Bloc
if (numFollows > FUNCTION_FOLLOWING_THRESHOLD)
follow = false;
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bMergeBlocks) {
follow = false;
}
if (!follow)
{
if (opinfo->flags & FL_ENDBLOCK) //right now we stop early