summaryrefslogtreecommitdiff
path: root/src/core/arm/dyncom
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/arm/dyncom')
-rw-r--r--src/core/arm/dyncom/arm_dyncom.cpp8
-rw-r--r--src/core/arm/dyncom/arm_dyncom.h2
2 files changed, 1 insertions, 9 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp
index da955c9b9..4d72aef77 100644
--- a/src/core/arm/dyncom/arm_dyncom.cpp
+++ b/src/core/arm/dyncom/arm_dyncom.cpp
@@ -77,12 +77,6 @@ void ARM_DynCom::SetCP15Register(CP15Register reg, u32 value) {
77 state->CP15[reg] = value; 77 state->CP15[reg] = value;
78} 78}
79 79
80void ARM_DynCom::AddTicks(u64 ticks) {
81 down_count -= ticks;
82 if (down_count < 0)
83 CoreTiming::Advance();
84}
85
86void ARM_DynCom::ExecuteInstructions(int num_instructions) { 80void ARM_DynCom::ExecuteInstructions(int num_instructions) {
87 state->NumInstrsToExecute = num_instructions; 81 state->NumInstrsToExecute = num_instructions;
88 82
@@ -90,7 +84,7 @@ void ARM_DynCom::ExecuteInstructions(int num_instructions) {
90 // executing one instruction at a time. Otherwise, if a block is being executed, more 84 // executing one instruction at a time. Otherwise, if a block is being executed, more
91 // instructions may actually be executed than specified. 85 // instructions may actually be executed than specified.
92 unsigned ticks_executed = InterpreterMainLoop(state.get()); 86 unsigned ticks_executed = InterpreterMainLoop(state.get());
93 AddTicks(ticks_executed); 87 CoreTiming::AddTicks(ticks_executed);
94} 88}
95 89
96void ARM_DynCom::SaveContext(ThreadContext& ctx) { 90void ARM_DynCom::SaveContext(ThreadContext& ctx) {
diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h
index 0ae535671..fc1ffed6a 100644
--- a/src/core/arm/dyncom/arm_dyncom.h
+++ b/src/core/arm/dyncom/arm_dyncom.h
@@ -31,8 +31,6 @@ public:
31 u32 GetCP15Register(CP15Register reg) override; 31 u32 GetCP15Register(CP15Register reg) override;
32 void SetCP15Register(CP15Register reg, u32 value) override; 32 void SetCP15Register(CP15Register reg, u32 value) override;
33 33
34 void AddTicks(u64 ticks) override;
35
36 void SaveContext(ThreadContext& ctx) override; 34 void SaveContext(ThreadContext& ctx) override;
37 void LoadContext(const ThreadContext& ctx) override; 35 void LoadContext(const ThreadContext& ctx) override;
38 36