summaryrefslogtreecommitdiffstats
path: root/src/core/hw
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-10-25 21:54:44 +0200
committerarchshift <admin@archshift.com>2014-10-28 02:35:21 +0100
commit0783498f570e7d5c00174cd10a3c1ff105d1eae6 (patch)
tree10f64506a8f5111f56c4db17c95f6aba19baf0b9 /src/core/hw
parentMerge pull request #150 from lioncash/typo (diff)
downloadyuzu-0783498f570e7d5c00174cd10a3c1ff105d1eae6.tar
yuzu-0783498f570e7d5c00174cd10a3c1ff105d1eae6.tar.gz
yuzu-0783498f570e7d5c00174cd10a3c1ff105d1eae6.tar.bz2
yuzu-0783498f570e7d5c00174cd10a3c1ff105d1eae6.tar.lz
yuzu-0783498f570e7d5c00174cd10a3c1ff105d1eae6.tar.xz
yuzu-0783498f570e7d5c00174cd10a3c1ff105d1eae6.tar.zst
yuzu-0783498f570e7d5c00174cd10a3c1ff105d1eae6.zip
Diffstat (limited to '')
-rw-r--r--src/core/hw/gpu.cpp16
-rw-r--r--src/core/hw/gpu.h3
2 files changed, 16 insertions, 3 deletions
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])).