OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdb/

Browse Source 
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.
This commit is contained in:
Jan Kratochvil 2012-03-08 19:37:08 +00:00
parent 05e7c24434
commit 7fe25d9bd2
5 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdb/ChangeLog
View File

@ -1,3 +1,13 @@
2012-03-08 Jan Kratochvil <jan.kratochvil@redhat.com>
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.
2012-03-08 Jan Kratochvil <jan.kratochvil@redhat.com>
* libunwind-frame.c: Rename to ...

2
gdb/dwarf2loc.h
View File

@ -61,7 +61,7 @@ const gdb_byte *dwarf2_find_location_expression
CORE_ADDR pc);
struct dwarf2_locexpr_baton dwarf2_fetch_die_location_block
(unsigned int offset, struct dwarf2_per_cu_data *per_cu,
(unsigned int offset_in_cu, struct dwarf2_per_cu_data *per_cu,
CORE_ADDR (*get_frame_pc) (void *baton),
void *baton);

6
gdb/dwarf2read.c
View File

@ -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;

6
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2012-03-08 Jan Kratochvil <jan.kratochvil@redhat.com>
Fix CU relative vs. absolute DIE offsets.
* gdb.dwarf2/dw2-op-call.S: New compilation unit preceding the existing
one.
2012-03-08 Jan Kratochvil <jan.kratochvil@redhat.com>
Fix false FAIL on distros with relro linkage as default.

17
gdb/testsuite/gdb.dwarf2/dw2-op-call.S
View File

@ -23,6 +23,23 @@ array2: .2byte 2
array3: .2byte 3
.section .debug_info
.Lcu0_begin:
/* CU header */
.4byte .Lcu0_end - .Lcu0_start /* Length of Compilation Unit */
.Lcu0_start:
.2byte 2 /* DWARF Version */
.4byte .Labbrev1_begin /* Offset into abbrev section */
.byte 4 /* Pointer size */
/* CU die */
.uleb128 1 /* Abbrev: DW_TAG_compile_unit */
.ascii "file0.txt\0" /* DW_AT_name */
.ascii "GNU C 3.3.3\0" /* DW_AT_producer */
.byte 2 /* DW_LANG_C (C) */
.byte 0 /* End of children of CU */
.Lcu0_end:
.Lcu1_begin:
/* CU header */
.4byte .Lcu1_end - .Lcu1_start /* Length of Compilation Unit */