koffi 2.16.0-beta.2 → 2.16.1

package/src/koffi/src/{abi/arm64_asm.S → abi_arm64_asm.S}

@@ -112,7 +112,9 @@ SYMBOL(ForwardCallXDDDD):
 # ----------------------------
 
 .global SYMBOL(RelayCallback)
-.global SYMBOL(CallSwitchStack)
+.global SYMBOL(SwitchAndRelay)
+.global SYMBOL(RelayDirect)
+.global SYMBOL(TrampolineEnd)
 
 # First, make a copy of the argument registers.
 # Then call the C function RelayCallback with the following arguments:
@@ -122,6 +124,13 @@ SYMBOL(ForwardCallXDDDD):
 .macro trampoline id
     .cfi_startproc
     hint #34
+    mov x9, \id
+    b RelayTrampoline
+    .cfi_endproc
+.endm
+
+RelayTrampoline:
+    .cfi_startproc
     stp x29, x30, [sp, -16]!
     .cfi_def_cfa sp, 16
     .cfi_offset 29, 16
@@ -137,10 +146,8 @@ SYMBOL(ForwardCallXDDDD):
     stp d2, d3, [sp, 88]
     stp d4, d5, [sp, 104]
     stp d6, d7, [sp, 120]
-    mov x0, \id
+    mov x0, x9
     mov x1, sp
-    add x2, sp, #208
-    add x3, sp, #136
     bl SYMBOL(RelayCallback)
     ldp x0, x1, [sp, 136]
     ldp d0, d1, [sp, 152]
@@ -153,14 +160,13 @@ SYMBOL(ForwardCallXDDDD):
     .cfi_restore 29
     ret
     .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 (x0, x1, x2) are passed through untouched.
-SYMBOL(CallSwitchStack):
+SYMBOL(SwitchAndRelay):
     .cfi_startproc
     hint #34
     stp x29, x30, [sp, -16]!
@@ -173,7 +179,7 @@ SYMBOL(CallSwitchStack):
     and x9, x9, #-16
     str x9, [x4, 8]
     mov sp, x3
-    blr x5
+    bl SYMBOL(RelayDirect)
     mov sp, x29
     .cfi_def_cfa sp, 16
     ldp x29, x30, [sp], 16
@@ -183,7 +189,7 @@ SYMBOL(CallSwitchStack):
     ret
     .cfi_endproc
 
-# Trampolines
-# ----------------------------
+#include "gnu.inc"
 
-#include "../trampolines/gnu.inc"
+SYMBOL(TrampolineEnd):
+    ret

package/src/koffi/src/{abi/arm64_asm.asm → abi_arm64_asm.asm}

@@ -106,7 +106,10 @@ ForwardCallXDDDD PROC
 
     EXPORT RelayCallback
     EXTERN RelayCallback
-    EXPORT CallSwitchStack
+    EXPORT SwitchAndRelay
+    EXPORT RelayDirect
+    EXTERN RelayDirect
+    EXPORT TrampolineEnd
 
     ; First, make a copy of the argument registers.
     ; Then call the C function RelayCallback with the following arguments:
@@ -116,6 +119,11 @@ ForwardCallXDDDD PROC
     MACRO
     trampoline $ID
 
+    mov x9, $ID
+    b RelayTrampoline
+    MEND
+
+RelayTrampoline PROC
     stp x29, x30, [sp, -16]!
     sub sp, sp, #192
     stp x0, x1, [sp, 0]
@@ -127,10 +135,8 @@ ForwardCallXDDDD PROC
     stp d2, d3, [sp, 88]
     stp d4, d5, [sp, 104]
     stp d6, d7, [sp, 120]
-    mov x0, $ID
+    mov x0, x9
     mov x1, sp
-    add x2, sp, #208
-    add x3, sp, #136
     bl RelayCallback
     ldp x0, x1, [sp, 136]
     ldp d0, d1, [sp, 152]
@@ -138,14 +144,14 @@ ForwardCallXDDDD PROC
     add sp, sp, #192
     ldp x29, x30, [sp], 16
     ret
-    MEND
+    ENDP
 
 ; 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 (x0, x1, x2) are passed through untouched.
-CallSwitchStack PROC
+SwitchAndRelay PROC
     stp x29, x30, [sp, -16]!
     mov x29, sp
     ldr x9, [x4, 0]
@@ -153,15 +159,16 @@ CallSwitchStack PROC
     and x9, x9, #-16
     str x9, [x4, 8]
     mov sp, x3
-    blr x5
+    bl RelayDirect
     mov sp, x29
     ldp x29, x30, [sp], 16
     ret
     ENDP
 
-; Trampolines
-; ----------------------------
+    INCLUDE armasm.inc
 
-    INCLUDE ../trampolines/armasm.inc
+TrampolineEnd PROC
+    ret
+    ENDP
 
     END

package/src/koffi/src/{abi/loong64_asm.S → abi_loong64_asm.S}

@@ -129,7 +129,9 @@ ForwardCallXDD:
 # ----------------------------
 
 .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:
@@ -137,6 +139,12 @@ ForwardCallXDD:
 # 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
+    li.d $t0, \id
+    b RelayTrampoline
+    .balign 16
+.endm
+
+RelayTrampoline:
     addi.d $sp, $sp, -176
     st.d $ra, $sp, 0
     st.d $a0, $sp, 8
@@ -155,10 +163,8 @@ ForwardCallXDD:
     fst.d $fa5, $sp, 112
     fst.d $fa6, $sp, 120
     fst.d $fa7, $sp, 128
-    li.d $a0, \id
+    move $a0, $t0
     addi.d $a1, $sp, 8
-    addi.d $a2, $sp, 176
-    addi.d $a3, $sp, 136
     bl RelayCallback
     ld.d $ra, $sp, 0
     ld.d $a0, $sp, 136
@@ -167,14 +173,13 @@ ForwardCallXDD:
     fld.d $fa1, $sp, 160
     addi.d $sp, $sp, 176
     jr $ra
-.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 (a0, a1, a2) are passed through untouched.
-CallSwitchStack:
+SwitchAndRelay:
     addi.d $sp, $sp, -16
     st.d $ra, $sp, 0
     st.d $fp, $sp, 8
@@ -185,14 +190,15 @@ CallSwitchStack:
     and $t0, $t0, $t1
     st.d $t0, $a4, 8
     move $sp, $a3
-    jirl $ra, $a5, 0
+    bl RelayDirect
     move $sp, $fp
     ld.d $ra, $sp, 0
     ld.d $fp, $sp, 8
     addi.d $sp, $sp, 16
     jr $ra
 
-# Trampolines
-# ----------------------------
+.balign 16
+#include "gnu.inc"
 
-#include "../trampolines/gnu.inc"
+TrampolineEnd:
+    jr $ra