Merge branch 'factor:master' into feature-vm-prepare-image-reserved-fields

[factor.git] / vm / contexts.hpp

diff --git a/vm/contexts.hpp b/vm/contexts.hpp
index 945b9cda7d50ae9d5fd1f9ecbb3bb36aa25be61f..8b8f38483e7f2641595ad715153d700b9e097d6a 100644 (file)
--- a/vm/contexts.hpp
+++ b/vm/contexts.hpp
@@ -1,3 +1,9 @@
+#ifdef FACTOR_ARM64
+#define ARM64_ALIGN alignas(16)
+#else
+#define ARM64_ALIGN
+#endif
+
 namespace factor {
 
 // Context object count and identifiers must be kept in sync with:
@@ -23,7 +29,7 @@ struct context {
 
   // Factor callstack pointers
   cell callstack_top;
-  cell callstack_bottom;
+  ARM64_ALIGN cell callstack_bottom;
 
   // current datastack top pointer
   cell datastack;