From 79189c7e3edfd2d628a927ea4be707eb0deeb4e3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 4 Jun 2019 19:41:48 -0400 Subject: core/core_timing_utils: Simplify overload set Removes unused overloads, simplifying the overall interface, deduplicating some code. --- src/core/core_timing_util.h | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'src/core/core_timing_util.h') diff --git a/src/core/core_timing_util.h b/src/core/core_timing_util.h index 679aa3123..c8749ff12 100644 --- a/src/core/core_timing_util.h +++ b/src/core/core_timing_util.h @@ -13,41 +13,10 @@ namespace Core::Timing { constexpr u64 BASE_CLOCK_RATE = 1019215872; // Switch clock speed is 1020MHz un/docked constexpr u64 CNTFREQ = 19200000; // Value from fusee. -inline s64 msToCycles(int ms) { - // since ms is int there is no way to overflow - return BASE_CLOCK_RATE * static_cast(ms) / 1000; -} - -inline s64 msToCycles(float ms) { - return static_cast(BASE_CLOCK_RATE * (0.001f) * ms); -} - -inline s64 msToCycles(double ms) { - return static_cast(BASE_CLOCK_RATE * (0.001) * ms); -} - -inline s64 usToCycles(float us) { - return static_cast(BASE_CLOCK_RATE * (0.000001f) * us); -} - -inline s64 usToCycles(int us) { - return (BASE_CLOCK_RATE * static_cast(us) / 1000000); -} - s64 usToCycles(s64 us); - s64 usToCycles(u64 us); -inline s64 nsToCycles(float ns) { - return static_cast(BASE_CLOCK_RATE * (0.000000001f) * ns); -} - -inline s64 nsToCycles(int ns) { - return BASE_CLOCK_RATE * static_cast(ns) / 1000000000; -} - s64 nsToCycles(s64 ns); - s64 nsToCycles(u64 ns); inline u64 cyclesToNs(s64 cycles) { -- cgit v1.2.3 From 42f5fd0ab32b117901d0cae228103811719606ff Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 4 Jun 2019 19:52:42 -0400 Subject: core/core_timing_util: Use std::chrono types for specifying time units Makes the interface more type-safe and consistent in terms of return values. --- src/core/core_timing_util.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/core/core_timing_util.h') diff --git a/src/core/core_timing_util.h b/src/core/core_timing_util.h index c8749ff12..1dcd38dd1 100644 --- a/src/core/core_timing_util.h +++ b/src/core/core_timing_util.h @@ -4,6 +4,7 @@ #pragma once +#include #include "common/common_types.h" namespace Core::Timing { @@ -13,22 +14,20 @@ namespace Core::Timing { constexpr u64 BASE_CLOCK_RATE = 1019215872; // Switch clock speed is 1020MHz un/docked constexpr u64 CNTFREQ = 19200000; // Value from fusee. -s64 usToCycles(s64 us); -s64 usToCycles(u64 us); +s64 msToCycles(std::chrono::milliseconds ms); +s64 usToCycles(std::chrono::microseconds us); +s64 nsToCycles(std::chrono::nanoseconds ns); -s64 nsToCycles(s64 ns); -s64 nsToCycles(u64 ns); - -inline u64 cyclesToNs(s64 cycles) { - return cycles * 1000000000 / BASE_CLOCK_RATE; +inline std::chrono::milliseconds cyclesToMs(s64 cycles) { + return std::chrono::milliseconds(cycles * 1000 / BASE_CLOCK_RATE); } -inline s64 cyclesToUs(s64 cycles) { - return cycles * 1000000 / BASE_CLOCK_RATE; +inline std::chrono::nanoseconds cyclesToNs(s64 cycles) { + return std::chrono::nanoseconds(cycles * 1000000000 / BASE_CLOCK_RATE); } -inline u64 cyclesToMs(s64 cycles) { - return cycles * 1000 / BASE_CLOCK_RATE; +inline std::chrono::microseconds cyclesToUs(s64 cycles) { + return std::chrono::microseconds(cycles * 1000000 / BASE_CLOCK_RATE); } u64 CpuCyclesToClockCycles(u64 ticks); -- cgit v1.2.3 From 2548661c08e006c6a56f976a4ef1c05653b3c6db Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 4 Jun 2019 20:11:04 -0400 Subject: core/core_timing_util: Amend casing of cyclesTo* functions Makes the casing consistent with all of our general function naming conventions. --- src/core/core_timing_util.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/core_timing_util.h') diff --git a/src/core/core_timing_util.h b/src/core/core_timing_util.h index 1dcd38dd1..cdd84d70f 100644 --- a/src/core/core_timing_util.h +++ b/src/core/core_timing_util.h @@ -18,15 +18,15 @@ s64 msToCycles(std::chrono::milliseconds ms); s64 usToCycles(std::chrono::microseconds us); s64 nsToCycles(std::chrono::nanoseconds ns); -inline std::chrono::milliseconds cyclesToMs(s64 cycles) { +inline std::chrono::milliseconds CyclesToMs(s64 cycles) { return std::chrono::milliseconds(cycles * 1000 / BASE_CLOCK_RATE); } -inline std::chrono::nanoseconds cyclesToNs(s64 cycles) { +inline std::chrono::nanoseconds CyclesToNs(s64 cycles) { return std::chrono::nanoseconds(cycles * 1000000000 / BASE_CLOCK_RATE); } -inline std::chrono::microseconds cyclesToUs(s64 cycles) { +inline std::chrono::microseconds CyclesToUs(s64 cycles) { return std::chrono::microseconds(cycles * 1000000 / BASE_CLOCK_RATE); } -- cgit v1.2.3