espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-25 21:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

* dwarf2read.c (partial_die_full_name): Record DW_FORM_ref_addr in

Browse Source 
attr.u.unsnd instead of attr.u.addr.
	(read_attribute_value) Ditto for cases DW_FORM_ref_addr,
	DW_FORM_ref1, DW_FORM_ref2, DW_FORM_ref4, DW_FORM_reg8,
	DW_FORM_ref_udata.
	(dump_die_shallow): Update cases DW_FORM_ref_addr,
	DW_FORM_ref1, DW_FORM_ref2, DW_FORM_ref4.  Add cases DW_FORM_ref8,
	DW_FORM_ref_udata.
	(dwarf2_get_ref_die_offset): Use DW_UNSND for reference attributes.
This commit is contained in:
Doug Evans
2012-04-23 16:46:02 +00:00
parent dca9aa3ad4
commit 4568ecf961
2 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gdb/ChangeLog
View File

@ -1,3 +1,15 @@
2012-04-23 Doug Evans <dje@google.com>
* dwarf2read.c (partial_die_full_name): Record DW_FORM_ref_addr in
attr.u.unsnd instead of attr.u.addr.
(read_attribute_value) Ditto for cases DW_FORM_ref_addr,
DW_FORM_ref1, DW_FORM_ref2, DW_FORM_ref4, DW_FORM_reg8,
DW_FORM_ref_udata.
(dump_die_shallow): Update cases DW_FORM_ref_addr,
DW_FORM_ref1, DW_FORM_ref2, DW_FORM_ref4. Add cases DW_FORM_ref8,
DW_FORM_ref_udata.
(dwarf2_get_ref_die_offset): Use DW_UNSND for reference attributes.
2012-04-23 Maciej W. Rozycki <macro@codesourcery.com> 2012-04-23 Maciej W. Rozycki <macro@codesourcery.com>
* mips-tdep.c (mips_n32n64_return_value): Fix coding style. * mips-tdep.c (mips_n32n64_return_value): Fix coding style.

28
gdb/dwarf2read.c
View File

