diff options
| author | Tom Tromey <tom@tromey.com> | 2020-09-29 18:49:08 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2020-09-29 20:29:07 -0600 |
| commit | 36d378cf86c7b4ed26f2a45cc1a4ea1a3802b4e1 (patch) | |
| tree | 1af0d2c0107441ec8c042ee406257ee13c79a902 /gdb/dwarf2/read.c | |
| parent | fe56917a86c37fbf4399583f4fa041227594d187 (diff) | |
| download | binutils-36d378cf86c7b4ed26f2a45cc1a4ea1a3802b4e1.zip binutils-36d378cf86c7b4ed26f2a45cc1a4ea1a3802b4e1.tar.gz binutils-36d378cf86c7b4ed26f2a45cc1a4ea1a3802b4e1.tar.bz2 | |
Remove DW_ADDR
This removes DW_ADDR in favor of accessor methods.
gdb/ChangeLog
2020-09-29 Tom Tromey <tom@tromey.com>
* dwarf2/read.c (read_attribute_reprocess, read_attribute_value)
(dwarf2_const_value_attr, dump_die_shallow)
(dwarf2_fetch_constant_bytes): Update.
* dwarf2/attribute.h (struct attribute) <form_is_ref>: Update
comment.
<set_address>: New method.
(DW_ADDR): Remove.
* dwarf2/attribute.c (attribute::form_is_ref): Update comment.
(attribute::as_string, attribute::as_address): Add assert.
Diffstat (limited to 'gdb/dwarf2/read.c')
| -rw-r--r-- | gdb/dwarf2/read.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 57b667e..a6d2936 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -19640,7 +19640,8 @@ read_attribute_reprocess (const struct die_reader_specs *reader, { case DW_FORM_addrx: case DW_FORM_GNU_addr_index: - DW_ADDR (attr) = read_addr_index (cu, attr->as_unsigned_reprocess ()); + attr->set_address (read_addr_index (cu, + attr->as_unsigned_reprocess ())); break; case DW_FORM_loclistx: DW_UNSND (attr) = read_loclist_index (cu, DW_UNSND (attr)); @@ -19707,8 +19708,9 @@ read_attribute_value (const struct die_reader_specs *reader, case DW_FORM_addr: { struct gdbarch *gdbarch = objfile->arch (); - DW_ADDR (attr) = cu->header.read_address (abfd, info_ptr, &bytes_read); - DW_ADDR (attr) = gdbarch_adjust_dwarf2_addr (gdbarch, DW_ADDR (attr)); + CORE_ADDR addr = cu->header.read_address (abfd, info_ptr, &bytes_read); + addr = gdbarch_adjust_dwarf2_addr (gdbarch, addr); + attr->set_address (addr); info_ptr += bytes_read; } break; @@ -21871,7 +21873,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, DW_ADDR (attr)); + byte_order, attr->as_address ()); data[cu_header->addr_size + 1] = DW_OP_stack_value; } break; @@ -22741,7 +22743,7 @@ dump_die_shallow (struct ui_file *f, int indent, struct die_info *die) case DW_FORM_addrx: case DW_FORM_GNU_addr_index: fprintf_unfiltered (f, "address: "); - fputs_filtered (hex_string (DW_ADDR (&die->attrs[i])), f); + fputs_filtered (hex_string (die->attrs[i].as_address ()), f); break; case DW_FORM_block2: case DW_FORM_block4: @@ -23185,7 +23187,7 @@ 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, DW_ADDR (attr)); + store_unsigned_integer (tem, *len, byte_order, attr->as_address ()); result = tem; } break; |