From: Julian Seward <jseward@acm.org>
Date: Mon, 3 Apr 2017 10:19:13 +0000 (+0000)
Subject: x86 guest: switch descriptor table registers to ULong type so they will take up
X-Git-Tag: svn/VALGRIND_3_13_0^2~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5213755ce4ddb0f36022e7340cce64e3defcc8d1;p=thirdparty%2Fvalgrind.git

x86 guest: switch descriptor table registers to ULong type so they will take up
consistent amount of space (VEX side).  Andrew Dutcher <andrewrdutcher@gmail.com>.


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

diff --git a/VEX/priv/guest_x86_helpers.c b/VEX/priv/guest_x86_helpers.c
index bc5a29eed9..bbbd433fc7 100644
--- a/VEX/priv/guest_x86_helpers.c
+++ b/VEX/priv/guest_x86_helpers.c
@@ -2879,6 +2879,8 @@ void LibVEX_GuestX86_initialise ( /*OUT*/VexGuestX86State* vex_state )
    vex_state->guest_IP_AT_SYSCALL = 0;
 
    vex_state->padding1 = 0;
+   vex_state->padding2 = 0;
+   vex_state->padding3 = 0;
 }
 
 
diff --git a/VEX/pub/libvex_guest_x86.h b/VEX/pub/libvex_guest_x86.h
index 5c77569c24..54d54a6e1d 100644
--- a/VEX/pub/libvex_guest_x86.h
+++ b/VEX/pub/libvex_guest_x86.h
@@ -194,8 +194,8 @@ typedef
       UShort guest_GS;
       UShort guest_SS;
       /* LDT/GDT stuff. */
-      HWord  guest_LDT; /* host addr, a VexGuestX86SegDescr* */
-      HWord  guest_GDT; /* host addr, a VexGuestX86SegDescr* */
+      ULong  guest_LDT; /* host addr, a VexGuestX86SegDescr* */
+      ULong  guest_GDT; /* host addr, a VexGuestX86SegDescr* */
 
       /* Emulation notes */
       UInt   guest_EMNOTE;
@@ -223,6 +223,8 @@ typedef
 
       /* Padding to make it have an 16-aligned size */
       UInt padding1;
+      UInt padding2;
+      UInt padding3;
    }
    VexGuestX86State;