|
 |
0332e15 |
--- valgrind-3.5.0/coregrind/m_debuginfo/readelf.c.jj 2009-12-02 05:38:20.000000000 -0500
|
|
|
0332e15 |
+++ valgrind-3.5.0/coregrind/m_debuginfo/readelf.c 2009-12-02 06:50:44.061404000 -0500
|
|
|
0332e15 |
@@ -1062,6 +1062,8 @@ Bool ML_(read_elf_debug_info) ( struct _
|
|
|
0332e15 |
Bool res, ok;
|
|
|
0332e15 |
SysRes fd, sres;
|
|
|
0332e15 |
Word i;
|
|
|
0332e15 |
+ Bool dynbss_present = False;
|
|
|
0332e15 |
+ Bool sdynbss_present = False;
|
|
|
0332e15 |
|
|
|
0332e15 |
/* Image addresses for the ELF file we're working with. */
|
|
|
0332e15 |
Addr oimage = 0;
|
|
|
0332e15 |
@@ -1476,8 +1478,40 @@ Bool ML_(read_elf_debug_info) ( struct _
|
|
|
0332e15 |
}
|
|
|
0332e15 |
}
|
|
|
0332e15 |
|
|
|
0332e15 |
+ if (0 == VG_(strcmp)(name, ".dynbss")) {
|
|
|
0332e15 |
+ if (inrw && size > 0 && !di->bss_present) {
|
|
|
0332e15 |
+ dynbss_present = True;
|
|
|
0332e15 |
+ di->bss_present = True;
|
|
|
0332e15 |
+ di->bss_svma = svma;
|
|
|
0332e15 |
+ di->bss_avma = svma + rw_bias;
|
|
|
0332e15 |
+ di->bss_size = size;
|
|
|
0332e15 |
+ di->bss_bias = rw_bias;
|
|
|
0332e15 |
+ di->bss_debug_svma = svma;
|
|
|
0332e15 |
+ di->bss_debug_bias = rw_bias;
|
|
|
0332e15 |
+ TRACE_SYMTAB("acquiring .dynbss svma = %#lx .. %#lx\n",
|
|
|
0332e15 |
+ di->bss_svma,
|
|
|
0332e15 |
+ di->bss_svma + di->bss_size - 1);
|
|
|
0332e15 |
+ TRACE_SYMTAB("acquiring .dynbss avma = %#lx .. %#lx\n",
|
|
|
0332e15 |
+ di->bss_avma,
|
|
|
0332e15 |
+ di->bss_avma + di->bss_size - 1);
|
|
|
0332e15 |
+ TRACE_SYMTAB("acquiring .dynbss bias = %#lx\n", di->bss_bias);
|
|
|
0332e15 |
+ }
|
|
|
0332e15 |
+ }
|
|
|
0332e15 |
+
|
|
|
0332e15 |
/* Accept .bss where mapped as rw (data), even if zero-sized */
|
|
|
0332e15 |
if (0 == VG_(strcmp)(name, ".bss")) {
|
|
|
0332e15 |
+ if (inrw && size > 0 && dynbss_present) {
|
|
|
0332e15 |
+ vg_assert(di->bss_present);
|
|
|
0332e15 |
+ dynbss_present = False;
|
|
|
0332e15 |
+ vg_assert(di->bss_svma + di->bss_size == svma);
|
|
|
0332e15 |
+ di->bss_size += size;
|
|
|
0332e15 |
+ TRACE_SYMTAB("acquiring .bss svma = %#lx .. %#lx\n",
|
|
|
0332e15 |
+ svma, svma + size - 1);
|
|
|
0332e15 |
+ TRACE_SYMTAB("acquiring .bss avma = %#lx .. %#lx\n",
|
|
|
0332e15 |
+ svma + rw_bias, svma + rw_bias + size - 1);
|
|
|
0332e15 |
+ TRACE_SYMTAB("acquiring .bss bias = %#lx\n", di->bss_bias);
|
|
|
0332e15 |
+ } else
|
|
|
0332e15 |
+
|
|
|
0332e15 |
if (inrw && size >= 0 && !di->bss_present) {
|
|
|
0332e15 |
di->bss_present = True;
|
|
|
0332e15 |
di->bss_svma = svma;
|
|
|
0332e15 |
@@ -1529,8 +1563,40 @@ Bool ML_(read_elf_debug_info) ( struct _
|
|
|
0332e15 |
}
|
|
|
0332e15 |
}
|
|
|
0332e15 |
|
|
|
0332e15 |
+ if (0 == VG_(strcmp)(name, ".sdynbss")) {
|
|
|
0332e15 |
+ if (inrw && size >= 0 && !di->sbss_present) {
|
|
|
0332e15 |
+ sdynbss_present = True;
|
|
|
0332e15 |
+ di->sbss_present = True;
|
|
|
0332e15 |
+ di->sbss_svma = svma;
|
|
|
0332e15 |
+ di->sbss_avma = svma + rw_bias;
|
|
|
0332e15 |
+ di->sbss_size = size;
|
|
|
0332e15 |
+ di->sbss_bias = rw_bias;
|
|
|
0332e15 |
+ di->sbss_debug_svma = svma;
|
|
|
0332e15 |
+ di->sbss_debug_bias = rw_bias;
|
|
|
0332e15 |
+ TRACE_SYMTAB("acquiring .sdynbss svma = %#lx .. %#lx\n",
|
|
|
0332e15 |
+ di->sbss_svma,
|
|
|
0332e15 |
+ di->sbss_svma + di->sbss_size - 1);
|
|
|
0332e15 |
+ TRACE_SYMTAB("acquiring .sdynbss avma = %#lx .. %#lx\n",
|
|
|
0332e15 |
+ di->sbss_avma,
|
|
|
0332e15 |
+ di->sbss_avma + di->sbss_size - 1);
|
|
|
0332e15 |
+ TRACE_SYMTAB("acquiring .sdynbss bias = %#lx\n", di->sbss_bias);
|
|
|
0332e15 |
+ }
|
|
|
0332e15 |
+ }
|
|
|
0332e15 |
+
|
|
|
0332e15 |
/* Accept .sbss where mapped as rw (data) */
|
|
|
0332e15 |
if (0 == VG_(strcmp)(name, ".sbss")) {
|
|
|
0332e15 |
+ if (inrw && size > 0 && sdynbss_present) {
|
|
|
0332e15 |
+ vg_assert(di->sbss_present);
|
|
|
0332e15 |
+ sdynbss_present = False;
|
|
|
0332e15 |
+ vg_assert(di->sbss_svma + di->sbss_size == svma);
|
|
|
0332e15 |
+ di->sbss_size += size;
|
|
|
0332e15 |
+ TRACE_SYMTAB("acquiring .sbss svma = %#lx .. %#lx\n",
|
|
|
0332e15 |
+ svma, svma + size - 1);
|
|
|
0332e15 |
+ TRACE_SYMTAB("acquiring .sbss avma = %#lx .. %#lx\n",
|
|
|
0332e15 |
+ svma + rw_bias, svma + rw_bias + size - 1);
|
|
|
0332e15 |
+ TRACE_SYMTAB("acquiring .sbss bias = %#lx\n", di->sbss_bias);
|
|
|
0332e15 |
+ } else
|
|
|
0332e15 |
+
|
|
|
0332e15 |
if (inrw && size > 0 && !di->sbss_present) {
|
|
|
0332e15 |
di->sbss_present = True;
|
|
|
0332e15 |
di->sbss_svma = svma;
|