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

* dwarf2read.c (dwarf_decode_lines): Call record_line upon 

encountering a different subfile.
This commit is contained in:
Daniel Jacobowitz 2006-10-11 15:39:35 +00:00
parent 07806542d5
commit 366da635ba
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2006-10-11 Daniel Jacobowitz <dan@codesourcery.com>
* dwarf2read.c (dwarf_decode_lines): Call record_line upon
encountering a different subfile.
2006-10-11 Denis Pilat <denis.pilat@st.com>
* tui/tui-source.c (tui_set_source_content): handle source

24
gdb/dwarf2read.c
View File

@ -6625,6 +6625,7 @@ dwarf_decode_lines (struct line_header *lh, char *comp_dir, bfd *abfd,
CORE_ADDR baseaddr;
struct objfile *objfile = cu->objfile;
const int decode_for_pst_p = (pst != NULL);
struct subfile *last_subfile = NULL;
baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
@ -6674,6 +6675,12 @@ dwarf_decode_lines (struct line_header *lh, char *comp_dir, bfd *abfd,
lh->file_names[file - 1].included_p = 1;
if (!decode_for_pst_p)
{
if (last_subfile != current_subfile)
{
if (last_subfile)
record_line (last_subfile, 0, address);
last_subfile = current_subfile;
}
/* Append row to matrix using current values. */
record_line (current_subfile, line,
check_cu_functions (address, cu));
@ -6728,8 +6735,16 @@ dwarf_decode_lines (struct line_header *lh, char *comp_dir, bfd *abfd,
case DW_LNS_copy:
lh->file_names[file - 1].included_p = 1;
if (!decode_for_pst_p)
record_line (current_subfile, line,
check_cu_functions (address, cu));
{
if (last_subfile != current_subfile)
{
if (last_subfile)
record_line (last_subfile, 0, address);
last_subfile = current_subfile;
}
record_line (current_subfile, line,
check_cu_functions (address, cu));
}
basic_block = 0;
break;
case DW_LNS_advance_pc:
@ -6756,7 +6771,10 @@ dwarf_decode_lines (struct line_header *lh, char *comp_dir, bfd *abfd,
dir = lh->include_dirs[fe->dir_index - 1];
if (!decode_for_pst_p)
dwarf2_start_subfile (fe->name, dir, comp_dir);
{
last_subfile = current_subfile;
dwarf2_start_subfile (fe->name, dir, comp_dir);
}
}
break;
case DW_LNS_set_column: