Index: VEX/priv/guest_arm_helpers.c =================================================================== --- VEX/priv/guest_arm_helpers.c (revision 2817) +++ VEX/priv/guest_arm_helpers.c (working copy) @@ -1030,10 +1030,6 @@ 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; } Index: VEX/priv/guest_x86_helpers.c =================================================================== --- VEX/priv/guest_x86_helpers.c (revision 2817) +++ VEX/priv/guest_x86_helpers.c (working copy) @@ -2764,11 +2764,7 @@ vex_state->guest_SC_CLASS = 0; vex_state->guest_IP_AT_SYSCALL = 0; - Int i; - for (i = 0; i < sizeof(vex_state->padding) - / sizeof(vex_state->padding[0]); i++) { - vex_state->padding[i] = 0; - } + vex_state->padding1 = 0; } Index: VEX/priv/host_generic_reg_alloc2.c =================================================================== --- VEX/priv/host_generic_reg_alloc2.c (revision 2817) +++ VEX/priv/host_generic_reg_alloc2.c (working copy) @@ -399,9 +399,9 @@ not at each insn processed. */ Bool do_sanity_check; - vassert(0 == (guest_sizeB % 32)); - vassert(0 == (LibVEX_N_SPILL_BYTES % 32)); - vassert(0 == (N_SPILL64S % 4)); + vassert(0 == (guest_sizeB % 16)); + vassert(0 == (LibVEX_N_SPILL_BYTES % 16)); + vassert(0 == (N_SPILL64S % 2)); /* The live range numbers are signed shorts, and so limiting the number of insns to 15000 comfortably guards against them Index: VEX/pub/libvex_guest_x86.h =================================================================== --- VEX/pub/libvex_guest_x86.h (revision 2817) +++ VEX/pub/libvex_guest_x86.h (working copy) @@ -220,8 +220,8 @@ been interrupted by a signal. */ UInt guest_IP_AT_SYSCALL; - /* Padding to make it have an 32-aligned size */ - UInt padding[5]; + /* Padding to make it have an 16-aligned size */ + UInt padding1; } VexGuestX86State; Index: VEX/pub/libvex_guest_s390x.h =================================================================== --- VEX/pub/libvex_guest_s390x.h (revision 2817) +++ VEX/pub/libvex_guest_s390x.h (working copy) @@ -148,11 +148,11 @@ /* 424 */ ULong host_EvC_FAILADDR; /*------------------------------------------------------------*/ -/*--- Force alignment to 32 bytes ---*/ +/*--- Force alignment to 16 bytes ---*/ /*------------------------------------------------------------*/ - /* 432 */ UChar padding[16]; + /* 432 */ UChar padding[0]; - /* 448 */ /* This is the size of the guest state */ + /* 432 */ /* This is the size of the guest state */ } VexGuestS390XState; Index: VEX/pub/libvex_guest_ppc32.h =================================================================== --- VEX/pub/libvex_guest_ppc32.h (revision 2817) +++ VEX/pub/libvex_guest_ppc32.h (working copy) @@ -242,7 +242,7 @@ /* 1368 */ ULong guest_TEXASR; // Transaction EXception And Summary Register /* 1376 */ ULong guest_TFIAR; // Transaction Failure Instruction Address Register - /* Padding to make it have an 8-aligned size */ + /* Padding to make it have an 16-aligned size */ /* 1384 */ UInt padding2; } Index: VEX/pub/libvex_guest_arm64.h =================================================================== --- VEX/pub/libvex_guest_arm64.h (revision 2817) +++ VEX/pub/libvex_guest_arm64.h (working copy) @@ -158,7 +158,7 @@ does get set when required. */ UInt guest_FPSR; - /* Padding to make it have an 32-aligned size */ + /* Padding to make it have an 16-aligned size */ UInt pad_end_0; ULong pad_end_1; } Index: VEX/pub/libvex.h =================================================================== --- VEX/pub/libvex.h (revision 2817) +++ VEX/pub/libvex.h (working copy) @@ -521,7 +521,7 @@ typedef struct { /* Total size of the guest state, in bytes. Must be - 8-aligned. */ + 16-aligned. */ Int total_sizeB; /* Whereabouts is the stack pointer? */ Int offset_SP; Index: VEX/pub/libvex_guest_mips32.h =================================================================== --- VEX/pub/libvex_guest_mips32.h (revision 2817) +++ VEX/pub/libvex_guest_mips32.h (working copy) @@ -148,7 +148,7 @@ ULong guest_ac2; /* 344 */ ULong guest_ac3; /* 352 */ - UInt padding[6]; + UInt padding[2]; } VexGuestMIPS32State; /*---------------------------------------------------------------*/ /*--- Utility functions for MIPS32 guest stuff. ---*/ Index: VEX/pub/libvex_guest_arm.h =================================================================== --- VEX/pub/libvex_guest_arm.h (revision 2817) +++ VEX/pub/libvex_guest_arm.h (working copy) @@ -193,12 +193,8 @@ */ UInt guest_ITSTATE; - /* Padding to make it have an 32-aligned size */ + /* Padding to make it have an 16-aligned size */ UInt padding1; - UInt padding2; - UInt padding3; - UInt padding4; - UInt padding5; } VexGuestARMState; Index: VEX/pub/libvex_guest_mips64.h =================================================================== --- VEX/pub/libvex_guest_mips64.h (revision 2817) +++ VEX/pub/libvex_guest_mips64.h (working copy) @@ -145,7 +145,7 @@ ULong host_EvC_FAILADDR; /* 600 */ UInt host_EvC_COUNTER; /* 608 */ UInt guest_COND; /* 612 */ - UInt padding[6]; + UInt padding[2]; } VexGuestMIPS64State; /*---------------------------------------------------------------*/