commit 51854535080a048df460cb9131f917022e73ba07
author florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> Fri Feb 13 16:26:44 2015 +0000
committer florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> Fri Feb 13 16:26:44 2015 +0000
tree 9de41e9fba25dc7e5552bd88fc9819eba0431180
parent 87d812e99f0e33604b268410a677793ef76229d9

Use LibVEX_GUEST_STATE_ALIGN introduced in VEX r3091.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14930 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/m_threadstate.c

diff --git a/coregrind/m_threadstate.c b/coregrind/m_threadstate.c
index c200002..c53e406 100644
--- a/coregrind/m_threadstate.c
+++ b/coregrind/m_threadstate.c
@@ -44,7 +44,8 @@
 
 ThreadId VG_(running_tid) = VG_INVALID_THREADID;
 
-ThreadState VG_(threads)[VG_N_THREADS] __attribute__((aligned(16)));
+ThreadState VG_(threads)[VG_N_THREADS]
+            __attribute__((aligned(LibVEX_GUEST_STATE_ALIGN)));
 
 /*------------------------------------------------------------*/
 /*--- Operations.                                          ---*/

coregrind/pub_core_threadstate.h

diff --git a/coregrind/pub_core_threadstate.h b/coregrind/pub_core_threadstate.h
index 2f32259..58d42f7 100644
--- a/coregrind/pub_core_threadstate.h
+++ b/coregrind/pub_core_threadstate.h
@@ -97,14 +97,17 @@
          scheduler.c. */
 
       /* Saved machine context. */
-      VexGuestArchState vex __attribute__((aligned(16)));
+      VexGuestArchState vex __attribute__((aligned(LibVEX_GUEST_STATE_ALIGN)));
 
       /* Saved shadow context (2 copies). */
-      VexGuestArchState vex_shadow1 __attribute__((aligned(16)));
-      VexGuestArchState vex_shadow2 __attribute__((aligned(16)));
+      VexGuestArchState vex_shadow1
+                        __attribute__((aligned(LibVEX_GUEST_STATE_ALIGN)));
+      VexGuestArchState vex_shadow2 
+                        __attribute__((aligned(LibVEX_GUEST_STATE_ALIGN)));
 
       /* Spill area. */
-      UChar vex_spill[LibVEX_N_SPILL_BYTES] __attribute__((aligned(16)));
+      UChar vex_spill[LibVEX_N_SPILL_BYTES]
+            __attribute__((aligned(LibVEX_GUEST_STATE_ALIGN)));
 
       /* --- END vex-mandated guest state --- */
    }