From fa07a0f3310858c7000762d10778e42ace256a40 Mon Sep 17 00:00:00 2001
From: ptitSeb <sebastien.chev@gmail.com>
Date: Wed, 23 Mar 2022 10:23:00 +0100
Subject: Added a better way to select 16K pages, and added M1 paragraph in
 COMPILE.md

---
 src/custommem.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/custommem.c b/src/custommem.c
index ede78b6f..c11e1557 100644
--- a/src/custommem.c
+++ b/src/custommem.c
@@ -42,7 +42,7 @@ static uintptr_t*          box64_jmptbldefault1[1<<JMPTABL_SHIFT];
 static uintptr_t           box64_jmptbldefault0[1<<JMPTABL_SHIFT];
 #endif
 static pthread_mutex_t     mutex_prot;
-#if defined(LA464) || defined(M1)
+#if defined(PAGE16K)
 #define MEMPROT_SHIFT 14
 #define MEMPROT_SHIFT2 (16+14)
 #else
@@ -1236,6 +1236,11 @@ void init_custommem_helper(box64context_t* ctx)
     mapmem->begin = 0x0;
     mapmem->end = (uintptr_t)LOWEST - 1;
     loadProtectionFromMap();
+    // check if PageSize is correctly defined
+    if(box64_pagesize != (1<<MEMPROT_SHIFT)) {
+        printf_log(LOG_NONE, "Error: PageSize configuation is wrong: configured with %d, but got %d\n", 1<<MEMPROT_SHIFT, box64_pagesize);
+        exit(-1);   // abort or let it continue?
+    }
 }
 
 void fini_custommem_helper(box64context_t *ctx)
-- 
cgit 1.4.1