|
From: <sv...@va...> - 2007-11-14 15:25:05
|
Author: dirk
Date: 2007-11-14 15:25:05 +0000 (Wed, 14 Nov 2007)
New Revision: 7157
Log:
merge 7119 from trunk to make it compile again
Modified:
branches/FORMATCHECK/cachegrind/cg_main.c
branches/FORMATCHECK/callgrind/main.c
branches/FORMATCHECK/lackey/lk_main.c
branches/FORMATCHECK/memcheck/mc_translate.c
Modified: branches/FORMATCHECK/cachegrind/cg_main.c
===================================================================
--- branches/FORMATCHECK/cachegrind/cg_main.c 2007-11-13 22:00:20 UTC (rev 7156)
+++ branches/FORMATCHECK/cachegrind/cg_main.c 2007-11-14 15:25:05 UTC (rev 7157)
@@ -963,7 +963,7 @@
case Ist_AbiHint:
case Ist_Put:
case Ist_PutI:
- case Ist_MFence:
+ case Ist_MBE:
break;
case Ist_IMark:
Modified: branches/FORMATCHECK/callgrind/main.c
===================================================================
--- branches/FORMATCHECK/callgrind/main.c 2007-11-13 22:00:20 UTC (rev 7156)
+++ branches/FORMATCHECK/callgrind/main.c 2007-11-14 15:25:05 UTC (rev 7157)
@@ -468,7 +468,7 @@
case Ist_Put:
case Ist_PutI:
- case Ist_MFence:
+ case Ist_MBE:
case Ist_Exit:
break;
Modified: branches/FORMATCHECK/lackey/lk_main.c
===================================================================
--- branches/FORMATCHECK/lackey/lk_main.c 2007-11-13 22:00:20 UTC (rev 7156)
+++ branches/FORMATCHECK/lackey/lk_main.c 2007-11-14 15:25:05 UTC (rev 7157)
@@ -670,7 +670,7 @@
case Ist_AbiHint:
case Ist_Put:
case Ist_PutI:
- case Ist_MFence:
+ case Ist_MBE:
addStmtToIRSB( sbOut, st );
break;
Modified: branches/FORMATCHECK/memcheck/mc_translate.c
===================================================================
--- branches/FORMATCHECK/memcheck/mc_translate.c 2007-11-13 22:00:20 UTC (rev 7156)
+++ branches/FORMATCHECK/memcheck/mc_translate.c 2007-11-14 15:25:05 UTC (rev 7157)
@@ -3290,7 +3290,7 @@
return isBogusAtom(st->Ist.AbiHint.base);
case Ist_NoOp:
case Ist_IMark:
- case Ist_MFence:
+ case Ist_MBE:
return False;
default:
unhandled:
@@ -3470,7 +3470,7 @@
case Ist_NoOp:
case Ist_IMark:
- case Ist_MFence:
+ case Ist_MBE:
break;
case Ist_Dirty:
|