From 2e461103790110a3deea6425709b1f7f937085ea Mon Sep 17 00:00:00 2001 From: Maide <34639600+Kelebek1@users.noreply.github.com> Date: Thu, 28 Jul 2022 00:47:06 +0100 Subject: Revert Coretiming PRs 8531 and 7454 (#8591) --- src/common/uint128.h | 5 ----- src/common/x64/native_clock.cpp | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'src/common') diff --git a/src/common/uint128.h b/src/common/uint128.h index 199d0f55e..f890ffec2 100644 --- a/src/common/uint128.h +++ b/src/common/uint128.h @@ -30,10 +30,6 @@ namespace Common { #else return _udiv128(r[1], r[0], d, &remainder); #endif -#else -#ifdef __SIZEOF_INT128__ - const auto product = static_cast(a) * static_cast(b); - return static_cast(product / d); #else const u64 diva = a / d; const u64 moda = a % d; @@ -41,7 +37,6 @@ namespace Common { const u64 modb = b % d; return diva * b + moda * divb + moda * modb / d; #endif -#endif } // This function multiplies 2 u64 values and produces a u128 value; diff --git a/src/common/x64/native_clock.cpp b/src/common/x64/native_clock.cpp index 6aaa8cdf9..8b08332ab 100644 --- a/src/common/x64/native_clock.cpp +++ b/src/common/x64/native_clock.cpp @@ -75,8 +75,8 @@ NativeClock::NativeClock(u64 emulated_cpu_frequency_, u64 emulated_clock_frequen } u64 NativeClock::GetRTSC() { - TimePoint current_time_point{}; TimePoint new_time_point{}; + TimePoint current_time_point{}; current_time_point.pack = Common::AtomicLoad128(time_point.pack.data()); do { -- cgit v1.2.3