Re: [Valgrind-developers] vex: r2332: Ensure arm guest state size is 32-byte aligned, as per increase in

[Christian B. <bor...@de...>]

A similar patch is necessary for s390.


Index: VEX/priv/guest_s390_helpers.c
===================================================================
--- VEX/priv/guest_s390_helpers.c	(revision 2332)
+++ VEX/priv/guest_s390_helpers.c	(working copy)
@@ -141,6 +141,8 @@
    state->guest_CC_DEP1 = 0;
    state->guest_CC_DEP2 = 0;
    state->guest_CC_NDEP = 0;
+   state->padding1 = 0;
+   state->padding2 = 0;
 }
 
 
Index: VEX/pub/libvex_guest_s390x.h
===================================================================
--- VEX/pub/libvex_guest_s390x.h	(revision 2332)
+++ VEX/pub/libvex_guest_s390x.h	(working copy)
@@ -149,11 +149,12 @@
    /*  424 */  ULong host_EvC_FAILADDR;
 
 /*------------------------------------------------------------*/
-/*--- Force alignment to 16 bytes                          ---*/
+/*--- Force alignment to 32 bytes                          ---*/
 /*------------------------------------------------------------*/
-   /* No padding needed */
+   /*  432 */  ULong padding1;
+   /*  440 */  ULong padding2;
 
-   /*  432 */  /* This is the size of the guest state */
+   /*  448 */  /* This is the size of the guest state */
 } VexGuestS390XState;