koffi 2.15.1 → 2.16.0-beta.1

package/src/koffi/src/abi_arm64_asm.S

@@ -114,43 +114,12 @@ SYMBOL(ForwardCallXDDDD):
 .global SYMBOL(RelayCallback)
 .global SYMBOL(CallSwitchStack)
 
-# First, make a copy of the GPR argument registers (x0 to x7).
+# First, make a copy of the argument registers.
 # Then call the C function RelayCallback with the following arguments:
 # static trampoline ID, a pointer to the saved GPR array, a pointer to the stack
 # 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
-    hint #34
-    stp x29, x30, [sp, -16]!
-    .cfi_def_cfa sp, 16
-    .cfi_offset 29, 16
-    .cfi_offset 30, 8
-    sub sp, sp, #192
-    .cfi_def_cfa sp, 208
-    stp x0, x1, [sp, 0]
-    stp x2, x3, [sp, 16]
-    stp x4, x5, [sp, 32]
-    stp x6, x7, [sp, 48]
-    str x8, [sp, 64]
-    mov x0, \id
-    mov x1, sp
-    add x2, sp, #208
-    add x3, sp, #136
-    bl SYMBOL(RelayCallback)
-    ldp x0, x1, [sp, 136]
-    add sp, sp, #192
-    .cfi_def_cfa sp, 16
-    ldp x29, x30, [sp], 16
-    .cfi_def_cfa sp, 0
-    .cfi_restore 30
-    .cfi_restore 29
-    ret
-    .cfi_endproc
-.endm
-
-# Same thing, but also forwards the floating-point argument registers and loads them at the end.
-.macro trampoline_vec id
     .cfi_startproc
     hint #34
     stp x29, x30, [sp, -16]!

package/src/koffi/src/abi_arm64_asm.asm

@@ -108,7 +108,7 @@ ForwardCallXDDDD PROC
     EXTERN RelayCallback
     EXPORT CallSwitchStack
 
-    ; First, make a copy of the GPR argument registers (x0 to x7).
+    ; First, make a copy of the argument registers.
     ; Then call the C function RelayCallback with the following arguments:
     ; static trampoline ID, a pointer to the saved GPR array, a pointer to the stack
     ; arguments of this call, and a pointer to a struct that will contain the result registers.
@@ -116,28 +116,6 @@ ForwardCallXDDDD PROC
     MACRO
     trampoline $ID
 
-    stp x29, x30, [sp, -16]!
-    sub sp, sp, #192
-    stp x0, x1, [sp, 0]
-    stp x2, x3, [sp, 16]
-    stp x4, x5, [sp, 32]
-    stp x6, x7, [sp, 48]
-    str x8, [sp, 64]
-    mov x0, $ID
-    mov x1, sp
-    add x2, sp, #208
-    add x3, sp, #136
-    bl RelayCallback
-    ldp x0, x1, [sp, 136]
-    add sp, sp, #192
-    ldp x29, x30, [sp], 16
-    ret
-    MEND
-
-    ; Same thing, but also forwards the floating-point argument registers and loads them at the end.
-    MACRO
-    trampoline_vec $ID
-
     stp x29, x30, [sp, -16]!
     sub sp, sp, #192
     stp x0, x1, [sp, 0]

package/src/koffi/src/abi_loong64_asm.S

@@ -131,36 +131,12 @@ ForwardCallXDD:
 .global RelayCallback
 .global CallSwitchStack
 
-# First, make a copy of the GPR argument registers (a0 to a7).
+# First, make a copy of the argument registers.
 # Then call the C function RelayCallback with the following arguments:
 # static trampoline ID, a pointer to the saved GPR array, a pointer to the stack
 # 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
-    addi.d $sp, $sp, -176
-    st.d $ra, $sp, 0
-    st.d $a0, $sp, 8
-    st.d $a1, $sp, 16
-    st.d $a2, $sp, 24
-    st.d $a3, $sp, 32
-    st.d $a4, $sp, 40
-    st.d $a5, $sp, 48
-    st.d $a6, $sp, 56
-    st.d $a7, $sp, 64
-    li.d $a0, \id
-    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
-    ld.d $a1, $sp, 144
-    addi.d $sp, $sp, 176
-    jr $ra
-.endm
-
-# Same thing, but also forwards the floating-point argument registers and loads them at the end.
-.macro trampoline_vec id
     addi.d $sp, $sp, -176
     st.d $ra, $sp, 0
     st.d $a0, $sp, 8