summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-11-11 02:11:27 +0100
committerGitHub <noreply@github.com>2022-11-11 02:11:27 +0100
commitd05b183f2118a5e2c919c35023549f30201bdd7c (patch)
tree082cf6bb2e372c3233872b836fa96bdc0c25f279 /src/common
parentMerge pull request #9180 from Docteh/remove_stuff (diff)
parentInitial ARM64 support (diff)
downloadyuzu-d05b183f2118a5e2c919c35023549f30201bdd7c.tar
yuzu-d05b183f2118a5e2c919c35023549f30201bdd7c.tar.gz
yuzu-d05b183f2118a5e2c919c35023549f30201bdd7c.tar.bz2
yuzu-d05b183f2118a5e2c919c35023549f30201bdd7c.tar.lz
yuzu-d05b183f2118a5e2c919c35023549f30201bdd7c.tar.xz
yuzu-d05b183f2118a5e2c919c35023549f30201bdd7c.tar.zst
yuzu-d05b183f2118a5e2c919c35023549f30201bdd7c.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/common_funcs.h4
-rw-r--r--src/common/host_memory.cpp6
2 files changed, 9 insertions, 1 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index e1e2a90fc..0dad9338a 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -31,8 +31,10 @@
#ifndef _MSC_VER
-#ifdef ARCHITECTURE_x86_64
+#if defined(ARCHITECTURE_x86_64)
#define Crash() __asm__ __volatile__("int $3")
+#elif defined(ARCHITECTURE_arm64)
+#define Crash() __asm__ __volatile__("brk #0")
#else
#define Crash() exit(1)
#endif
diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp
index 7f9659612..909f6cf3f 100644
--- a/src/common/host_memory.cpp
+++ b/src/common/host_memory.cpp
@@ -359,6 +359,12 @@ public:
}
});
+ long page_size = sysconf(_SC_PAGESIZE);
+ if (page_size != 0x1000) {
+ LOG_CRITICAL(HW_Memory, "page size {:#x} is incompatible with 4K paging", page_size);
+ throw std::bad_alloc{};
+ }
+
// Backing memory initialization
#if defined(__FreeBSD__) && __FreeBSD__ < 13
// XXX Drop after FreeBSD 12.* reaches EOL on 2024-06-30