diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-10-11 20:44:14 +0200 |
---|---|---|
committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-10-11 20:44:14 +0200 |
commit | e0650a2034026d8292196128d2f9decb50eeb0f3 (patch) | |
tree | 59c51153a985e7fb66e62c812250c6dacd69a82c /src/core/arm | |
parent | Core Timing: Correct Idle and remove lefting pragma (diff) | |
download | yuzu-e0650a2034026d8292196128d2f9decb50eeb0f3.tar yuzu-e0650a2034026d8292196128d2f9decb50eeb0f3.tar.gz yuzu-e0650a2034026d8292196128d2f9decb50eeb0f3.tar.bz2 yuzu-e0650a2034026d8292196128d2f9decb50eeb0f3.tar.lz yuzu-e0650a2034026d8292196128d2f9decb50eeb0f3.tar.xz yuzu-e0650a2034026d8292196128d2f9decb50eeb0f3.tar.zst yuzu-e0650a2034026d8292196128d2f9decb50eeb0f3.zip |
Diffstat (limited to 'src/core/arm')
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 2 | ||||
-rw-r--r-- | src/core/arm/unicorn/arm_unicorn.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 4d2e99ed0..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<s64>(parent.system.CoreTiming().GetDowncount(), 0LL); + return std::max(parent.system.CoreTiming().GetDowncount(), s64{0}); } u64 GetCNTPCT() override { return Timing::CpuCyclesToClockCycles(parent.system.CoreTiming().GetTicks()); diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp index 3f91b06d4..d4f41bfc1 100644 --- a/src/core/arm/unicorn/arm_unicorn.cpp +++ b/src/core/arm/unicorn/arm_unicorn.cpp @@ -156,7 +156,7 @@ void ARM_Unicorn::Run() { if (GDBStub::IsServerEnabled()) { ExecuteInstructions(std::max(4000000, 0)); } else { - ExecuteInstructions(std::max<s64>(system.CoreTiming().GetDowncount(), 0LL)); + ExecuteInstructions(std::max(system.CoreTiming().GetDowncount(), s64{0})); } } |