Biswapriyo Nath : winecrt0: Add missing members in _JUMP_BUFFER for SJLJ.

[Alexandre Julliard]

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

Author: Biswapriyo Nath <nathbappai(a)gmail.com>
Date:   Sat Jul 10 10:47:30 2021 +0530

winecrt0: Add missing members in _JUMP_BUFFER for SJLJ.

Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ntdll/tests/exception.c | 4 +++-
 dlls/winecrt0/setjmp.c       | 5 +++++
 include/msvcrt/setjmp.h      | 4 +++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index cc97a98e0d6..8bede41ee49 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -127,7 +127,9 @@ typedef struct _JUMP_BUFFER
     unsigned __int64 R14;
     unsigned __int64 R15;
     unsigned __int64 Rip;
-    unsigned __int64 Spare;
+    unsigned long MxCsr;
+    unsigned short FpCsr;
+    unsigned short Spare;
     SETJMP_FLOAT128  Xmm6;
     SETJMP_FLOAT128  Xmm7;
     SETJMP_FLOAT128  Xmm8;
diff --git a/dlls/winecrt0/setjmp.c b/dlls/winecrt0/setjmp.c
index d83df54b889..ffb3b243e75 100644
--- a/dlls/winecrt0/setjmp.c
+++ b/dlls/winecrt0/setjmp.c
@@ -66,6 +66,8 @@ __ASM_GLOBAL_FUNC( __wine_setjmpex,
                    "movq %r15,0x48(%rcx)\n\t"      /* jmp_buf->R15 */
                    "movq (%rsp),%rax\n\t"
                    "movq %rax,0x50(%rcx)\n\t"      /* jmp_buf->Rip */
+                   "stmxcsr 0x58(%rcx)\n\t"        /* jmp_buf->MxCsr */
+                   "fnstcw 0x5c(%rcx)\n\t"         /* jmp_buf->FpCsr */
                    "movdqa %xmm6,0x60(%rcx)\n\t"   /* jmp_buf->Xmm6 */
                    "movdqa %xmm7,0x70(%rcx)\n\t"   /* jmp_buf->Xmm7 */
                    "movdqa %xmm8,0x80(%rcx)\n\t"   /* jmp_buf->Xmm8 */
@@ -89,6 +91,9 @@ __ASM_GLOBAL_FUNC( __wine_longjmp,
                    "movq 0x38(%rcx),%r13\n\t"      /* jmp_buf->R13 */
                    "movq 0x40(%rcx),%r14\n\t"      /* jmp_buf->R14 */
                    "movq 0x48(%rcx),%r15\n\t"      /* jmp_buf->R15 */
+                   "ldmxcsr 0x58(%rcx)\n\t"        /* jmp_buf->MxCsr */
+                   "fnclex\n\t"
+                   "fldcw 0x5c(%rcx)\n\t"          /* jmp_buf->FpCsr */
                    "movdqa 0x60(%rcx),%xmm6\n\t"   /* jmp_buf->Xmm6 */
                    "movdqa 0x70(%rcx),%xmm7\n\t"   /* jmp_buf->Xmm7 */
                    "movdqa 0x80(%rcx),%xmm8\n\t"   /* jmp_buf->Xmm8 */
diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h
index b539b22058f..6576605cf1b 100644
--- a/include/msvcrt/setjmp.h
+++ b/include/msvcrt/setjmp.h
@@ -65,7 +65,9 @@ typedef DECLSPEC_ALIGN(16) struct _JUMP_BUFFER
     unsigned __int64 R14;
     unsigned __int64 R15;
     unsigned __int64 Rip;
-    unsigned __int64 Spare;
+    unsigned long MxCsr;
+    unsigned short FpCsr;
+    unsigned short Spare;
     SETJMP_FLOAT128  Xmm6;
     SETJMP_FLOAT128  Xmm7;
     SETJMP_FLOAT128  Xmm8;