Merge from trunk, r11516 (x86: get_otrack_shadow_offset_wrk: handle

guest_NRADDR)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_6_BRANCH@11549

diff --git a/memcheck/mc_machine.c b/memcheck/mc_machine.c
index 3cc665e363e66363362bd7eb70d33fce9c0c5d1f..030c845482c6b4d86819987ba54c9ccdd5850bdb 100644 (file)
--- a/memcheck/mc_machine.c
+++ b/memcheck/mc_machine.c
@@ -610,6 +610,7 @@ static Int get_otrack_shadow_offset_wrk ( Int offset, Int szB )
    if (o == GOF(ACFLAG)  && sz == 4) return -1; /* slot unused */
    if (o == GOF(TISTART) && sz == 4) return -1; /* slot unused */
    if (o == GOF(TILEN)   && sz == 4) return -1; /* slot unused */
+   if (o == GOF(NRADDR)  && sz == 4) return -1; /* slot unused */
 
    /* Treat %AH, %BH, %CH, %DH as independent registers.  To do this
       requires finding 4 unused 32-bit slots in the second-shadow