Track Vex API (semantics) changes in rev 1061: introduction of IRStmt_NoOp.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3396 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/addrcheck/ac_main.c b/addrcheck/ac_main.c
index 93ae96e..e93981a 100644
--- a/addrcheck/ac_main.c
+++ b/addrcheck/ac_main.c
@@ -1007,7 +1007,7 @@
for (i = 0; i < bb_in->stmts_used; i++) {
st = bb_in->stmts[i];
- if (!st) continue;
+ tl_assert(st);
/* Examine each stmt in turn to figure out if it needs to be
preceded by a memory access check. If so, collect up the
@@ -1061,6 +1061,7 @@
}
break;
+ case Ist_NoOp:
case Ist_IMark:
case Ist_MFence:
break;
diff --git a/cachegrind/cg_main.c b/cachegrind/cg_main.c
index 03feacb..d6e18ee 100644
--- a/cachegrind/cg_main.c
+++ b/cachegrind/cg_main.c
@@ -384,9 +384,6 @@
return bbInfo;
}
-// XXX: remove eventually
-#define Ist_Nop 99
-
static
void handleOneStatement(IRTypeEnv* tyenv, IRBB* bbOut, IRStmt* st,
Addr* instrAddr, UInt* instrLen,
@@ -394,7 +391,7 @@
UInt* dataSize)
{
switch (st->tag) {
- case Ist_Nop:
+ case Ist_NoOp:
break;
case Ist_IMark:
@@ -573,15 +570,6 @@
UInt instrLen;
IRExpr *loadAddrExpr, *storeAddrExpr;
- // Add Nops
- // XXX: remove eventually
- IRStmt xxx = { Ist_Nop };
- IRStmt* myNOP = &xxx;
- for (i = 0; i < bbIn->stmts_used; i++) {
- st = bbIn->stmts[i];
- if (!st) bbIn->stmts[i] = myNOP;
- }
-
/* Set up BB */
bbOut = emptyIRBB();
bbOut->tyenv = dopyIRTypeEnv(bbIn->tyenv);
diff --git a/memcheck/mc_translate.c b/memcheck/mc_translate.c
index 7de3e06..5dc79be 100644
--- a/memcheck/mc_translate.c
+++ b/memcheck/mc_translate.c
@@ -2371,6 +2371,7 @@
|| isBogusAtom(st->Ist.STle.data);
case Ist_Exit:
return isBogusAtom(st->Ist.Exit.guard);
+ case Ist_NoOp:
case Ist_IMark:
case Ist_MFence:
return False;
@@ -2411,7 +2412,7 @@
for (i = 0; i < bb_in->stmts_used; i++) {
st = bb_in->stmts[i];
- if (!st) continue;
+ tl_assert(st);
tl_assert(isFlatIRStmt(st));
@@ -2465,6 +2466,7 @@
complainIfUndefined( &mce, st->Ist.Exit.guard );
break;
+ case Ist_NoOp:
case Ist_IMark:
case Ist_MFence:
break;