From 2b2db15ad02479a56a31f3a9769dbb6a66c48adb Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 5 Mar 2010 15:37:33 +0000 Subject: [PATCH] * dwarf2read.c (skip_one_die) : Use offset size in DWARF 3 and later. (read_attribute_value) : Likewise. --- gdb/ChangeLog | 6 ++++++ gdb/dwarf2read.c | 17 +++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c18065443e3..89fa1c27013 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2010-03-04 Tom Tromey + + * dwarf2read.c (skip_one_die) : Use offset size + in DWARF 3 and later. + (read_attribute_value) : Likewise. + 2010-03-04 Tom Tromey * printcmd.c (printf_command): Pass dummy argument to diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 549d2c0add8..b144dc16d82 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -2882,8 +2882,15 @@ skip_one_die (gdb_byte *buffer, gdb_byte *info_ptr, skip_attribute: switch (form) { - case DW_FORM_addr: case DW_FORM_ref_addr: + /* In DWARF 2, DW_FORM_ref_addr is address sized; in DWARF 3 + and later it is offset sized. */ + if (cu->header.version == 2) + info_ptr += cu->header.addr_size; + else + info_ptr += cu->header.offset_size; + break; + case DW_FORM_addr: info_ptr += cu->header.addr_size; break; case DW_FORM_data1: @@ -7017,8 +7024,14 @@ read_attribute_value (struct attribute *attr, unsigned form, attr->form = form; switch (form) { - case DW_FORM_addr: case DW_FORM_ref_addr: + if (cu->header.version == 2) + DW_ADDR (attr) = read_address (abfd, info_ptr, cu, &bytes_read); + else + DW_ADDR (attr) = read_offset (abfd, info_ptr, &cu->header, &bytes_read); + info_ptr += bytes_read; + break; + case DW_FORM_addr: DW_ADDR (attr) = read_address (abfd, info_ptr, cu, &bytes_read); info_ptr += bytes_read; break;