koffi 2.16.0-beta.2 → 2.16.0

package/src/koffi/src/{abi/arm32_asm.S → abi_arm32_asm.S}

@@ -91,7 +91,9 @@ ForwardCallXDDDD:
 # ----------------------------
 
 .global RelayCallback
-.global CallSwitchStack
+.global SwitchAndRelay
+.global RelayDirect
+.global TrampolineEnd
 
 # First, make a copy of the argument registers.
 # Then call the C function RelayCallback with the following arguments:
@@ -99,20 +101,24 @@ ForwardCallXDDDD:
 # arguments of this call, and a pointer to a struct that will contain the result registers.
 # After the call, simply load these registers from the output struct.
 .macro trampoline id
+    .cfi_startproc
+    mov r12, \id
+    b RelayTrampoline
+    .cfi_endproc
+.endm
+
+RelayTrampoline:
     .cfi_startproc
     push {fp, lr}
     .cfi_def_cfa sp, 8
     .cfi_offset 11, 4
     .cfi_offset 14, 8
-    sub sp, sp, #120
+    sub sp, sp, #40
+    stmdb sp!, {r0-r3}
+    vstmdb sp!, {d0-d7}
     .cfi_def_cfa sp, 128
-    mov r12, sp
-    vstmia r12!, {d0-d7}
-    stmia r12!, {r0-r3}
-    mov r0, \id
+    mov r0, r12
     mov r1, sp
-    add r2, sp, #128
-    mov r3, r12
     bl RelayCallback
     add sp, sp, #80
     ldmia sp!, {r0-r1}
@@ -124,14 +130,13 @@ ForwardCallXDDDD:
     .cfi_restore 14
     bx lr
     .cfi_endproc
-.endm
 
 # When a callback is relayed, Koffi will call into Node.js and V8 to execute Javascript.
 # The problem is that we're still running on the separate Koffi stack, and V8 will
 # probably misdetect this as a "stack overflow". We have to restore the old
 # stack pointer, call Node.js/V8 and go back to ours.
 # The first three parameters (r0, r1, r2) are passed through untouched.
-CallSwitchStack:
+SwitchAndRelay:
     .cfi_startproc
     push {fp, lr}
     .cfi_def_cfa sp, 8
@@ -145,9 +150,8 @@ CallSwitchStack:
     sub r5, sp, r5
     and r5, r5, #-16
     str r5, [r4, 4]
-    ldr r4, [sp, 20]
     mov sp, r3
-    blx r4
+    bl RelayDirect
     mov sp, fp
     .cfi_def_cfa sp, 16
     pop {r4, r5}
@@ -159,7 +163,7 @@ CallSwitchStack:
     bx lr
     .cfi_endproc
 
-# Trampolines
-# ----------------------------
+#include "gnu.inc"
 
-#include "../trampolines/gnu.inc"
+TrampolineEnd:
+    bx lr