[newlib-cygwin] Try to make sure struct _mcontext is 16-byte aligned

Jon TURNEY jturney@sourceware.org
Thu Apr 2 17:07:00 GMT 2015


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=cbb9849fa76f1dbe6c66d91b68d9a10f46f1ba69

commit cbb9849fa76f1dbe6c66d91b68d9a10f46f1ba69
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date:   Thu Apr 2 18:05:32 2015 +0100

    Try to make sure struct _mcontext is 16-byte aligned
    
    On x86_64, RtlCaptureContext() uses fxsave to save FPU/MMX/SSE state.
    
    fxsave requires that the destination address is 16-byte aligned, or it will
    fault.
    
    CONTEXT is already annotated __attribute__ ((aligned (16))), do the same with
    struct _mcontext.
    
    Rearrange ucontext_t so that it's struct _mcontext element is also correctly
    aligned.
    
    	* include/cygwin/signal.h (struct __mcontext): 16-byte align.
    	* include/sys/ucontext.h (ucontext_t): Ditto.
    
    Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>

Diff:
---
 winsup/cygwin/ChangeLog               | 5 +++++
 winsup/cygwin/include/cygwin/signal.h | 2 +-
 winsup/cygwin/include/sys/ucontext.h  | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9871b96..3b0e111 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-02  Jon TURNEY  <jon.turney@dronecode.org.uk>
+
+	* include/cygwin/signal.h (struct __mcontext): 16-byte align.
+	* include/sys/ucontext.h (ucontext_t): Ditto.
+
 2015-04-02  Corinna Vinschen  <corinna@vinschen.de>
 
 	* sec_acl.cc (CYG_ACE_ISBITS_TO_WIN): Fix typo.
diff --git a/winsup/cygwin/include/cygwin/signal.h b/winsup/cygwin/include/cygwin/signal.h
index 04e65aa..ef29baf 100644
--- a/winsup/cygwin/include/cygwin/signal.h
+++ b/winsup/cygwin/include/cygwin/signal.h
@@ -49,7 +49,7 @@ struct _fpstate
   __uint32_t padding[24];
 };
 
-struct __mcontext
+struct __attribute__ ((aligned (16))) __mcontext
 {
   __uint64_t p1home;
   __uint64_t p2home;
diff --git a/winsup/cygwin/include/sys/ucontext.h b/winsup/cygwin/include/sys/ucontext.h
index 9362d90..65485fb 100644
--- a/winsup/cygwin/include/sys/ucontext.h
+++ b/winsup/cygwin/include/sys/ucontext.h
@@ -15,11 +15,11 @@ details. */
 
 typedef struct __mcontext mcontext_t;
 
-typedef struct __ucontext {
+typedef __attribute__ ((aligned (16))) struct __ucontext {
+	mcontext_t	uc_mcontext;
 	struct __ucontext *uc_link;
 	sigset_t	uc_sigmask;
 	stack_t	uc_stack;
-	mcontext_t	uc_mcontext;
 	unsigned long int	uc_flags;
 } ucontext_t;



More information about the Cygwin-cvs mailing list