From 1e73d09f86dd7a7e7bf24f54358095ff45e47c14 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 20 Apr 2023 06:32:26 -0600 Subject: [PATCH] Use unrelocated_addr in the DWARF reader This changes various spots in the DWARF reader to use unrelocated_addr. --- gdb/dwarf2/attribute.c | 6 +- gdb/dwarf2/attribute.h | 6 +- gdb/dwarf2/call-site.h | 14 +- gdb/dwarf2/comp-unit-head.c | 6 +- gdb/dwarf2/comp-unit-head.h | 4 +- gdb/dwarf2/cu.h | 2 +- gdb/dwarf2/die.c | 2 +- gdb/dwarf2/expr.c | 12 +- gdb/dwarf2/loc.c | 117 +++++----- gdb/dwarf2/loc.h | 2 +- gdb/dwarf2/read-gdb-index.c | 9 +- gdb/dwarf2/read.c | 446 ++++++++++++++++++------------------ gdb/dwarf2/read.h | 15 +- gdb/gdbtypes.c | 3 +- gdb/symtab.c | 5 +- 15 files changed, 339 insertions(+), 310 deletions(-) diff --git a/gdb/dwarf2/attribute.c b/gdb/dwarf2/attribute.c index 3b14757f9db..aab87014c8c 100644 --- a/gdb/dwarf2/attribute.c +++ b/gdb/dwarf2/attribute.c @@ -31,10 +31,10 @@ /* See attribute.h. */ -CORE_ADDR +unrelocated_addr attribute::as_address () const { - CORE_ADDR addr; + unrelocated_addr addr; gdb_assert (!requires_reprocessing); @@ -53,7 +53,7 @@ attribute::as_address () const as well as update callers to pass in at least the CU's DWARF version. This is more overhead than what we're willing to expand for a pretty rare case. */ - addr = u.unsnd; + addr = (unrelocated_addr) u.unsnd; } else addr = u.addr; diff --git a/gdb/dwarf2/attribute.h b/gdb/dwarf2/attribute.h index e13822af911..4cfdaa1e355 100644 --- a/gdb/dwarf2/attribute.h +++ b/gdb/dwarf2/attribute.h @@ -45,7 +45,7 @@ struct attribute { /* Read the given attribute value as an address, taking the attribute's form into account. */ - CORE_ADDR as_address () const; + unrelocated_addr as_address () const; /* If the attribute has a string form, return the string value; otherwise return NULL. */ @@ -261,7 +261,7 @@ struct attribute } /* Set this attribute to an address. */ - void set_address (CORE_ADDR addr) + void set_address (unrelocated_addr addr) { gdb_assert (form == DW_FORM_addr || ((form == DW_FORM_addrx @@ -319,7 +319,7 @@ struct attribute struct dwarf_block *blk; ULONGEST unsnd; LONGEST snd; - CORE_ADDR addr; + unrelocated_addr addr; ULONGEST signature; } u; diff --git a/gdb/dwarf2/call-site.h b/gdb/dwarf2/call-site.h index a397b8b6337..07257fae357 100644 --- a/gdb/dwarf2/call-site.h +++ b/gdb/dwarf2/call-site.h @@ -59,7 +59,7 @@ struct call_site_target ADDRESSES, }; - void set_loc_physaddr (CORE_ADDR physaddr) + void set_loc_physaddr (unrelocated_addr physaddr) { m_loc_kind = PHYSADDR; m_loc.physaddr = physaddr; @@ -77,7 +77,7 @@ struct call_site_target m_loc.dwarf_block = dwarf_block; } - void set_loc_array (unsigned length, const CORE_ADDR *data) + void set_loc_array (unsigned length, const unrelocated_addr *data) { m_loc_kind = ADDRESSES; m_loc.addresses.length = length; @@ -102,7 +102,7 @@ private: union { /* Address. */ - CORE_ADDR physaddr; + unrelocated_addr physaddr; /* Mangled name. */ const char *physname; /* DWARF block. */ @@ -111,7 +111,7 @@ private: struct { unsigned length; - const CORE_ADDR *values; + const unrelocated_addr *values; } addresses; } m_loc; @@ -163,7 +163,7 @@ struct call_site_parameter struct call_site { - call_site (CORE_ADDR pc, dwarf2_per_cu_data *per_cu, + call_site (unrelocated_addr pc, dwarf2_per_cu_data *per_cu, dwarf2_per_objfile *per_objfile) : per_cu (per_cu), per_objfile (per_objfile), m_unrelocated_pc (pc) {} @@ -177,7 +177,7 @@ struct call_site static hashval_t hash (const call_site *a) { - return a->m_unrelocated_pc; + return (hashval_t) a->m_unrelocated_pc; } static int @@ -233,7 +233,7 @@ struct call_site private: /* Unrelocated address of the first instruction after this call. */ - const CORE_ADDR m_unrelocated_pc; + const unrelocated_addr m_unrelocated_pc; public: /* * Describe DW_TAG_call_site's DW_TAG_formal_parameter. */ diff --git a/gdb/dwarf2/comp-unit-head.c b/gdb/dwarf2/comp-unit-head.c index 2deceb50932..32dd60ad8bf 100644 --- a/gdb/dwarf2/comp-unit-head.c +++ b/gdb/dwarf2/comp-unit-head.c @@ -193,11 +193,11 @@ read_and_check_comp_unit_head (dwarf2_per_objfile *per_objfile, return info_ptr; } -CORE_ADDR +unrelocated_addr comp_unit_head::read_address (bfd *abfd, const gdb_byte *buf, unsigned int *bytes_read) const { - CORE_ADDR retval = 0; + ULONGEST retval = 0; if (signed_addr_p) { @@ -238,5 +238,5 @@ comp_unit_head::read_address (bfd *abfd, const gdb_byte *buf, } *bytes_read = addr_size; - return retval; + return (unrelocated_addr) retval; } diff --git a/gdb/dwarf2/comp-unit-head.h b/gdb/dwarf2/comp-unit-head.h index 65a16f4ef14..696a62b7845 100644 --- a/gdb/dwarf2/comp-unit-head.h +++ b/gdb/dwarf2/comp-unit-head.h @@ -108,8 +108,8 @@ public: } /* Read an address from BUF. BYTES_READ is updated. */ - CORE_ADDR read_address (bfd *abfd, const gdb_byte *buf, - unsigned int *bytes_read) const; + unrelocated_addr read_address (bfd *abfd, const gdb_byte *buf, + unsigned int *bytes_read) const; }; /* Expected enum dwarf_unit_type for read_comp_unit_head. */ diff --git a/gdb/dwarf2/cu.h b/gdb/dwarf2/cu.h index 8059b70f721..0c15d8b02db 100644 --- a/gdb/dwarf2/cu.h +++ b/gdb/dwarf2/cu.h @@ -101,7 +101,7 @@ struct dwarf2_cu struct comp_unit_head header; /* Base address of this compilation unit. */ - gdb::optional base_address; + gdb::optional base_address; /* The language we are debugging. */ const struct language_defn *language_defn = nullptr; diff --git a/gdb/dwarf2/die.c b/gdb/dwarf2/die.c index d409d24d7f6..bba2976616f 100644 --- a/gdb/dwarf2/die.c +++ b/gdb/dwarf2/die.c @@ -91,7 +91,7 @@ dump_die_shallow (struct ui_file *f, int indent, struct die_info *die) case DW_FORM_addrx: case DW_FORM_GNU_addr_index: gdb_printf (f, "address: "); - gdb_puts (hex_string (die->attrs[i].as_address ()), f); + gdb_puts (hex_string ((CORE_ADDR) die->attrs[i].as_address ()), f); break; case DW_FORM_block2: case DW_FORM_block4: diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c index f12abd9599d..ccdd87f3a55 100644 --- a/gdb/dwarf2/expr.c +++ b/gdb/dwarf2/expr.c @@ -1588,17 +1588,19 @@ dwarf_expr_context::execute_stack_op (const gdb_byte *op_ptr, ensure_have_per_cu (this->m_per_cu, "DW_OP_addrx"); op_ptr = safe_read_uleb128 (op_ptr, op_end, &uoffset); - result = dwarf2_read_addr_index (this->m_per_cu, this->m_per_objfile, - uoffset); - result += this->m_per_objfile->objfile->text_section_offset (); + result = (m_per_objfile->relocate + (dwarf2_read_addr_index (this->m_per_cu, + this->m_per_objfile, + uoffset))); result_val = value_from_ulongest (address_type, result); break; case DW_OP_GNU_const_index: ensure_have_per_cu (this->m_per_cu, "DW_OP_GNU_const_index"); op_ptr = safe_read_uleb128 (op_ptr, op_end, &uoffset); - result = dwarf2_read_addr_index (this->m_per_cu, this->m_per_objfile, - uoffset); + result = (ULONGEST) dwarf2_read_addr_index (this->m_per_cu, + this->m_per_objfile, + uoffset); result_val = value_from_ulongest (address_type, result); break; diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c index c1955f28a44..e50e7f1e47e 100644 --- a/gdb/dwarf2/loc.c +++ b/gdb/dwarf2/loc.c @@ -107,7 +107,7 @@ invalid_synthetic_pointer (void) static enum debug_loc_kind decode_debug_loc_addresses (const gdb_byte *loc_ptr, const gdb_byte *buf_end, const gdb_byte **new_ptr, - CORE_ADDR *low, CORE_ADDR *high, + unrelocated_addr *lowp, unrelocated_addr *highp, enum bfd_endian byte_order, unsigned int addr_size, int signed_addr_p) @@ -117,26 +117,29 @@ decode_debug_loc_addresses (const gdb_byte *loc_ptr, const gdb_byte *buf_end, if (buf_end - loc_ptr < 2 * addr_size) return DEBUG_LOC_BUFFER_OVERFLOW; + CORE_ADDR low, high; if (signed_addr_p) - *low = extract_signed_integer (loc_ptr, addr_size, byte_order); + low = extract_signed_integer (loc_ptr, addr_size, byte_order); else - *low = extract_unsigned_integer (loc_ptr, addr_size, byte_order); + low = extract_unsigned_integer (loc_ptr, addr_size, byte_order); loc_ptr += addr_size; if (signed_addr_p) - *high = extract_signed_integer (loc_ptr, addr_size, byte_order); + high = extract_signed_integer (loc_ptr, addr_size, byte_order); else - *high = extract_unsigned_integer (loc_ptr, addr_size, byte_order); + high = extract_unsigned_integer (loc_ptr, addr_size, byte_order); loc_ptr += addr_size; *new_ptr = loc_ptr; + *lowp = (unrelocated_addr) low; + *highp = (unrelocated_addr) high; /* A base-address-selection entry. */ - if ((*low & base_mask) == base_mask) + if ((low & base_mask) == base_mask) return DEBUG_LOC_BASE_ADDRESS; /* An end-of-list entry. */ - if (*low == 0 && *high == 0) + if (low == 0 && high == 0) return DEBUG_LOC_END_OF_LIST; /* We want the caller to apply the base address, so we must return @@ -155,7 +158,8 @@ decode_debug_loclists_addresses (dwarf2_per_cu_data *per_cu, const gdb_byte *loc_ptr, const gdb_byte *buf_end, const gdb_byte **new_ptr, - CORE_ADDR *low, CORE_ADDR *high, + unrelocated_addr *low, + unrelocated_addr *high, enum bfd_endian byte_order, unsigned int addr_size, int signed_addr_p) @@ -168,7 +172,7 @@ decode_debug_loclists_addresses (dwarf2_per_cu_data *per_cu, switch (*loc_ptr++) { case DW_LLE_base_addressx: - *low = 0; + *low = {}; loc_ptr = gdb_read_uleb128 (loc_ptr, buf_end, &u64); if (loc_ptr == NULL) return DEBUG_LOC_BUFFER_OVERFLOW; @@ -188,7 +192,7 @@ decode_debug_loclists_addresses (dwarf2_per_cu_data *per_cu, if (loc_ptr == NULL) return DEBUG_LOC_BUFFER_OVERFLOW; - *high += u64; + *high = (unrelocated_addr) ((uint64_t) *high + u64); *new_ptr = loc_ptr; return DEBUG_LOC_START_LENGTH; @@ -197,9 +201,11 @@ decode_debug_loclists_addresses (dwarf2_per_cu_data *per_cu, return DEBUG_LOC_BUFFER_OVERFLOW; if (signed_addr_p) - *low = extract_signed_integer (loc_ptr, addr_size, byte_order); + *low = (unrelocated_addr) extract_signed_integer (loc_ptr, addr_size, + byte_order); else - *low = extract_unsigned_integer (loc_ptr, addr_size, byte_order); + *low = (unrelocated_addr) extract_unsigned_integer (loc_ptr, addr_size, + byte_order); loc_ptr += addr_size; *high = *low; @@ -208,7 +214,7 @@ decode_debug_loclists_addresses (dwarf2_per_cu_data *per_cu, if (loc_ptr == NULL) return DEBUG_LOC_BUFFER_OVERFLOW; - *high += u64; + *high = (unrelocated_addr) ((uint64_t) *high + u64); *new_ptr = loc_ptr; return DEBUG_LOC_START_LENGTH; @@ -221,9 +227,11 @@ decode_debug_loclists_addresses (dwarf2_per_cu_data *per_cu, return DEBUG_LOC_BUFFER_OVERFLOW; if (signed_addr_p) - *high = extract_signed_integer (loc_ptr, addr_size, byte_order); + *high = (unrelocated_addr) extract_signed_integer (loc_ptr, addr_size, + byte_order); else - *high = extract_unsigned_integer (loc_ptr, addr_size, byte_order); + *high = (unrelocated_addr) extract_unsigned_integer (loc_ptr, addr_size, + byte_order); loc_ptr += addr_size; *new_ptr = loc_ptr; @@ -234,12 +242,12 @@ decode_debug_loclists_addresses (dwarf2_per_cu_data *per_cu, if (loc_ptr == NULL) return DEBUG_LOC_BUFFER_OVERFLOW; - *low = u64; + *low = (unrelocated_addr) u64; loc_ptr = gdb_read_uleb128 (loc_ptr, buf_end, &u64); if (loc_ptr == NULL) return DEBUG_LOC_BUFFER_OVERFLOW; - *high = u64; + *high = (unrelocated_addr) u64; *new_ptr = loc_ptr; return DEBUG_LOC_OFFSET_PAIR; @@ -248,15 +256,19 @@ decode_debug_loclists_addresses (dwarf2_per_cu_data *per_cu, return DEBUG_LOC_BUFFER_OVERFLOW; if (signed_addr_p) - *low = extract_signed_integer (loc_ptr, addr_size, byte_order); + *low = (unrelocated_addr) extract_signed_integer (loc_ptr, addr_size, + byte_order); else - *low = extract_unsigned_integer (loc_ptr, addr_size, byte_order); + *low = (unrelocated_addr) extract_unsigned_integer (loc_ptr, addr_size, + byte_order); loc_ptr += addr_size; if (signed_addr_p) - *high = extract_signed_integer (loc_ptr, addr_size, byte_order); + *high = (unrelocated_addr) extract_signed_integer (loc_ptr, addr_size, + byte_order); else - *high = extract_unsigned_integer (loc_ptr, addr_size, byte_order); + *high = (unrelocated_addr) extract_unsigned_integer (loc_ptr, addr_size, + byte_order); loc_ptr += addr_size; *new_ptr = loc_ptr; @@ -281,7 +293,8 @@ decode_debug_loc_dwo_addresses (dwarf2_per_cu_data *per_cu, const gdb_byte *loc_ptr, const gdb_byte *buf_end, const gdb_byte **new_ptr, - CORE_ADDR *low, CORE_ADDR *high, + unrelocated_addr *low, + unrelocated_addr *high, enum bfd_endian byte_order) { uint64_t low_index, high_index; @@ -296,7 +309,7 @@ decode_debug_loc_dwo_addresses (dwarf2_per_cu_data *per_cu, return DEBUG_LOC_END_OF_LIST; case DW_LLE_GNU_base_address_selection_entry: - *low = 0; + *low = {}; loc_ptr = gdb_read_uleb128 (loc_ptr, buf_end, &high_index); if (loc_ptr == NULL) return DEBUG_LOC_BUFFER_OVERFLOW; @@ -329,7 +342,9 @@ decode_debug_loc_dwo_addresses (dwarf2_per_cu_data *per_cu, return DEBUG_LOC_BUFFER_OVERFLOW; *high = *low; - *high += extract_unsigned_integer (loc_ptr, 4, byte_order); + *high = (unrelocated_addr) ((CORE_ADDR) *high + + extract_unsigned_integer (loc_ptr, 4, + byte_order)); *new_ptr = loc_ptr + 4; return DEBUG_LOC_START_LENGTH; @@ -348,7 +363,7 @@ decode_debug_loc_dwo_addresses (dwarf2_per_cu_data *per_cu, const gdb_byte * dwarf2_find_location_expression (const dwarf2_loclist_baton *baton, - size_t *locexpr_length, CORE_ADDR pc) + size_t *locexpr_length, const CORE_ADDR pc) { dwarf2_per_objfile *per_objfile = baton->per_objfile; struct objfile *objfile = per_objfile->objfile; @@ -358,7 +373,8 @@ dwarf2_find_location_expression (const dwarf2_loclist_baton *baton, int signed_addr_p = bfd_get_sign_extend_vma (objfile->obfd.get ()); /* Adjustment for relocatable objects. */ CORE_ADDR text_offset = baton->per_objfile->objfile->text_section_offset (); - CORE_ADDR base_address = baton->base_address; + unrelocated_addr unrel_pc = (unrelocated_addr) (pc - text_offset); + unrelocated_addr base_address = baton->base_address; const gdb_byte *loc_ptr, *buf_end; loc_ptr = baton->data; @@ -366,7 +382,7 @@ dwarf2_find_location_expression (const dwarf2_loclist_baton *baton, while (1) { - CORE_ADDR low = 0, high = 0; /* init for gcc -Wall */ + unrelocated_addr low = {}, high = {}; /* init for gcc -Wall */ int length; enum debug_loc_kind kind; const gdb_byte *new_ptr = NULL; /* init for gcc -Wall */ @@ -421,12 +437,10 @@ dwarf2_find_location_expression (const dwarf2_loclist_baton *baton, operands are offsets relative to the applicable base address. If the entry is DW_LLE_start_end or DW_LLE_start_length, then it already is an address, and we don't need to add the base. */ - low += text_offset; - high += text_offset; if (!baton->from_dwo && kind == DEBUG_LOC_OFFSET_PAIR) { - low += base_address; - high += base_address; + low = (unrelocated_addr) ((CORE_ADDR) low + (CORE_ADDR) base_address); + high = (unrelocated_addr) ((CORE_ADDR) high + (CORE_ADDR) base_address); } if (baton->per_cu->version () < 5) @@ -442,7 +456,7 @@ dwarf2_find_location_expression (const dwarf2_loclist_baton *baton, loc_ptr += bytes_read; } - if (low == high && pc == low) + if (low == high && unrel_pc == low) { /* This is entry PC record present only at entry point of a function. Verify it is really the function entry point. */ @@ -460,7 +474,7 @@ dwarf2_find_location_expression (const dwarf2_loclist_baton *baton, } } - if (pc >= low && pc < high) + if (unrel_pc >= low && unrel_pc < high) { *locexpr_length = length; return loc_ptr; @@ -722,19 +736,17 @@ call_site_target::iterate_over_addresses case call_site_target::PHYSADDR: { dwarf2_per_objfile *per_objfile = call_site->per_objfile; - CORE_ADDR delta = per_objfile->objfile->text_section_offset (); - callback (m_loc.physaddr + delta); + callback (per_objfile->relocate (m_loc.physaddr)); } break; case call_site_target::ADDRESSES: { dwarf2_per_objfile *per_objfile = call_site->per_objfile; - CORE_ADDR delta = per_objfile->objfile->text_section_offset (); for (unsigned i = 0; i < m_loc.addresses.length; ++i) - callback (m_loc.addresses.values[i] + delta); + callback (per_objfile->relocate (m_loc.addresses.values[i])); } break; @@ -3269,7 +3281,7 @@ locexpr_describe_location_piece (struct symbol *symbol, struct ui_file *stream, uint64_t offset; data = safe_read_uleb128 (data + 1, end, &offset); - offset = dwarf2_read_addr_index (per_cu, per_objfile, offset); + offset = (uint64_t) dwarf2_read_addr_index (per_cu, per_objfile, offset); gdb_printf (stream, _("a thread-local variable at offset 0x%s " "in the thread-local storage for `%s'"), @@ -3663,13 +3675,13 @@ disassemble_dwarf_expression (struct ui_file *stream, case DW_OP_addrx: case DW_OP_GNU_addr_index: data = safe_read_uleb128 (data, end, &ul); - ul = dwarf2_read_addr_index (per_cu, per_objfile, ul); + ul = (uint64_t) dwarf2_read_addr_index (per_cu, per_objfile, ul); gdb_printf (stream, " 0x%s", phex_nz (ul, addr_size)); break; case DW_OP_GNU_const_index: data = safe_read_uleb128 (data, end, &ul); - ul = dwarf2_read_addr_index (per_cu, per_objfile, ul); + ul = (uint64_t) dwarf2_read_addr_index (per_cu, per_objfile, ul); gdb_printf (stream, " %s", pulongest (ul)); break; @@ -3948,9 +3960,7 @@ loclist_describe_location (struct symbol *symbol, CORE_ADDR addr, unsigned int addr_size = dlbaton->per_cu->addr_size (); int offset_size = dlbaton->per_cu->offset_size (); int signed_addr_p = bfd_get_sign_extend_vma (objfile->obfd.get ()); - /* Adjustment for relocatable objects. */ - CORE_ADDR text_offset = objfile->text_section_offset (); - CORE_ADDR base_address = dlbaton->base_address; + unrelocated_addr base_address = dlbaton->base_address; int done = 0; loc_ptr = dlbaton->data; @@ -3961,7 +3971,7 @@ loclist_describe_location (struct symbol *symbol, CORE_ADDR addr, /* Iterate through locations until we run out. */ while (!done) { - CORE_ADDR low = 0, high = 0; /* init for gcc -Wall */ + unrelocated_addr low = {}, high = {}; /* init for gcc -Wall */ int length; enum debug_loc_kind kind; const gdb_byte *new_ptr = NULL; /* init for gcc -Wall */ @@ -3992,7 +4002,7 @@ loclist_describe_location (struct symbol *symbol, CORE_ADDR addr, case DEBUG_LOC_BASE_ADDRESS: base_address = high; gdb_printf (stream, _(" Base address %s"), - paddress (gdbarch, base_address)); + paddress (gdbarch, (CORE_ADDR) base_address)); continue; case DEBUG_LOC_START_END: @@ -4010,16 +4020,16 @@ loclist_describe_location (struct symbol *symbol, CORE_ADDR addr, } /* Otherwise, a location expression entry. */ - low += text_offset; - high += text_offset; if (!dlbaton->from_dwo && kind == DEBUG_LOC_OFFSET_PAIR) { - low += base_address; - high += base_address; + low = (unrelocated_addr) ((CORE_ADDR) low + + (CORE_ADDR) base_address); + high = (unrelocated_addr) ((CORE_ADDR) high + + (CORE_ADDR) base_address); } - low = gdbarch_adjust_dwarf2_addr (gdbarch, low); - high = gdbarch_adjust_dwarf2_addr (gdbarch, high); + CORE_ADDR low_reloc = per_objfile->relocate (low); + CORE_ADDR high_reloc = per_objfile->relocate (high); if (dlbaton->per_cu->version () < 5) { @@ -4036,10 +4046,11 @@ loclist_describe_location (struct symbol *symbol, CORE_ADDR addr, /* (It would improve readability to print only the minimum necessary digits of the second number of the range.) */ gdb_printf (stream, _(" Range %s-%s: "), - paddress (gdbarch, low), paddress (gdbarch, high)); + paddress (gdbarch, low_reloc), + paddress (gdbarch, high_reloc)); /* Now describe this particular location. */ - locexpr_describe_location_1 (symbol, low, stream, loc_ptr, length, + locexpr_describe_location_1 (symbol, low_reloc, stream, loc_ptr, length, addr_size, offset_size, dlbaton->per_cu, per_objfile); diff --git a/gdb/dwarf2/loc.h b/gdb/dwarf2/loc.h index 1fec834787b..5cf824d3ae2 100644 --- a/gdb/dwarf2/loc.h +++ b/gdb/dwarf2/loc.h @@ -180,7 +180,7 @@ struct dwarf2_loclist_baton { /* The initial base address for the location list, based on the compilation unit. */ - CORE_ADDR base_address; + unrelocated_addr base_address; /* Pointer to the start of the location list. */ const gdb_byte *data; diff --git a/gdb/dwarf2/read-gdb-index.c b/gdb/dwarf2/read-gdb-index.c index 1006386cb2d..1127643e53a 100644 --- a/gdb/dwarf2/read-gdb-index.c +++ b/gdb/dwarf2/read-gdb-index.c @@ -717,19 +717,14 @@ static void create_addrmap_from_gdb_index (dwarf2_per_objfile *per_objfile, mapped_gdb_index *index) { - struct objfile *objfile = per_objfile->objfile; dwarf2_per_bfd *per_bfd = per_objfile->per_bfd; - struct gdbarch *gdbarch = objfile->arch (); const gdb_byte *iter, *end; - CORE_ADDR baseaddr; addrmap_mutable mutable_map; iter = index->address_table.data (); end = iter + index->address_table.size (); - baseaddr = objfile->text_section_offset (); - while (iter < end) { ULONGEST hi, lo, cu_index; @@ -754,8 +749,8 @@ create_addrmap_from_gdb_index (dwarf2_per_objfile *per_objfile, continue; } - lo = gdbarch_adjust_dwarf2_addr (gdbarch, lo + baseaddr) - baseaddr; - hi = gdbarch_adjust_dwarf2_addr (gdbarch, hi + baseaddr) - baseaddr; + lo = (ULONGEST) per_objfile->adjust ((unrelocated_addr) lo); + hi = (ULONGEST) per_objfile->adjust ((unrelocated_addr) hi); mutable_map.set_empty (lo, hi - 1, per_bfd->get_cu (cu_index)); } diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 27bf66df48a..4fe1d88aa20 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -769,7 +769,8 @@ static void read_attribute_reprocess (const struct die_reader_specs *reader, struct attribute *attr, dwarf_tag tag = DW_TAG_padding); -static CORE_ADDR read_addr_index (struct dwarf2_cu *cu, unsigned int addr_index); +static unrelocated_addr read_addr_index (struct dwarf2_cu *cu, + unsigned int addr_index); static sect_offset read_abbrev_offset (dwarf2_per_objfile *per_objfile, dwarf2_section_info *, sect_offset); @@ -778,9 +779,9 @@ static const char *read_indirect_string (dwarf2_per_objfile *per_objfile, bfd *, const gdb_byte *, const struct comp_unit_head *, unsigned int *); -static CORE_ADDR read_addr_index_from_leb128 (struct dwarf2_cu *, - const gdb_byte *, - unsigned int *); +static unrelocated_addr read_addr_index_from_leb128 (struct dwarf2_cu *, + const gdb_byte *, + unsigned int *); static const char *read_dwo_str_index (const struct die_reader_specs *reader, ULONGEST str_index); @@ -896,13 +897,14 @@ enum pc_bounds_kind }; static enum pc_bounds_kind dwarf2_get_pc_bounds (struct die_info *, - CORE_ADDR *, CORE_ADDR *, + unrelocated_addr *, + unrelocated_addr *, struct dwarf2_cu *, addrmap *, void *); static void get_scope_pc_bounds (struct die_info *, - CORE_ADDR *, CORE_ADDR *, + unrelocated_addr *, unrelocated_addr *, struct dwarf2_cu *); static void dwarf2_record_block_ranges (struct die_info *, struct block *, @@ -1200,6 +1202,27 @@ dwarf2_invalid_attrib_class_complaint (const char *arg1, const char *arg2) arg1, arg2); } +/* See read.h. */ + +unrelocated_addr +dwarf2_per_objfile::adjust (unrelocated_addr addr) +{ + CORE_ADDR baseaddr = objfile->text_section_offset (); + CORE_ADDR tem = (CORE_ADDR) addr + baseaddr; + tem = gdbarch_adjust_dwarf2_addr (objfile->arch (), tem); + return (unrelocated_addr) (tem - baseaddr); +} + +/* See read.h. */ + +CORE_ADDR +dwarf2_per_objfile::relocate (unrelocated_addr addr) +{ + CORE_ADDR baseaddr = objfile->text_section_offset (); + CORE_ADDR tem = (CORE_ADDR) addr + baseaddr; + return gdbarch_adjust_dwarf2_addr (objfile->arch (), tem); +} + /* Hash function for line_header_hash. */ static hashval_t @@ -1823,7 +1846,6 @@ read_addrmap_from_aranges (dwarf2_per_objfile *per_objfile, struct objfile *objfile = per_objfile->objfile; bfd *abfd = objfile->obfd.get (); struct gdbarch *gdbarch = objfile->arch (); - const CORE_ADDR baseaddr = objfile->text_section_offset (); dwarf2_per_bfd *per_bfd = per_objfile->per_bfd; std::unordered_mapadjust ((unrelocated_addr) start); + end = (ULONGEST) per_objfile->adjust ((unrelocated_addr) end); mutable_map->set_empty (start, end - 1, per_cu); } @@ -6369,16 +6389,11 @@ static void process_full_comp_unit (dwarf2_cu *cu, enum language pretend_language) { dwarf2_per_objfile *per_objfile = cu->per_objfile; - struct objfile *objfile = per_objfile->objfile; - struct gdbarch *gdbarch = objfile->arch (); - CORE_ADDR lowpc, highpc; + unrelocated_addr lowpc, highpc; struct compunit_symtab *cust; - CORE_ADDR baseaddr; struct block *static_block; CORE_ADDR addr; - baseaddr = objfile->text_section_offset (); - /* Clear the list here in case something was left over. */ cu->method_list.clear (); @@ -6419,7 +6434,7 @@ process_full_comp_unit (dwarf2_cu *cu, enum language pretend_language) it, by scanning the DIE's below the compilation unit. */ get_scope_pc_bounds (cu->dies, &lowpc, &highpc, cu); - addr = gdbarch_adjust_dwarf2_addr (gdbarch, highpc + baseaddr); + addr = per_objfile->relocate (highpc); static_block = cu->get_builder ()->end_compunit_symtab_get_static_block (addr, 0, 1); @@ -7629,23 +7644,20 @@ read_file_scope (struct die_info *die, struct dwarf2_cu *cu) { dwarf2_per_objfile *per_objfile = cu->per_objfile; struct objfile *objfile = per_objfile->objfile; - struct gdbarch *gdbarch = objfile->arch (); - CORE_ADDR lowpc = ((CORE_ADDR) -1); - CORE_ADDR highpc = ((CORE_ADDR) 0); + CORE_ADDR lowpc; struct attribute *attr; struct die_info *child_die; - CORE_ADDR baseaddr; prepare_one_comp_unit (cu, die, cu->lang ()); - baseaddr = objfile->text_section_offset (); - get_scope_pc_bounds (die, &lowpc, &highpc, cu); + unrelocated_addr unrel_low, unrel_high; + get_scope_pc_bounds (die, &unrel_low, &unrel_high, cu); /* If we didn't find a lowpc, set it to highpc to avoid complaints from finish_block. */ - if (lowpc == ((CORE_ADDR) -1)) - lowpc = highpc; - lowpc = gdbarch_adjust_dwarf2_addr (gdbarch, lowpc + baseaddr); + if (unrel_low == ((unrelocated_addr) -1)) + unrel_low = unrel_high; + lowpc = per_objfile->relocate (unrel_low); file_and_directory &fnd = find_file_and_directory (die, cu); @@ -7659,7 +7671,7 @@ read_file_scope (struct die_info *die, struct dwarf2_cu *cu) /* Decode line number information if present. We do this before processing child DIEs, so that the line header table is available for DW_AT_decl_file. */ - handle_DW_AT_stmt_list (die, cu, fnd, lowpc, lowpc != highpc); + handle_DW_AT_stmt_list (die, cu, fnd, lowpc, unrel_low != unrel_high); /* Process all dies in compilation unit. */ if (die->child != NULL) @@ -10047,7 +10059,8 @@ check_ada_pragma_import (struct die_info *die, struct dwarf2_cu *cu) static void read_func_scope (struct die_info *die, struct dwarf2_cu *cu) { - struct objfile *objfile = cu->per_objfile->objfile; + dwarf2_per_objfile *per_objfile = cu->per_objfile; + struct objfile *objfile = per_objfile->objfile; struct gdbarch *gdbarch = objfile->arch (); struct context_stack *newobj; CORE_ADDR lowpc; @@ -10055,7 +10068,6 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) struct die_info *child_die; struct attribute *attr, *call_line, *call_file; const char *name; - CORE_ADDR baseaddr; struct block *block; int inlined_func = (die->tag == DW_TAG_inlined_subroutine); std::vector template_args; @@ -10075,8 +10087,6 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) } } - baseaddr = objfile->text_section_offset (); - name = dwarf2_name (die, cu); if (name == nullptr) name = dw2_linkage_name (die, cu); @@ -10099,7 +10109,8 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) } /* Ignore functions with missing or invalid low and high pc attributes. */ - if (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, nullptr, nullptr) + unrelocated_addr unrel_low, unrel_high; + if (dwarf2_get_pc_bounds (die, &unrel_low, &unrel_high, cu, nullptr, nullptr) <= PC_BOUNDS_INVALID) { if (have_complaint ()) @@ -10122,8 +10133,8 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) return; } - lowpc = gdbarch_adjust_dwarf2_addr (gdbarch, lowpc + baseaddr); - highpc = gdbarch_adjust_dwarf2_addr (gdbarch, highpc + baseaddr); + lowpc = per_objfile->relocate (unrel_low); + highpc = per_objfile->relocate (unrel_high); /* If we have any template arguments, then we must allocate a different sort of symbol. */ @@ -10270,20 +10281,18 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) static void read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu) { - struct objfile *objfile = cu->per_objfile->objfile; - struct gdbarch *gdbarch = objfile->arch (); + dwarf2_per_objfile *per_objfile = cu->per_objfile; CORE_ADDR lowpc, highpc; struct die_info *child_die; - CORE_ADDR baseaddr; - - baseaddr = objfile->text_section_offset (); /* Ignore blocks with missing or invalid low and high pc attributes. */ /* ??? Perhaps consider discontiguous blocks defined by DW_AT_ranges as multiple lexical blocks? Handling children in a sane way would be nasty. Might be easier to properly extend generic blocks to describe ranges. */ - switch (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, nullptr, nullptr)) + unrelocated_addr unrel_low, unrel_high; + switch (dwarf2_get_pc_bounds (die, &unrel_low, &unrel_high, cu, + nullptr, nullptr)) { case PC_BOUNDS_NOT_PRESENT: /* DW_TAG_lexical_block has no attributes, process its children as if @@ -10306,8 +10315,8 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu) case PC_BOUNDS_INVALID: return; } - lowpc = gdbarch_adjust_dwarf2_addr (gdbarch, lowpc + baseaddr); - highpc = gdbarch_adjust_dwarf2_addr (gdbarch, highpc + baseaddr); + lowpc = per_objfile->relocate (unrel_low); + highpc = per_objfile->relocate (unrel_high); cu->get_builder ()->push_context (0, lowpc); if (die->child != NULL) @@ -10345,10 +10354,11 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu) cu->get_builder ()->set_local_using_directives (cstk.local_using_directives); } -static void dwarf2_ranges_read_low_addrs (unsigned offset, - struct dwarf2_cu *cu, - dwarf_tag tag, - std::vector &result); +static void dwarf2_ranges_read_low_addrs + (unsigned offset, + struct dwarf2_cu *cu, + dwarf_tag tag, + std::vector &result); /* Read in DW_TAG_call_site and insert it to CU->call_site_htab. */ @@ -10358,14 +10368,11 @@ read_call_site_scope (struct die_info *die, struct dwarf2_cu *cu) dwarf2_per_objfile *per_objfile = cu->per_objfile; struct objfile *objfile = per_objfile->objfile; struct gdbarch *gdbarch = objfile->arch (); - CORE_ADDR pc, baseaddr; struct attribute *attr; void **slot; int nparams; struct die_info *child_die; - baseaddr = objfile->text_section_offset (); - attr = dwarf2_attr (die, DW_AT_call_return_pc, cu); if (attr == NULL) { @@ -10380,9 +10387,7 @@ read_call_site_scope (struct die_info *die, struct dwarf2_cu *cu) sect_offset_str (die->sect_off), objfile_name (objfile)); return; } - pc = attr->as_address () + baseaddr; - pc = gdbarch_adjust_dwarf2_addr (gdbarch, pc); - pc -= baseaddr; + unrelocated_addr pc = per_objfile->adjust (attr->as_address ()); if (cu->call_site_htab == NULL) cu->call_site_htab = htab_create_alloc_ex (16, call_site::hash, @@ -10395,7 +10400,7 @@ read_call_site_scope (struct die_info *die, struct dwarf2_cu *cu) { complaint (_("Duplicate PC %s for DW_TAG_call_site " "DIE %s [in module %s]"), - paddress (gdbarch, pc), sect_offset_str (die->sect_off), + paddress (gdbarch, (CORE_ADDR) pc), sect_offset_str (die->sect_off), objfile_name (objfile)); return; } @@ -10536,17 +10541,18 @@ read_call_site_scope (struct die_info *die, struct dwarf2_cu *cu) { ULONGEST ranges_offset = (ranges_attr->as_unsigned () + target_cu->gnu_ranges_base); - std::vector addresses; + std::vector addresses; dwarf2_ranges_read_low_addrs (ranges_offset, target_cu, target_die->tag, addresses); - CORE_ADDR *saved = XOBNEWVAR (&objfile->objfile_obstack, CORE_ADDR, - addresses.size ()); + unrelocated_addr *saved = XOBNEWVAR (&objfile->objfile_obstack, + unrelocated_addr, + addresses.size ()); std::copy (addresses.begin (), addresses.end (), saved); call_site->target.set_loc_array (addresses.size (), saved); } else { - CORE_ADDR lowpc; + unrelocated_addr lowpc; /* DW_AT_entry_pc should be preferred. */ if (dwarf2_get_pc_bounds (target_die, &lowpc, NULL, target_cu, @@ -10557,8 +10563,7 @@ read_call_site_scope (struct die_info *die, struct dwarf2_cu *cu) sect_offset_str (die->sect_off), objfile_name (objfile)); else { - lowpc = (gdbarch_adjust_dwarf2_addr (gdbarch, lowpc + baseaddr) - - baseaddr); + lowpc = per_objfile->adjust (lowpc); call_site->target.set_loc_physaddr (lowpc); } } @@ -10769,7 +10774,7 @@ dwarf2_rnglists_process (unsigned offset, struct dwarf2_cu *cu, struct objfile *objfile = per_objfile->objfile; bfd *obfd = objfile->obfd.get (); /* Base address selection entry. */ - gdb::optional base; + gdb::optional base; const gdb_byte *buffer; bool overflow = false; ULONGEST addr_index; @@ -10790,7 +10795,7 @@ dwarf2_rnglists_process (unsigned offset, struct dwarf2_cu *cu, while (1) { /* Initialize it due to a false compiler warning. */ - CORE_ADDR range_beginning = 0, range_end = 0; + unrelocated_addr range_beginning = {}, range_end = {}; const gdb_byte *buf_end = (rnglists_section->buffer + rnglists_section->size); unsigned int bytes_read; @@ -10828,8 +10833,10 @@ dwarf2_rnglists_process (unsigned offset, struct dwarf2_cu *cu, range_beginning = cu->header.read_address (obfd, buffer, &bytes_read); buffer += bytes_read; - range_end = (range_beginning - + read_unsigned_leb128 (obfd, buffer, &bytes_read)); + range_end + = (unrelocated_addr) ((CORE_ADDR) range_beginning + + read_unsigned_leb128 (obfd, buffer, + &bytes_read)); buffer += bytes_read; if (buffer > buf_end) { @@ -10846,19 +10853,23 @@ dwarf2_rnglists_process (unsigned offset, struct dwarf2_cu *cu, overflow = true; break; } - range_end = (range_beginning - + read_unsigned_leb128 (obfd, buffer, &bytes_read)); + range_end + = (unrelocated_addr) ((CORE_ADDR) range_beginning + + read_unsigned_leb128 (obfd, buffer, + &bytes_read)); buffer += bytes_read; break; case DW_RLE_offset_pair: - range_beginning = read_unsigned_leb128 (obfd, buffer, &bytes_read); + range_beginning = (unrelocated_addr) read_unsigned_leb128 (obfd, buffer, + &bytes_read); buffer += bytes_read; if (buffer > buf_end) { overflow = true; break; } - range_end = read_unsigned_leb128 (obfd, buffer, &bytes_read); + range_end = (unrelocated_addr) read_unsigned_leb128 (obfd, buffer, + &bytes_read); buffer += bytes_read; if (buffer > buf_end) { @@ -10922,13 +10933,15 @@ dwarf2_rnglists_process (unsigned offset, struct dwarf2_cu *cu, return false; } - range_beginning += *base; - range_end += *base; + range_beginning = (unrelocated_addr) ((CORE_ADDR) range_beginning + + (CORE_ADDR) *base); + range_end = (unrelocated_addr) ((CORE_ADDR) range_end + + (CORE_ADDR) *base); } /* A not-uncommon case of bad debug info. Don't pollute the addrmap with bad data. */ - if (range_beginning == 0 + if (range_beginning == (unrelocated_addr) 0 && !per_objfile->per_bfd->has_section_at_zero) { complaint (_(".debug_rnglists entry has start address of zero" @@ -10952,7 +10965,7 @@ dwarf2_rnglists_process (unsigned offset, struct dwarf2_cu *cu, /* Call CALLBACK from DW_AT_ranges attribute value OFFSET reading .debug_ranges. Callback's type should be: - void (CORE_ADDR range_beginning, CORE_ADDR range_end) + void (unrelocated_addr range_beginning, unrelocated_addr range_end) Return 1 if the attributes are present and valid, otherwise, return 0. */ template @@ -10967,7 +10980,7 @@ dwarf2_ranges_process (unsigned offset, struct dwarf2_cu *cu, dwarf_tag tag, unsigned int addr_size = cu_header->addr_size; CORE_ADDR mask = ~(~(CORE_ADDR)1 << (addr_size * 8 - 1)); /* Base address selection entry. */ - gdb::optional base; + gdb::optional base; unsigned int dummy; const gdb_byte *buffer; @@ -10987,7 +11000,7 @@ dwarf2_ranges_process (unsigned offset, struct dwarf2_cu *cu, dwarf_tag tag, while (1) { - CORE_ADDR range_beginning, range_end; + unrelocated_addr range_beginning, range_end; range_beginning = cu->header.read_address (obfd, buffer, &dummy); buffer += addr_size; @@ -10996,14 +11009,15 @@ dwarf2_ranges_process (unsigned offset, struct dwarf2_cu *cu, dwarf_tag tag, offset += 2 * addr_size; /* An end of list marker is a pair of zero addresses. */ - if (range_beginning == 0 && range_end == 0) + if (range_beginning == (unrelocated_addr) 0 + && range_end == (unrelocated_addr) 0) /* Found the end of list entry. */ break; /* Each base address selection entry is a pair of 2 values. The first is the largest possible address, the second is the base address. Check for a base address here. */ - if ((range_beginning & mask) == mask) + if (((CORE_ADDR) range_beginning & mask) == mask) { /* If we found the largest possible address, then we already have the base address in range_end. */ @@ -11030,12 +11044,14 @@ dwarf2_ranges_process (unsigned offset, struct dwarf2_cu *cu, dwarf_tag tag, if (range_beginning == range_end) continue; - range_beginning += *base; - range_end += *base; + range_beginning = (unrelocated_addr) ((CORE_ADDR) range_beginning + + (CORE_ADDR) *base); + range_end = (unrelocated_addr) ((CORE_ADDR) range_end + + (CORE_ADDR) *base); /* A not-uncommon case of bad debug info. Don't pollute the addrmap with bad data. */ - if (range_beginning == 0 + if (range_beginning == (unrelocated_addr) 0 && !per_objfile->per_bfd->has_section_at_zero) { complaint (_(".debug_ranges entry has start address of zero" @@ -11055,33 +11071,28 @@ dwarf2_ranges_process (unsigned offset, struct dwarf2_cu *cu, dwarf_tag tag, ranges in MAP are set, using DATUM as the value. */ static int -dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return, - CORE_ADDR *high_return, struct dwarf2_cu *cu, +dwarf2_ranges_read (unsigned offset, unrelocated_addr *low_return, + unrelocated_addr *high_return, struct dwarf2_cu *cu, addrmap *map, void *datum, dwarf_tag tag) { - struct objfile *objfile = cu->per_objfile->objfile; - struct gdbarch *gdbarch = objfile->arch (); - const CORE_ADDR baseaddr = objfile->text_section_offset (); + dwarf2_per_objfile *per_objfile = cu->per_objfile; int low_set = 0; - CORE_ADDR low = 0; - CORE_ADDR high = 0; + unrelocated_addr low = {}; + unrelocated_addr high = {}; int retval; retval = dwarf2_ranges_process (offset, cu, tag, - [&] (CORE_ADDR range_beginning, CORE_ADDR range_end) + [&] (unrelocated_addr range_beginning, unrelocated_addr range_end) { if (map != nullptr) { - CORE_ADDR lowpc; - CORE_ADDR highpc; - - lowpc = (gdbarch_adjust_dwarf2_addr (gdbarch, - range_beginning + baseaddr) - - baseaddr); - highpc = (gdbarch_adjust_dwarf2_addr (gdbarch, - range_end + baseaddr) - - baseaddr); - map->set_empty (lowpc, highpc - 1, datum); + unrelocated_addr lowpc; + unrelocated_addr highpc; + + lowpc = per_objfile->adjust (range_beginning); + highpc = per_objfile->adjust (range_end); + /* addrmap only accepts CORE_ADDR, so we must cast here. */ + map->set_empty ((CORE_ADDR) lowpc, (CORE_ADDR) highpc - 1, datum); } /* FIXME: This is recording everything as a low-high @@ -11122,10 +11133,10 @@ dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return, static void dwarf2_ranges_read_low_addrs (unsigned offset, struct dwarf2_cu *cu, dwarf_tag tag, - std::vector &result) + std::vector &result) { dwarf2_ranges_process (offset, cu, tag, - [&] (CORE_ADDR start, CORE_ADDR end) + [&] (unrelocated_addr start, unrelocated_addr end) { result.push_back (start); }); @@ -11136,15 +11147,15 @@ dwarf2_ranges_read_low_addrs (unsigned offset, struct dwarf2_cu *cu, neither PC_BOUNDS_NOT_PRESENT nor PC_BOUNDS_INVALID are returned. */ static enum pc_bounds_kind -dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc, - CORE_ADDR *highpc, struct dwarf2_cu *cu, +dwarf2_get_pc_bounds (struct die_info *die, unrelocated_addr *lowpc, + unrelocated_addr *highpc, struct dwarf2_cu *cu, addrmap *map, void *datum) { dwarf2_per_objfile *per_objfile = cu->per_objfile; struct attribute *attr; struct attribute *attr_high; - CORE_ADDR low = 0; - CORE_ADDR high = 0; + unrelocated_addr low = {}; + unrelocated_addr high = {}; enum pc_bounds_kind ret; attr_high = dwarf2_attr (die, DW_AT_high_pc, cu); @@ -11156,7 +11167,7 @@ dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc, low = attr->as_address (); high = attr_high->as_address (); if (cu->header.version >= 4 && attr_high->form_is_constant ()) - high += low; + high = (unrelocated_addr) ((ULONGEST) high + (ULONGEST) low); } else /* Found high w/o low attribute. */ @@ -11203,7 +11214,8 @@ dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc, labels are not in the output, so the relocs get a value of 0. If this is a discarded function, mark the pc bounds as invalid, so that GDB will ignore it. */ - if (low == 0 && !per_objfile->per_bfd->has_section_at_zero) + if (low == (unrelocated_addr) 0 + && !per_objfile->per_bfd->has_section_at_zero) return PC_BOUNDS_INVALID; *lowpc = low; @@ -11219,10 +11231,11 @@ dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc, static void dwarf2_get_subprogram_pc_bounds (struct die_info *die, - CORE_ADDR *lowpc, CORE_ADDR *highpc, + unrelocated_addr *lowpc, + unrelocated_addr *highpc, struct dwarf2_cu *cu) { - CORE_ADDR low, high; + unrelocated_addr low, high; struct die_info *child = die->child; if (dwarf2_get_pc_bounds (die, &low, &high, cu, nullptr, nullptr) @@ -11256,12 +11269,12 @@ dwarf2_get_subprogram_pc_bounds (struct die_info *die, static void get_scope_pc_bounds (struct die_info *die, - CORE_ADDR *lowpc, CORE_ADDR *highpc, + unrelocated_addr *lowpc, unrelocated_addr *highpc, struct dwarf2_cu *cu) { - CORE_ADDR best_low = (CORE_ADDR) -1; - CORE_ADDR best_high = (CORE_ADDR) 0; - CORE_ADDR current_low, current_high; + unrelocated_addr best_low = (unrelocated_addr) -1; + unrelocated_addr best_high = {}; + unrelocated_addr current_low, current_high; if (dwarf2_get_pc_bounds (die, ¤t_low, ¤t_high, cu, nullptr, nullptr) @@ -11292,7 +11305,7 @@ get_scope_pc_bounds (struct die_info *die, standards says that they have to be there. */ get_scope_pc_bounds (child, ¤t_low, ¤t_high, cu); - if (current_low != ((CORE_ADDR) -1)) + if (current_low != ((unrelocated_addr) -1)) { best_low = std::min (best_low, current_low); best_high = std::max (best_high, current_high); @@ -11318,9 +11331,8 @@ static void dwarf2_record_block_ranges (struct die_info *die, struct block *block, struct dwarf2_cu *cu) { - struct objfile *objfile = cu->per_objfile->objfile; - CORE_ADDR baseaddr = objfile->text_section_offset (); - struct gdbarch *gdbarch = objfile->arch (); + dwarf2_per_objfile *per_objfile = cu->per_objfile; + struct objfile *objfile = per_objfile->objfile; struct attribute *attr; struct attribute *attr_high; @@ -11330,14 +11342,15 @@ dwarf2_record_block_ranges (struct die_info *die, struct block *block, attr = dwarf2_attr (die, DW_AT_low_pc, cu); if (attr != nullptr) { - CORE_ADDR low = attr->as_address (); - CORE_ADDR high = attr_high->as_address (); + unrelocated_addr unrel_low = attr->as_address (); + unrelocated_addr unrel_high = attr_high->as_address (); if (cu->header.version >= 4 && attr_high->form_is_constant ()) - high += low; + unrel_high = (unrelocated_addr) ((ULONGEST) unrel_high + + (ULONGEST) unrel_low); - low = gdbarch_adjust_dwarf2_addr (gdbarch, low + baseaddr); - high = gdbarch_adjust_dwarf2_addr (gdbarch, high + baseaddr); + CORE_ADDR low = per_objfile->relocate (unrel_low); + CORE_ADDR high = per_objfile->relocate (unrel_high); cu->get_builder ()->record_block_range (block, low, high - 1); } } @@ -11356,14 +11369,13 @@ dwarf2_record_block_ranges (struct die_info *die, struct block *block, std::vector blockvec; dwarf2_ranges_process (ranges_offset, cu, die->tag, - [&] (CORE_ADDR start, CORE_ADDR end) + [&] (unrelocated_addr start, unrelocated_addr end) { - start += baseaddr; - end += baseaddr; - start = gdbarch_adjust_dwarf2_addr (gdbarch, start); - end = gdbarch_adjust_dwarf2_addr (gdbarch, end); - cu->get_builder ()->record_block_range (block, start, end - 1); - blockvec.emplace_back (start, end); + CORE_ADDR abs_start = per_objfile->relocate (start); + CORE_ADDR abs_end = per_objfile->relocate (end); + cu->get_builder ()->record_block_range (block, abs_start, + abs_end - 1); + blockvec.emplace_back (abs_start, abs_end); }); block->set_ranges (make_blockranges (objfile, blockvec)); @@ -16071,7 +16083,7 @@ cooked_indexer::check_bounds (cutu_reader *reader) dwarf2_cu *cu = reader->cu; - CORE_ADDR best_lowpc = 0, best_highpc = 0; + unrelocated_addr best_lowpc = {}, best_highpc = {}; /* Possibly set the default values of LOWPC and HIGHPC from `DW_AT_ranges'. */ dwarf2_find_base_address (reader->comp_unit_die, cu); @@ -16080,18 +16092,15 @@ cooked_indexer::check_bounds (cutu_reader *reader) cu, m_index_storage->get_addrmap (), cu->per_cu); if (cu_bounds_kind == PC_BOUNDS_HIGH_LOW && best_lowpc < best_highpc) { - struct objfile *objfile = cu->per_objfile->objfile; - CORE_ADDR baseaddr = objfile->text_section_offset (); - struct gdbarch *gdbarch = objfile->arch (); - CORE_ADDR low - = (gdbarch_adjust_dwarf2_addr (gdbarch, best_lowpc + baseaddr) - - baseaddr); - CORE_ADDR high - = (gdbarch_adjust_dwarf2_addr (gdbarch, best_highpc + baseaddr) - - baseaddr - 1); + dwarf2_per_objfile *per_objfile = cu->per_objfile; + unrelocated_addr low = per_objfile->adjust (best_lowpc); + unrelocated_addr high = per_objfile->adjust (best_highpc); /* Store the contiguous range if it is not empty; it can be - empty for CUs with no code. */ - m_index_storage->get_addrmap ()->set_empty (low, high, cu->per_cu); + empty for CUs with no code. addrmap requires CORE_ADDR, so + we cast here. */ + m_index_storage->get_addrmap ()->set_empty ((CORE_ADDR) low, + (CORE_ADDR) high - 1, + cu->per_cu); cu->per_cu->addresses_seen = true; } @@ -16181,8 +16190,8 @@ cooked_indexer::scan_attributes (dwarf2_per_cu_data *scanning_per_cu, bool is_declaration = false; sect_offset origin_offset {}; - gdb::optional low_pc; - gdb::optional high_pc; + gdb::optional low_pc; + gdb::optional high_pc; bool high_pc_relative = false; for (int i = 0; i < abbrev->num_attrs; ++i) @@ -16280,11 +16289,11 @@ cooked_indexer::scan_attributes (dwarf2_per_cu_data *scanning_per_cu, && (addr != 0 || reader->cu->per_objfile->per_bfd->has_section_at_zero)) { - low_pc = addr; + low_pc = (unrelocated_addr) addr; /* For variables, we don't want to try decoding the type just to find the size -- for gdb's purposes we only need the address of a variable. */ - high_pc = addr + 1; + high_pc = (unrelocated_addr) (addr + 1); high_pc_relative = false; } } @@ -16301,7 +16310,7 @@ cooked_indexer::scan_attributes (dwarf2_per_cu_data *scanning_per_cu, want to add this value. */ ranges_offset += reader->cu->gnu_ranges_base; - CORE_ADDR lowpc, highpc; + unrelocated_addr lowpc, highpc; dwarf2_ranges_read (ranges_offset, &lowpc, &highpc, reader->cu, m_index_storage->get_addrmap (), scanning_per_cu, abbrev->tag); @@ -16375,24 +16384,21 @@ cooked_indexer::scan_attributes (dwarf2_per_cu_data *scanning_per_cu, if (!scanning_per_cu->addresses_seen && low_pc.has_value () && (reader->cu->per_objfile->per_bfd->has_section_at_zero - || *low_pc != 0) + || *low_pc != (unrelocated_addr) 0) && high_pc.has_value ()) { if (high_pc_relative) - high_pc = *high_pc + *low_pc; + high_pc = (unrelocated_addr) ((ULONGEST) *high_pc + + (ULONGEST) *low_pc); if (*high_pc > *low_pc) { - struct objfile *objfile = reader->cu->per_objfile->objfile; - CORE_ADDR baseaddr = objfile->text_section_offset (); - struct gdbarch *gdbarch = objfile->arch (); - CORE_ADDR lo - = (gdbarch_adjust_dwarf2_addr (gdbarch, *low_pc + baseaddr) - - baseaddr); - CORE_ADDR hi - = (gdbarch_adjust_dwarf2_addr (gdbarch, *high_pc + baseaddr) - - baseaddr); - m_index_storage->get_addrmap ()->set_empty (lo, hi - 1, + dwarf2_per_objfile *per_objfile = reader->cu->per_objfile; + unrelocated_addr lo = per_objfile->adjust (*low_pc); + unrelocated_addr hi = per_objfile->adjust (*high_pc); + /* Need CORE_ADDR casts for addrmap. */ + m_index_storage->get_addrmap ()->set_empty ((CORE_ADDR) lo, + (CORE_ADDR) hi - 1, scanning_per_cu); } } @@ -17175,8 +17181,8 @@ read_attribute_value (const struct die_reader_specs *reader, { case DW_FORM_ref_addr: if (cu_header->version == 2) - attr->set_unsigned (cu_header->read_address (abfd, info_ptr, - &bytes_read)); + attr->set_unsigned ((ULONGEST) cu_header->read_address (abfd, info_ptr, + &bytes_read)); else attr->set_unsigned (cu_header->read_offset (abfd, info_ptr, &bytes_read)); @@ -17189,9 +17195,9 @@ read_attribute_value (const struct die_reader_specs *reader, break; case DW_FORM_addr: { - struct gdbarch *gdbarch = objfile->arch (); - CORE_ADDR addr = cu_header->read_address (abfd, info_ptr, &bytes_read); - addr = gdbarch_adjust_dwarf2_addr (gdbarch, addr); + unrelocated_addr addr = cu_header->read_address (abfd, info_ptr, + &bytes_read); + addr = per_objfile->adjust (addr); attr->set_address (addr); info_ptr += bytes_read; } @@ -17512,7 +17518,7 @@ dwarf2_per_objfile::read_line_string (const gdb_byte *buf, ADDR_BASE is the DW_AT_addr_base (DW_AT_GNU_addr_base) attribute or zero. ADDR_SIZE is the size of addresses from the CU header. */ -static CORE_ADDR +static unrelocated_addr read_addr_index_1 (dwarf2_per_objfile *per_objfile, unsigned int addr_index, gdb::optional addr_base, int addr_size) { @@ -17533,14 +17539,14 @@ read_addr_index_1 (dwarf2_per_objfile *per_objfile, unsigned int addr_index, info_ptr = (per_objfile->per_bfd->addr.buffer + addr_base_or_zero + addr_index * addr_size); if (addr_size == 4) - return bfd_get_32 (abfd, info_ptr); + return (unrelocated_addr) bfd_get_32 (abfd, info_ptr); else - return bfd_get_64 (abfd, info_ptr); + return (unrelocated_addr) bfd_get_64 (abfd, info_ptr); } /* Given index ADDR_INDEX in .debug_addr, fetch the value. */ -static CORE_ADDR +static unrelocated_addr read_addr_index (struct dwarf2_cu *cu, unsigned int addr_index) { return read_addr_index_1 (cu->per_objfile, addr_index, @@ -17549,7 +17555,7 @@ read_addr_index (struct dwarf2_cu *cu, unsigned int addr_index) /* Given a pointer to an leb128 value, fetch the value from .debug_addr. */ -static CORE_ADDR +static unrelocated_addr read_addr_index_from_leb128 (struct dwarf2_cu *cu, const gdb_byte *info_ptr, unsigned int *bytes_read) { @@ -17561,7 +17567,7 @@ read_addr_index_from_leb128 (struct dwarf2_cu *cu, const gdb_byte *info_ptr, /* See read.h. */ -CORE_ADDR +unrelocated_addr dwarf2_read_addr_index (dwarf2_per_cu_data *per_cu, dwarf2_per_objfile *per_objfile, unsigned int addr_index) @@ -18072,7 +18078,8 @@ public: nop-out rest of the lines in this sequence. */ void check_line_address (struct dwarf2_cu *cu, const gdb_byte *line_ptr, - CORE_ADDR unrelocated_lowpc, CORE_ADDR address); + unrelocated_addr unrelocated_lowpc, + unrelocated_addr address); void handle_set_discriminator (unsigned int discriminator) { @@ -18081,10 +18088,13 @@ public: } /* Handle DW_LNE_set_address. */ - void handle_set_address (CORE_ADDR address) + void handle_set_address (unrelocated_addr address) { m_op_index = 0; - m_address = gdbarch_adjust_dwarf2_line (m_gdbarch, address, false); + m_address + = (unrelocated_addr) gdbarch_adjust_dwarf2_line (m_gdbarch, + (CORE_ADDR) address, + false); } /* Handle DW_LNS_advance_pc. */ @@ -18114,7 +18124,8 @@ public: /* Handle DW_LNS_fixed_advance_pc. */ void handle_fixed_advance_pc (CORE_ADDR addr_adj) { - m_address += gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true); + addr_adj = gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true); + m_address = (unrelocated_addr) ((CORE_ADDR) m_address + addr_adj); m_op_index = 0; } @@ -18165,7 +18176,7 @@ private: /* These are initialized in the constructor. */ - CORE_ADDR m_address; + unrelocated_addr m_address; linetable_entry_flags m_flags; unsigned int m_discriminator = 0; @@ -18178,7 +18189,7 @@ private: struct subfile *m_last_subfile = NULL; /* The address of the last line entry. */ - CORE_ADDR m_last_address; + unrelocated_addr m_last_address; /* Set to true when a previous line at the same address (using m_last_address) had LEF_IS_STMT set in m_flags. This is reset to false @@ -18202,7 +18213,8 @@ lnp_state_machine::handle_advance_pc (CORE_ADDR adjust) CORE_ADDR addr_adj = (((m_op_index + adjust) / m_line_header->maximum_ops_per_instruction) * m_line_header->minimum_instruction_length); - m_address += gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true); + addr_adj = gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true); + m_address = (unrelocated_addr) ((CORE_ADDR) m_address + addr_adj); m_op_index = ((m_op_index + adjust) % m_line_header->maximum_ops_per_instruction); } @@ -18216,7 +18228,8 @@ lnp_state_machine::handle_special_opcode (unsigned char op_code) CORE_ADDR addr_adj = (((m_op_index + adj_opcode_d) / m_line_header->maximum_ops_per_instruction) * m_line_header->minimum_instruction_length); - m_address += gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true); + addr_adj = gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true); + m_address = (unrelocated_addr) ((CORE_ADDR) m_address + addr_adj); m_op_index = ((m_op_index + adj_opcode_d) % m_line_header->maximum_ops_per_instruction); @@ -18254,7 +18267,8 @@ lnp_state_machine::handle_const_add_pc () / m_line_header->maximum_ops_per_instruction) * m_line_header->minimum_instruction_length); - m_address += gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true); + addr_adj = gdbarch_adjust_dwarf2_line (m_gdbarch, addr_adj, true); + m_address = (unrelocated_addr) ((CORE_ADDR) m_address + addr_adj); m_op_index = ((m_op_index + adjust) % m_line_header->maximum_ops_per_instruction); } @@ -18312,19 +18326,20 @@ dwarf_record_line_p (struct dwarf2_cu *cu, static void dwarf_record_line_1 (struct gdbarch *gdbarch, struct subfile *subfile, - unsigned int line, CORE_ADDR address, + unsigned int line, unrelocated_addr address, linetable_entry_flags flags, struct dwarf2_cu *cu) { unrelocated_addr addr - = unrelocated_addr (gdbarch_addr_bits_remove (gdbarch, address)); + = unrelocated_addr (gdbarch_addr_bits_remove (gdbarch, + (CORE_ADDR) address)); if (dwarf_line_debug) { gdb_printf (gdb_stdlog, "Recording line %u, file %s, address %s\n", line, lbasename (subfile->name.c_str ()), - paddress (gdbarch, address)); + paddress (gdbarch, (CORE_ADDR) address)); } if (cu != nullptr) @@ -18338,7 +18353,7 @@ dwarf_record_line_1 (struct gdbarch *gdbarch, struct subfile *subfile, static void dwarf_finish_line (struct gdbarch *gdbarch, struct subfile *subfile, - CORE_ADDR address, struct dwarf2_cu *cu) + unrelocated_addr address, struct dwarf2_cu *cu) { if (subfile == NULL) return; @@ -18348,7 +18363,7 @@ dwarf_finish_line (struct gdbarch *gdbarch, struct subfile *subfile, gdb_printf (gdb_stdlog, "Finishing current line, file %s, address %s\n", lbasename (subfile->name.c_str ()), - paddress (gdbarch, address)); + paddress (gdbarch, (CORE_ADDR) address)); } dwarf_record_line_1 (gdbarch, subfile, 0, address, LEF_IS_STMT, cu); @@ -18363,7 +18378,7 @@ lnp_state_machine::record_line (bool end_sequence) "Processing actual line %u: file %u," " address %s, is_stmt %u, prologue_end %u, discrim %u%s\n", m_line, m_file, - paddress (m_gdbarch, m_address), + paddress (m_gdbarch, (CORE_ADDR) m_address), (m_flags & LEF_IS_STMT) != 0, (m_flags & LEF_PROLOGUE_END) != 0, m_discriminator, @@ -18449,7 +18464,7 @@ lnp_state_machine::lnp_state_machine (struct dwarf2_cu *cu, gdbarch *arch, chance to adjust it and also record it in case it needs it. This is currently used by MIPS code, cf. `mips_adjust_dwarf2_line'. */ - m_address (gdbarch_adjust_dwarf2_line (arch, 0, 0)), + m_address ((unrelocated_addr) gdbarch_adjust_dwarf2_line (arch, 0, 0)), m_flags (lh->default_is_stmt ? LEF_IS_STMT : (linetable_entry_flags) 0), m_last_address (m_address) { @@ -18458,15 +18473,16 @@ lnp_state_machine::lnp_state_machine (struct dwarf2_cu *cu, gdbarch *arch, void lnp_state_machine::check_line_address (struct dwarf2_cu *cu, const gdb_byte *line_ptr, - CORE_ADDR unrelocated_lowpc, CORE_ADDR address) + unrelocated_addr unrelocated_lowpc, + unrelocated_addr address) { /* Linkers resolve a symbolic relocation referencing a GC'd function to 0 or -1. If ADDRESS is 0, ignoring the opcode will err if the text section is located at 0x0. In this case, additionally check that if ADDRESS < UNRELOCATED_LOWPC. */ - if ((address == 0 && address < unrelocated_lowpc) - || address == (CORE_ADDR) -1) + if ((address == (unrelocated_addr) 0 && address < unrelocated_lowpc) + || address == (unrelocated_addr) -1) { /* This line table is for a function which has been GCd by the linker. Ignore it. PR gdb/12528 */ @@ -18553,12 +18569,13 @@ dwarf_decode_lines_1 (struct line_header *lh, struct dwarf2_cu *cu, break; case DW_LNE_set_address: { - CORE_ADDR address + unrelocated_addr address = cu->header.read_address (abfd, line_ptr, &bytes_read); line_ptr += bytes_read; - state_machine.check_line_address (cu, line_ptr, - lowpc - baseaddr, address); + state_machine.check_line_address + (cu, line_ptr, (unrelocated_addr) (lowpc - baseaddr), + address); state_machine.handle_set_address (address); } break; @@ -18830,13 +18847,14 @@ var_decode_location (struct attribute *attr, struct symbol *sym, { unsigned int dummy; + unrelocated_addr tem; if (block->data[0] == DW_OP_addr) - sym->set_value_address - (cu->header.read_address (objfile->obfd.get (), block->data + 1, - &dummy)); + tem = cu->header.read_address (objfile->obfd.get (), + block->data + 1, + &dummy); else - sym->set_value_address - (read_addr_index_from_leb128 (cu, block->data + 1, &dummy)); + tem = read_addr_index_from_leb128 (cu, block->data + 1, &dummy); + sym->set_value_address ((CORE_ADDR) tem); sym->set_aclass_index (LOC_STATIC); fixup_symbol_section (sym, objfile); sym->set_value_address @@ -18918,18 +18936,14 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu, { dwarf2_per_objfile *per_objfile = cu->per_objfile; struct objfile *objfile = per_objfile->objfile; - struct gdbarch *gdbarch = objfile->arch (); struct symbol *sym = NULL; const char *name; struct attribute *attr = NULL; struct attribute *attr2 = NULL; - CORE_ADDR baseaddr; struct pending **list_to_add = NULL; int inlined_func = (die->tag == DW_TAG_inlined_subroutine); - baseaddr = objfile->text_section_offset (); - name = dwarf2_name (die, cu); if (name == nullptr && (die->tag == DW_TAG_subprogram || die->tag == DW_TAG_inlined_subroutine @@ -19009,10 +19023,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu, attr = dwarf2_attr (die, DW_AT_low_pc, cu); if (attr != nullptr) { - CORE_ADDR addr; - - addr = attr->as_address (); - addr = gdbarch_adjust_dwarf2_addr (gdbarch, addr + baseaddr); + CORE_ADDR addr = per_objfile->relocate (attr->as_address ()); sym->set_section_index (SECT_OFF_TEXT (objfile)); sym->set_value_address (addr); sym->set_aclass_index (LOC_LABEL); @@ -19463,7 +19474,7 @@ dwarf2_const_value_attr (const struct attribute *attr, struct type *type, data[0] = DW_OP_addr; store_unsigned_integer (&data[1], cu_header->addr_size, - byte_order, attr->as_address ()); + byte_order, (ULONGEST) attr->as_address ()); data[cu_header->addr_size + 1] = DW_OP_stack_value; } break; @@ -20532,8 +20543,6 @@ dwarf2_fetch_die_loc_sect_off (sect_offset sect_off, != per_objfile->per_bfd->abstract_to_concrete.end ())) { CORE_ADDR pc = get_frame_pc (); - CORE_ADDR baseaddr = objfile->text_section_offset (); - struct gdbarch *gdbarch = objfile->arch (); for (const auto &cand_off : per_objfile->per_bfd->abstract_to_concrete[die->sect_off]) @@ -20546,12 +20555,12 @@ dwarf2_fetch_die_loc_sect_off (sect_offset sect_off, || cand->parent->tag != DW_TAG_subprogram) continue; - CORE_ADDR pc_low, pc_high; - get_scope_pc_bounds (cand->parent, &pc_low, &pc_high, cu); - if (pc_low == ((CORE_ADDR) -1)) + unrelocated_addr unrel_low, unrel_high; + get_scope_pc_bounds (cand->parent, &unrel_low, &unrel_high, cu); + if (unrel_low == ((unrelocated_addr) -1)) continue; - pc_low = gdbarch_adjust_dwarf2_addr (gdbarch, pc_low + baseaddr); - pc_high = gdbarch_adjust_dwarf2_addr (gdbarch, pc_high + baseaddr); + CORE_ADDR pc_low = per_objfile->relocate (unrel_low); + CORE_ADDR pc_high = per_objfile->relocate (unrel_high); if (!(pc_low <= pc && pc < pc_high)) continue; @@ -20684,7 +20693,8 @@ dwarf2_fetch_constant_bytes (sect_offset sect_off, *len = cu->header.addr_size; tem = (gdb_byte *) obstack_alloc (obstack, *len); - store_unsigned_integer (tem, *len, byte_order, attr->as_address ()); + store_unsigned_integer (tem, *len, byte_order, + (ULONGEST) attr->as_address ()); result = tem; } break; @@ -21146,9 +21156,10 @@ decode_locdesc (struct dwarf_block *blk, struct dwarf2_cu *cu, break; case DW_OP_addr: - stack[++stacki] = cu->header.read_address (objfile->obfd.get (), - &data[i], - &bytes_read); + stack[++stacki] + = (CORE_ADDR) cu->header.read_address (objfile->obfd.get (), + &data[i], + &bytes_read); i += bytes_read; break; @@ -21231,8 +21242,9 @@ decode_locdesc (struct dwarf_block *blk, struct dwarf2_cu *cu, case DW_OP_addrx: case DW_OP_GNU_addr_index: case DW_OP_GNU_const_index: - stack[++stacki] = read_addr_index_from_leb128 (cu, &data[i], - &bytes_read); + stack[++stacki] + = (CORE_ADDR) read_addr_index_from_leb128 (cu, &data[i], + &bytes_read); i += bytes_read; break; @@ -21412,7 +21424,7 @@ fill_in_loclist_baton (struct dwarf2_cu *cu, if (cu->base_address.has_value ()) baton->base_address = *cu->base_address; else - baton->base_address = 0; + baton->base_address = {}; baton->from_dwo = cu->dwo_unit != NULL; } diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h index 37023a20709..a99299cbc6d 100644 --- a/gdb/dwarf2/read.h +++ b/gdb/dwarf2/read.h @@ -711,6 +711,15 @@ struct dwarf2_per_objfile any that are too old. */ void age_comp_units (); + /* Apply any needed adjustments to ADDR, returning an adjusted but + still unrelocated address. */ + unrelocated_addr adjust (unrelocated_addr addr); + + /* Apply any needed adjustments to ADDR and then relocate the + address according to the objfile's section offsets, returning a + relocated address. */ + CORE_ADDR relocate (unrelocated_addr addr); + /* Back link. */ struct objfile *objfile; @@ -771,9 +780,9 @@ struct type *dwarf2_get_die_type (cu_offset die_offset, long after the debug information has been read, and thus per_cu->cu may no longer exist. */ -CORE_ADDR dwarf2_read_addr_index (dwarf2_per_cu_data *per_cu, - dwarf2_per_objfile *per_objfile, - unsigned int addr_index); +unrelocated_addr dwarf2_read_addr_index (dwarf2_per_cu_data *per_cu, + dwarf2_per_objfile *per_objfile, + unsigned int addr_index); /* Return DWARF block referenced by DW_AT_location of DIE at SECT_OFF at PER_CU. Returned value is intended for DW_OP_call*. Returned diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 10e585066f7..9aa644b7990 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -6134,8 +6134,7 @@ builtin_type (struct objfile *objfile) CORE_ADDR call_site::pc () const { - CORE_ADDR delta = this->per_objfile->objfile->text_section_offset (); - return m_unrelocated_pc + delta; + return per_objfile->relocate (m_unrelocated_pc); } void _initialize_gdbtypes (); diff --git a/gdb/symtab.c b/gdb/symtab.c index 59bdc007fe3..e3030e462f1 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -344,7 +344,7 @@ compunit_symtab::find_call_site (CORE_ADDR pc) const return nullptr; CORE_ADDR delta = this->objfile ()->text_section_offset (); - CORE_ADDR unrelocated_pc = pc - delta; + unrelocated_addr unrelocated_pc = (unrelocated_addr) (pc - delta); struct call_site call_site_local (unrelocated_pc, nullptr, nullptr); void **slot @@ -360,7 +360,8 @@ compunit_symtab::find_call_site (CORE_ADDR pc) const if (pc == new_pc) return nullptr; - call_site new_call_site_local (new_pc - delta, nullptr, nullptr); + unrelocated_pc = (unrelocated_addr) (new_pc - delta); + call_site new_call_site_local (unrelocated_pc, nullptr, nullptr); slot = htab_find_slot (m_call_site_htab, &new_call_site_local, NO_INSERT); if (slot == nullptr) return nullptr; -- 2.30.2