|
From: <sv...@va...> - 2006-11-25 22:38:15
|
Author: njn
Date: 2006-11-25 22:38:11 +0000 (Sat, 25 Nov 2006)
New Revision: 6372
Log:
Use the newly-added dopyIRBBExceptStmts() in tools.
Modified:
trunk/cachegrind/cg_main.c
trunk/callgrind/main.c
trunk/lackey/lk_main.c
trunk/memcheck/mc_translate.c
Modified: trunk/cachegrind/cg_main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cachegrind/cg_main.c 2006-11-24 15:18:15 UTC (rev 6371)
+++ trunk/cachegrind/cg_main.c 2006-11-25 22:38:11 UTC (rev 6372)
@@ -724,12 +724,8 @@
VG_(tool_panic)("host/guest word size mismatch");
}
=20
- /* Set up BB, including copying of the where-next stuff. */
- cgs.bbOut =3D emptyIRBB();
- cgs.bbOut->tyenv =3D dopyIRTypeEnv(tyenv);
- tl_assert( isIRAtom(bbIn->next) );
- cgs.bbOut->next =3D dopyIRExpr(bbIn->next);
- cgs.bbOut->jumpkind =3D bbIn->jumpkind;
+ // Set up new BB
+ cgs.bbOut =3D dopyIRBBExceptStmts(bbIn);
=20
// Copy verbatim any IR preamble preceding the first IMark
i =3D 0;
Modified: trunk/callgrind/main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/callgrind/main.c 2006-11-24 15:18:15 UTC (rev 6371)
+++ trunk/callgrind/main.c 2006-11-25 22:38:11 UTC (rev 6372)
@@ -530,10 +530,7 @@
CLG_DEBUG(3, "+ instrument(BB %p)\n", (Addr)closure->readdr);
=20
/* Set up BB for instrumented IR */
- bbOut =3D emptyIRBB();
- bbOut->tyenv =3D dopyIRTypeEnv(bbIn->tyenv);
- bbOut->next =3D dopyIRExpr(bbIn->next);
- bbOut->jumpkind =3D bbIn->jumpkind;
+ bbOut =3D dopyIRBBExceptStmts(bbIn);
=20
// Copy verbatim any IR preamble preceding the first IMark
i =3D 0;
Modified: trunk/lackey/lk_main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lackey/lk_main.c 2006-11-24 15:18:15 UTC (rev 6371)
+++ trunk/lackey/lk_main.c 2006-11-25 22:38:11 UTC (rev 6372)
@@ -560,10 +560,7 @@
}
=20
/* Set up BB */
- bbOut =3D emptyIRBB();
- bbOut->tyenv =3D dopyIRTypeEnv(bbIn->tyenv);
- bbOut->next =3D dopyIRExpr(bbIn->next);
- bbOut->jumpkind =3D bbIn->jumpkind;
+ bbOut =3D dopyIRBBExceptStmts(bbIn);
=20
// Copy verbatim any IR preamble preceding the first IMark
i =3D 0;
Modified: trunk/memcheck/mc_translate.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/mc_translate.c 2006-11-24 15:18:15 UTC (rev 6371)
+++ trunk/memcheck/mc_translate.c 2006-11-25 22:38:11 UTC (rev 6372)
@@ -3257,10 +3257,7 @@
tl_assert(sizeof(Int) =3D=3D 4);
=20
/* Set up BB */
- bb =3D emptyIRBB();
- bb->tyenv =3D dopyIRTypeEnv(bb_in->tyenv);
- bb->next =3D dopyIRExpr(bb_in->next);
- bb->jumpkind =3D bb_in->jumpkind;
+ bb =3D dopyIRBBExceptStmts(bb_in);
=20
/* Set up the running environment. Only .bb is modified as we go
along. */
|