=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: ntdll: Correctly align the stack for odd numbers of arguments in relay traces on ARM .

Alexandre Julliard julliard at winehq.org
Tue Feb 19 13:33:03 CST 2013


Module: wine
Branch: master
Commit: 242da6708202c1bd4835e49e2dd2315c95ba0e24
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=242da6708202c1bd4835e49e2dd2315c95ba0e24

Author: André Hentschel <nerv at dawncrow.de>
Date:   Mon Feb 18 23:24:15 2013 +0100

ntdll: Correctly align the stack for odd numbers of arguments in relay traces on ARM.

---

 dlls/ntdll/relay.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c
index b3c4aea..81e1593 100644
--- a/dlls/ntdll/relay.c
+++ b/dlls/ntdll/relay.c
@@ -364,7 +364,8 @@ __ASM_GLOBAL_FUNC( call_entry_point,
                    "cmp r3, #0\n\t"
                    "beq 5f\n\t"
                    "sub SP, SP, r3\n\t"
-                   "bic SP, SP, #15\n\t"
+                   "tst r1, #1\n\t"
+                   "subeq SP, SP, #4\n\t"
                    "1:\tsub r3, r3, #4\n\t"
                    "ldr r0, [r2, r3]\n\t"
                    "str r0, [SP, r3]\n\t"




More information about the wine-cvs mailing list