summaryrefslogtreecommitdiffstats
path: root/src/core/arm/dynarmic/arm_dynarmic.cpp
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-09-10 03:37:29 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-10-09 18:30:31 +0200
commit555866f8dcb98897688d5d7b0e6c6cca55ac069f (patch)
tree287ffee685bd8fbd6a8a16aa02a198a6cab3ede3 /src/core/arm/dynarmic/arm_dynarmic.cpp
parentMerge pull request #2921 from FreddyFunk/compiler-warnings-core (diff)
downloadyuzu-555866f8dcb98897688d5d7b0e6c6cca55ac069f.tar
yuzu-555866f8dcb98897688d5d7b0e6c6cca55ac069f.tar.gz
yuzu-555866f8dcb98897688d5d7b0e6c6cca55ac069f.tar.bz2
yuzu-555866f8dcb98897688d5d7b0e6c6cca55ac069f.tar.lz
yuzu-555866f8dcb98897688d5d7b0e6c6cca55ac069f.tar.xz
yuzu-555866f8dcb98897688d5d7b0e6c6cca55ac069f.tar.zst
yuzu-555866f8dcb98897688d5d7b0e6c6cca55ac069f.zip
Diffstat (limited to '')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.cpp2
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 f1506b372..4d2e99ed0 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic.cpp
@@ -116,7 +116,7 @@ public:
num_interpreted_instructions = 0;
}
u64 GetTicksRemaining() override {
- return std::max(parent.system.CoreTiming().GetDowncount(), 0);
+ return std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0LL);
}
u64 GetCNTPCT() override {
return Timing::CpuCyclesToClockCycles(parent.system.CoreTiming().GetTicks());