Merge from branches/THUMB: add (partial) --track-origins support for

new guest state components needed for Thumb and NEON support.

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

diff --git a/memcheck/mc_machine.c b/memcheck/mc_machine.c
index 30995237769c133ff4fd0244fd506871f41b57e8..61494d9e3c490c43daa21e4fff5f7d194f83753e 100644 (file)
--- a/memcheck/mc_machine.c
+++ b/memcheck/mc_machine.c
@@ -711,7 +711,7 @@ static Int get_otrack_shadow_offset_wrk ( Int offset, Int szB )
    if (o == GOF(R14) && sz == 4) return o;
 
    /* EAZG: These may be completely wrong. */
-   if (o == GOF(R15)   && sz == 4) return -1; /* slot unused */
+   if (o == GOF(R15T)  && sz == 4) return -1; /* slot unused */
    if (o == GOF(CC_OP) && sz == 4) return -1; /* slot unused */
 
    if (o == GOF(CC_DEP1) && sz == 4) return o;
@@ -719,6 +719,8 @@ static Int get_otrack_shadow_offset_wrk ( Int offset, Int szB )
 
    if (o == GOF(CC_NDEP) && sz == 4) return -1; /* slot unused */
 
+   if (o == GOF(QFLAG32) && sz == 4) return o;
+
    //if (o == GOF(SYSCALLNO)     && sz == 4) return -1; /* slot unused */
    //if (o == GOF(CC)     && sz == 4) return -1; /* slot unused */
    //if (o == GOF(EMWARN)     && sz == 4) return -1; /* slot unused */
@@ -727,6 +729,7 @@ static Int get_otrack_shadow_offset_wrk ( Int offset, Int szB )
 
    if (o == GOF(FPSCR)    && sz == 4) return -1;
    if (o == GOF(TPIDRURO) && sz == 4) return -1;
+   if (o == GOF(ITSTATE)  && sz == 4) return -1;
 
    if (o >= GOF(D0)  && o+sz <= GOF(D0) +SZB(D0))  return GOF(D0);
    if (o >= GOF(D1)  && o+sz <= GOF(D1) +SZB(D1))  return GOF(D1);