Merged FORMATCHECK branch (r8368) to trunk.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8369 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/callgrind/bbcc.c b/callgrind/bbcc.c
index 4b91c7c..c564266 100644
--- a/callgrind/bbcc.c
+++ b/callgrind/bbcc.c
@@ -85,7 +85,7 @@
jCC* jcc;
CLG_ASSERT(bbcc->cxt != 0);
- CLG_DEBUG(1, " zero_bbcc: BB %p, Cxt %d "
+ CLG_DEBUG(1, " zero_bbcc: BB %#lx, Cxt %d "
"(fn '%s', rec %d)\n",
bb_addr(bbcc->bb),
bbcc->cxt->base_number + bbcc->rec_index,
@@ -177,7 +177,7 @@
bbcc = bbcc->next;
}
- CLG_DEBUG(2," lookup_bbcc(BB %p, Cxt %d, fn '%s'): %p (tid %d)\n",
+ CLG_DEBUG(2," lookup_bbcc(BB %#lx, Cxt %d, fn '%s'): %p (tid %d)\n",
bb_addr(bb), cxt->base_number, cxt->fn[0]->name,
bbcc, bbcc ? bbcc->tid : 0);
@@ -294,7 +294,7 @@
CLG_(stat).distinct_bbccs++;
- CLG_DEBUG(3, " new_bbcc(BB %p): %p (now %d)\n",
+ CLG_DEBUG(3, " new_bbcc(BB %#lx): %p (now %d)\n",
bb_addr(bb), new, CLG_(stat).distinct_bbccs);
return new;
@@ -319,7 +319,7 @@
CLG_ASSERT(bbcc->cxt != 0);
- CLG_DEBUG(3,"+ insert_bbcc_into_hash(BB %p, fn '%s')\n",
+ CLG_DEBUG(3,"+ insert_bbcc_into_hash(BB %#lx, fn '%s')\n",
bb_addr(bbcc->bb), bbcc->cxt->fn[0]->name);
/* check fill degree of hash and resize if needed (>90%) */
@@ -368,7 +368,7 @@
{
BBCC* new;
- CLG_DEBUG(3,"+ clone_bbcc(BB %p, rec %d, fn %s)\n",
+ CLG_DEBUG(3,"+ clone_bbcc(BB %#lx, rec %d, fn %s)\n",
bb_addr(orig->bb), rec_index, cxt->fn[0]->name);
new = new_bbcc(orig->bb);
@@ -410,7 +410,7 @@
CLG_DEBUGIF(3)
CLG_(print_bbcc)(-2, new, False);
- CLG_DEBUG(2,"- clone_BBCC(%p, %d) for BB %p\n"
+ CLG_DEBUG(2,"- clone_BBCC(%p, %d) for BB %#lx\n"
" orig %s\n"
" new %s\n",
orig, rec_index, bb_addr(orig->bb),
@@ -433,7 +433,7 @@
{
BBCC* bbcc;
- CLG_DEBUG(3, "+ get_bbcc(BB %p)\n", bb_addr(bb));
+ CLG_DEBUG(3, "+ get_bbcc(BB %#lx)\n", bb_addr(bb));
bbcc = bb->bbcc_list;
@@ -453,7 +453,7 @@
CLG_(print_bbcc)(-2, bbcc, False);
}
- CLG_DEBUG(3, "- get_bbcc(BB %p): BBCC %p\n",
+ CLG_DEBUG(3, "- get_bbcc(BB %#lx): BBCC %p\n",
bb_addr(bb), bbcc);
return bbcc;
@@ -558,7 +558,7 @@
Bool ret_without_call = False;
Int popcount_on_return = 1;
- CLG_DEBUG(3,"+ setup_bbcc(BB %p)\n", bb_addr(bb));
+ CLG_DEBUG(3,"+ setup_bbcc(BB %#lx)\n", bb_addr(bb));
/* This is needed because thread switches can not reliable be tracked
* with callback CLG_(run_thread) only: we have otherwise no way to get
@@ -714,7 +714,7 @@
else
ppIRJumpKind( jmpkind );
- VG_(printf)(" %08lx -> %08x, SP %08x\n",
+ VG_(printf)(" %08lx -> %08lx, SP %08lx\n",
last_bb ? bb_jmpaddr(last_bb) : 0,
bb_addr(bb), sp);
}
@@ -870,7 +870,7 @@
VG_(printf)("\n");
}
- CLG_DEBUG(3,"- setup_bbcc (BB %p): Cost %p (Len %d), Instrs %d (Len %d)\n",
+ CLG_DEBUG(3,"- setup_bbcc (BB %#lx): Cost %p (Len %d), Instrs %d (Len %d)\n",
bb_addr(bb), bbcc->cost, bb->cost_count,
bb->instr_count, bb->instr_len);
CLG_DEBUGIF(3)