486180 [MIPS] 'VexGuestArchState' has no member named 'guest_IP_AT_SYSCALL'

(cherry picked from commit 7214886886bce9029f325214156c02dcfff760d5)

diff --git a/NEWS b/NEWS
index 8bdd3753f7bb09ef1777bd5415c5030cb3df95ce..c40e00cce46b018c6c06692cda4f2089c5df1d27 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ Branch 3.23
 
 The following bugs have been fixed or resolved on this branch.
 
+486180  [MIPS] 'VexGuestArchState' has no member named 'guest_IP_AT_SYSCALL'
+
 To see details of a given bug, visit
   https://bugs.kde.org/show_bug.cgi?id=XXXXXX
 where XXXXXX is the bug number as listed above.

diff --git a/VEX/priv/guest_mips_helpers.c b/VEX/priv/guest_mips_helpers.c
index 74cfb9c34caa2bad76124397f74037b8e5bc113b..79197378cc74933a34ee226e34892d40c7239ca2 100644 (file)
--- a/VEX/priv/guest_mips_helpers.c
+++ b/VEX/priv/guest_mips_helpers.c
@@ -187,6 +187,8 @@ void LibVEX_GuestMIPS32_initialise( /*OUT*/ VexGuestMIPS32State * vex_state)
    vex_state->guest_w1.w64[1] = 0;
    vex_state->guest_w2.w64[0] = 0;
    vex_state->guest_w2.w64[1] = 0;
+
+   vex_state->guest_IP_AT_SYSCALL = 0;
 }
 
 void LibVEX_GuestMIPS64_initialise ( /*OUT*/ VexGuestMIPS64State * vex_state )
@@ -294,6 +296,8 @@ void LibVEX_GuestMIPS64_initialise ( /*OUT*/ VexGuestMIPS64State * vex_state )
    vex_state->guest_LLaddr = 0xFFFFFFFFFFFFFFFFULL;
    vex_state->guest_LLdata = 0;
 
+   vex_state->guest_IP_AT_SYSCALL = 0;
+
    vex_state->guest_MSACSR = 0;
 }
 

diff --git a/VEX/pub/libvex_guest_mips32.h b/VEX/pub/libvex_guest_mips32.h
index 214f63cdbe8c0a011852d015e67a6809dd7a4d88..e769819d75ae9bc1f5fbaeb828ea329a7809d00a 100644 (file)
--- a/VEX/pub/libvex_guest_mips32.h
+++ b/VEX/pub/libvex_guest_mips32.h
@@ -188,10 +188,10 @@ typedef
 
       /*  1016 */ UInt guest_MSACSR;
 
-      /*  1020 */ UInt _padding3;
+      /*  1020 */ UInt guest_IP_AT_SYSCALL;
 
-      /*  1020 */ ULong guest_LLdata64;
-      /*  1028 */ ULong _padding4;
+      /*  1024 */ ULong guest_LLdata64;
+      /*  1032 */ ULong _padding3;
 } VexGuestMIPS32State;
 /*---------------------------------------------------------------*/
 /*--- Utility functions for MIPS32 guest stuff.               ---*/

diff --git a/VEX/pub/libvex_guest_mips64.h b/VEX/pub/libvex_guest_mips64.h
index 657fe6fa3343f5b60f9437d5eec5f45ab885d8f5..a953f0ab86a24a35c5a71c5e7a366db7577f3a4b 100644 (file)
--- a/VEX/pub/libvex_guest_mips64.h
+++ b/VEX/pub/libvex_guest_mips64.h
@@ -184,6 +184,8 @@ typedef
       /* 1144 */ UInt guest_MSACSR;
 
       /* 1148 */ UInt _padding2;
+      /* 1152 */ ULong guest_IP_AT_SYSCALL;
+      /* 1160 */ ULong _padding3;
 
 } VexGuestMIPS64State;