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.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 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 c0f08cddb..4d73a0d89 100644 --- a/src/core/core_timing_util.cpp +++ b/src/core/core_timing_util.cpp @@ -26,15 +26,7 @@ s64 usToCycles(s64 us) { } s64 usToCycles(u64 us) { - if (us / 1000000 > MAX_VALUE_TO_MULTIPLY) { - LOG_ERROR(Core_Timing, "Integer overflow, use max value"); - return std::numeric_limits::max(); - } - if (us > MAX_VALUE_TO_MULTIPLY) { - LOG_DEBUG(Core_Timing, "Time very big, do rounding"); - return BASE_CLOCK_RATE * static_cast(us / 1000000); - } - return (BASE_CLOCK_RATE * static_cast(us)) / 1000000; + return usToCycles(static_cast(us)); } s64 nsToCycles(s64 ns) { @@ -50,15 +42,7 @@ s64 nsToCycles(s64 ns) { } s64 nsToCycles(u64 ns) { - if (ns / 1000000000 > MAX_VALUE_TO_MULTIPLY) { - LOG_ERROR(Core_Timing, "Integer overflow, use max value"); - return std::numeric_limits::max(); - } - if (ns > MAX_VALUE_TO_MULTIPLY) { - LOG_DEBUG(Core_Timing, "Time very big, do rounding"); - return BASE_CLOCK_RATE * (static_cast(ns) / 1000000000); - } - return (BASE_CLOCK_RATE * static_cast(ns)) / 1000000000; + return nsToCycles(static_cast(ns)); } u64 CpuCyclesToClockCycles(u64 ticks) { -- cgit v1.2.3