Author: sewardj
Date: 2008-01-08 17:29:02 +0000 (Tue, 08 Jan 2008)
New Revision: 7326
Log:
Fix enough stuff so that simple x86-linux programs Memcheckify OK once
again.
Modified:
branches/DATASYMS/coregrind/m_debuginfo/debuginfo.c
branches/DATASYMS/coregrind/m_debuginfo/priv_storage.h
branches/DATASYMS/coregrind/m_debuginfo/readelf.c
Modified: branches/DATASYMS/coregrind/m_debuginfo/debuginfo.c
===================================================================
--- branches/DATASYMS/coregrind/m_debuginfo/debuginfo.c 2008-01-08 16:48:30 UTC
(rev 7325)
+++ branches/DATASYMS/coregrind/m_debuginfo/debuginfo.c 2008-01-08 17:29:02 UTC
(rev 7326)
@@ -215,8 +215,9 @@
while (True) {
if (curr == NULL)
break;
- if (start+length - 1 < curr->text_avma
- || curr->text_avma + curr->text_size - 1 < start) {
+ if (curr->text_size > 0
+ && (start+length - 1 < curr->text_avma
+ || curr->text_avma + curr->text_size - 1 < start)) {
/* no overlap */
} else {
found = True;
@@ -581,6 +582,7 @@
[a, a+len). */
void VG_(di_notify_munmap)( Addr a, SizeT len )
{
+ if (0) VG_(printf)("DISCARD %p %p\n", a, a+len);
discard_syms_in_range(a, len);
}
Modified: branches/DATASYMS/coregrind/m_debuginfo/priv_storage.h
===================================================================
--- branches/DATASYMS/coregrind/m_debuginfo/priv_storage.h 2008-01-08
16:48:30 UTC (rev 7325)
+++ branches/DATASYMS/coregrind/m_debuginfo/priv_storage.h 2008-01-08
17:29:02 UTC (rev 7326)
@@ -207,7 +207,7 @@
extern void ML_(ppCfiExpr)( XArray* src, Int ix );
-/* --------------------- SEGINFO --------------------- */
+/* --------------------- DEBUGINFO --------------------- */
/* This is the top-level data type. It's a structure which contains
information pertaining to one mapped ELF object. This type is
Modified: branches/DATASYMS/coregrind/m_debuginfo/readelf.c
===================================================================
--- branches/DATASYMS/coregrind/m_debuginfo/readelf.c 2008-01-08 16:48:30 UTC
(rev 7325)
+++ branches/DATASYMS/coregrind/m_debuginfo/readelf.c 2008-01-08 17:29:02 UTC
(rev 7326)
@@ -837,7 +837,7 @@
Addr dimage = 0;
UWord n_dimage = 0;
OffT offset_dimage = 0;
- Bool debug = 1||False;
+ Bool debug = False;
/* Image addresses for the ELF file we're working with. */
Addr oimage = 0;
@@ -872,6 +872,12 @@
vg_assert(!di->strchunks);
vg_assert(!di->soname);
+ /* If these don't hold true, it means that m_syswrap/m_aspacemgr
+ managed to do a mapping where the start isn't page aligned.
+ Which sounds pretty bogus to me. */
+ vg_assert(VG_IS_PAGE_ALIGNED(di->rx_map_avma));
+ vg_assert(VG_IS_PAGE_ALIGNED(di->rw_map_avma));
+
/* ----------------------------------------------------------
Phase 1. At this point, there is very little information in
the DebugInfo. We only know that something that looks like an
@@ -1139,36 +1145,50 @@
goto out; \
} while (0)
- /* Find avma-s for .text, .data, .opd */
+ /* Find avma-s for: .text .data .bss .plt .got .opd .eh_frame */
- /* Accept .text only when mapped as rx */
+ /* Accept .text where mapped as rx */
if (0 == VG_(strcmp)(name, ".text")) {
- if (inrx /* && !inrw */ && size > 0 && di->text_size == 0) {
+ if (inrx && size > 0 && di->text_size == 0) {
di->text_avma = di->rx_map_avma + foff - di->rx_map_foff;
- di->text_size = size;
- di->text_bias = di->text_avma - svma;
+ di->text_size = //di->rx_map_size; //size;
+ size;
+ di->text_bias = VG_PGROUNDDN(di->text_avma) - VG_PGROUNDDN(svma);
if (debug)
VG_(printf)("acquiring .text avma = %p\n", di->text_avma);
} else {
BAD(".text");
}
- }
+ }
- /* Accept .data only when mapped as rw */
+ /* Accept .data where mapped as rw */
if (0 == VG_(strcmp)(name, ".data")) {
- if (/*!inrx && */ inrw && size > 0 && di->data_size == 0) {
+ if (inrw && size > 0 && di->data_size == 0) {
di->data_avma = di->rw_map_avma + foff - di->rw_map_foff;
di->data_size = size;
+ di->data_bias = di->data_avma - svma;
if (debug)
VG_(printf)("acquiring .data avma = %p\n", di->data_avma);
} else {
BAD(".data");
}
- }
+ }
- /* Accept .opd only when mapped as rw */
+ /* Accept .bss where mapped as rw */
+ if (0 == VG_(strcmp)(name, ".bss")) {
+ if (inrw && size > 0 && di->bss_size == 0) {
+ di->bss_avma = di->rw_map_avma + foff - di->rw_map_foff;
+ di->bss_size = size;
+ if (debug)
+ VG_(printf)("acquiring .bss avma = %p\n", di->bss_avma);
+ } else {
+ BAD(".bss");
+ }
+ }
+
+ /* Accept .opd where mapped as rw */
if (0 == VG_(strcmp)(name, ".opd")) {
- if (!inrx && inrw && size > 0 && di->opd_size == 0) {
+ if (inrw && size > 0 && di->opd_size == 0) {
di->opd_avma = di->rw_map_avma + foff - di->rw_map_foff;
di->opd_size = size;
if (debug)
@@ -1176,12 +1196,26 @@
} else {
BAD(".opd");
}
- }
+ }
+ /* Accept .eh_frame where mapped as rx */
+ if (0 == VG_(strcmp)(name, ".eh_frame")) {
+ if (inrx && size > 0 && di->ehframe_size == 0) {
+ di->ehframe_avma = VG_PGROUNDDN(di->rx_map_avma + foff -
di->rx_map_foff);
+ di->ehframe_size = size;
+ if (debug)
+ VG_(printf)("acquiring .eh_frame avma = %p\n",
di->ehframe_avma);
+ } else {
+ BAD(".eh_frame");
+ }
+ }
+
# undef BAD
}
+ if (0) VG_(printf)("YYYY text_: avma %p size %ld bias %p\n",
+ di->text_avma, di->text_size, di->text_bias);
if (VG_(clo_verbosity) > 2 || VG_(clo_trace_redir))
VG_(message)(Vg_DebugMsg, " svma %010p, avma %010p",
@@ -1407,12 +1441,12 @@
read_elf_symtab = read_elf_symtab__normal;
# endif
read_elf_symtab(di, "symbol table",
- symtab_img, symtab_sz, symtab_offset,
+ symtab_img, symtab_sz, di->text_bias,
/*symtab_offset,*/
strtab_img, strtab_sz,
opd_filea_img, opd_offset);
read_elf_symtab(di, "dynamic symbol table",
- dynsym_img, dynsym_sz, dynsym_offset,
+ dynsym_img, dynsym_sz, di->text_bias,
/*dynsym_offset,*/
dynstr_img, dynstr_sz,
opd_filea_img, opd_offset);
}
@@ -1420,7 +1454,7 @@
/* Read .eh_frame (call-frame-info) if any */
if (ehframe_img) {
ML_(read_callframe_info_dwarf3)
- ( di, ehframe_img, ehframe_sz, ehframe_avma );
+ ( di, ehframe_img, di->ehframe_size, di->ehframe_avma );
}
/* Read the stabs and/or dwarf2 debug information, if any. It
@@ -1439,7 +1473,7 @@
before using it. */
if (debug_info_img && debug_abbv_img && debug_line_img
/* && debug_str_img */) {
- ML_(read_debuginfo_dwarf2) ( di, debug_offset,
+ ML_(read_debuginfo_dwarf2) ( di, di->text_bias, /*debug_offset,*/
debug_info_img, debug_info_sz,
debug_abbv_img,
debug_line_img, debug_line_sz,
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Valgrind-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/valgrind-developers
