diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2012-03-08 19:37:08 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2012-03-08 19:37:08 +0000 |
| commit | 7fe25d9bd274089557e2947f7ba09b6e333533cd (patch) | |
| tree | 425e72499567e1844211391e2f13213d97f44866 /gdb/dwarf2read.c | |
| parent | 05e7c244344f338bf2af7718db34eb91637587dd (diff) | |
| download | gdb-7fe25d9bd274089557e2947f7ba09b6e333533cd.zip gdb-7fe25d9bd274089557e2947f7ba09b6e333533cd.tar.gz gdb-7fe25d9bd274089557e2947f7ba09b6e333533cd.tar.bz2 | |
gdb/
Fix CU relative vs. absolute DIE offsets.
* dwarf2loc.h (dwarf2_fetch_die_location_block): Rename parameter
offset to offset_in_cu.
* dwarf2read.c (process_enumeration_scope): Add CU offset to
TYPE_OFFSET.
(dwarf2_fetch_die_location_block): Rename parameter offset to
offset_in_cu. New variable offset, add CU offset to OFFSET_IN_CU.
gdb/testsuite/
Fix CU relative vs. absolute DIE offsets.
* gdb.dwarf2/dw2-op-call.S: New compilation unit preceding the existing
one.
Diffstat (limited to 'gdb/dwarf2read.c')
| -rw-r--r-- | gdb/dwarf2read.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 307d98e..6eed8d5 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -8031,7 +8031,8 @@ process_enumeration_scope (struct die_info *die, struct dwarf2_cu *cu) = lookup_signatured_type_at_offset (dwarf2_per_objfile->objfile, cu->per_cu->debug_types_section, cu->per_cu->offset); - if (type_sig->type_offset != die->offset) + if (type_sig->per_cu.offset + type_sig->type_offset + != die->offset) return; } @@ -14202,11 +14203,12 @@ follow_die_ref (struct die_info *src_die, struct attribute *attr, dwarf2_locexpr_baton->data has lifetime of PER_CU->OBJFILE. */ struct dwarf2_locexpr_baton -dwarf2_fetch_die_location_block (unsigned int offset, +dwarf2_fetch_die_location_block (unsigned int offset_in_cu, struct dwarf2_per_cu_data *per_cu, CORE_ADDR (*get_frame_pc) (void *baton), void *baton) { + unsigned int offset = per_cu->offset + offset_in_cu; struct dwarf2_cu *cu; struct die_info *die; struct attribute *attr; |