|
From: <sv...@va...> - 2005-10-12 16:45:31
|
Author: njn
Date: 2005-10-12 17:45:17 +0100 (Wed, 12 Oct 2005)
New Revision: 4913
Log:
Tiny comment/code layout tweaks; no functional change.
Modified:
trunk/cachegrind/cg_main.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 2005-10-12 16:16:03 UTC (rev 4912)
+++ trunk/cachegrind/cg_main.c 2005-10-12 16:45:17 UTC (rev 4913)
@@ -495,9 +495,10 @@
if (Ist_IMark =3D=3D st->tag) n_instrs++;
}
=20
- // Check that the BB has never been translated before. If this
- // assertion fails, there has been some screwup in translation
- // discard/invalidation management.
+ // Check that we don't have an entry for this BB in the instr-info ta=
ble.
+ // If this assertion fails, there has been some screwup: some
+ // translations must have been discarded but Cachegrind hasn't discar=
ded
+ // the corresponding entries in the instr-info table.
bbInfo =3D (BB_info*)VG_(HT_lookup)(instr_info_table, origAddr);
tl_assert(NULL =3D=3D bbInfo);
=20
@@ -514,13 +515,11 @@
=20
=20
static
-void init_instr_info( /*OUT*/instr_info* n,=20
- Addr instr_addr, Int instr_len )
+void init_instr_info( instr_info* n, Addr instr_addr, Int instr_len )
{
- lineCC* parent =3D get_lineCC(instr_addr);
- n->instr_addr =3D instr_addr;
- n->instr_len =3D instr_len;
- n->parent =3D parent;
+ n->instr_addr =3D instr_addr;
+ n->instr_len =3D instr_len;
+ n->parent =3D get_lineCC(instr_addr);
}
=20
static void showEvent ( Event* ev )
|