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

Remove inherited variable that was no longer used. Clean up.

This commit is contained in:
Sacha 2012-03-29 17:01:59 +10:00
parent 2ee5e5cebc
commit 5f85815922
10 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/Src/BootManager.cpp
View File

@ -74,9 +74,6 @@ bool BootCore(const std::string& _rFilename)
StartUp.bRunCompareServer = false; StartUp.bRunCompareServer = false;
StartUp.hInstance = Host_GetInstance(); StartUp.hInstance = Host_GetInstance();
#if defined(_WIN32) && defined(_M_X64)
StartUp.bUseFastMem = true;
#endif
// If for example the ISO file is bad we return here // If for example the ISO file is bad we return here
if (!StartUp.AutoSetup(SCoreStartupParameter::BOOT_DEFAULT)) return false; if (!StartUp.AutoSetup(SCoreStartupParameter::BOOT_DEFAULT)) return false;

3
Source/Core/Core/Src/Core.cpp
View File

@ -293,8 +293,9 @@ void CpuThread()
if (_CoreParameter.bLockThreads) if (_CoreParameter.bLockThreads)
Common::SetCurrentThreadAffinity(1); // Force to first core Common::SetCurrentThreadAffinity(1); // Force to first core
if (_CoreParameter.bUseFastMem) #if defined(_WIN32) && defined(_M_X64)
EMM::InstallExceptionHandler(); // Let's run under memory watch EMM::InstallExceptionHandler(); // Let's run under memory watch
#endif
if (!g_stateFileName.empty()) if (!g_stateFileName.empty())
State::LoadAs(g_stateFileName); State::LoadAs(g_stateFileName);

3
Source/Core/Core/Src/CoreParameter.cpp
View File

@ -45,8 +45,7 @@ SCoreStartupParameter::SCoreStartupParameter()
bEnableFPRF(false), bEnableFPRF(false),
bCPUThread(true), bDSPThread(false), bDSPHLE(true), bCPUThread(true), bDSPThread(false), bDSPHLE(true),
bSkipIdle(true), bNTSC(false), bForceNTSCJ(false), bSkipIdle(true), bNTSC(false), bForceNTSCJ(false),
bHLE_BS2(true), bUseFastMem(false), bHLE_BS2(true), bLockThreads(false),
bLockThreads(false),
bEnableCheats(false), bEnableCheats(false),
bMergeBlocks(false), bMergeBlocks(false),
bRunCompareServer(false), bRunCompareClient(false), bRunCompareServer(false), bRunCompareClient(false),

1
Source/Core/Core/Src/CoreParameter.h
View File

@ -103,7 +103,6 @@ struct SCoreStartupParameter
bool bNTSC; bool bNTSC;
bool bForceNTSCJ; bool bForceNTSCJ;
bool bHLE_BS2; bool bHLE_BS2;
bool bUseFastMem;
bool bLockThreads; bool bLockThreads;
bool bEnableCheats; bool bEnableCheats;
bool bMergeBlocks; bool bMergeBlocks;

7
Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
View File

@ -191,12 +191,7 @@ void Jit64::Init()
else else
jo.enableBlocklink = !Core::g_CoreStartupParameter.bMMU; jo.enableBlocklink = !Core::g_CoreStartupParameter.bMMU;
} }
#ifdef _M_X64
jo.enableFastMem = Core::g_CoreStartupParameter.bUseFastMem;
#else
jo.enableFastMem = false;
#endif
jo.assumeFPLoadFromMem = Core::g_CoreStartupParameter.bUseFastMem;
jo.fpAccurateFcmp = true; // Fallback to Interpreter jo.fpAccurateFcmp = true; // Fallback to Interpreter
jo.optimizeGatherPipe = true; jo.optimizeGatherPipe = true;
jo.fastInterrupts = false; jo.fastInterrupts = false;

4
Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
View File

