* \return MC specific representation of the location list represented by the given attribute
* of the given die
*/
-static dw_location_t MC_dwarf_get_location_list(Dwarf_Die* die, Dwarf_Attribute* attr) {
+static dw_location_t MC_dwarf_get_location_list(mc_object_info_t info, Dwarf_Die* die, Dwarf_Attribute* attr) {
dw_location_t location = xbt_new0(s_dw_location_t, 1);
location->type = e_dw_loclist;
xbt_die("Error while loading location list");
dw_location_entry_t new_entry = xbt_new0(s_dw_location_entry_t, 1);
- new_entry->lowpc = start;
- new_entry->highpc = end;
+
+ void* base = info->flags & MC_OBJECT_INFO_EXECUTABLE ? 0 : MC_object_base_address(info);
+
+ new_entry->lowpc = (char*) base + start;
+ new_entry->highpc = (char*) base + end;
new_entry->location = MC_dwarf_get_expression(expr, len);
xbt_dynar_push(loclist, &new_entry);
}
}
+/** \brief Find the frame base of a given frame
+ *
+ * \param ip Instruction pointer
+ * \param frame
+ * \param unw_cursor
+ */
+void* mc_find_frame_base(void* ip, dw_frame_t frame, unw_cursor_t* unw_cursor) {
+ switch(frame->frame_base->type) {
+ case e_dw_loclist:
+ {
+ int loclist_cursor;
+ for(loclist_cursor=0; loclist_cursor < xbt_dynar_length(frame->frame_base->location.loclist); loclist_cursor++){
+ dw_location_entry_t entry = xbt_dynar_get_as(frame->frame_base->location.loclist, loclist_cursor, dw_location_entry_t);
+ if((ip >= entry->lowpc) && (ip < entry->highpc)){
+ return (void*) MC_dwarf_resolve_location(unw_cursor, entry->location, NULL);
+ }
+ }
+ return NULL;
+ }
+ // Not handled:
+ default:
+ return NULL;
+ }
+}
+
/** \brief Get the location expression or location list from an attribute
*
* Processes direct expressions as well as location lists.
* \return MC specific representation of the location represented by the given attribute
* of the given die
*/
-static dw_location_t MC_dwarf_get_location(Dwarf_Die* die, Dwarf_Attribute* attr) {
+static dw_location_t MC_dwarf_get_location(mc_object_info_t info, Dwarf_Die* die, Dwarf_Attribute* attr) {
int form = dwarf_whatform(attr);
switch (form) {
case DW_FORM_data4:
case DW_FORM_data8:
{
- return MC_dwarf_get_location_list(die, attr);
+ return MC_dwarf_get_location_list(info, die, attr);
}
break;
* \return MC specific representation of the location represented by the given attribute
* of the given die
*/
-static dw_location_t MC_dwarf_at_location(Dwarf_Die* die, int attribute) {
+static dw_location_t MC_dwarf_at_location(mc_object_info_t info, Dwarf_Die* die, int attribute) {
if(!dwarf_hasattr_integrate(die, attribute))
return xbt_new0(s_dw_location_t, 1);
Dwarf_Attribute attr;
dwarf_attr_integrate(die, attribute, &attr);
- return MC_dwarf_get_location(die, &attr);
+ return MC_dwarf_get_location(info, die, &attr);
}
static char* MC_dwarf_at_type(Dwarf_Die* die) {
case MC_DW_CLASS_LOCLISTPTR:
case MC_DW_CLASS_CONSTANT:
// Reference to location list:
- variable->location = MC_dwarf_get_location_list(die, &attr_location);
+ variable->location = MC_dwarf_get_location_list(info, die, &attr_location);
break;
default:
xbt_die("Unexpected calss 0x%x (%i) list for location in <%p>%s",
name = MC_dwarf_attr_string(die, DW_AT_name);
frame->name = xbt_strdup(name);
+ // This is the base address for DWARF addresses.
+ // Relocated addresses are offset from this base address.
+ // See DWARF4 spec 7.5
+ void* base = info->flags & MC_OBJECT_INFO_EXECUTABLE ? 0 : MC_object_base_address(info);
+
// Variables are filled in the (recursive) call of MC_dwarf_handle_children:
frame->variables = xbt_dynar_new(sizeof(dw_variable_t), dw_variable_free_voidp);
- frame->high_pc = (void*) MC_dwarf_attr_addr(die, DW_AT_high_pc);
- frame->low_pc = (void*) MC_dwarf_attr_addr(die, DW_AT_low_pc);
- frame->frame_base = MC_dwarf_at_location(die, DW_AT_frame_base);
+ frame->high_pc = ((char*) base) + MC_dwarf_attr_addr(die, DW_AT_high_pc);
+ frame->low_pc = ((char*) base) + MC_dwarf_attr_addr(die, DW_AT_low_pc);
+ frame->frame_base = MC_dwarf_at_location(info, die, DW_AT_frame_base);
frame->end = -1; // This one is now useless:
// Handle children:
case DW_TAG_shared_type:
MC_dwarf_handle_type_die(info, die, unit);
break;
- case DW_TAG_inlined_subroutine:
case DW_TAG_subprogram:
MC_dwarf_handle_subprogram_die(info, die, unit, frame);
return;