diff options
author | Huw Pascoe <huw.pascoe@gmail.com> | 2017-09-30 18:25:49 +0200 |
---|---|---|
committer | Huw Pascoe <huw.pascoe@gmail.com> | 2017-09-30 18:38:14 +0200 |
commit | 529f4a01318a450f999ffa7e01c5c26f801d22e0 (patch) | |
tree | 8728152f1726aeb775c2bba2ecc60bc67354e083 /src/core/arm/dynarmic | |
parent | Services/UDS: Handle the rest of the connection sequence. (#2963) (diff) | |
download | yuzu-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/dynarmic')
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 9 | ||||
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.h | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 42ae93ae8..2cb56d12f 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -124,13 +124,6 @@ void ARM_Dynarmic::SetCP15Register(CP15Register reg, u32 value) { interpreter_state->CP15[reg] = value; } -void ARM_Dynarmic::AddTicks(u64 ticks) { - down_count -= ticks; - if (down_count < 0) { - CoreTiming::Advance(); - } -} - MICROPROFILE_DEFINE(ARM_Jit, "ARM JIT", "ARM JIT", MP_RGB(255, 64, 64)); void ARM_Dynarmic::ExecuteInstructions(int num_instructions) { @@ -139,7 +132,7 @@ void ARM_Dynarmic::ExecuteInstructions(int num_instructions) { std::size_t ticks_executed = jit->Run(static_cast<unsigned>(num_instructions)); - AddTicks(ticks_executed); + CoreTiming::AddTicks(ticks_executed); } void ARM_Dynarmic::SaveContext(ARM_Interface::ThreadContext& ctx) { diff --git a/src/core/arm/dynarmic/arm_dynarmic.h b/src/core/arm/dynarmic/arm_dynarmic.h index 96148a1a5..0b00158a5 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.h +++ b/src/core/arm/dynarmic/arm_dynarmic.h @@ -32,8 +32,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; |