From: Cerion Armour-Brown <cerion@valgrind.org>
Date: Tue, 6 Dec 2005 19:11:02 +0000 (+0000)
Subject: fix padding for VexGuestPPC64State
X-Git-Tag: svn/VALGRIND_3_2_3^2~168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b4b860d227659590cd68eb4260175abc95495d5;p=thirdparty%2Fvalgrind.git

fix padding for VexGuestPPC64State



git-svn-id: svn://svn.valgrind.org/vex/trunk@1484
---

diff --git a/VEX/pub/libvex_guest_ppc32.h b/VEX/pub/libvex_guest_ppc32.h
index 529eaec7c0..b9df3569cd 100644
--- a/VEX/pub/libvex_guest_ppc32.h
+++ b/VEX/pub/libvex_guest_ppc32.h
@@ -208,7 +208,8 @@ typedef
       /* 952 */ UInt guest_RESVN;
 
       /* Padding to make it have an 8-aligned size */
-      UInt  padding;
+      /* 956 */ UInt  padding;
+      /* 960 */
    }
    VexGuestPPC32State;
 
diff --git a/VEX/pub/libvex_guest_ppc64.h b/VEX/pub/libvex_guest_ppc64.h
index 214b2eb9a5..c03b74bf06 100644
--- a/VEX/pub/libvex_guest_ppc64.h
+++ b/VEX/pub/libvex_guest_ppc64.h
@@ -161,7 +161,7 @@ typedef
       /* 480 */ ULong guest_FPR28;
       /* 488 */ ULong guest_FPR29;
       /* 496 */ ULong guest_FPR30;
-      /*  504 */ ULong guest_FPR31;
+      /* 504 */ ULong guest_FPR31;
 
       // Vector Registers
       /*  512 */ U128 guest_VR0 __attribute__ ((aligned (16)));
@@ -237,16 +237,20 @@ typedef
       /* Emulation warnings */
       /* 1080 */ UInt guest_EMWARN;
 
+      /* gcc adds 4 bytes padding here: pre-empt it. */
+      /* 1084 */ UInt  padding;
+
       /* For icbi: record start and length of area to invalidate */
-      /* 1084 */ ULong guest_TISTART;
-      /* 1092 */ ULong guest_TILEN;
+      /* 1088 */ ULong guest_TISTART;
+      /* 1096 */ ULong guest_TILEN;
 
       /* For lwarx/stwcx.: 0 == no reservation exists, non-0 == a
          reservation exists. */
-      /* 2000 */ ULong guest_RESVN;
+      /* 1104 */ ULong guest_RESVN;
 
-      /* Padding to make it have an 8-aligned size */
-      //UInt  padding;
+      /* Padding to make it have an 16-aligned size */
+      /* 1112 */ ULong padding2;
+      /* 1120 */
    }
    VexGuestPPC64State;