Alexandre Julliard : rpcrt4: Implement NdrClientCall2 in assembly on all platforms.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e994c8ef741ce28ac6971ea5ff6a131c483f0fd7
URL:    https://gitlab.winehq.org/wine/wine/-/commit/e994c8ef741ce28ac6971ea5ff6a131...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Apr 17 12:46:10 2024 +0200

rpcrt4: Implement NdrClientCall2 in assembly on all platforms.

---

 dlls/rpcrt4/ndr_stubless.c | 85 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 62 insertions(+), 23 deletions(-)

diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index 1cdb575b9e6..f87817f7fd1 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -1000,8 +1000,48 @@ LONG_PTR WINAPI NdrpClientCall2( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForm
     return RetVal;
 }
 
-#ifdef __x86_64__
-
+#ifdef __aarch64__
+__ASM_GLOBAL_FUNC( NdrClientCall2,
+                   "stp x29, x30, [sp, #-0x40]!\n\t"
+                   ".seh_save_fplr_x 0x40\n\t"
+                   ".seh_endprologue\n\t"
+                   "stp x2, x3, [sp, #0x10]\n\t"
+                   "stp x4, x5, [sp, #0x20]\n\t"
+                   "stp x6, x7, [sp, #0x30]\n\t"
+                   "add x2, sp, #0x10\n\t"   /* stack */
+                   "mov x3, #0\n\t"          /* fpu_stack */
+                   "bl NdrpClientCall2\n\t"
+                   "ldp x29, x30, [sp], #0x40\n\t"
+                   "ret" )
+#elif defined(__arm64ec__)
+CLIENT_CALL_RETURN __attribute__((naked)) NdrClientCall2( PMIDL_STUB_DESC desc, PFORMAT_STRING fmt, ... )
+{
+    asm( ".seh_proc \"#NdrClientCall2\"\n\t"
+         "stp x29, x30, [sp, #-0x10]!\n\t"
+         ".seh_save_fplr_x 0x10\n\t"
+         ".seh_endprologue\n\t"
+         "stp x2, x3, [x4, #-0x10]!\n\t"
+         "mov x2, x4\n\t"          /* stack */
+         "mov x3, #0\n\t"          /* fpu_stack */
+         "bl \"#NdrpClientCall2\"\n\t"
+         "ldp x29, x30, [sp], #0x10\n\t"
+         "ret\n\t"
+         ".seh_endproc" );
+}
+#elif defined(__arm__)
+__ASM_GLOBAL_FUNC( NdrClientCall2,
+                   "push {r2-r3}\n\t"
+                   ".seh_save_regs {r2,r3}\n\t"
+                   "push {fp,lr}\n\t"
+                   ".seh_save_regs_w {fp,lr}\n\t"
+                   ".seh_endprologue\n\t"
+                   "add r2, sp, #8\n\t"      /* stack */
+                   "mov r3, #0\n\t"          /* fpu_stack */
+                   "bl NdrpClientCall2\n\t"
+                   "pop {fp,lr}\n\t"
+                   "add sp, #8\n\t"
+                   "bx lr" )
+#elif defined(__x86_64__)
 __ASM_GLOBAL_FUNC( NdrClientCall2,
                    "subq $0x28,%rsp\n\t"
                    __ASM_SEH(".seh_stackalloc 0x28\n\t")
@@ -1009,30 +1049,29 @@ __ASM_GLOBAL_FUNC( NdrClientCall2,
                    __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t")
                    "movq %r8,0x40(%rsp)\n\t"
                    "movq %r9,0x48(%rsp)\n\t"
-                   "leaq 0x40(%rsp),%r8\n\t"
-                   "xorq %r9,%r9\n\t"
+                   "leaq 0x40(%rsp),%r8\n\t" /* stack */
+                   "xorq %r9,%r9\n\t"        /* fpu_stack */
                    "call " __ASM_NAME("NdrpClientCall2") "\n\t"
                    "addq $0x28,%rsp\n\t"
                    __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t")
-                   "ret" );
-
-#else  /* __x86_64__ */
-
-/***********************************************************************
- *            NdrClientCall2 [RPCRT4.@]
- */
-CLIENT_CALL_RETURN WINAPIV NdrClientCall2( PMIDL_STUB_DESC desc, PFORMAT_STRING format, ... )
-{
-    va_list args;
-    LONG_PTR ret;
-
-    va_start( args, format );
-    ret = NdrpClientCall2( desc, format, va_arg( args, void ** ), NULL );
-    va_end( args );
-    return *(CLIENT_CALL_RETURN *)&ret;
-}
-
-#endif  /* __x86_64__ */
+                   "ret" )
+#elif defined(__i386__)
+__ASM_GLOBAL_FUNC( NdrClientCall2,
+                   "pushl %ebp\n\t"
+                   __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
+                   __ASM_CFI(".cfi_rel_offset %ebp,0\n\t")
+                   "movl %esp,%ebp\n\t"
+                   __ASM_CFI(".cfi_def_cfa_register %ebp\n\t")
+                   "push $0\n\t"             /* fpu_stack */
+                   "push 16(%ebp)\n\t"       /* stack */
+                   "push 12(%ebp)\n\t"       /* format */
+                   "push 8(%ebp)\n\t"        /* desc */
+                   "call " __ASM_STDCALL("NdrpClientCall2",16) "\n\t"
+                   "leave\n\t"
+                   __ASM_CFI(".cfi_def_cfa %esp,4\n\t")
+                   __ASM_CFI(".cfi_same_value %ebp\n\t")
+                   "ret" )
+#endif
 
 /* Calls a function with the specified arguments, restoring the stack
  * properly afterwards as we don't know the calling convention of the