diff options
| author |  Fernando Sahmkow | 2019-10-11 14:44:14 -0400 |
|---|---|---|
| committer | Fernando Sahmkow | 2019-10-11 14:44:14 -0400 |
| commit | e0650a2034026d8292196128d2f9decb50eeb0f3 (patch) | |
| tree | 59c51153a985e7fb66e62c812250c6dacd69a82c /src/core/arm/dynarmic | |
| parent | Core Timing: Correct Idle and remove lefting pragma (diff) | |
| download | yuzu-e0650a2034026d8292196128d2f9decb50eeb0f3.tar.gz yuzu-e0650a2034026d8292196128d2f9decb50eeb0f3.tar.xz yuzu-e0650a2034026d8292196128d2f9decb50eeb0f3.zip | |
Core_Timing: Address Feedback and suppress warnings.
Diffstat (limited to 'src/core/arm/dynarmic')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 4d2e99ed0..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<s64>(parent.system.CoreTiming().GetDowncount(), 0LL); | 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()); |