diff --git a/src/core/core_timing_util.cpp b/src/core/core_timing_util.cpp index c0f08cddb5..4d73a0d898 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) { diff --git a/src/core/core_timing_util.h b/src/core/core_timing_util.h index 679aa31231..c8749ff12a 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) {