Menu
▾
▴
[Valgrind-developers] valgrind: r3709 - in trunk: coregrind coregrind/m_aspacemgr helgrind include
|
From: <sv...@va...> - 2005-05-14 18:42:28
|
Author: njn
Date: 2005-05-14 19:42:26 +0100 (Sat, 14 May 2005)
New Revision: 3709
Modified:
trunk/coregrind/core.h
trunk/coregrind/m_aspacemgr/aspacemgr.c
trunk/coregrind/pub_core_aspacemgr.h
trunk/coregrind/vg_symtab2.c
trunk/helgrind/hg_main.c
trunk/include/tool.h
Log:
Renamed the field Segment.symtab to Segment.seginfo to avoid confusion
with SegInfo.symtab. =20
Also renamed VG_(symtab_{inc,dec}ref)() as VG_(seginfo_{inc,dec}ref)()
for the same reason.
Also renamed various SegInfo variables from "seg" to "si" to avoid
confusion with the many Segment variables called "seg".
Modified: trunk/coregrind/core.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/coregrind/core.h 2005-05-14 17:18:12 UTC (rev 3708)
+++ trunk/coregrind/core.h 2005-05-14 18:42:26 UTC (rev 3709)
@@ -642,8 +642,8 @@
=20
extern Bool VG_(is_object_file) ( const void *hdr );
extern SegInfo * VG_(read_seg_symbols) ( Segment *seg );
-extern void VG_(symtab_incref) ( SegInfo * );
-extern void VG_(symtab_decref) ( SegInfo *, Addr a );
+extern void VG_(seginfo_incref) ( SegInfo * );
+extern void VG_(seginfo_decref) ( SegInfo *, Addr a );
=20
extern Bool VG_(get_fnname_nodemangle)( Addr a, Char* fnname, Int n_fnna=
me );
=20
Modified: trunk/coregrind/m_aspacemgr/aspacemgr.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/coregrind/m_aspacemgr/aspacemgr.c 2005-05-14 17:18:12 UTC (rev =
3708)
+++ trunk/coregrind/m_aspacemgr/aspacemgr.c 2005-05-14 18:42:26 UTC (rev =
3709)
@@ -278,7 +278,7 @@
segments[i].fnIdx =3D -1;
segments[i].dev =3D 0;
segments[i].ino =3D 0;
- segments[i].symtab =3D NULL;
+ segments[i].seginfo =3D NULL;
}
=20
=20
@@ -386,7 +386,7 @@
if (s1->prot !=3D s2->prot)
return False;
=20
- if (s1->symtab !=3D s2->symtab)
+ if (s1->seginfo !=3D s2->seginfo)
return False;
=20
if (s1->flags & SF_FILE){
@@ -520,9 +520,9 @@
static void freeseg(Segment *s)
{
recycleseg(s);
- if (s->symtab !=3D NULL) {
- VG_(symtab_decref)(s->symtab, s->addr);
- s->symtab =3D NULL;
+ if (s->seginfo !=3D NULL) {
+ VG_(seginfo_decref)(s->seginfo, s->addr);
+ s->seginfo =3D NULL;
}
=20
VG_(SkipNode_Free)(&sk_segments, s);
@@ -700,7 +700,7 @@
s->filename =3D s->fnIdx=3D=3D-1 ? NULL : &segnames[s->fnIdx].fname[0=
];
s->dev =3D dev;
s->ino =3D ino;
- s->symtab =3D NULL;
+ s->seginfo =3D NULL;
=20
/* Clean up right now */
preen_segments();
@@ -710,7 +710,7 @@
Valgrind, is at least readable and seems to contain an object
file, then try reading symbols from it.
*/
- if (s->symtab =3D=3D NULL
+ if (s->seginfo =3D=3D NULL
&& (addr+len < VG_(valgrind_base) || addr > VG_(valgrind_last))
&& (flags & (SF_MMAP|SF_NOSYMS)) =3D=3D SF_MMAP) {
if (off =3D=3D 0
@@ -718,22 +718,22 @@
&& (prot & (VKI_PROT_READ|VKI_PROT_EXEC)) =3D=3D (VKI_PROT_READ|VKI_P=
ROT_EXEC)
&& len >=3D VKI_PAGE_SIZE
&& VG_(is_object_file)((void *)addr)) {
- s->symtab =3D VG_(read_seg_symbols)(s);
- if (s->symtab !=3D NULL) {
+ s->seginfo =3D VG_(read_seg_symbols)(s);
+ if (s->seginfo !=3D NULL) {
s->flags |=3D SF_DYNLIB;
}
} else if (flags & SF_MMAP) {
#if 0
const SegInfo *info;
=20
- /* Otherwise see if an existing symtab applies to this Segment */
+ /* Otherwise see if an existing SegInfo applies to this Segment */
for(info =3D VG_(next_seginfo)(NULL);
info !=3D NULL;
info =3D VG_(next_seginfo)(info)) {
if (VG_(seg_overlaps)(s, VG_(seg_start)(info), VG_(seg_size)(info))=
)
{
- s->symtab =3D (SegInfo *)info;
- VG_(symtab_incref)((SegInfo *)info);
+ s->seginfo =3D (SegInfo *)info;
+ VG_(seginfo_incref)((SegInfo *)info);
}
}
#endif
Modified: trunk/coregrind/pub_core_aspacemgr.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/coregrind/pub_core_aspacemgr.h 2005-05-14 17:18:12 UTC (rev 370=
8)
+++ trunk/coregrind/pub_core_aspacemgr.h 2005-05-14 18:42:26 UTC (rev 370=
9)
@@ -77,7 +77,7 @@
UInt dev; // device
UInt ino; // inode
=20
- SegInfo* symtab; // symbol table
+ SegInfo* seginfo; // symbol table, etc
};
=20
/* segment mapped from a file descriptor */
Modified: trunk/coregrind/vg_symtab2.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/coregrind/vg_symtab2.c 2005-05-14 17:18:12 UTC (rev 3708)
+++ trunk/coregrind/vg_symtab2.c 2005-05-14 18:42:26 UTC (rev 3709)
@@ -1539,7 +1539,7 @@
continue;
=20
if (seg->symtab !=3D NULL)
- VG_(symtab_decref)(seg->symtab, seg->addr);
+ VG_(seginfo_decref)(seg->symtab, seg->addr);
=20
VG_(symtab_incref)(si);
seg->symtab =3D si;
@@ -1644,11 +1644,11 @@
else FIND(".plt", si->plt_start, si->plt_size, dummy_a=
ddr, 1, Addr)
=20
# undef FIND
- =20
- /* Check some sizes */
- vg_assert((o_dynsym_sz % sizeof(ElfXX_Sym)) =3D=3D 0);
- vg_assert((o_symtab_sz % sizeof(ElfXX_Sym)) =3D=3D 0);
}
+ =20
+ /* Check some sizes */
+ vg_assert((o_dynsym_sz % sizeof(ElfXX_Sym)) =3D=3D 0);
+ vg_assert((o_symtab_sz % sizeof(ElfXX_Sym)) =3D=3D 0);
=20
read_symtab(si, "symbol table", False,
o_symtab, o_symtab_sz,
@@ -1702,10 +1702,6 @@
else FIND(".line", dwarf1l, dwarf1l_sz, =
UChar*)
=20
# undef FIND
- =20
- /* Check some sizes */
- vg_assert((o_dynsym_sz % sizeof(ElfXX_Sym)) =3D=3D 0);
- vg_assert((o_symtab_sz % sizeof(ElfXX_Sym)) =3D=3D 0);
}
}
}
@@ -1766,7 +1762,7 @@
{
SegInfo* si;
=20
- vg_assert(seg->symtab =3D=3D NULL);
+ vg_assert(seg->seginfo =3D=3D NULL);
=20
VGP_PUSHCC(VgpReadSyms);
=20
@@ -1869,14 +1865,14 @@
return;
}
=20
-void VG_(symtab_decref)(SegInfo *si, Addr start)
+void VG_(seginfo_decref)(SegInfo *si, Addr start)
{
vg_assert(si->ref >=3D 1);
if (--si->ref =3D=3D 0)
unload_symbols(si->start, si->size);
}
=20
-void VG_(symtab_incref)(SegInfo *si)
+void VG_(seginfo_incref)(SegInfo *si)
{
vg_assert(si->ref > 0);
si->ref++;
@@ -1949,10 +1945,10 @@
=20
s =3D VG_(find_segment)(ptr);
=20
- if (s =3D=3D NULL || s->symtab =3D=3D NULL)
+ if (s =3D=3D NULL || s->seginfo =3D=3D NULL)
goto not_found;
=20
- si =3D s->symtab;
+ si =3D s->seginfo;
=20
sno =3D search_one_symtab ( si, ptr, match_anywhere_in_fun );
if (sno =3D=3D -1) goto not_found;
@@ -2522,56 +2518,56 @@
/*--- SegInfo accessor functions ---*/
/*------------------------------------------------------------*/
=20
-const SegInfo* VG_(next_seginfo)(const SegInfo* seg)
+const SegInfo* VG_(next_seginfo)(const SegInfo* si)
{
- if (seg =3D=3D NULL)
+ if (si =3D=3D NULL)
return segInfo;
- return seg->next;
+ return si->next;
}
=20
-Addr VG_(seg_start)(const SegInfo* seg)
+Addr VG_(seg_start)(const SegInfo* si)
{
- return seg->start;
+ return si->start;
}
=20
-SizeT VG_(seg_size)(const SegInfo* seg)
+SizeT VG_(seg_size)(const SegInfo* si)
{
- return seg->size;
+ return si->size;
}
=20
-const UChar* VG_(seg_filename)(const SegInfo* seg)
+const UChar* VG_(seg_filename)(const SegInfo* si)
{
- return seg->filename;
+ return si->filename;
}
=20
-ULong VG_(seg_sym_offset)(const SegInfo* seg)
+ULong VG_(seg_sym_offset)(const SegInfo* si)
{
- return seg->offset;
+ return si->offset;
}
=20
VgSectKind VG_(seg_sect_kind)(Addr a)
{
- SegInfo* seg;
+ SegInfo* si;
VgSectKind ret =3D Vg_SectUnknown;
=20
- for(seg =3D segInfo; seg !=3D NULL; seg =3D seg->next) {
- if (a >=3D seg->start && a < (seg->start + seg->size)) {
+ for(si =3D segInfo; si !=3D NULL; si =3D si->next) {
+ if (a >=3D si->start && a < (si->start + si->size)) {
if (0)
- VG_(printf)("addr=3D%p seg=3D%p %s got=3D%p %d plt=3D%p %d data=3D=
%p %d bss=3D%p %d\n",
- a, seg, seg->filename,=20
- seg->got_start, seg->got_size,
- seg->plt_start, seg->plt_size,
- seg->data_start, seg->data_size,
- seg->bss_start, seg->bss_size);
+ VG_(printf)("addr=3D%p si=3D%p %s got=3D%p %d plt=3D%p %d data=3D%=
p %d bss=3D%p %d\n",
+ a, si, si->filename,=20
+ si->got_start, si->got_size,
+ si->plt_start, si->plt_size,
+ si->data_start, si->data_size,
+ si->bss_start, si->bss_size);
ret =3D Vg_SectText;
=20
- if (a >=3D seg->data_start && a < (seg->data_start + seg->data_size))
+ if (a >=3D si->data_start && a < (si->data_start + si->data_size))
ret =3D Vg_SectData;
- else if (a >=3D seg->bss_start && a < (seg->bss_start + seg->bss_size)=
)
+ else if (a >=3D si->bss_start && a < (si->bss_start + si->bss_size))
ret =3D Vg_SectBSS;
- else if (a >=3D seg->plt_start && a < (seg->plt_start + seg->plt_size)=
)
+ else if (a >=3D si->plt_start && a < (si->plt_start + si->plt_size))
ret =3D Vg_SectPLT;
- else if (a >=3D seg->got_start && a < (seg->got_start + seg->got_size)=
)
+ else if (a >=3D si->got_start && a < (si->got_start + si->got_size))
ret =3D Vg_SectGOT;
}
}
Modified: trunk/helgrind/hg_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/helgrind/hg_main.c 2005-05-14 17:18:12 UTC (rev 3708)
+++ trunk/helgrind/hg_main.c 2005-05-14 18:42:26 UTC (rev 3709)
@@ -2402,14 +2402,15 @@
=20
/* Search for it in segments */
{
- const SegInfo *seg;
+ const SegInfo *si;
=20
- for(seg =3D VG_(next_seginfo)(NULL);=20
- seg !=3D NULL;=20
- seg =3D VG_(next_seginfo)(seg)) {
- Addr base =3D VG_(seg_start)(seg);
- SizeT size =3D VG_(seg_size)(seg);
- const UChar *filename =3D VG_(seg_filename)(seg);
+ for (si =3D VG_(next_seginfo)(NULL);=20
+ si !=3D NULL;=20
+ si =3D VG_(next_seginfo)(si))=20
+ {
+ Addr base =3D VG_(seg_start)(si);
+ SizeT size =3D VG_(seg_size)(si);
+ const UChar *filename =3D VG_(seg_filename)(si);
=20
if (a >=3D base && a < base+size) {
ai->akind =3D Segment;
Modified: trunk/include/tool.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/include/tool.h 2005-05-14 17:18:12 UTC (rev 3708)
+++ trunk/include/tool.h 2005-05-14 18:42:26 UTC (rev 3709)
@@ -559,11 +559,11 @@
is present or not. */
extern SegInfo* VG_(get_obj) ( Addr a );
=20
-extern const SegInfo* VG_(next_seginfo) ( const SegInfo *seg );
-extern Addr VG_(seg_start) ( const SegInfo *seg );
-extern SizeT VG_(seg_size) ( const SegInfo *seg );
-extern const UChar* VG_(seg_filename) ( const SegInfo *seg );
-extern ULong VG_(seg_sym_offset)( const SegInfo *seg );
+extern const SegInfo* VG_(next_seginfo) ( const SegInfo *si );
+extern Addr VG_(seg_start) ( const SegInfo *si );
+extern SizeT VG_(seg_size) ( const SegInfo *si );
+extern const UChar* VG_(seg_filename) ( const SegInfo *si );
+extern ULong VG_(seg_sym_offset)( const SegInfo *si );
=20
typedef
enum {
|
