mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 14:49:42 -06:00
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:
@ -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;
|
||||
|
||||
|
@ -74,6 +74,7 @@ struct SCoreStartupParameter
|
||||
bool bUseFastMem;
|
||||
bool bLockThreads;
|
||||
bool bEnableCheats;
|
||||
bool bMergeBlocks;
|
||||
|
||||
bool bRunCompareServer;
|
||||
bool bRunCompareClient;
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user