From 0783498f570e7d5c00174cd10a3c1ff105d1eae6 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sat, 25 Oct 2014 12:54:44 -0700
Subject: Use configuration files to enable or disable the new dyncom
 interpreter.

---
 src/core/hw/gpu.cpp | 16 ++++++++++++++++
 src/core/hw/gpu.h   |  3 ---
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'src/core/hw')

diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index 33a0e0fe7..94768b101 100644
--- a/src/core/hw/gpu.cpp
+++ b/src/core/hw/gpu.cpp
@@ -4,6 +4,7 @@
 
 #include "common/common_types.h"
 
+#include "core/settings.h"
 #include "core/core.h"
 #include "core/mem_map.h"
 
@@ -24,6 +25,9 @@ u32 g_cur_line = 0;         ///< Current vertical screen line
 u64 g_last_line_ticks = 0;  ///< CPU tick count from last vertical screen line
 u64 g_last_frame_ticks = 0; ///< CPU tick count from last frame
 
+static u32 kFrameCycles = 0; ///< 268MHz / 60 frames per second
+static u32 kFrameTicks  = 0; ///< Approximate number of instructions/frame
+
 template <typename T>
 inline void Read(T &var, const u32 raw_addr) {
     u32 addr = raw_addr - 0x1EF00000;
@@ -214,6 +218,18 @@ void Update() {
 
 /// Initialize hardware
 void Init() {
+    switch (Settings::values.cpu_core) {
+        case Core::CPU_FastInterpreter:
+            kFrameCycles = 268123480 / 2048;
+            break;
+        case Core::CPU_Interpreter:
+        default:
+            kFrameCycles = 268123480 / 60;
+            break;
+    }
+    
+    kFrameTicks  = kFrameCycles / 3;
+
     g_cur_line = 0;
     g_last_frame_ticks = g_last_line_ticks = Core::g_app_core->GetTicks();
 
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h
index 92097d182..3fa7b9ccf 100644
--- a/src/core/hw/gpu.h
+++ b/src/core/hw/gpu.h
@@ -11,9 +11,6 @@
 
 namespace GPU {
 
-static const u32 kFrameCycles   = 268123480 / 60;   ///< 268MHz / 60 frames per second
-static const u32 kFrameTicks    = kFrameCycles / 3; ///< Approximate number of instructions/frame
-
 // Returns index corresponding to the Regs member labeled by field_name
 // TODO: Due to Visual studio bug 209229, offsetof does not return constant expressions
 //       when used with array elements (e.g. GPU_REG_INDEX(memory_fill_config[0])).
-- 
cgit v1.2.3


From 09e19f9f1ee2e965a581e70b30cbc357f4b5ad21 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Mon, 27 Oct 2014 18:56:08 -0700
Subject: Added `gpu_refresh_rate` config setting for the new interpreter speed
 hack.

---
 src/citra/config.cpp    |  1 +
 src/citra/default_ini.h |  3 ++-
 src/citra_qt/config.cpp |  2 ++
 src/core/hw/gpu.cpp     | 11 +----------
 src/core/settings.h     |  1 +
 5 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'src/core/hw')

diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 3e5e986c2..c5ce8a164 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -58,6 +58,7 @@ void Config::ReadControls() {
 
 void Config::ReadCore() {
     Settings::values.cpu_core = glfw_config->GetInteger("Core", "cpu_core", Core::CPU_Interpreter);
+    Settings::values.gpu_refresh_rate = glfw_config->GetInteger("Core", "gpu_refresh_rate", 60);
 }
 
 void Config::ReadData() {
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h
index 4a016d483..7352c70c2 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -27,7 +27,8 @@ pad_sleft =
 pad_sright =
 
 [Core]
-cpu_core = ## 0: Interpreter (default), 1: DynCom Interpreter
+cpu_core = ## 0: Interpreter (default), 1: FastInterpreter (experimental)
+gpu_refresh_rate = ## 60 (default), 1024 or 2048 may work better on the FastInterpreter
 
 [Data Storage]
 use_virtual_sd =
diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp
index ded44ea8d..63d396439 100644
--- a/src/citra_qt/config.cpp
+++ b/src/citra_qt/config.cpp
@@ -68,12 +68,14 @@ void Config::SaveControls() {
 void Config::ReadCore() {
     qt_config->beginGroup("Core");
     Settings::values.cpu_core = qt_config->value("cpu_core", Core::CPU_Interpreter).toInt();
+    Settings::values.gpu_refresh_rate = qt_config->value("gpu_refresh_rate", 60).toInt();
     qt_config->endGroup();
 }
 
 void Config::SaveCore() {
     qt_config->beginGroup("Core");
     qt_config->setValue("cpu_core", Settings::values.cpu_core);
+    qt_config->setValue("gpu_refresh_rate", Settings::values.gpu_refresh_rate);
     qt_config->endGroup();
 }
 
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index 94768b101..76dbe3fdc 100644
--- a/src/core/hw/gpu.cpp
+++ b/src/core/hw/gpu.cpp
@@ -218,16 +218,7 @@ void Update() {
 
 /// Initialize hardware
 void Init() {
-    switch (Settings::values.cpu_core) {
-        case Core::CPU_FastInterpreter:
-            kFrameCycles = 268123480 / 2048;
-            break;
-        case Core::CPU_Interpreter:
-        default:
-            kFrameCycles = 268123480 / 60;
-            break;
-    }
-    
+    kFrameCycles = 268123480 / Settings::values.gpu_refresh_rate;
     kFrameTicks  = kFrameCycles / 3;
 
     g_cur_line = 0;
diff --git a/src/core/settings.h b/src/core/settings.h
index 3e4781884..6a6265e18 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -28,6 +28,7 @@ struct Values {
 
     // Core
     int cpu_core;
+    int gpu_refresh_rate;
 
     // Data Storage
     bool use_virtual_sd;
-- 
cgit v1.2.3