diff options
| author | 2019-10-15 11:48:30 -0400 | |
|---|---|---|
| committer | 2019-10-15 11:48:30 -0400 | |
| commit | cab2619aeb111bd6c5dbcc5adc0d2e8154a1e8fc (patch) | |
| tree | 1664df6e9abff74f37adee0c90ae3c9eaff6babf /src/core/arm | |
| parent | Merge pull request #2897 from DarkLordZach/oss-ext-fonts-1 (diff) | |
| parent | Core_Timing: Address Remaining feedback. (diff) | |
| download | yuzu-cab2619aeb111bd6c5dbcc5adc0d2e8154a1e8fc.tar.gz yuzu-cab2619aeb111bd6c5dbcc5adc0d2e8154a1e8fc.tar.xz yuzu-cab2619aeb111bd6c5dbcc5adc0d2e8154a1e8fc.zip | |
Merge pull request #2965 from FernandoS27/fair-core-timing
Core Timing: Rework Core Timing to run all cores evenly.
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 2 | ||||
| -rw-r--r-- | src/core/arm/unicorn/arm_unicorn.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index f1506b372..700c4afff 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp | |||
| @@ -116,7 +116,7 @@ public: | |||
| 116 | num_interpreted_instructions = 0; | 116 | num_interpreted_instructions = 0; |
| 117 | } | 117 | } |
| 118 | u64 GetTicksRemaining() override { | 118 | u64 GetTicksRemaining() override { |
| 119 | return std::max(parent.system.CoreTiming().GetDowncount(), 0); | 119 | return std::max(parent.system.CoreTiming().GetDowncount(), s64{0}); |
| 120 | } | 120 | } |
| 121 | u64 GetCNTPCT() override { | 121 | u64 GetCNTPCT() override { |
| 122 | return Timing::CpuCyclesToClockCycles(parent.system.CoreTiming().GetTicks()); | 122 | return Timing::CpuCyclesToClockCycles(parent.system.CoreTiming().GetTicks()); |
diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp index 97d5c2a8a..d4f41bfc1 100644 --- a/src/core/arm/unicorn/arm_unicorn.cpp +++ b/src/core/arm/unicorn/arm_unicorn.cpp | |||
| @@ -156,7 +156,7 @@ void ARM_Unicorn::Run() { | |||
| 156 | if (GDBStub::IsServerEnabled()) { | 156 | if (GDBStub::IsServerEnabled()) { |
| 157 | ExecuteInstructions(std::max(4000000, 0)); | 157 | ExecuteInstructions(std::max(4000000, 0)); |
| 158 | } else { | 158 | } else { |
| 159 | ExecuteInstructions(std::max(system.CoreTiming().GetDowncount(), 0)); | 159 | ExecuteInstructions(std::max(system.CoreTiming().GetDowncount(), s64{0})); |
| 160 | } | 160 | } |
| 161 | } | 161 | } |
| 162 | 162 | ||