summaryrefslogtreecommitdiffstats
path: root/src/core/arm/dyncom
diff options
context:
space:
mode:
authorHuw Pascoe <huw.pascoe@gmail.com>2017-09-30 18:25:49 +0200
committerHuw Pascoe <huw.pascoe@gmail.com>2017-09-30 18:38:14 +0200
commit529f4a01318a450f999ffa7e01c5c26f801d22e0 (patch)
tree8728152f1726aeb775c2bba2ecc60bc67354e083 /src/core/arm/dyncom
parentServices/UDS: Handle the rest of the connection sequence. (#2963) (diff)
downloadyuzu-529f4a01318a450f999ffa7e01c5c26f801d22e0.tar
yuzu-529f4a01318a450f999ffa7e01c5c26f801d22e0.tar.gz
yuzu-529f4a01318a450f999ffa7e01c5c26f801d22e0.tar.bz2
yuzu-529f4a01318a450f999ffa7e01c5c26f801d22e0.tar.lz
yuzu-529f4a01318a450f999ffa7e01c5c26f801d22e0.tar.xz
yuzu-529f4a01318a450f999ffa7e01c5c26f801d22e0.tar.zst
yuzu-529f4a01318a450f999ffa7e01c5c26f801d22e0.zip
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) {
state->CP15[reg] = value;
}
-void ARM_DynCom::AddTicks(u64 ticks) {
- down_count -= ticks;
- if (down_count < 0)
- CoreTiming::Advance();
-}
-
void ARM_DynCom::ExecuteInstructions(int num_instructions) {
state->NumInstrsToExecute = num_instructions;
@@ -90,7 +84,7 @@ void ARM_DynCom::ExecuteInstructions(int num_instructions) {
// executing one instruction at a time. Otherwise, if a block is being executed, more
// instructions may actually be executed than specified.
unsigned ticks_executed = InterpreterMainLoop(state.get());
- AddTicks(ticks_executed);
+ CoreTiming::AddTicks(ticks_executed);
}
void 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:
u32 GetCP15Register(CP15Register reg) override;
void SetCP15Register(CP15Register reg, u32 value) override;
- void AddTicks(u64 ticks) override;
-
void SaveContext(ThreadContext& ctx) override;
void LoadContext(const ThreadContext& ctx) override;