diff options
| author | bunnei <bunneidev@gmail.com> | 2015-03-16 14:25:15 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-03-16 14:25:15 -0400 |
| commit | e4e2c929af8953fd9946d2556b112b80c9b0ffb5 (patch) | |
| tree | 2ea2d84aac8e0226f8cc089c5752178473ba4030 /src/core/arm/dyncom/arm_dyncom.cpp | |
| parent | 3e5aeb9a7abb74fb5492f8f93265c03f45c1757a (diff) | |
| parent | 8cf81643a96875d29f3c5b1054c16fe163836697 (diff) | |
Merge pull request #663 from lioncash/ticks
arm_interface: Get rid of GetTicks.
Diffstat (limited to 'src/core/arm/dyncom/arm_dyncom.cpp')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom.cpp | 5 |
1 files changed, 0 insertions, 5 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) |