From 36d378cf86c7b4ed26f2a45cc1a4ea1a3802b4e1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 29 Sep 2020 18:49:08 -0600 Subject: [PATCH] Remove DW_ADDR This removes DW_ADDR in favor of accessor methods. gdb/ChangeLog 2020-09-29 Tom Tromey * 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) : Update comment. : New method. (DW_ADDR): Remove. * dwarf2/attribute.c (attribute::form_is_ref): Update comment. (attribute::as_string, attribute::as_address): Add assert. --- gdb/ChangeLog | 12 ++++++++++++ gdb/dwarf2/attribute.c | 3 +++ gdb/dwarf2/attribute.h | 17 ++++++++++++++--- gdb/dwarf2/read.c | 14 ++++++++------ 4 files changed, 37 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d02fd7d8cda..328c7a69bc6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2020-09-29 Tom Tromey + + * 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) : Update + comment. + : New method. + (DW_ADDR): Remove. + * dwarf2/attribute.c (attribute::form_is_ref): Update comment. + (attribute::as_string, attribute::as_address): Add assert. + 2020-09-29 Tom Tromey * dwarf2/read.c (read_cutu_die_from_dwo): Use OBSTACK_ZALLOC. diff --git a/gdb/dwarf2/attribute.c b/gdb/dwarf2/attribute.c index 5d9c559194a..7783c468a26 100644 --- a/gdb/dwarf2/attribute.c +++ b/gdb/dwarf2/attribute.c @@ -36,6 +36,8 @@ attribute::as_address () const { CORE_ADDR addr; + gdb_assert (!requires_reprocessing); + if (form != DW_FORM_addr && form != DW_FORM_addrx && form != DW_FORM_GNU_addr_index) { @@ -80,6 +82,7 @@ attribute::form_is_string () const const char * attribute::as_string () const { + gdb_assert (!requires_reprocessing); if (form_is_string ()) return u.str; return nullptr; diff --git a/gdb/dwarf2/attribute.h b/gdb/dwarf2/attribute.h index b2c824f71f7..356e71e3c2c 100644 --- a/gdb/dwarf2/attribute.h +++ b/gdb/dwarf2/attribute.h @@ -111,8 +111,9 @@ struct attribute bool form_is_constant () const; - /* DW_ADDR is always stored already as sect_offset; despite for the forms - besides DW_FORM_ref_addr it is stored as cu_offset in the DWARF file. */ + /* The address is always stored already as sect_offset; despite for + the forms besides DW_FORM_ref_addr it is stored as cu_offset in + the DWARF file. */ bool form_is_ref () const { @@ -223,6 +224,17 @@ struct attribute requires_reprocessing = 1; } + /* Set this attribute to an address. */ + void set_address (CORE_ADDR addr) + { + gdb_assert (form == DW_FORM_addr + || ((form == DW_FORM_addrx + || form == DW_FORM_GNU_addr_index) + && requires_reprocessing)); + u.addr = addr; + requires_reprocessing = 0; + } + ENUM_BITFIELD(dwarf_attribute) name : 15; @@ -265,6 +277,5 @@ private: /* Get at parts of an attribute structure. */ #define DW_UNSND(attr) ((attr)->u.unsnd) -#define DW_ADDR(attr) ((attr)->u.addr) #endif /* GDB_DWARF2_ATTRIBUTE_H */ diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 57b667e1bb7..a6d29364abf 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; -- 2.30.2