(almost completely just function renaming):
* VG_(find_seginfo): incrementally rearrange the DebugInfo list, like
most of the other list-searching functions do.
* rename all VG_(*seginfo*) functions exported from m_debuginfo to
VG_(*DebugInfo*). "seginfo" was a historical name which was mostly
but not completely, done away with some time back.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10678 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/callgrind/fn.c b/callgrind/fn.c
index 0845a13..6ed6f60 100644
--- a/callgrind/fn.c
+++ b/callgrind/fn.c
@@ -232,8 +232,9 @@
obj_node* obj;
obj = (obj_node*) CLG_MALLOC("cl.fn.non.1", sizeof(obj_node));
- obj->name = di ? VG_(strdup)( "cl.fn.non.2",VG_(seginfo_filename)(di) )
- : anonymous_obj;
+ obj->name = di ? VG_(strdup)( "cl.fn.non.2",
+ VG_(DebugInfo_get_filename)(di) )
+ : anonymous_obj;
for (i = 0; i < N_FILE_ENTRIES; i++) {
obj->files[i] = NULL;
}
@@ -242,9 +243,9 @@
/* JRS 2008 Feb 19: maybe rename .start/.size/.offset to
.text_avma/.text_size/.test_bias to make it clearer what these
fields really mean */
- obj->start = di ? VG_(seginfo_get_text_avma)(di) : 0;
- obj->size = di ? VG_(seginfo_get_text_size)(di) : 0;
- obj->offset = di ? VG_(seginfo_get_text_bias)(di) : 0;
+ obj->start = di ? VG_(DebugInfo_get_text_avma)(di) : 0;
+ obj->size = di ? VG_(DebugInfo_get_text_size)(di) : 0;
+ obj->offset = di ? VG_(DebugInfo_get_text_bias)(di) : 0;
obj->next = next;
// not only used for debug output (see static.c)
@@ -266,7 +267,7 @@
UInt objname_hash;
const UChar* obj_name;
- obj_name = di ? (Char*) VG_(seginfo_filename)(di) : anonymous_obj;
+ obj_name = di ? (Char*) VG_(DebugInfo_get_filename)(di) : anonymous_obj;
/* lookup in obj hash */
objname_hash = str_hash(obj_name, N_OBJ_ENTRIES);
@@ -425,7 +426,7 @@
CLG_DEBUG(6, " + get_debug_info(%#lx)\n", instr_addr);
if (pDebugInfo) {
- *pDebugInfo = VG_(find_seginfo)(instr_addr);
+ *pDebugInfo = VG_(find_DebugInfo)(instr_addr);
// for generated code in anonymous space, pSegInfo is 0
}
@@ -471,7 +472,7 @@
CLG_DEBUG(6, " - get_debug_info(%#lx): seg '%s', fn %s\n",
instr_addr,
!pDebugInfo ? (const UChar*)"-" :
- (*pDebugInfo) ? VG_(seginfo_filename)(*pDebugInfo) :
+ (*pDebugInfo) ? VG_(DebugInfo_get_filename)(*pDebugInfo) :
(const UChar*)"(None)",
fn_name);