|
From: <sv...@va...> - 2010-08-22 12:16:33
|
Author: sewardj
Date: 2010-08-22 13:16:25 +0100 (Sun, 22 Aug 2010)
New Revision: 11282
Log:
Merge from branches/THUMB: add (partial) --track-origins support for
new guest state components needed for Thumb and NEON support.
Modified:
trunk/memcheck/mc_machine.c
Modified: trunk/memcheck/mc_machine.c
===================================================================
--- trunk/memcheck/mc_machine.c 2010-08-22 12:13:35 UTC (rev 11281)
+++ trunk/memcheck/mc_machine.c 2010-08-22 12:16:25 UTC (rev 11282)
@@ -711,7 +711,7 @@
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 @@
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 @@
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);
|