From: Julian Seward Date: Sun, 22 Aug 2010 12:16:25 +0000 (+0000) Subject: Merge from branches/THUMB: add (partial) --track-origins support for X-Git-Tag: svn/VALGRIND_3_6_0~175 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58d26cc9983f509ee5788a0af94947657627ba33;p=thirdparty%2Fvalgrind.git 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 3099523776..61494d9e3c 100644 --- 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);