summaryrefslogtreecommitdiffstats
path: root/src/core/arm
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2020-05-14 20:48:50 +0200
committerFernando Sahmkow <fsahmkow27@gmail.com>2020-06-27 17:36:17 +0200
commit0a8013d71eebf13864e73c94075ef969e76cb485 (patch)
tree330b5211e04ee43400c0a95a8e62ad566ea12f68 /src/core/arm
parentCommon/AtomicOps: Correct GCC Intrinsic argument ordering. (diff)
downloadyuzu-0a8013d71eebf13864e73c94075ef969e76cb485.tar
yuzu-0a8013d71eebf13864e73c94075ef969e76cb485.tar.gz
yuzu-0a8013d71eebf13864e73c94075ef969e76cb485.tar.bz2
yuzu-0a8013d71eebf13864e73c94075ef969e76cb485.tar.lz
yuzu-0a8013d71eebf13864e73c94075ef969e76cb485.tar.xz
yuzu-0a8013d71eebf13864e73c94075ef969e76cb485.tar.zst
yuzu-0a8013d71eebf13864e73c94075ef969e76cb485.zip
Diffstat (limited to 'src/core/arm')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_32.cpp6
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_64.cpp6
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 {