feat(darwin): Add support for arm64

Author: RichieSams

third_party/boost_context/CMakeLists.txt

@@ -69,7 +69,10 @@ if (WIN32)
 		set(CONTEXT_ASM "gas.S")
 	endif()
 elseif(APPLE)
-	set(CONTEXT_OS  "sysv")
+	# arm requires aapcs. So we have to check if arm already set the calling convention
+	if (NOT CONTEXT_OS)
+		set(CONTEXT_OS  "sysv")
+	endif()
 	set(CONTEXT_ABI "macho")
 	set(CONTEXT_ASM "gas.S")
 elseif(UNIX)

…odified_yet/jump_arm64_aapcs_macho_gas.S …context/asm/jump_arm64_aapcs_macho_gas.Sthird_party/boost_context/asm/not_modified_yet/jump_arm64_aapcs_macho_gas.S renamed to third_party/boost_context/asm/jump_arm64_aapcs_macho_gas.S third_party/boost_context/asm/not_modified_yet/jump_arm64_aapcs_macho_gas.S renamed to third_party/boost_context/asm/jump_arm64_aapcs_macho_gas.S

@@ -1,5 +1,6 @@
 /*
          Copyright Edward Nevill + Oliver Kowalke 2015
+             Copyright Adrian Astley 2025.
    Distributed under the Boost Software License, Version 1.0.
       (See accompanying file LICENSE_1_0.txt or copy at
           http://www.boost.org/LICENSE_1_0.txt)
@@ -42,9 +43,9 @@
  *  |    x27    |    x28    |    FP     |     LR    |  *
  *  -------------------------------------------------  *
  *  -------------------------------------------------  *
- *  |  40 |  41 |  42 | 43  |           |           |  *
+ *  |  40 |  41 |  42 | 43  |  444|  45 |  46 | 47  |  *
  *  -------------------------------------------------  *
- *  | 0xa0| 0xa4| 0xa8| 0xac|           |           |  *
+ *  | 0xa0| 0xa4| 0xa8| 0xac| 0xb0| 0xb4| 0xb8| 0xbc|  *
  *  -------------------------------------------------  *
  *  |     PC    |   align   |           |           |  *
  *  -------------------------------------------------  *
@@ -55,55 +56,55 @@
 .globl _jump_fcontext
 .balign 16
 _jump_fcontext:
-    ; prepare stack for GP + FPU
+    # prepare stack for GP + FPU
     sub  sp, sp, #0xb0
 
-    ; save d8 - d15
+    # save d8 - d15
     stp  d8,  d9,  [sp, #0x00]
     stp  d10, d11, [sp, #0x10]
     stp  d12, d13, [sp, #0x20]
     stp  d14, d15, [sp, #0x30]
 
-    ; save x19-x30
+    # save x19-x30
     stp  x19, x20, [sp, #0x40]
     stp  x21, x22, [sp, #0x50]
     stp  x23, x24, [sp, #0x60]
     stp  x25, x26, [sp, #0x70]
     stp  x27, x28, [sp, #0x80]
-    stp  fp,  lr,  [sp, #0x90]
+    stp  x29, x30, [sp, #0x90]
 
-    ; save LR as PC
-    str  lr, [sp, #0xa0]
+    # save LR as PC
+    str  x30, [sp, #0xa0]
 
-    ; store RSP (pointing to context-data) in X0
-    mov  x4, sp
+    # store RSP (pointing to context-data) at address pointed at by X0
+	# STR doesn't allow us to use sp as the base register, so we have to mov it to x4 first
+	mov x4, sp    
+	str x4, [x0, 0]
 
-    ; restore RSP (pointing to context-data) from X1
-    mov  sp, x0
+    # restore RSP (pointing to context-data) from X1
+    mov  sp, x1
 
-    ; load d8 - d15
+    # load d8 - d15
     ldp  d8,  d9,  [sp, #0x00]
     ldp  d10, d11, [sp, #0x10]
     ldp  d12, d13, [sp, #0x20]
     ldp  d14, d15, [sp, #0x30]
 
-    ; load x19-x30
+    # load x19-x30
     ldp  x19, x20, [sp, #0x40]
     ldp  x21, x22, [sp, #0x50]
     ldp  x23, x24, [sp, #0x60]
     ldp  x25, x26, [sp, #0x70]
     ldp  x27, x28, [sp, #0x80]
-    ldp  fp,  lr,  [sp, #0x90]
+    ldp  x29, x30, [sp, #0x90]
 
-    ; return transfer_t from jump
-    ; pass transfer_t as first arg in context function
-    ; X0 == FCTX, X1 == DATA
-    mov x0, x4
+    # pass data (third arg passed to jump_fcontext) as first arg passed to context function
+    mov x0, x2
 
-    ; load pc
+    # load pc
     ldr  x4, [sp, #0xa0]
 
-    ; restore stack from GP + FPU
+    # restore stack from GP + FP
     add  sp, sp, #0xb0
 
     ret x4

…odified_yet/make_arm64_aapcs_macho_gas.S …context/asm/make_arm64_aapcs_macho_gas.Sthird_party/boost_context/asm/not_modified_yet/make_arm64_aapcs_macho_gas.S renamed to third_party/boost_context/asm/make_arm64_aapcs_macho_gas.S third_party/boost_context/asm/not_modified_yet/make_arm64_aapcs_macho_gas.S renamed to third_party/boost_context/asm/make_arm64_aapcs_macho_gas.S

@@ -1,5 +1,6 @@
 /*
-            Copyright Edward Nevill + Oliver Kowalke 2015
+        Copyright Edward Nevill + Oliver Kowalke 2015
+                Copyright Adrian Astley 2025.
    Distributed under the Boost Software License, Version 1.0.
       (See accompanying file LICENSE_1_0.txt or copy at
           http://www.boost.org/LICENSE_1_0.txt)
@@ -56,33 +57,26 @@
 .balign 16
 
 _make_fcontext:
-    ; shift address in x0 (allocated stack) to lower 16 byte boundary
+    # shift address in x0 (allocated stack) to lower 16 byte boundary
     and x0, x0, ~0xF
 
-    ; reserve space for context-data on context-stack
+    # reserve space for context-data on context-stack
     sub  x0, x0, #0xb0
 
-    ; third arg of make_fcontext() == address of context-function
-    ; store address as a PC to jump in
+    # third arg of make_fcontext() == address of context-function
+    # store address as a PC to jump in
     str  x2, [x0, #0xa0]
 
-    ; compute abs address of label finish
-    ; 0x0c = 3 instructions * size (4) before label 'finish'
-
-    ; TODO: Numeric offset since llvm still does not support labels in ADR. Fix:
-    ;       http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20140407/212336.html
-    adr  x1, 0x0c
-
-    ; save address of finish as return-address for context-function
-    ; will be entered after context-function returns (LR register)
+    # save address of finish as return-address for context-function
+    # will be entered after context-function returns (LR register)
+    adr  x1, finish
     str  x1, [x0, #0x98]
 
-    ret  lr ; return pointer to context-data (x0)
+    ret  x30 // return pointer to context-data (x0)
 
 finish:
-    ; exit code is zero
+    # exit code is zero
     mov  x0, #0
-    ; exit application
-    bl  __exit
-
+    # exit application
+    bl  _exit