|
From: <sv...@va...> - 2007-01-11 21:56:21
|
Author: sewardj
Date: 2007-01-11 21:56:20 +0000 (Thu, 11 Jan 2007)
New Revision: 6508
Log:
In struct _SegInfo, rename field 'size' to 'text_size' so as to be
consistent with all the other 'foo_start_avma'/'foo_size' pairings.
Modified:
trunk/coregrind/m_debuginfo/debuginfo.c
trunk/coregrind/m_debuginfo/priv_storage.h
trunk/coregrind/m_debuginfo/readelf.c
trunk/coregrind/m_debuginfo/storage.c
Modified: trunk/coregrind/m_debuginfo/debuginfo.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_debuginfo/debuginfo.c 2007-01-11 20:11:51 UTC (rev =
6507)
+++ trunk/coregrind/m_debuginfo/debuginfo.c 2007-01-11 21:56:20 UTC (rev =
6508)
@@ -115,7 +115,7 @@
SegInfo* si =3D VG_(arena_calloc)(VG_AR_SYMTAB, 1, sizeof(SegInfo));
=20
si->text_start_avma =3D start;
- si->size =3D size;
+ si->text_size =3D size;
si->foffset =3D foffset;
si->filename =3D VG_(arena_strdup)(VG_AR_SYMTAB, filename);
si->memname =3D memname=20
@@ -169,7 +169,7 @@
VG_(message)(Vg_DebugMsg,=20
"Discarding syms at %p-%p in %s due to %s()",=20
si->text_start_avma,=20
- si->text_start_avma + si->size,
+ si->text_start_avma + si->text_size,
curr->filename ? curr->filename : (UChar*)"???"=
,
reason);
vg_assert(*prev_next_ptr =3D=3D curr);
@@ -202,8 +202,8 @@
while (True) {
if (curr =3D=3D NULL)
break;
- if (start+length-1 < curr->text_start_avma=20
- || curr->text_start_avma+curr->size-1 < start) {
+ if (start+length - 1 < curr->text_start_avma=20
+ || curr->text_start_avma + curr->text_size - 1 < start) {
/* no overlap */
} else {
found =3D True;
@@ -473,7 +473,7 @@
=20
for (si =3D segInfo_list; si !=3D NULL; si =3D si->next) {
if (si->text_start_avma <=3D ptr=20
- && ptr < si->text_start_avma + si->size) {
+ && ptr < si->text_start_avma + si->text_size) {
sno =3D ML_(search_one_symtab) ( si, ptr, match_anywhere_in_fun=
);
if (sno =3D=3D -1) goto not_found;
*symno =3D sno;
@@ -498,7 +498,7 @@
=20
for (si =3D segInfo_list; si !=3D NULL; si =3D si->next) {
if (si->text_start_avma <=3D ptr=20
- && ptr < si->text_start_avma + si->size) {
+ && ptr < si->text_start_avma + si->text_size) {
lno =3D ML_(search_one_loctab) ( si, ptr );
if (lno =3D=3D -1) goto not_found;
*locno =3D lno;
@@ -641,7 +641,8 @@
=20
vg_assert(nbuf > 0);
for (si =3D segInfo_list; si !=3D NULL; si =3D si->next) {
- if (si->text_start_avma <=3D a && a < si->text_start_avma+si->size=
) {
+ if (si->text_start_avma <=3D a=20
+ && a < si->text_start_avma + si->text_size) {
VG_(strncpy_safely)(buf, si->filename, nbuf);
if (si->memname) {
used =3D VG_(strlen)(buf);
@@ -668,7 +669,8 @@
SegInfo* si;
=20
for (si =3D segInfo_list; si !=3D NULL; si =3D si->next) {
- if (si->text_start_avma <=3D a && a < si->text_start_avma + si->si=
ze) {
+ if (si->text_start_avma <=3D a=20
+ && a < si->text_start_avma + si->text_size) {
return si;
}
}
@@ -1089,7 +1091,7 @@
=20
SizeT VG_(seginfo_size)(const SegInfo* si)
{
- return si->size;
+ return si->text_size;
}
=20
const UChar* VG_(seginfo_soname)(const SegInfo* si)
@@ -1114,7 +1116,7 @@
=20
for(si =3D segInfo_list; si !=3D NULL; si =3D si->next) {
if (a >=3D si->text_start_avma=20
- && a < si->text_start_avma + si->size) {
+ && a < si->text_start_avma + si->text_size) {
=20
if (0)
VG_(printf)(
Modified: trunk/coregrind/m_debuginfo/priv_storage.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/m_debuginfo/priv_storage.h 2007-01-11 20:11:51 UTC (r=
ev 6507)
+++ trunk/coregrind/m_debuginfo/priv_storage.h 2007-01-11 21:56:20 UTC (r=
ev 6508)
@@ -143,7 +143,7 @@
=20
/* Description of the mapped segment. */
Addr text_start_avma;
- UInt size;
+ UInt text_size;
UChar* filename; /* in mallocville */
UChar* memname; /* malloc'd. AIX5 only: .a member name */
OffT foffset; /* file offset for mapped text section - UNUSED */
Modified: trunk/coregrind/m_debuginfo/readelf.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_debuginfo/readelf.c 2007-01-11 20:11:51 UTC (rev 65=
07)
+++ trunk/coregrind/m_debuginfo/readelf.c 2007-01-11 21:56:20 UTC (rev 65=
08)
@@ -357,10 +357,11 @@
/* If no part of the symbol falls within the mapped range,
ignore it. */
if (*sym_addr_out + *sym_size_out <=3D si->text_start_avma
- || *sym_addr_out >=3D si->text_start_avma + si->size) {
+ || *sym_addr_out >=3D si->text_start_avma + si->text_size) {
TRACE_SYMTAB( "ignore -- %p .. %p outside mapped range %p .. %p\n"=
,
*sym_addr_out, *sym_addr_out + *sym_size_out,
- si->text_start_avma, si->text_start_avma + si->size)=
;
+ si->text_start_avma,
+ si->text_start_avma + si->text_size);
return False;
}
=20
@@ -962,18 +963,23 @@
=20
if (VG_(needs).data_syms=20
&& mapped >=3D si->text_start_avma=20
- && mapped <=3D (si->text_start_avma + si->size)
- && mapped_end > (si->text_start_avma + si->size)) {
+ && mapped <=3D (si->text_start_avma + si->text_size)
+ && mapped_end > (si->text_start_avma + si->text_size)) {
+ /* XXX jrs 2007 Jan 11: what's going on here? If data
+ syms are involved, surely we shouldn't be messing with
+ the segment's text_size unless there is an assumption
+ that the data segment has been mapped immediately after
+ the text segment. Which doesn't sound good to me. */
UInt newsz =3D mapped_end - si->text_start_avma;
- if (newsz > si->size) {
+ if (newsz > si->text_size) {
if (0)
VG_(printf)("extending mapping %p..%p %d -> ..%p %d\n",=20
si->text_start_avma,=20
- si->text_start_avma + si->size,=20
- si->size,
+ si->text_start_avma + si->text_size,=20
+ si->text_size,
si->text_start_avma + newsz, newsz);
=20
- si->size =3D newsz;
+ si->text_size =3D newsz;
}
}
}
Modified: trunk/coregrind/m_debuginfo/storage.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_debuginfo/storage.c 2007-01-11 20:11:51 UTC (rev 65=
07)
+++ trunk/coregrind/m_debuginfo/storage.c 2007-01-11 21:56:20 UTC (rev 65=
08)
@@ -255,14 +255,14 @@
=20
/* vg_assert(this < si->text_start_avma + si->size=20
&& next-1 >=3D si->text_start_avma); */
- if (this >=3D si->text_start_avma + si->size=20
+ if (this >=3D si->text_start_avma + si->text_size=20
|| next-1 < si->text_start_avma) {
if (0)
VG_(message)(Vg_DebugMsg,=20
"warning: ignoring line info entry falling "
"outside current SegInfo: %p %p %p %p",
si->text_start_avma,=20
- si->text_start_avma + si->size,=20
+ si->text_start_avma + si->text_size,=20
this, next-1);
return;
}
@@ -323,7 +323,7 @@
probably indicate some kind of bug, but for the meantime ignore
them. */
if ( cfsi->base + cfsi->len - 1 < si->text_start_avma
- || si->text_start_avma + si->size - 1 < cfsi->base ) {
+ || si->text_start_avma + si->text_size - 1 < cfsi->base ) {
static Int complaints =3D 3;
if (VG_(clo_trace_cfi) || complaints > 0) {
complaints--;
@@ -334,7 +334,7 @@
cfsi->base,=20
cfsi->base + cfsi->len - 1,
si->text_start_avma,
- si->text_start_avma + si->size - 1=20
+ si->text_start_avma + si->text_size - 1=20
);
}
if (VG_(clo_trace_cfi))=20
|