From 0a8013d71eebf13864e73c94075ef969e76cb485 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Thu, 14 May 2020 14:48:50 -0400
Subject: [PATCH] ARMDynarmicInterface: Correct GCC Build Errors.
---
src/core/arm/dynarmic/arm_dynarmic_32.cpp | 6 +++---
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:
u64 GetTicksRemaining() override {
if (parent.uses_wall_clock) {
if (!parent.interrupt_handlers[parent.core_index].IsInterrupted()) {
- return std::max<s64>(1000U, 0);
+ return 1000U;
}
- return 0ULL;
+ return 0U;
}
- return std::max(parent.system.CoreTiming().GetDowncount(), 0LL);
+ return std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0);
}
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:
u64 GetTicksRemaining() override {
if (parent.uses_wall_clock) {
if (!parent.interrupt_handlers[parent.core_index].IsInterrupted()) {
- return std::max<s64>(1000U, 0);
+ return 1000U;
}
- return 0ULL;
+ return 0U;
}
- return std::max(parent.system.CoreTiming().GetDowncount(), 0LL);
+ return std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0);
}
u64 GetCNTPCT() override {