@ -3996,6 +3996,7 @@ partial_die_parent_scope (struct partial_die_info *pdi,
/* Return the fully scoped name associated with PDI, from compilation unit /* Return the fully scoped name associated with PDI, from compilation unit
CU. The result will be allocated with malloc. */ CU. The result will be allocated with malloc. */
static char * static char *
partial_die_full_name (struct partial_die_info *pdi, partial_die_full_name (struct partial_die_info *pdi,
struct dwarf2_cu *cu) struct dwarf2_cu *cu)
@ -4019,7 +4020,7 @@ partial_die_full_name (struct partial_die_info *pdi,
/* DW_FORM_ref_addr is using section offset. */ /* DW_FORM_ref_addr is using section offset. */
attr.name = 0; attr.name = 0;
attr.form = DW_FORM_ref_addr; attr.form = DW_FORM_ref_addr;
attr.u.addr = pdi->offset.sect_off; attr.u.unsnd = pdi->offset.sect_off;
die = follow_die_ref (NULL, &attr, &ref_cu); die = follow_die_ref (NULL, &attr, &ref_cu);
return xstrdup (dwarf2_full_name (NULL, die, ref_cu)); return xstrdup (dwarf2_full_name (NULL, die, ref_cu));
@ -10226,9 +10227,9 @@ read_attribute_value (struct attribute *attr, unsigned form,
{ {
case DW_FORM_ref_addr: case DW_FORM_ref_addr:
if (cu->header.version == 2) if (cu->header.version == 2)
DW_ADDR (attr) = read_address (abfd, info_ptr, cu, &bytes_read); DW_UNSND (attr) = read_address (abfd, info_ptr, cu, &bytes_read);
else else
DW_ADDR (attr) = read_offset (abfd, info_ptr, DW_UNSND (attr) = read_offset (abfd, info_ptr,
&cu->header, &bytes_read); &cu->header, &bytes_read);
info_ptr += bytes_read; info_ptr += bytes_read;
break; break;
@ -10316,22 +10317,22 @@ read_attribute_value (struct attribute *attr, unsigned form,
info_ptr += bytes_read; info_ptr += bytes_read;
break; break;
case DW_FORM_ref1: case DW_FORM_ref1:
DW_ADDR (attr) = (cu->header.offset.sect_off DW_UNSND (attr) = (cu->header.offset.sect_off
+ read_1_byte (abfd, info_ptr)); + read_1_byte (abfd, info_ptr));
info_ptr += 1; info_ptr += 1;
break; break;
case DW_FORM_ref2: case DW_FORM_ref2:
DW_ADDR (attr) = (cu->header.offset.sect_off DW_UNSND (attr) = (cu->header.offset.sect_off
+ read_2_bytes (abfd, info_ptr)); + read_2_bytes (abfd, info_ptr));
info_ptr += 2; info_ptr += 2;
break; break;
case DW_FORM_ref4: case DW_FORM_ref4:
DW_ADDR (attr) = (cu->header.offset.sect_off DW_UNSND (attr) = (cu->header.offset.sect_off
+ read_4_bytes (abfd, info_ptr)); + read_4_bytes (abfd, info_ptr));
info_ptr += 4; info_ptr += 4;
break; break;
case DW_FORM_ref8: case DW_FORM_ref8:
DW_ADDR (attr) = (cu->header.offset.sect_off DW_UNSND (attr) = (cu->header.offset.sect_off
+ read_8_bytes (abfd, info_ptr)); + read_8_bytes (abfd, info_ptr));
info_ptr += 8; info_ptr += 8;
break; break;
@ -10344,7 +10345,7 @@ read_attribute_value (struct attribute *attr, unsigned form,
info_ptr += 8; info_ptr += 8;
break; break;
case DW_FORM_ref_udata: case DW_FORM_ref_udata:
DW_ADDR (attr) = (cu->header.offset.sect_off DW_UNSND (attr) = (cu->header.offset.sect_off
+ read_unsigned_leb128 (abfd, info_ptr, &bytes_read)); + read_unsigned_leb128 (abfd, info_ptr, &bytes_read));
info_ptr += bytes_read; info_ptr += bytes_read;
break; break;
@ -13970,7 +13971,6 @@ dump_die_shallow (struct ui_file *f, int indent, struct die_info *die)
switch (die->attrs[i].form) switch (die->attrs[i].form)
{ {
case DW_FORM_ref_addr:
case DW_FORM_addr: case DW_FORM_addr:
fprintf_unfiltered (f, "address: "); fprintf_unfiltered (f, "address: ");
fputs_filtered (hex_string (DW_ADDR (&die->attrs[i])), f); fputs_filtered (hex_string (DW_ADDR (&die->attrs[i])), f);
@ -13986,11 +13986,17 @@ dump_die_shallow (struct ui_file *f, int indent, struct die_info *die)
fprintf_unfiltered (f, "expression: size %u", fprintf_unfiltered (f, "expression: size %u",
DW_BLOCK (&die->attrs[i])->size); DW_BLOCK (&die->attrs[i])->size);
break; break;
case DW_FORM_ref_addr:
fprintf_unfiltered (f, "ref address: ");
fputs_filtered (hex_string (DW_UNSND (&die->attrs[i])), f);
break;
case DW_FORM_ref1: case DW_FORM_ref1:
case DW_FORM_ref2: case DW_FORM_ref2:
case DW_FORM_ref4: case DW_FORM_ref4:
case DW_FORM_ref8:
case DW_FORM_ref_udata:
fprintf_unfiltered (f, "constant ref: 0x%lx (adjusted)", fprintf_unfiltered (f, "constant ref: 0x%lx (adjusted)",
(long) (DW_ADDR (&die->attrs[i]))); (long) (DW_UNSND (&die->attrs[i])));
break; break;
case DW_FORM_data1: case DW_FORM_data1:
case DW_FORM_data2: case DW_FORM_data2:
@ -14129,7 +14135,7 @@ is_ref_attr (struct attribute *attr)
static sect_offset static sect_offset
dwarf2_get_ref_die_offset (struct attribute *attr) dwarf2_get_ref_die_offset (struct attribute *attr)
{ {
sect_offset retval = { DW_ADDR (attr) }; sect_offset retval = { DW_UNSND (attr) };
if (is_ref_attr (attr)) if (is_ref_attr (attr))
return retval; return retval;