|
From: <sv...@va...> - 2012-05-21 15:45:42
|
sewardj 2012-05-21 16:45:34 +0100 (Mon, 21 May 2012)
New Revision: 2333
Log:
Ensure s390x guest state size is 32-byte aligned, as per increase in
alignment requirements resulting from r12569/r2330.
(Christian Borntraeger <bor...@de...>)
Modified files:
trunk/priv/guest_s390_helpers.c
trunk/pub/libvex_guest_s390x.h
Modified: trunk/priv/guest_s390_helpers.c (+2 -0)
===================================================================
--- trunk/priv/guest_s390_helpers.c 2012-05-21 12:21:50 +01:00 (rev 2332)
+++ trunk/priv/guest_s390_helpers.c 2012-05-21 16:45:34 +01:00 (rev 2333)
@@ -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;
}
Modified: trunk/pub/libvex_guest_s390x.h (+4 -3)
===================================================================
--- trunk/pub/libvex_guest_s390x.h 2012-05-21 12:21:50 +01:00 (rev 2332)
+++ trunk/pub/libvex_guest_s390x.h 2012-05-21 16:45:34 +01:00 (rev 2333)
@@ -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;
|