summaryrefslogtreecommitdiff
path: root/src/core/arm
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/arm')
-rw-r--r--src/core/arm/arm_interface.h6
-rw-r--r--src/core/arm/dyncom/arm_dyncom.cpp5
-rw-r--r--src/core/arm/dyncom/arm_dyncom.h1
3 files changed, 0 insertions, 12 deletions
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h
index ef37ee055..fe1e584ad 100644
--- a/src/core/arm/arm_interface.h
+++ b/src/core/arm/arm_interface.h
@@ -74,12 +74,6 @@ public:
74 virtual void SetCPSR(u32 cpsr) = 0; 74 virtual void SetCPSR(u32 cpsr) = 0;
75 75
76 /** 76 /**
77 * Returns the number of clock ticks since the last rese
78 * @return Returns number of clock ticks
79 */
80 virtual u64 GetTicks() const = 0;
81
82 /**
83 * Advance the CPU core by the specified number of ticks (e.g. to simulate CPU execution time) 77 * Advance the CPU core by the specified number of ticks (e.g. to simulate CPU execution time)
84 * @param ticks Number of ticks to advance the CPU core 78 * @param ticks Number of ticks to advance the CPU core
85 */ 79 */
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
71u64 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
76void ARM_DynCom::AddTicks(u64 ticks) { 71void 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);