Martin Storsjö : msvcrt: Don't set frame to 0 in arm and arm64 setjmp.

Alexandre Julliard julliard at winehq.org
Tue Nov 9 15:55:08 CST 2021


Module: wine
Branch: master
Commit: 6a072b98c100f38a61fad00b6c96c86b3445efac
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6a072b98c100f38a61fad00b6c96c86b3445efac

Author: Martin Storsjö <martin at martin.st>
Date:   Tue Nov  9 16:05:55 2021 +0200

msvcrt: Don't set frame to 0 in arm and arm64 setjmp.

This matches what was done for x86_64 in
882980c17a9a033fa8e49a4c116af9583698d218.

Signed-off-by: Martin Storsjö <martin at martin.st>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msvcrt/except_arm.c   | 1 -
 dlls/msvcrt/except_arm64.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c
index 8e5c552b552..fecbfe65929 100644
--- a/dlls/msvcrt/except_arm.c
+++ b/dlls/msvcrt/except_arm.c
@@ -109,7 +109,6 @@ unsigned int CDECL __CxxQueryExceptionSize(void)
  *		_setjmp (MSVCRT.@)
  */
 __ASM_GLOBAL_FUNC(MSVCRT__setjmp,
-                  "mov r1, #0\n\t"  /* frame */
                   "b " __ASM_NAME("__wine_setjmpex"));
 
 /*******************************************************************
diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c
index 242ef8bdb09..574e77485f9 100644
--- a/dlls/msvcrt/except_arm64.c
+++ b/dlls/msvcrt/except_arm64.c
@@ -110,7 +110,6 @@ unsigned int CDECL __CxxQueryExceptionSize(void)
  *		_setjmp (MSVCRT.@)
  */
 __ASM_GLOBAL_FUNC(MSVCRT__setjmp,
-                  "mov x1, #0\n\t"  /* frame */
                   "b " __ASM_NAME("__wine_setjmpex"));
 
 /*******************************************************************




More information about the wine-cvs mailing list