From: Julian Seward <jseward@acm.org>
Date: Mon, 14 Feb 2011 10:41:06 +0000 (+0000)
Subject: Merge from trunk, r11516 (x86: get_otrack_shadow_offset_wrk: handle
X-Git-Tag: svn/VALGRIND_3_6_1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a7b283d30695c690cab6f570c5762c995ac60d2;p=thirdparty%2Fvalgrind.git

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 3cc665e363..030c845482 100644
--- 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