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 e45d666ec8e5ab65e9d026b3ec3d21914a7f8735..07491ad1ef34f061379ac54a4351cd3afa642ead 100644 (file)
--- 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