diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-03-16 17:16:59 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-03-16 17:18:37 +0100 |
| commit | 8cf81643a96875d29f3c5b1054c16fe163836697 (patch) | |
| tree | 2ea2d84aac8e0226f8cc089c5752178473ba4030 /src/core/arm/dyncom | |
| parent | Merge pull request #657 from Subv/flip (diff) | |
| download | yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.tar yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.tar.gz yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.tar.bz2 yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.tar.lz yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.tar.xz yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.tar.zst yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom.cpp | 5 | ||||
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp index bbcbbdd2b..cb1a410a0 100644 --- a/src/core/arm/dyncom/arm_dyncom.cpp +++ b/src/core/arm/dyncom/arm_dyncom.cpp @@ -68,11 +68,6 @@ void ARM_DynCom::SetCPSR(u32 cpsr) { state->Cpsr = cpsr; } -u64 ARM_DynCom::GetTicks() const { - // TODO(Subv): Remove ARM_DynCom::GetTicks() and use CoreTiming::GetTicks() directly once ARMemu is gone - return CoreTiming::GetTicks(); -} - void ARM_DynCom::AddTicks(u64 ticks) { down_count -= ticks; if (down_count < 0) diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h index 213cac1ad..a7f95d307 100644 --- a/src/core/arm/dyncom/arm_dyncom.h +++ b/src/core/arm/dyncom/arm_dyncom.h @@ -23,7 +23,6 @@ public: u32 GetCPSR() const override; void SetCPSR(u32 cpsr) override; - u64 GetTicks() const override; void AddTicks(u64 ticks) override; void ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg); |