|
[Valgrind-developers] vex: r2332: Ensure arm guest state size is
32-byte aligned, as per increase in
From: <sv...@va...> - 2012-05-21 11:22:00
|
sewardj 2012-05-21 12:21:50 +0100 (Mon, 21 May 2012)
New Revision: 2332
Log:
Ensure arm guest state size is 32-byte aligned, as per increase in
alignment requirements resulting from r12569/r2330.
Modified files:
trunk/priv/guest_arm_helpers.c
trunk/pub/libvex_guest_arm.h
Modified: trunk/priv/guest_arm_helpers.c (+4 -0)
===================================================================
--- trunk/priv/guest_arm_helpers.c 2012-05-21 12:00:41 +01:00 (rev 2331)
+++ trunk/priv/guest_arm_helpers.c 2012-05-21 12:21:50 +01:00 (rev 2332)
@@ -1029,6 +1029,10 @@
vex_state->guest_ITSTATE = 0;
vex_state->padding1 = 0;
+ vex_state->padding2 = 0;
+ vex_state->padding3 = 0;
+ vex_state->padding4 = 0;
+ vex_state->padding5 = 0;
}
Modified: trunk/pub/libvex_guest_arm.h (+5 -1)
===================================================================
--- trunk/pub/libvex_guest_arm.h 2012-05-21 12:00:41 +01:00 (rev 2331)
+++ trunk/pub/libvex_guest_arm.h 2012-05-21 12:21:50 +01:00 (rev 2332)
@@ -194,8 +194,12 @@
*/
UInt guest_ITSTATE;
- /* Padding to make it have an 16-aligned size */
+ /* Padding to make it have an 32-aligned size */
UInt padding1;
+ UInt padding2;
+ UInt padding3;
+ UInt padding4;
+ UInt padding5;
}
VexGuestARMState;
|
|
From: Christian B. <bor...@de...> - 2012-05-21 12:08:06
|
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;
|