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

Merge pull request #6972 from JosJuice/default-jit 

When CPU core is invalid, fall back to JIT instead of interpreter
This commit is contained in:
Léo Lam 2018-05-26 20:18:31 +02:00 committed by GitHub
parent 71c6eb2a5d 792446e1da
commit f568e41fac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/PowerPC/JitInterface.cpp
View File

@ -64,7 +64,9 @@ CPUCoreBase* InitJitCore(int core)
break; break;
default: default:
PanicAlert("Unrecognizable cpu_core: %d", core); PanicAlertT("The selected CPU emulation core (%d) is not available. "
"Please select a different CPU emulation core in the settings.",
core);
g_jit = nullptr; g_jit = nullptr;
return nullptr; return nullptr;
} }

13
Source/Core/Core/PowerPC/PowerPC.cpp
View File

@ -164,20 +164,13 @@ static void InitializeCPUCore(int cpu_core)
s_cpu_core_base = JitInterface::InitJitCore(cpu_core); s_cpu_core_base = JitInterface::InitJitCore(cpu_core);
if (!s_cpu_core_base) // Handle Situations where JIT core isn't available if (!s_cpu_core_base) // Handle Situations where JIT core isn't available
{ {
WARN_LOG(POWERPC, "Jit core %d not available. Defaulting to interpreter.", cpu_core); WARN_LOG(POWERPC, "CPU core %d not available. Falling back to default.", cpu_core);
s_cpu_core_base = s_interpreter; s_cpu_core_base = JitInterface::InitJitCore(DefaultCPUCore());
} }
break; break;
} }
if (s_cpu_core_base != s_interpreter) s_mode = s_cpu_core_base == s_interpreter ? CoreMode::Interpreter : CoreMode::JIT;
{
s_mode = CoreMode::JIT;
}
else
{
s_mode = CoreMode::Interpreter;
}
} }
const std::vector<CPUCore>& AvailableCPUCores() const std::vector<CPUCore>& AvailableCPUCores()