1 files changed, 23 insertions, 19 deletions

diff --git a/src/core/core_timing_util.cpp b/src/core/core_timing_util.cpp
index 8ce8e602e..5cd450714 100644
--- a/src/core/core_timing_util.cpp
+++ b/src/core/core_timing_util.cpp
@@ -21,9 +21,9 @@ s64 msToCycles(std::chrono::milliseconds ms) {
     }
     if (static_cast<u64>(ms.count()) > MAX_VALUE_TO_MULTIPLY) {
         LOG_DEBUG(Core_Timing, "Time very big, do rounding");
-        return Hardware::BASE_CLOCK_RATE * (ms.count() / 1000);
+        return static_cast<s64>(Hardware::BASE_CLOCK_RATE * static_cast<u64>(ms.count() / 1000));
     }
-    return (Hardware::BASE_CLOCK_RATE * ms.count()) / 1000;
+    return static_cast<s64>((Hardware::BASE_CLOCK_RATE * static_cast<u64>(ms.count())) / 1000);
 }
 
 s64 usToCycles(std::chrono::microseconds us) {
@@ -33,51 +33,55 @@ s64 usToCycles(std::chrono::microseconds us) {
     }
     if (static_cast<u64>(us.count()) > MAX_VALUE_TO_MULTIPLY) {
         LOG_DEBUG(Core_Timing, "Time very big, do rounding");
-        return Hardware::BASE_CLOCK_RATE * (us.count() / 1000000);
+        return static_cast<s64>(Hardware::BASE_CLOCK_RATE * static_cast<u64>(us.count() / 1000000));
     }
-    return (Hardware::BASE_CLOCK_RATE * us.count()) / 1000000;
+    return static_cast<s64>((Hardware::BASE_CLOCK_RATE * static_cast<u64>(us.count())) / 1000000);
 }
 
 s64 nsToCycles(std::chrono::nanoseconds ns) {
-    const u128 temporal = Common::Multiply64Into128(ns.count(), Hardware::BASE_CLOCK_RATE);
-    return Common::Divide128On32(temporal, static_cast<u32>(1000000000)).first;
+    const u128 temp =
+        Common::Multiply64Into128(static_cast<u64>(ns.count()), Hardware::BASE_CLOCK_RATE);
+    return static_cast<s64>(Common::Divide128On32(temp, static_cast<u32>(1000000000)).first);
 }
 
-u64 msToClockCycles(std::chrono::milliseconds ns) {
-    const u128 temp = Common::Multiply64Into128(ns.count(), Hardware::CNTFREQ);
+u64 msToClockCycles(std::chrono::milliseconds ms) {
+    const auto count = static_cast<u64>(ms.count());
+    const u128 temp = Common::Multiply64Into128(count, Hardware::CNTFREQ);
     return Common::Divide128On32(temp, 1000).first;
 }
 
-u64 usToClockCycles(std::chrono::microseconds ns) {
-    const u128 temp = Common::Multiply64Into128(ns.count(), Hardware::CNTFREQ);
+u64 usToClockCycles(std::chrono::microseconds us) {
+    const auto count = static_cast<u64>(us.count());
+    const u128 temp = Common::Multiply64Into128(count, Hardware::CNTFREQ);
     return Common::Divide128On32(temp, 1000000).first;
 }
 
 u64 nsToClockCycles(std::chrono::nanoseconds ns) {
-    const u128 temp = Common::Multiply64Into128(ns.count(), Hardware::CNTFREQ);
+    const auto count = static_cast<u64>(ns.count());
+    const u128 temp = Common::Multiply64Into128(count, Hardware::CNTFREQ);
     return Common::Divide128On32(temp, 1000000000).first;
 }
 
 u64 CpuCyclesToClockCycles(u64 ticks) {
-    const u128 temporal = Common::Multiply64Into128(ticks, Hardware::CNTFREQ);
-    return Common::Divide128On32(temporal, static_cast<u32>(Hardware::BASE_CLOCK_RATE)).first;
+    const u128 temp = Common::Multiply64Into128(ticks, Hardware::CNTFREQ);
+    return Common::Divide128On32(temp, static_cast<u32>(Hardware::BASE_CLOCK_RATE)).first;
 }
 
 std::chrono::milliseconds CyclesToMs(s64 cycles) {
-    const u128 temporal = Common::Multiply64Into128(cycles, 1000);
-    u64 ms = Common::Divide128On32(temporal, static_cast<u32>(Hardware::BASE_CLOCK_RATE)).first;
+    const u128 temp = Common::Multiply64Into128(static_cast<u64>(cycles), 1000);
+    const u64 ms = Common::Divide128On32(temp, static_cast<u32>(Hardware::BASE_CLOCK_RATE)).first;
     return std::chrono::milliseconds(ms);
 }
 
 std::chrono::nanoseconds CyclesToNs(s64 cycles) {
-    const u128 temporal = Common::Multiply64Into128(cycles, 1000000000);
-    u64 ns = Common::Divide128On32(temporal, static_cast<u32>(Hardware::BASE_CLOCK_RATE)).first;
+    const u128 temp = Common::Multiply64Into128(static_cast<u64>(cycles), 1000000000);
+    const u64 ns = Common::Divide128On32(temp, static_cast<u32>(Hardware::BASE_CLOCK_RATE)).first;
     return std::chrono::nanoseconds(ns);
 }
 
 std::chrono::microseconds CyclesToUs(s64 cycles) {
-    const u128 temporal = Common::Multiply64Into128(cycles, 1000000);
-    u64 us = Common::Divide128On32(temporal, static_cast<u32>(Hardware::BASE_CLOCK_RATE)).first;
+    const u128 temp = Common::Multiply64Into128(static_cast<u64>(cycles), 1000000);
+    const u64 us = Common::Divide128On32(temp, static_cast<u32>(Hardware::BASE_CLOCK_RATE)).first;
     return std::chrono::microseconds(us);
 }