Address some review comments

3 files changed, 6 insertions, 3 deletions

diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp
index 8a869e558..f14077750 100644
--- a/src/common/host_memory.cpp
+++ b/src/common/host_memory.cpp
@@ -409,11 +409,14 @@ static void* ChooseVirtualBase(size_t virtual_size) {
 
     return MAP_FAILED;
 }
+
 #else
+
 static void* ChooseVirtualBase(size_t virtual_size) {
     return mmap(nullptr, virtual_size, PROT_READ | PROT_WRITE,
                 MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
 }
+
 #endif
 
 class HostMemory::Impl {
diff --git a/src/common/settings.h b/src/common/settings.h
index 648e0be0d..fea639ee3 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -181,7 +181,7 @@ struct Values {
 
     // Cpu
     SwitchableSetting<CpuBackend, true> cpu_backend{
-        linkage,         CpuBackend::Nce, CpuBackend::Dynarmic,
+        linkage,         CpuBackend::Dynarmic, CpuBackend::Dynarmic,
 #ifdef ARCHITECTURE_arm64
         CpuBackend::Nce,
 #else
diff --git a/src/common/signal_chain.h b/src/common/signal_chain.h
index e3bfe6882..8d06a1bd1 100644
--- a/src/common/signal_chain.h
+++ b/src/common/signal_chain.h
@@ -10,8 +10,8 @@
 namespace Common {
 
 // Android's ART overrides sigaction with its own wrapper. This is problematic for SIGSEGV
-// in particular, because ARTs handler access TPIDR_EL0, so this extracts the libc version
-// and calls it directly.
+// in particular, because ART's handler accesses tpidr_el0, which conflicts with NCE.
+// This extracts the libc symbol and calls it directly.
 int SigAction(int signum, const struct sigaction* act, struct sigaction* oldact);
 
 } // namespace Common