From 620d77b7e314f5efae36d12c88637cd337b257ef Mon Sep 17 00:00:00 2001 From: Subv Date: Thu, 8 Jan 2015 19:39:14 -0500 Subject: Timing: Use CoreTiming::GetTicks to keep track of ticks. This will keep track of idle ticks for us, and fixes some tickcount-related issues --- src/core/arm/dyncom/arm_dyncom.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/core/arm/dyncom/arm_dyncom.cpp') diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp index c779e3fd..02a3da1c 100644 --- a/src/core/arm/dyncom/arm_dyncom.cpp +++ b/src/core/arm/dyncom/arm_dyncom.cpp @@ -15,7 +15,7 @@ const static cpu_config_t s_arm11_cpu_info = { "armv6", "arm11", 0x0007b000, 0x0007f000, NONCACHE }; -ARM_DynCom::ARM_DynCom() : ticks(0) { +ARM_DynCom::ARM_DynCom() { state = std::unique_ptr(new ARMul_State); ARMul_EmulateInit(); @@ -74,11 +74,10 @@ void ARM_DynCom::SetCPSR(u32 cpsr) { } u64 ARM_DynCom::GetTicks() const { - return ticks; + return CoreTiming::GetTicks(); } void ARM_DynCom::AddTicks(u64 ticks) { - this->ticks += ticks; down_count -= ticks; if (down_count < 0) CoreTiming::Advance(); -- cgit v1.2.3