src/common/wall_clock.cpp

@@ -8,9 +8,6 @@
 #include "common/uint128.h"
 #include "common/wall_clock.h"
 
-#ifdef __ANDROID__
-#include <sys/system_properties.h>
-#endif
 #ifdef ARCHITECTURE_x86_64
 #include "common/x64/cpu_detect.h"
 #include "common/x64/rdtsc.h"
@@ -139,12 +136,10 @@ s64 WallClock::GetGPUTick() const {
 
 s64 WallClock::GetUptime() const {
     s64 cntvct_el0 = 0;
-    asm volatile(
-        "dsb ish\n\t"
-        "mrs %[cntvct_el0], cntvct_el0\n\t"
-        "dsb ish\n\t"
-        : [cntvct_el0] "=r"(cntvct_el0)
-    );
+    asm volatile("dsb ish\n\t"
+                 "mrs %[cntvct_el0], cntvct_el0\n\t"
+                 "dsb ish\n\t"
+                 : [cntvct_el0] "=r"(cntvct_el0));
     return cntvct_el0;
 }
 

src/core/arm/nce/patcher.cpp

@@ -3,7 +3,7 @@
 
 #include <numeric>
 #include <bit>
-#include "common/wall_clock.h"
+#include "common/arm64/native_clock.h"
 #include "common/alignment.h"
 #include "common/literals.h"
 #include "core/arm/nce/arm_nce.h"
@@ -578,11 +578,7 @@ void Patcher::WriteMsrHandler(ModuleDestLabel module_dest, oaknut::XReg src_reg,
 }
 
 void Patcher::WriteCntpctHandler(ModuleDestLabel module_dest, oaknut::XReg dest_reg, oaknut::VectorCodeGenerator& cg) {
-#if defined(HAS_NCE)
-    static Common::WallClock clock(false, 1);
-#else
-    static Common::WallClock clock(true, 1);
-#endif
+    static Common::WallClock clock{};
     const auto factor = clock.GetGuestCNTFRQFactor();
     const auto raw_factor = std::bit_cast<std::array<u64, 2>>(factor);