Rename BBPTR to GSPTR as it denotes guest state pointer only

Fixes BZ#373555.

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

diff --git a/NEWS b/NEWS
index fe609aa3019558259f16ba739ca528c474d6ecca..155d14222324d518ad435db4496e75dc64273c3a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -91,6 +91,7 @@ where XXXXXX is the bug number as listed below.
 372600  process loops forever when fatal signals are arriving quickly
 373046  Stacks registered by core are never deregistered
 373192  Calling posix_spawn in glibc 2.24 completely broken
+373555  Rename BBPTR to GSPTR as it denotes guest state pointer only
 
 Release 3.12.0 (20 October 2016)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/memcheck/mc_translate.c b/memcheck/mc_translate.c
index 999276b2a3dbf33523e22354b7f60b96b7c43ca7..da7a0bb9925271f437bf269021527a067181521c 100644 (file)
--- a/memcheck/mc_translate.c
+++ b/memcheck/mc_translate.c
@@ -5370,7 +5370,7 @@ void do_shadow_Dirty ( MCEnv* mce, IRDirty* d )
    for (i = 0; d->args[i]; i++) {
       IRAtom* arg = d->args[i];
       if ( (d->cee->mcx_mask & (1<<i))
-           || UNLIKELY(is_IRExpr_VECRET_or_BBPTR(arg)) ) {
+           || UNLIKELY(is_IRExpr_VECRET_or_GSPTR(arg)) ) {
          /* ignore this arg */
       } else {
          here = mkPCastTo( mce, Ity_I32, expr2vbits(mce, arg) );
@@ -6268,7 +6268,7 @@ static Bool checkForBogusLiterals ( /*FLAT*/ IRStmt* st )
          d = st->Ist.Dirty.details;
          for (i = 0; d->args[i]; i++) {
             IRAtom* atom = d->args[i];
-            if (LIKELY(!is_IRExpr_VECRET_or_BBPTR(atom))) {
+            if (LIKELY(!is_IRExpr_VECRET_or_GSPTR(atom))) {
                if (isBogusAtom(atom))
                   return True;
             }
@@ -7273,7 +7273,7 @@ static void do_origins_Dirty ( MCEnv* mce, IRDirty* d )
    for (i = 0; d->args[i]; i++) {
       IRAtom* arg = d->args[i];
       if ( (d->cee->mcx_mask & (1<<i))
-           || UNLIKELY(is_IRExpr_VECRET_or_BBPTR(arg)) ) {
+           || UNLIKELY(is_IRExpr_VECRET_or_GSPTR(arg)) ) {
          /* ignore this arg */
       } else {
          here = schemeE( mce, arg );