|
From: <sv...@va...> - 2005-12-23 12:56:20
|
Author: sewardj
Date: 2005-12-23 12:56:11 +0000 (Fri, 23 Dec 2005)
New Revision: 5422
Log:
ppc64-linux fixes
Modified:
trunk/lackey/lk_main.c
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 2005-12-23 12:47:42 UTC (rev 5421)
+++ trunk/lackey/lk_main.c 2005-12-23 12:56:11 UTC (rev 5422)
@@ -36,8 +36,8 @@
#include "pub_tool_debuginfo.h"
#include "pub_tool_libcbase.h"
#include "pub_tool_options.h"
+#include "pub_tool_machine.h" // VG_(fnptr_to_fnentry)
=20
-
/* The name of the function of which the number of calls is to be
* counted, with default. Override with command line option
* --fnname. */
@@ -196,7 +196,9 @@
tl_assert(typeIx < N_TYPES);
=20
argv =3D mkIRExprVec_1( mkIRExpr_HWord( (HWord)&detailCounts[op][type=
Ix] ) );
- di =3D unsafeIRDirty_0_N( 1, "increment_detail", &increment_detail, a=
rgv);
+ di =3D unsafeIRDirty_0_N( 1, "increment_detail",
+ VG_(fnptr_to_fnentry)( &increment_detail )=
,=20
+ argv);
addStmtToIRBB( bb, IRStmt_Dirty(di) );
}
=20
@@ -264,7 +266,8 @@
}
=20
/* Count this basic block. */
- di =3D unsafeIRDirty_0_N( 0, "add_one_BB_entered", &add_one_BB_entere=
d,
+ di =3D unsafeIRDirty_0_N( 0, "add_one_BB_entered",=20
+ VG_(fnptr_to_fnentry)( &add_one_BB_entered=
),
mkIRExprVec_0() );
addStmtToIRBB( bb, IRStmt_Dirty(di) );
=20
@@ -273,7 +276,8 @@
if (!st || st->tag =3D=3D Ist_NoOp) continue;
=20
/* Count one VEX statement. */
- di =3D unsafeIRDirty_0_N( 0, "add_one_IRStmt", &add_one_IRStmt,=20
+ di =3D unsafeIRDirty_0_N( 0, "add_one_IRStmt",=20
+ VG_(fnptr_to_fnentry)( &add_one_IRStmt =
),=20
mkIRExprVec_0() );
addStmtToIRBB( bb, IRStmt_Dirty(di) );
=20
@@ -281,7 +285,7 @@
case Ist_IMark:
/* Count guest instruction. */
di =3D unsafeIRDirty_0_N( 0, "add_one_guest_instr",
- &add_one_guest_instr,=20
+ VG_(fnptr_to_fnentry)( &add_one_g=
uest_instr ),=20
mkIRExprVec_0() );
addStmtToIRBB( bb, IRStmt_Dirty(di) );
=20
@@ -302,9 +306,10 @@
if (VG_(get_fnname_if_entry)(st->Ist.IMark.addr,=20
fnname, sizeof(fnname))
&& 0 =3D=3D VG_(strcmp)(fnname, lk_clo_fnname)) {
- di =3D unsafeIRDirty_0_N( 0, "add_one_func_call",=20
- &add_one_func_call,=20
- mkIRExprVec_0() );
+ di =3D unsafeIRDirty_0_N(=20
+ 0, "add_one_func_call",=20
+ VG_(fnptr_to_fnentry)( &add_one_func_call ),=20
+ mkIRExprVec_0() );
addStmtToIRBB( bb, IRStmt_Dirty(di) );
}
addStmtToIRBB( bb, st );
@@ -312,7 +317,8 @@
=20
case Ist_Exit:
/* Count Jcc */
- di =3D unsafeIRDirty_0_N( 0, "add_one_Jcc", &add_one_Jcc,=20
+ di =3D unsafeIRDirty_0_N( 0, "add_one_Jcc",=20
+ VG_(fnptr_to_fnentry)( &add_one_J=
cc ),=20
mkIRExprVec_0() );
addStmtToIRBB( bb, IRStmt_Dirty(di) );
=20
@@ -320,7 +326,8 @@
=20
/* Count non-taken Jcc */
di =3D unsafeIRDirty_0_N( 0, "add_one_Jcc_untaken",=20
- &add_one_Jcc_untaken, mkIRExprVec=
_0() );
+ VG_(fnptr_to_fnentry)( &add_one_J=
cc_untaken ),
+ mkIRExprVec_0() );
addStmtToIRBB( bb, IRStmt_Dirty(di) );
break;
=20
@@ -374,7 +381,8 @@
=20
/* Count this basic block. */
di =3D unsafeIRDirty_0_N( 0, "add_one_BB_completed",=20
- &add_one_BB_completed, mkIRExprVec_0() );
+ VG_(fnptr_to_fnentry)( &add_one_BB_complet=
ed ),=20
+ mkIRExprVec_0() );
addStmtToIRBB( bb, IRStmt_Dirty(di) );
=20
return bb;
|