koffi 2.16.1 → 3.0.0-alpha.2

package/src/koffi/src/{abi_x86_asm.S → abi/x86_asm.S}

@@ -1,17 +1,21 @@
 # SPDX-License-Identifier: MIT
 # SPDX-FileCopyrightText: 2025 Niels Martignène <niels.martignene@protonmail.com>
 
-#define SYMBOL(Symbol) Symbol
+#if defined(_WIN32)
+    #define SYMBOL(Symbol) _ ## Symbol
+#else
+    #define SYMBOL(Symbol) Symbol
+#endif
 
 # Forward
 # ----------------------------
 
-.global ForwardCallG
-.global ForwardCallF
-.global ForwardCallD
-.global ForwardCallRG
-.global ForwardCallRF
-.global ForwardCallRD
+.global SYMBOL(ForwardCallG)
+.global SYMBOL(ForwardCallF)
+.global SYMBOL(ForwardCallD)
+.global SYMBOL(ForwardCallGR)
+.global SYMBOL(ForwardCallFR)
+.global SYMBOL(ForwardCallDR)
 
 #define ENDBR32 .byte 0xf3, 0x0f, 0x1e, 0xfb
 
@@ -50,29 +54,29 @@
     .cfi_endproc
 .endm
 
-ForwardCallG:
+SYMBOL(ForwardCallG):
     prologue
     epilogue
 
-ForwardCallF:
+SYMBOL(ForwardCallF):
     prologue
     epilogue
 
-ForwardCallD:
+SYMBOL(ForwardCallD):
     prologue
     epilogue
 
-ForwardCallRG:
+SYMBOL(ForwardCallGR):
     prologue
     fastcall
     epilogue
 
-ForwardCallRF:
+SYMBOL(ForwardCallFR):
     prologue
     fastcall
     epilogue
 
-ForwardCallRD:
+SYMBOL(ForwardCallDR):
     prologue
     fastcall
     epilogue
@@ -80,11 +84,15 @@ ForwardCallRD:
 # Callbacks
 # ----------------------------
 
-.global RelayCallback
-.global SwitchAndRelay
-.global RelayDirect
-.global FindTrampolineStart
-.global FindTrampolineEnd
+.global SYMBOL(RelayCallback)
+.global SYMBOL(SwitchAndRelay)
+.global SYMBOL(RelayDirect)
+#if defined(_WIN32)
+.global SYMBOL(FindTrampolineStart)
+.global SYMBOL(FindTrampolineEnd)
+#else
+.global SYMBOL(TrampolineEnd)
+#endif
 
 # Call the C function RelayCallback with the following arguments:
 # static trampoline ID, the current stack pointer, a pointer to the stack arguments of this call,
@@ -105,17 +113,21 @@ ForwardCallRD:
 RelayTrampoline:
     .cfi_startproc
     .cfi_def_cfa esp, 4
-    sub $44, %esp
+    subl $44, %esp
     .cfi_def_cfa esp, 48
     movl %eax, 0(%esp)
     movl %esp, 4(%esp)
     movl $0, 32(%esp)
     movl $0, 36(%esp)
+#if defined(_WIN32)
+    call _RelayCallback
+#else
     call GetEIP
     addl $_GLOBAL_OFFSET_TABLE_, %eax
     call *RelayCallback@GOT(%eax)
-    movl 44(%esp), %edx
+#endif
     movl 36(%esp), %ecx
+    movl 44(%esp), %edx
     movl %edx, 44(%esp, %ecx)
     cmpl $1, 32(%esp)
     je 1f
@@ -143,7 +155,7 @@ RelayTrampoline:
 # 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.
-SwitchAndRelay:
+SYMBOL(SwitchAndRelay):
     .cfi_startproc
     .cfi_def_cfa esp, 4
     ENDBR32
@@ -152,10 +164,7 @@ SwitchAndRelay:
     movl %esp, %ebp
     .cfi_def_cfa ebp, 8
     movl 24(%esp), %ecx
-    movl %esp, %eax
-    subl 0(%ecx), %eax
-    andl $-16, %eax
-    movl %eax, 4(%ecx)
+    movl %esp, 4(%ecx)
     movl 20(%esp), %esp
     subl $24, %esp
     movl 8(%ebp), %eax
@@ -164,9 +173,13 @@ SwitchAndRelay:
     movl %eax, 4(%esp)
     movl 16(%ebp), %eax
     movl %eax, 8(%esp)
+#if defined(_WIN32)
+    call _RelayDirect
+#else
     call GetEIP
     addl $_GLOBAL_OFFSET_TABLE_, %eax
     call *RelayDirect@GOT(%eax)
+#endif
     mov %ebp, %esp
     .cfi_def_cfa esp, 8
     pop %ebp
@@ -174,6 +187,8 @@ SwitchAndRelay:
     ret
     .cfi_endproc
 
+#if defined(_WIN32)
+
 .balign 16
 FindTrampolineStart:
     call GetEIP
@@ -188,6 +203,15 @@ FindTrampolineEnd:
     call GetEIP
     ret
 
+#else
+
+#include "gnu.inc"
+
+SYMBOL(TrampolineEnd):
+    ret
+
+#endif
+
 GetEIP:
     movl (%esp), %eax
     ret

package/src/koffi/src/{abi_x86_asm.asm → abi/x86_asm.asm}

@@ -7,9 +7,9 @@
 public ForwardCallG
 public ForwardCallF
 public ForwardCallD
-public ForwardCallRG
-public ForwardCallRF
-public ForwardCallRD
+public ForwardCallGR
+public ForwardCallFR
+public ForwardCallDR
 
 .model flat, C
 .code
@@ -58,23 +58,23 @@ ForwardCallD proc
     epilogue
 ForwardCallD endp
 
-ForwardCallRG proc
+ForwardCallGR proc
     prologue
     fastcall
     epilogue
-ForwardCallRG endp
+ForwardCallGR endp
 
-ForwardCallRF proc
+ForwardCallFR proc
     prologue
     fastcall
     epilogue
-ForwardCallRF endp
+ForwardCallFR endp
 
-ForwardCallRD proc
+ForwardCallDR proc
     prologue
     fastcall
     epilogue
-ForwardCallRD endp
+ForwardCallDR endp
 
 ; Callbacks
 ; ----------------------------
@@ -104,8 +104,8 @@ RelayTrampoline proc
     mov dword ptr [esp+32], 0
     mov dword ptr [esp+36], 0
     call RelayCallback
-    mov edx, dword ptr [esp+44]
     mov ecx, dword ptr [esp+36]
+    mov edx, dword ptr [esp+44]
     mov dword ptr [esp+ecx+44], edx
     cmp dword ptr [esp+32], 1
     je l1
@@ -135,10 +135,7 @@ SwitchAndRelay proc
     push ebp
     mov ebp, esp
     mov ecx, dword ptr [esp+24]
-    mov eax, esp
-    sub eax, dword ptr [ecx+0]
-    and eax, -16
-    mov dword ptr [ecx+4], eax
+    mov dword ptr [ecx+4], esp
     mov esp, dword ptr [esp+20]
     sub esp, 24
     mov eax, dword ptr [ebp+8]