diff options
| author | 2015-03-16 12:16:59 -0400 | |
|---|---|---|
| committer | 2015-03-16 12:18:37 -0400 | |
| commit | 8cf81643a96875d29f3c5b1054c16fe163836697 (patch) | |
| tree | 2ea2d84aac8e0226f8cc089c5752178473ba4030 /src/core/arm/dyncom | |
| parent | Merge pull request #657 from Subv/flip (diff) | |
| download | yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.tar.gz yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.tar.xz yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.zip | |
arm_interface: Get rid of GetTicks.
Removes a TODO.
Diffstat (limited to 'src/core/arm/dyncom')
| -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) { | |||
| 68 | state->Cpsr = cpsr; | 68 | state->Cpsr = cpsr; |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | u64 ARM_DynCom::GetTicks() const { | ||
| 72 | // TODO(Subv): Remove ARM_DynCom::GetTicks() and use CoreTiming::GetTicks() directly once ARMemu is gone | ||
| 73 | return CoreTiming::GetTicks(); | ||
| 74 | } | ||
| 75 | |||
| 76 | void ARM_DynCom::AddTicks(u64 ticks) { | 71 | void ARM_DynCom::AddTicks(u64 ticks) { |
| 77 | down_count -= ticks; | 72 | down_count -= ticks; |
| 78 | if (down_count < 0) | 73 | 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: | |||
| 23 | u32 GetCPSR() const override; | 23 | u32 GetCPSR() const override; |
| 24 | void SetCPSR(u32 cpsr) override; | 24 | void SetCPSR(u32 cpsr) override; |
| 25 | 25 | ||
| 26 | u64 GetTicks() const override; | ||
| 27 | void AddTicks(u64 ticks) override; | 26 | void AddTicks(u64 ticks) override; |
| 28 | 27 | ||
| 29 | void ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg); | 28 | void ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg); |