summaryrefslogtreecommitdiff
path: root/src/core/arm/dynarmic
diff options
context:
space:
mode:
authorGravatar Lioncash2019-02-12 12:32:15 -0500
committerGravatar Lioncash2019-02-12 12:42:17 -0500
commit48d9d66dc585477d26b4cfbf1c4f71fd637b42ea (patch)
treef53430f173796e92b2e3dfd2570ed6752d5e8f77 /src/core/arm/dynarmic
parentMerge pull request #1904 from bunnei/better-fermi-copy (diff)
downloadyuzu-48d9d66dc585477d26b4cfbf1c4f71fd637b42ea.tar.gz
yuzu-48d9d66dc585477d26b4cfbf1c4f71fd637b42ea.tar.xz
yuzu-48d9d66dc585477d26b4cfbf1c4f71fd637b42ea.zip
core_timing: Rename CoreTiming namespace to Core::Timing
Places all of the timing-related functionality under the existing Core namespace to keep things consistent, rather than having the timing utilities sitting in its own completely separate namespace.
Diffstat (limited to 'src/core/arm/dynarmic')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp
index afbda8d8b..f28951f8a 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic.cpp
@@ -112,14 +112,14 @@ public:
112 // Always execute at least one tick. 112 // Always execute at least one tick.
113 amortized_ticks = std::max<u64>(amortized_ticks, 1); 113 amortized_ticks = std::max<u64>(amortized_ticks, 1);
114 114
115 CoreTiming::AddTicks(amortized_ticks); 115 Timing::AddTicks(amortized_ticks);
116 num_interpreted_instructions = 0; 116 num_interpreted_instructions = 0;
117 } 117 }
118 u64 GetTicksRemaining() override { 118 u64 GetTicksRemaining() override {
119 return std::max(CoreTiming::GetDowncount(), 0); 119 return std::max(Timing::GetDowncount(), 0);
120 } 120 }
121 u64 GetCNTPCT() override { 121 u64 GetCNTPCT() override {
122 return CoreTiming::GetTicks(); 122 return Timing::GetTicks();
123 } 123 }
124 124
125 ARM_Dynarmic& parent; 125 ARM_Dynarmic& parent;