summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-01-09 02:01:19 +0100
committerbunnei <bunneidev@gmail.com>2015-01-09 02:01:19 +0100
commit0d0d6ef31a8a347a3660c5ff64639e6a9a65b331 (patch)
tree4c04ce1ccae59017deb85c296dd3ab0de67e5c18
parentMerge pull request #443 from Subv/sleep_thread (diff)
parentDynCom: Add a comment to GetTicks. (diff)
downloadyuzu-0d0d6ef31a8a347a3660c5ff64639e6a9a65b331.tar
yuzu-0d0d6ef31a8a347a3660c5ff64639e6a9a65b331.tar.gz
yuzu-0d0d6ef31a8a347a3660c5ff64639e6a9a65b331.tar.bz2
yuzu-0d0d6ef31a8a347a3660c5ff64639e6a9a65b331.tar.lz
yuzu-0d0d6ef31a8a347a3660c5ff64639e6a9a65b331.tar.xz
yuzu-0d0d6ef31a8a347a3660c5ff64639e6a9a65b331.tar.zst
yuzu-0d0d6ef31a8a347a3660c5ff64639e6a9a65b331.zip
-rw-r--r--src/core/arm/dyncom/arm_dyncom.cpp6
-rw-r--r--src/core/arm/dyncom/arm_dyncom.h3
2 files changed, 3 insertions, 6 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp
index c779e3fd4..31eb879a2 100644
--- a/src/core/arm/dyncom/arm_dyncom.cpp
+++ b/src/core/arm/dyncom/arm_dyncom.cpp
@@ -15,7 +15,7 @@ const static cpu_config_t s_arm11_cpu_info = {
"armv6", "arm11", 0x0007b000, 0x0007f000, NONCACHE
};
-ARM_DynCom::ARM_DynCom() : ticks(0) {
+ARM_DynCom::ARM_DynCom() {
state = std::unique_ptr<ARMul_State>(new ARMul_State);
ARMul_EmulateInit();
@@ -74,11 +74,11 @@ void ARM_DynCom::SetCPSR(u32 cpsr) {
}
u64 ARM_DynCom::GetTicks() const {
- return ticks;
+ // TODO(Subv): Remove ARM_DynCom::GetTicks() and use CoreTiming::GetTicks() directly once ARMemu is gone
+ return CoreTiming::GetTicks();
}
void ARM_DynCom::AddTicks(u64 ticks) {
- this->ticks += ticks;
down_count -= ticks;
if (down_count < 0)
CoreTiming::Advance();
diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h
index 7284dcd07..9e102a46e 100644
--- a/src/core/arm/dyncom/arm_dyncom.h
+++ b/src/core/arm/dyncom/arm_dyncom.h
@@ -89,8 +89,5 @@ public:
void ExecuteInstructions(int num_instructions) override;
private:
-
std::unique_ptr<ARMul_State> state;
- u64 ticks;
-
};