Merge pull request #2042 from bunnei/dynarmic

Interface ARM CPU JIT (Dynarmic)

3 files changed, 27 insertions, 0 deletions

diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp
index fa3fa210c..cf1c09930 100644
--- a/src/citra_qt/config.cpp
+++ b/src/citra_qt/config.cpp
@@ -41,6 +41,7 @@ void Config::ReadValues() {
     qt_config->endGroup();
 
     qt_config->beginGroup("Core");
+    Settings::values.use_cpu_jit = qt_config->value("use_cpu_jit", true).toBool();
     Settings::values.frame_skip = qt_config->value("frame_skip", 0).toInt();
     qt_config->endGroup();
 
@@ -134,6 +135,7 @@ void Config::SaveValues() {
     qt_config->endGroup();
 
     qt_config->beginGroup("Core");
+    qt_config->setValue("use_cpu_jit", Settings::values.use_cpu_jit);
     qt_config->setValue("frame_skip", Settings::values.frame_skip);
     qt_config->endGroup();
 
diff --git a/src/citra_qt/configure_general.cpp b/src/citra_qt/configure_general.cpp
index 95aab9f2e..e6832341a 100644
--- a/src/citra_qt/configure_general.cpp
+++ b/src/citra_qt/configure_general.cpp
@@ -7,6 +7,7 @@
 #include "ui_configure_general.h"
 
 #include "core/settings.h"
+#include "core/system.h"
 
 ConfigureGeneral::ConfigureGeneral(QWidget *parent) :
     QWidget(parent),
@@ -14,6 +15,8 @@ ConfigureGeneral::ConfigureGeneral(QWidget *parent) :
 {
     ui->setupUi(this);
     this->setConfiguration();
+
+    ui->toggle_cpu_jit->setEnabled(!System::IsPoweredOn());
 }
 
 ConfigureGeneral::~ConfigureGeneral() {
@@ -22,6 +25,7 @@ ConfigureGeneral::~ConfigureGeneral() {
 void ConfigureGeneral::setConfiguration() {
     ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan);
     ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing);
+    ui->toggle_cpu_jit->setChecked(Settings::values.use_cpu_jit);
     ui->region_combobox->setCurrentIndex(Settings::values.region_value);
 }
 
@@ -29,5 +33,6 @@ void ConfigureGeneral::applyConfiguration() {
     UISettings::values.gamedir_deepscan = ui->toggle_deepscan->isChecked();
     UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked();
     Settings::values.region_value = ui->region_combobox->currentIndex();
+    Settings::values.use_cpu_jit = ui->toggle_cpu_jit->isChecked();
     Settings::Apply();
 }
diff --git a/src/citra_qt/configure_general.ui b/src/citra_qt/configure_general.ui
index 343f804c0..81688113f 100644
--- a/src/citra_qt/configure_general.ui
+++ b/src/citra_qt/configure_general.ui
@@ -43,6 +43,26 @@
        </layout>
       </widget>
      </item>
+      <item>
+        <widget class="QGroupBox" name="groupBox_2">
+          <property name="title">
+            <string>Performance</string>
+          </property>
+          <layout class="QHBoxLayout" name="horizontalLayout_7">
+            <item>
+              <layout class="QVBoxLayout" name="verticalLayout_5">
+                <item>
+                  <widget class="QCheckBox" name="toggle_cpu_jit">
+                    <property name="text">
+                      <string>Enable CPU JIT</string>
+                    </property>
+                  </widget>
+                </item>
+              </layout>
+            </item>
+          </layout>
+        </widget>
+      </item>
      <item>
       <widget class="QGroupBox" name="groupBox_4">
        <property name="title">