summaryrefslogtreecommitdiffstats
path: root/src/core/arm/dynarmic/arm_dynarmic.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-10-15 17:48:30 +0200
committerGitHub <noreply@github.com>2019-10-15 17:48:30 +0200
commitcab2619aeb111bd6c5dbcc5adc0d2e8154a1e8fc (patch)
tree1664df6e9abff74f37adee0c90ae3c9eaff6babf /src/core/arm/dynarmic/arm_dynarmic.cpp
parentMerge pull request #2897 from DarkLordZach/oss-ext-fonts-1 (diff)
parentCore_Timing: Address Remaining feedback. (diff)
downloadyuzu-cab2619aeb111bd6c5dbcc5adc0d2e8154a1e8fc.tar
yuzu-cab2619aeb111bd6c5dbcc5adc0d2e8154a1e8fc.tar.gz
yuzu-cab2619aeb111bd6c5dbcc5adc0d2e8154a1e8fc.tar.bz2
yuzu-cab2619aeb111bd6c5dbcc5adc0d2e8154a1e8fc.tar.lz
yuzu-cab2619aeb111bd6c5dbcc5adc0d2e8154a1e8fc.tar.xz
yuzu-cab2619aeb111bd6c5dbcc5adc0d2e8154a1e8fc.tar.zst
yuzu-cab2619aeb111bd6c5dbcc5adc0d2e8154a1e8fc.zip
Diffstat (limited to 'src/core/arm/dynarmic/arm_dynarmic.cpp')
-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..700c4afff 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(parent.system.CoreTiming().GetDowncount(), s64{0});
}
u64 GetCNTPCT() override {
return Timing::CpuCyclesToClockCycles(parent.system.CoreTiming().GetTicks());