@ -352,8 +352,8 @@ void Jit64::stX(UGeckoInstruction inst)
} }
/* // TODO - figure out why Beyond Good and Evil hates this /* // TODO - figure out why Beyond Good and Evil hates this
#ifdef _M_X64 #if defined(_WIN32) && defined(_M_X64)
if (accessSize == 32 && !update && jo.enableFastMem) if (accessSize == 32 && !update)
{ {
// Fast and daring - requires 64-bit // Fast and daring - requires 64-bit
MOV(32, R(EAX), gpr.R(s)); MOV(32, R(EAX), gpr.R(s));

13
Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp
View File

@ -62,14 +62,11 @@ void Jit64::lfs(UGeckoInstruction inst)
return; return;
} }
s32 offset = (s32)(s16)inst.SIMM_16; s32 offset = (s32)(s16)inst.SIMM_16;
if (jo.assumeFPLoadFromMem) #if defined(_WIN32) && defined(_M_X64)
{ UnsafeLoadToEAX(gpr.R(a), 32, offset, false);
UnsafeLoadToEAX(gpr.R(a), 32, offset, false); #else
} SafeLoadToEAX(gpr.R(a), 32, offset, false);
else #endif
{
SafeLoadToEAX(gpr.R(a), 32, offset, false);
}
MEMCHECK_START MEMCHECK_START

6
Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp
View File

@ -276,12 +276,6 @@ void JitIL::Init()
jo.enableBlocklink = !Core::g_CoreStartupParameter.bMMU; jo.enableBlocklink = !Core::g_CoreStartupParameter.bMMU;
} }
#ifdef _M_X64
jo.enableFastMem = false;
#else
jo.enableFastMem = false;
#endif
jo.assumeFPLoadFromMem = Core::g_CoreStartupParameter.bUseFastMem;
jo.fpAccurateFcmp = false; jo.fpAccurateFcmp = false;
jo.optimizeGatherPipe = true; jo.optimizeGatherPipe = true;
jo.fastInterrupts = false; jo.fastInterrupts = false;

2
Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h
View File

@ -41,10 +41,8 @@ protected:
struct JitOptions struct JitOptions
{ {
bool optimizeStack; bool optimizeStack;
bool assumeFPLoadFromMem;
bool enableBlocklink; bool enableBlocklink;
bool fpAccurateFcmp; bool fpAccurateFcmp;
bool enableFastMem;
bool optimizeGatherPipe; bool optimizeGatherPipe;
bool fastInterrupts; bool fastInterrupts;
bool accurateSinglePrecision; bool accurateSinglePrecision;

6
Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp
View File

@ -118,16 +118,18 @@ void EmuCodeBlock::UnsafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize,
void EmuCodeBlock::SafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s32 offset, bool signExtend) void EmuCodeBlock::SafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s32 offset, bool signExtend)
{ {
#if defined(_WIN32) && defined(_M_X64)
#ifdef ENABLE_MEM_CHECK #ifdef ENABLE_MEM_CHECK
if (Core::g_CoreStartupParameter.bUseFastMem && (accessSize == 32) && !Core::g_CoreStartupParameter.bMMU && !Core::g_CoreStartupParameter.bEnableDebugging) if (accessSize == 32 && !Core::g_CoreStartupParameter.bMMU && !Core::g_CoreStartupParameter.bEnableDebugging)
#else #else
if (Core::g_CoreStartupParameter.bUseFastMem && (accessSize == 32) && !Core::g_CoreStartupParameter.bMMU) if (accessSize == 32 && !Core::g_CoreStartupParameter.bMMU)
#endif #endif
{ {
// BackPatch only supports 32-bits accesses // BackPatch only supports 32-bits accesses
UnsafeLoadToEAX(opAddress, accessSize, offset, signExtend); UnsafeLoadToEAX(opAddress, accessSize, offset, signExtend);
} }
else else
#endif
{ {
u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS; u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS;
if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack) if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)