[Valgrind-developers] valgrind: r13498: Followup to VEX r2742 which eliminates IRExprP__VECRET and IRExprP__BBPTR

[<sv...@va...>]

florian	2013-08-15 21:55:42 +0100 (Thu, 15 Aug 2013)

  New Revision: 13498

  Log:
    Followup to VEX r2742 which eliminates IRExprP__VECRET and IRExprP__BBPTR
    and adds Iex_VECRET and Iex_BBPTR.

  Modified files:
    trunk/memcheck/mc_translate.c


  Modified: trunk/memcheck/mc_translate.c (+4 -4)
===================================================================
--- trunk/memcheck/mc_translate.c	2013-08-15 14:48:28 +01:00 (rev 13497)
+++ trunk/memcheck/mc_translate.c	2013-08-15 21:55:42 +01:00 (rev 13498)
@@ -4273,7 +4273,7 @@
       di = unsafeIRDirty_1_N( datavbits, 
                               2/*regparms*/, 
                               hname, VG_(fnptr_to_fnentry)( helper ), 
-                              mkIRExprVec_2( IRExprP__VECRET, addrAct ) );
+                              mkIRExprVec_2( IRExpr_VECRET(), addrAct ) );
    } else {
       di = unsafeIRDirty_1_N( datavbits, 
                               1/*regparms*/, 
@@ -4880,7 +4880,7 @@
    for (i = 0; d->args[i]; i++) {
       IRAtom* arg = d->args[i];
       if ( (d->cee->mcx_mask & (1<<i))
-           || UNLIKELY(is_IRExprP__VECRET_or_BBPTR(arg)) ) {
+           || UNLIKELY(is_IRExpr_VECRET_or_BBPTR(arg)) ) {
          /* ignore this arg */
       } else {
          here = mkPCastTo( mce, Ity_I32, expr2vbits(mce, arg) );
@@ -5755,7 +5755,7 @@
          d = st->Ist.Dirty.details;
          for (i = 0; d->args[i]; i++) {
             IRAtom* atom = d->args[i];
-            if (LIKELY(!is_IRExprP__VECRET_or_BBPTR(atom))) {
+            if (LIKELY(!is_IRExpr_VECRET_or_BBPTR(atom))) {
                if (isBogusAtom(atom))
                   return True;
             }
@@ -6647,7 +6647,7 @@
    for (i = 0; d->args[i]; i++) {
       IRAtom* arg = d->args[i];
       if ( (d->cee->mcx_mask & (1<<i))
-           || UNLIKELY(is_IRExprP__VECRET_or_BBPTR(arg)) ) {
+           || UNLIKELY(is_IRExpr_VECRET_or_BBPTR(arg)) ) {
          /* ignore this arg */
       } else {
          here = schemeE( mce, arg );