+2018-05-22 Mark Wielaard <mark@klomp.org>
+
+ * dwarf_getlocation.c (__libdw_cu_base_address): Treat errors of
+ getting lowpc or entrypc the same as missing base address (zero).
+ * dwarf_highpc (dwarf_highpc): Handle any address form. Always set
+ error when attribute could not be found.
+
2018-05-21 Mark Wielaard <mark@klomp.org>
* dwarf_begin_elf.c (valid_p): Add a fake_addr_cu to the result.
&attr_mem),
&base) != 0)
{
- int err = INTUSE(dwarf_errno) ();
- if (err != 0)
- {
- __libdw_seterrno (err);
- base = (Dwarf_Addr) -1;
- }
- else
- {
- /* The compiler provided no base address when it should
- have. Buggy GCC does this when it used absolute
- addresses in the location list and no DW_AT_ranges. */
- base = 0;
- }
+ /* The compiler provided no base address when it should
+ have. Buggy GCC does this when it used absolute
+ addresses in the location list and no DW_AT_ranges. */
+ base = 0;
}
cu->base_address = base;
}
attr_high = INTUSE(dwarf_attr) (die, DW_AT_high_pc, &attr_high_mem);
if (attr_high == NULL)
- return -1;
+ goto no_addr;
- if (attr_high->form == DW_FORM_addr)
- return INTUSE(dwarf_formaddr) (attr_high, return_addr);
+ if (INTUSE(dwarf_formaddr) (attr_high, return_addr) == 0)
+ return 0;
/* DWARF 4 allows high_pc to be a constant offset from low_pc. */
if (INTUSE(dwarf_lowpc) (die, return_addr) == 0)
*return_addr += uval;
return 0;
}
- __libdw_seterrno (DWARF_E_NO_ADDR);
}
+
+no_addr:
+ __libdw_seterrno (DWARF_E_NO_ADDR);
return -1;
}
INTDEF(dwarf_highpc)