From 5b7ec71fb7cc81ea0f98f019cb0dac0b6bcb2fa2 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Fri, 15 Feb 2019 13:15:28 -0400 Subject: Correct CNTPCT to use Clock Cycles instead of Cpu Cycles. --- src/core/core_timing_util.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/core/core_timing_util.cpp') diff --git a/src/core/core_timing_util.cpp b/src/core/core_timing_util.cpp index 88ff70233..8fc92560a 100644 --- a/src/core/core_timing_util.cpp +++ b/src/core/core_timing_util.cpp @@ -60,4 +60,11 @@ s64 nsToCycles(u64 ns) { return (BASE_CLOCK_RATE * static_cast(ns)) / 1000000000; } +u64 CpuCyclesToClockCycles(u64 ticks) { + u64 result = ticks; + result *= CNTFREQ; + result /= BASE_CLOCK_RATE; + return static_cast(result); +} + } // namespace Core::Timing -- cgit v1.2.3 From ecccfe033777d6ae7d29bcf0cfc30412f7d3be24 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Fri, 15 Feb 2019 20:04:11 -0400 Subject: Use u128 on Clock Cycles calculation. --- src/core/core_timing_util.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/core_timing_util.cpp') diff --git a/src/core/core_timing_util.cpp b/src/core/core_timing_util.cpp index 8fc92560a..aab4aa697 100644 --- a/src/core/core_timing_util.cpp +++ b/src/core/core_timing_util.cpp @@ -7,6 +7,7 @@ #include #include #include "common/logging/log.h" +#include "common/uint128.h" namespace Core::Timing { @@ -61,10 +62,9 @@ s64 nsToCycles(u64 ns) { } u64 CpuCyclesToClockCycles(u64 ticks) { - u64 result = ticks; - result *= CNTFREQ; - result /= BASE_CLOCK_RATE; - return static_cast(result); + u128 temporal = Common::Multiply64Into128(ticks, CNTFREQ); + std::pair result = Common::Divide128On64(temporal, BASE_CLOCK_RATE); + return result.first; } } // namespace Core::Timing -- cgit v1.2.3 From a8d4927e29bb1acbf5f3267f368801847acd4222 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sat, 16 Feb 2019 16:52:24 -0400 Subject: Corrections, documenting and fixes. --- src/core/core_timing_util.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/core/core_timing_util.cpp') diff --git a/src/core/core_timing_util.cpp b/src/core/core_timing_util.cpp index aab4aa697..7942f30d6 100644 --- a/src/core/core_timing_util.cpp +++ b/src/core/core_timing_util.cpp @@ -62,9 +62,8 @@ s64 nsToCycles(u64 ns) { } u64 CpuCyclesToClockCycles(u64 ticks) { - u128 temporal = Common::Multiply64Into128(ticks, CNTFREQ); - std::pair result = Common::Divide128On64(temporal, BASE_CLOCK_RATE); - return result.first; + const u128 temporal = Common::Multiply64Into128(ticks, CNTFREQ); + return Common::Divide128On32(temporal, static_cast(BASE_CLOCK_RATE)).first; } } // namespace Core::Timing -- cgit v1.2.3