FYI: DW_FORM_ref_addr -vs- DWARF 3 http://sourceware.org/ml/gdb-patches/2010-03/msg00219.html http://sourceware.org/ml/gdb-cvs/2010-03/msg00039.html ### src/gdb/ChangeLog 2010/03/04 19:00:18 1.11430 ### src/gdb/ChangeLog 2010/03/04 22:01:09 1.11431 ## -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 Keith Seitz * linespec.c (decode_line_1): Update comments for is_quote_enclosed. --- src/gdb/dwarf2read.c 2010/03/02 17:19:58 1.357 +++ src/gdb/dwarf2read.c 2010/03/04 22:01:10 1.358 @@ -2882,8 +2882,15 @@ 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 @@ 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;