diff options
| author | Subv <subv2112@gmail.com> | 2015-01-09 01:39:14 +0100 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2015-01-09 01:39:14 +0100 |
| commit | 620d77b7e314f5efae36d12c88637cd337b257ef (patch) | |
| tree | b6bd9285d90f7fe92411d936724f7d5d952fff5c | |
| parent | Merge pull request #443 from Subv/sleep_thread (diff) | |
| download | yuzu-620d77b7e314f5efae36d12c88637cd337b257ef.tar yuzu-620d77b7e314f5efae36d12c88637cd337b257ef.tar.gz yuzu-620d77b7e314f5efae36d12c88637cd337b257ef.tar.bz2 yuzu-620d77b7e314f5efae36d12c88637cd337b257ef.tar.lz yuzu-620d77b7e314f5efae36d12c88637cd337b257ef.tar.xz yuzu-620d77b7e314f5efae36d12c88637cd337b257ef.tar.zst yuzu-620d77b7e314f5efae36d12c88637cd337b257ef.zip | |
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom.cpp | 5 | ||||
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom.h | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp index c779e3fd4..02a3da1ce 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<ARMul_State>(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(); diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h index 7284dcd07..9e102a46e 100644 --- a/src/core/arm/dyncom/arm_dyncom.h +++ b/src/core/arm/dyncom/arm_dyncom.h @@ -89,8 +89,5 @@ public: void ExecuteInstructions(int num_instructions) override; private: - std::unique_ptr<ARMul_State> state; - u64 ticks; - }; |