diff --git a/Qt/EmuThread.cpp b/Qt/EmuThread.cpp index 3c41af0359..065e5c7707 100644 --- a/Qt/EmuThread.cpp +++ b/Qt/EmuThread.cpp @@ -185,7 +185,7 @@ void EmuThread::run() coreParameter.fileToStart = fileToStart.toStdString(); coreParameter.enableSound = true; coreParameter.gpuCore = GPU_GLES; - coreParameter.cpuCore = (CPUCore)g_Config.iCpuCore; + coreParameter.cpuCore = g_Config.bJit ? CPU_JIT : CPU_INTERPRETER; coreParameter.enableDebugging = true; coreParameter.printfEmuLog = false; coreParameter.headLess = false; diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp index af4cf7776a..8f8efc2269 100644 --- a/Qt/mainwindow.cpp +++ b/Qt/mainwindow.cpp @@ -109,15 +109,11 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co gfxLog = true; break; case 'j': - g_Config.iCpuCore = CPU_JIT; - g_Config.bSaveSettings = false; - break; - case 'f': - g_Config.iCpuCore = CPU_FASTINTERPRETER; + g_Config.bJit = true; g_Config.bSaveSettings = false; break; case 'i': - g_Config.iCpuCore = CPU_INTERPRETER; + g_Config.bJit = false; g_Config.bSaveSettings = false; break; case 'l': @@ -231,9 +227,8 @@ void MainWindow::UpdateMenus() { ui->action_OptionsDisplayRawFramebuffer->setChecked(g_Config.bDisplayFramebuffer); ui->action_OptionsIgnoreIllegalReadsWrites->setChecked(g_Config.bIgnoreBadMemAccess); - ui->action_CPUInterpreter->setChecked(g_Config.iCpuCore == CPU_INTERPRETER); - ui->action_CPUFastInterpreter->setChecked(g_Config.iCpuCore == CPU_FASTINTERPRETER); - ui->action_CPUDynarec->setChecked(g_Config.iCpuCore == CPU_JIT); + ui->action_CPUInterpreter->setChecked(!g_Config.bJit); + ui->action_CPUDynarec->setChecked(g_Config.bJit); ui->action_OptionsBufferedRendering->setChecked(g_Config.bBufferedRendering); ui->action_OptionsShowDebugStatistics->setChecked(g_Config.bShowDebugStats); ui->action_OptionsWireframe->setChecked(g_Config.bDrawWireframe); @@ -518,19 +513,13 @@ void MainWindow::on_action_FileExit_triggered() void MainWindow::on_action_CPUDynarec_triggered() { - g_Config.iCpuCore = CPU_JIT; + g_Config.bJit = true; UpdateMenus(); } void MainWindow::on_action_CPUInterpreter_triggered() { - g_Config.iCpuCore = CPU_INTERPRETER; - UpdateMenus(); -} - -void MainWindow::on_action_CPUFastInterpreter_triggered() -{ - g_Config.iCpuCore = CPU_FASTINTERPRETER; + g_Config.bJit = false; UpdateMenus(); } diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h index 14a1b8af75..013bb54e1b 100644 --- a/Qt/mainwindow.h +++ b/Qt/mainwindow.h @@ -81,8 +81,6 @@ private slots: void on_action_CPUInterpreter_triggered(); - void on_action_CPUFastInterpreter_triggered(); - void on_action_DebugLoadMapFile_triggered(); void on_action_DebugSaveMapFile_triggered(); diff --git a/Qt/mainwindow.ui b/Qt/mainwindow.ui index a167aad884..10f40c73a7 100644 --- a/Qt/mainwindow.ui +++ b/Qt/mainwindow.ui @@ -180,7 +180,6 @@ &Core - @@ -289,14 +288,6 @@ &Interpreter - - - true - - - &Slightly Faster Interpreter - - true