From: Julian Seward <jseward@acm.org>
Date: Fri, 9 May 2008 23:26:19 +0000 (+0000)
Subject: Oops.  Don't die on {x86,amd64}-linux when doing --track-origins=yes
X-Git-Tag: svn/VALGRIND_3_4_0~617
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a6be60077cef03e95d8c43720bb69d368c25497;p=thirdparty%2Fvalgrind.git

Oops.  Don't die on {x86,amd64}-linux when doing --track-origins=yes
and --smc-check=all.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8021
---

diff --git a/memcheck/mc_machine.c b/memcheck/mc_machine.c
index e45d666ec8..07491ad1ef 100644
--- a/memcheck/mc_machine.c
+++ b/memcheck/mc_machine.c
@@ -489,6 +489,8 @@ static Int get_otrack_shadow_offset_wrk ( Int offset, Int szB )
    if (o == GOF(RIP)     && sz == 8) return -1; /* slot unused */
    if (o == GOF(IDFLAG)  && sz == 8) return -1; /* slot used for %DH */
    if (o == GOF(FS_ZERO) && sz == 8) return -1; /* slot unused */
+   if (o == GOF(TISTART) && sz == 8) return -1; /* slot unused */
+   if (o == GOF(TILEN)   && sz == 8) 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
@@ -591,6 +593,8 @@ static Int get_otrack_shadow_offset_wrk ( Int offset, Int szB )
    if (o == GOF(EIP)     && sz == 4) return -1; /* slot unused */
    if (o == GOF(IDFLAG)  && sz == 4) return -1; /* slot used for %DH */
    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 */
 
    /* Treat %AH, %BH, %CH, %DH as independent registers.  To do this
       requires finding 4 unused 32-bit slots in the second-shadow