diff options
| author |  Fernando Sahmkow | 2020-05-14 14:48:50 -0400 |
|---|---|---|
| committer | Fernando Sahmkow | 2020-06-27 11:36:17 -0400 |
| commit | 0a8013d71eebf13864e73c94075ef969e76cb485 (patch) | |
| tree | 330b5211e04ee43400c0a95a8e62ad566ea12f68 /src | |
| parent | Common/AtomicOps: Correct GCC Intrinsic argument ordering. (diff) | |
| download | yuzu-0a8013d71eebf13864e73c94075ef969e76cb485.tar.gz yuzu-0a8013d71eebf13864e73c94075ef969e76cb485.tar.xz yuzu-0a8013d71eebf13864e73c94075ef969e76cb485.zip | |
ARMDynarmicInterface: Correct GCC Build Errors.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_32.cpp | 6 | ||||
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_64.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index bd9c072d0..71d7e169a 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp | |||
| @@ -91,11 +91,11 @@ public: | |||
| 91 | u64 GetTicksRemaining() override { | 91 | u64 GetTicksRemaining() override { |
| 92 | if (parent.uses_wall_clock) { | 92 | if (parent.uses_wall_clock) { |
| 93 | if (!parent.interrupt_handlers[parent.core_index].IsInterrupted()) { | 93 | if (!parent.interrupt_handlers[parent.core_index].IsInterrupted()) { |
| 94 | return std::max<s64>(1000U, 0); | 94 | return 1000U; |
| 95 | } | 95 | } |
| 96 | return 0ULL; | 96 | return 0U; |
| 97 | } | 97 | } |
| 98 | return std::max(parent.system.CoreTiming().GetDowncount(), 0LL); | 98 | return std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0); |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | ARM_Dynarmic_32& parent; | 101 | ARM_Dynarmic_32& parent; |
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp index 8095901d1..8e8f7ce0a 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp | |||
| @@ -143,11 +143,11 @@ public: | |||
| 143 | u64 GetTicksRemaining() override { | 143 | u64 GetTicksRemaining() override { |
| 144 | if (parent.uses_wall_clock) { | 144 | if (parent.uses_wall_clock) { |
| 145 | if (!parent.interrupt_handlers[parent.core_index].IsInterrupted()) { | 145 | if (!parent.interrupt_handlers[parent.core_index].IsInterrupted()) { |
| 146 | return std::max<s64>(1000U, 0); | 146 | return 1000U; |
| 147 | } | 147 | } |
| 148 | return 0ULL; | 148 | return 0U; |
| 149 | } | 149 | } |
| 150 | return std::max(parent.system.CoreTiming().GetDowncount(), 0LL); | 150 | return std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0); |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | u64 GetCNTPCT() override { | 153 | u64 GetCNTPCT() override { |