FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change linetables to be objfile-independent

Browse source 
This changes linetables to not add the text offset to the addresses
they contain.  I did this in a few steps, necessarily combined
together in one patch: I renamed the 'pc' member to 'm_pc', added the
appropriate accessors, and then recompiled.  Then I fixed all the
errors.  Where possible I generally chose to use the raw_pc accessor,
as it is less expensive.

Note that this patch discounts the possibility that the text section
offset might cause wraparound in the addresses in the line table.
However, this was already discounted -- in particular,
objfile_relocate1 did not re-sort the table in this scenario.  (There
was a bug open about this, but as far as I can tell this has never
happened, it's not even clear what inspired that bug.)

Approved-By: Simon Marchi <simon.marchi@efficios.com>
This commit is contained in:
Tom Tromey 2023-03-07 17:37:45 -07:00
parent 6e6ac32dde
commit 1acc9dca42
15 changed files with 110 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gdb/buildsym.c
View file

@ -655,7 +655,7 @@ buildsym_compunit::record_line (struct subfile *subfile, int line,
linetable_entry *last = &subfile->line_vector_entries.back (); linetable_entry *last = &subfile->line_vector_entries.back ();
last_line = last->line; last_line = last->line;
if (last->pc != pc) if (last->raw_pc () != pc)
break; break;
subfile->line_vector_entries.pop_back (); subfile->line_vector_entries.pop_back ();
@ -670,7 +670,7 @@ buildsym_compunit::record_line (struct subfile *subfile, int line,
linetable_entry &e = subfile->line_vector_entries.back (); linetable_entry &e = subfile->line_vector_entries.back ();
e.line = line; e.line = line;
e.is_stmt = (flags & LEF_IS_STMT) != 0; e.is_stmt = (flags & LEF_IS_STMT) != 0;
e.pc = pc; e.set_raw_pc (pc);
e.prologue_end = (flags & LEF_PROLOGUE_END) != 0; e.prologue_end = (flags & LEF_PROLOGUE_END) != 0;
} }

1
gdb/coffread.c
View file

@ -1458,7 +1458,6 @@ enter_linenos (file_ptr file_offset, int first_line,
if (L_LNNO32 (&lptr) && L_LNNO32 (&lptr) <= last_line) if (L_LNNO32 (&lptr) && L_LNNO32 (&lptr) <= last_line)
{ {
CORE_ADDR addr = lptr.l_addr.l_paddr; CORE_ADDR addr = lptr.l_addr.l_paddr;
addr += objfile->text_section_offset ();
record_line (get_current_subfile (), record_line (get_current_subfile (),
first_line + L_LNNO32 (&lptr), first_line + L_LNNO32 (&lptr),
gdbarch_addr_bits_remove (gdbarch, addr)); gdbarch_addr_bits_remove (gdbarch, addr));

9
gdb/dbxread.c
View file

@ -2454,7 +2454,8 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name,
CORE_ADDR addr = last_function_start + valu; CORE_ADDR addr = last_function_start + valu;
record_line (get_current_subfile (), 0, record_line (get_current_subfile (), 0,
gdbarch_addr_bits_remove (gdbarch, addr)); gdbarch_addr_bits_remove (gdbarch, addr)
- objfile->text_section_offset ());
} }
within_function = 0; within_function = 0;
@ -2662,12 +2663,14 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name,
last_function_start : valu; last_function_start : valu;
record_line (get_current_subfile (), desc, record_line (get_current_subfile (), desc,
gdbarch_addr_bits_remove (gdbarch, addr)); gdbarch_addr_bits_remove (gdbarch, addr)
- objfile->text_section_offset ());
sline_found_in_function = 1; sline_found_in_function = 1;
} }
else else
record_line (get_current_subfile (), desc, record_line (get_current_subfile (), desc,
gdbarch_addr_bits_remove (gdbarch, valu)); gdbarch_addr_bits_remove (gdbarch, valu)
- objfile->text_section_offset ());
break; break;
case N_BCOMM: case N_BCOMM:

27
gdb/disasm.c
View file

@ -32,6 +32,7 @@
#include "gdbsupport/gdb_optional.h" #include "gdbsupport/gdb_optional.h"
#include "valprint.h" #include "valprint.h"
#include "cli/cli-style.h" #include "cli/cli-style.h"
#include "objfiles.h"
/* Disassemble functions. /* Disassemble functions.
FIXME: We should get rid of all the duplicate code in gdb that does FIXME: We should get rid of all the duplicate code in gdb that does
@ -592,17 +593,21 @@ do_mixed_source_and_assembly_deprecated
mle = (struct deprecated_dis_line_entry *) mle = (struct deprecated_dis_line_entry *)
alloca (nlines * sizeof (struct deprecated_dis_line_entry)); alloca (nlines * sizeof (struct deprecated_dis_line_entry));
struct objfile *objfile = symtab->compunit ()->objfile ();
low -= objfile->text_section_offset ();
high -= objfile->text_section_offset ();
/* Copy linetable entries for this function into our data /* Copy linetable entries for this function into our data
structure, creating end_pc's and setting out_of_order as structure, creating end_pc's and setting out_of_order as
appropriate. */ appropriate. */
/* First, skip all the preceding functions. */ /* First, skip all the preceding functions. */
for (i = 0; i < nlines - 1 && le[i].pc < low; i++); for (i = 0; i < nlines - 1 && le[i].raw_pc () < low; i++);
/* Now, copy all entries before the end of this function. */ /* Now, copy all entries before the end of this function. */
for (; i < nlines - 1 && le[i].pc < high; i++) for (; i < nlines - 1 && le[i].raw_pc () < high; i++)
{ {
if (le[i] == le[i + 1]) if (le[i] == le[i + 1])
continue; /* Ignore duplicates. */ continue; /* Ignore duplicates. */
@ -614,19 +619,19 @@ do_mixed_source_and_assembly_deprecated
mle[newlines].line = le[i].line; mle[newlines].line = le[i].line;
if (le[i].line > le[i + 1].line) if (le[i].line > le[i + 1].line)
out_of_order = 1; out_of_order = 1;
mle[newlines].start_pc = le[i].pc; mle[newlines].start_pc = le[i].pc (objfile);
mle[newlines].end_pc = le[i + 1].pc; mle[newlines].end_pc = le[i + 1].pc (objfile);
newlines++; newlines++;
} }
/* If we're on the last line, and it's part of the function, /* If we're on the last line, and it's part of the function,
then we need to get the end pc in a special way. */ then we need to get the end pc in a special way. */
if (i == nlines - 1 && le[i].pc < high) if (i == nlines - 1 && le[i].raw_pc () < high)
{ {
mle[newlines].line = le[i].line; mle[newlines].line = le[i].line;
mle[newlines].start_pc = le[i].pc; mle[newlines].start_pc = le[i].pc (objfile);
sal = find_pc_line (le[i].pc, 0); sal = find_pc_line (le[i].pc (objfile), 0);
mle[newlines].end_pc = sal.end; mle[newlines].end_pc = sal.end;
newlines++; newlines++;
} }
@ -733,6 +738,10 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch,
htab_up dis_line_table (allocate_dis_line_table ()); htab_up dis_line_table (allocate_dis_line_table ());
struct objfile *objfile = main_symtab->compunit ()->objfile ();
low -= objfile->text_section_offset ();
high -= objfile->text_section_offset ();
pc = low; pc = low;
/* The prologue may be empty, but there may still be a line number entry /* The prologue may be empty, but there may still be a line number entry
@ -746,10 +755,10 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch,
first_le = NULL; first_le = NULL;
/* Skip all the preceding functions. */ /* Skip all the preceding functions. */
for (i = 0; i < nlines && le[i].pc < low; i++) for (i = 0; i < nlines && le[i].raw_pc () < low; i++)
continue; continue;
if (i < nlines && le[i].pc < high) if (i < nlines && le[i].raw_pc () < high)
first_le = &le[i]; first_le = &le[i];
/* Add lines for every pc value. */ /* Add lines for every pc value. */

5
gdb/dwarf2/read.c
View file

@ -17980,10 +17980,9 @@ public:
} }
/* Handle DW_LNE_set_address. */ /* Handle DW_LNE_set_address. */
void handle_set_address (CORE_ADDR baseaddr, CORE_ADDR address) void handle_set_address (CORE_ADDR address)
{ {
m_op_index = 0; m_op_index = 0;
address += baseaddr;
m_address = gdbarch_adjust_dwarf2_line (m_gdbarch, address, false); m_address = gdbarch_adjust_dwarf2_line (m_gdbarch, address, false);
} }
@ -18458,7 +18457,7 @@ dwarf_decode_lines_1 (struct line_header *lh, struct dwarf2_cu *cu,
state_machine.check_line_address (cu, line_ptr, state_machine.check_line_address (cu, line_ptr,
lowpc - baseaddr, address); lowpc - baseaddr, address);
state_machine.handle_set_address (baseaddr, address); state_machine.handle_set_address (address);
} }
break; break;
case DW_LNE_define_file: case DW_LNE_define_file:

2
gdb/jit.c
View file

@ -491,7 +491,7 @@ jit_symtab_line_mapping_add_impl (struct gdb_symbol_callbacks *cb,
stab->linetable->nitems = nlines; stab->linetable->nitems = nlines;
for (i = 0; i < nlines; i++) for (i = 0; i < nlines; i++)
{ {
stab->linetable->item[i].pc = (CORE_ADDR) map[i].pc; stab->linetable->item[i].set_raw_pc ((CORE_ADDR) map[i].pc);
stab->linetable->item[i].line = map[i].line; stab->linetable->item[i].line = map[i].line;
stab->linetable->item[i].is_stmt = 1; stab->linetable->item[i].is_stmt = 1;
} }

9
gdb/mdebugread.c
View file

@ -2152,7 +2152,7 @@ parse_external (EXTR *es, int bigend, const section_offsets &section_offsets,
static void static void
parse_lines (FDR *fh, PDR *pr, struct linetable *lt, int maxlines, parse_lines (FDR *fh, PDR *pr, struct linetable *lt, int maxlines,
CORE_ADDR textlow, CORE_ADDR lowest_pdr_addr) CORE_ADDR lowest_pdr_addr)
{ {
unsigned char *base; unsigned char *base;
int j, k; int j, k;
@ -2183,7 +2183,7 @@ parse_lines (FDR *fh, PDR *pr, struct linetable *lt, int maxlines,
halt = base + fh->cbLine; halt = base + fh->cbLine;
base += pr->cbLineOffset; base += pr->cbLineOffset;
adr = textlow + pr->adr - lowest_pdr_addr; adr = pr->adr - lowest_pdr_addr;
l = adr >> 2; /* in words */ l = adr >> 2; /* in words */
for (lineno = pr->lnLow; base < halt;) for (lineno = pr->lnLow; base < halt;)
@ -3982,7 +3982,6 @@ mdebug_expand_psymtab (legacy_psymtab *pst, struct objfile *objfile)
else else
{ {
/* Handle encoded stab line number. */ /* Handle encoded stab line number. */
valu += section_offsets[SECT_OFF_TEXT (objfile)];
record_line (get_current_subfile (), sh.index, record_line (get_current_subfile (), sh.index,
gdbarch_addr_bits_remove (gdbarch, valu)); gdbarch_addr_bits_remove (gdbarch, valu));
} }
@ -4134,7 +4133,7 @@ mdebug_expand_psymtab (legacy_psymtab *pst, struct objfile *objfile)
} }
parse_lines (fh, pr_block.data (), lines, maxlines, parse_lines (fh, pr_block.data (), lines, maxlines,
pst->text_low (objfile), lowest_pdr_addr); lowest_pdr_addr);
if (lines->nitems < fh->cline) if (lines->nitems < fh->cline)
lines = shrink_linetable (lines); lines = shrink_linetable (lines);
@ -4511,7 +4510,7 @@ add_line (struct linetable *lt, int lineno, CORE_ADDR adr, int last)
return lineno; return lineno;
lt->item[lt->nitems].line = lineno; lt->item[lt->nitems].line = lineno;
lt->item[lt->nitems++].pc = adr << 2; lt->item[lt->nitems++].set_raw_pc (adr << 2);
return lineno; return lineno;
} }

6
gdb/mi/mi-symbol-cmds.c
View file

@ -50,14 +50,16 @@ mi_cmd_symbol_list_lines (const char *command, char **argv, int argc)
already sorted by increasing values in the symbol table, so no already sorted by increasing values in the symbol table, so no
need to perform any other sorting. */ need to perform any other sorting. */
gdbarch = s->compunit ()->objfile ()->arch (); struct objfile *objfile = s->compunit ()->objfile ();
gdbarch = objfile->arch ();
ui_out_emit_list list_emitter (uiout, "lines"); ui_out_emit_list list_emitter (uiout, "lines");
if (s->linetable () != NULL && s->linetable ()->nitems > 0) if (s->linetable () != NULL && s->linetable ()->nitems > 0)
for (i = 0; i < s->linetable ()->nitems; i++) for (i = 0; i < s->linetable ()->nitems; i++)
{ {
ui_out_emit_tuple tuple_emitter (uiout, NULL); ui_out_emit_tuple tuple_emitter (uiout, NULL);
uiout->field_core_addr ("pc", gdbarch, s->linetable ()->item[i].pc); uiout->field_core_addr ("pc", gdbarch,
s->linetable ()->item[i].pc (objfile));
uiout->field_signed ("line", s->linetable ()->item[i].line); uiout->field_signed ("line", s->linetable ()->item[i].line);
} }
} }

16
gdb/objfiles.c
View file

@ -616,22 +616,6 @@ objfile_relocate1 (struct objfile *objfile,
/* OK, get all the symtabs. */ /* OK, get all the symtabs. */
{ {
for (compunit_symtab *cust : objfile->compunits ())
{
for (symtab *s : cust->filetabs ())
{
struct linetable *l;
/* First the line table. */
l = s->linetable ();
if (l)
{
for (int i = 0; i < l->nitems; ++i)
l->item[i].pc += delta[SECT_OFF_TEXT (objfile)];
}
}
}
for (compunit_symtab *cust : objfile->compunits ()) for (compunit_symtab *cust : objfile->compunits ())
{ {
struct blockvector *bv = cust->blockvector (); struct blockvector *bv = cust->blockvector ();

3
gdb/python/py-linetable.c
View file

@ -422,7 +422,8 @@ ltpy_iternext (PyObject *self)
item = &(symtab->linetable ()->item[iter_obj->current_index]); item = &(symtab->linetable ()->item[iter_obj->current_index]);
} }
obj = build_linetable_entry (item->line, item->pc); struct objfile *objfile = symtab->compunit ()->objfile ();
obj = build_linetable_entry (item->line, item->pc (objfile));
iter_obj->current_index++; iter_obj->current_index++;
return obj; return obj;

6
gdb/record-btrace.c
View file

@ -44,6 +44,7 @@
#include "cli/cli-style.h" #include "cli/cli-style.h"
#include "async-event.h" #include "async-event.h"
#include <forward_list> #include <forward_list>
#include "objfiles.h"
static const target_info record_btrace_target_info = { static const target_info record_btrace_target_info = {
"record-btrace", "record-btrace",
@ -722,6 +723,9 @@ btrace_find_line_range (CORE_ADDR pc)
if (nlines <= 0) if (nlines <= 0)
return btrace_mk_line_range (symtab, 0, 0); return btrace_mk_line_range (symtab, 0, 0);
struct objfile *objfile = symtab->compunit ()->objfile ();
pc -= objfile->text_section_offset ();
range = btrace_mk_line_range (symtab, 0, 0); range = btrace_mk_line_range (symtab, 0, 0);
for (i = 0; i < nlines - 1; i++) for (i = 0; i < nlines - 1; i++)
{ {
@ -733,7 +737,7 @@ btrace_find_line_range (CORE_ADDR pc)
possibly adding more line numbers to the range. At the time this possibly adding more line numbers to the range. At the time this
change was made I was unsure how to test this so chose to go with change was made I was unsure how to test this so chose to go with
maintaining the existing experience. */ maintaining the existing experience. */
if ((lines[i].pc == pc) && (lines[i].line != 0) if ((lines[i].raw_pc () == pc) && (lines[i].line != 0)
&& (lines[i].is_stmt == 1)) && (lines[i].is_stmt == 1))
range = btrace_line_range_add (range, lines[i].line); range = btrace_line_range_add (range, lines[i].line);
} }

4
gdb/symmisc.c
View file

@ -263,7 +263,7 @@ dump_symtab_1 (struct symtab *symtab, struct ui_file *outfile)
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
{ {
gdb_printf (outfile, " line %d at ", l->item[i].line); gdb_printf (outfile, " line %d at ", l->item[i].line);
gdb_puts (paddress (gdbarch, l->item[i].pc), outfile); gdb_puts (paddress (gdbarch, l->item[i].pc (objfile)), outfile);
if (l->item[i].is_stmt) if (l->item[i].is_stmt)
gdb_printf (outfile, "\t(stmt)"); gdb_printf (outfile, "\t(stmt)");
gdb_printf (outfile, "\n"); gdb_printf (outfile, "\n");
@ -996,7 +996,7 @@ maintenance_print_one_line_table (struct symtab *symtab, void *data)
else else
uiout->field_string ("line", _("END")); uiout->field_string ("line", _("END"));
uiout->field_core_addr ("address", objfile->arch (), uiout->field_core_addr ("address", objfile->arch (),
item->pc); item->raw_pc ());
uiout->field_string ("is-stmt", item->is_stmt ? "Y" : ""); uiout->field_string ("is-stmt", item->is_stmt ? "Y" : "");
uiout->field_string ("prologue-end", item->prologue_end ? "Y" : ""); uiout->field_string ("prologue-end", item->prologue_end ? "Y" : "");
uiout->text ("\n"); uiout->text ("\n");

64
gdb/symtab.c
View file

@ -329,6 +329,14 @@ search_domain_name (enum search_domain e)
/* See symtab.h. */ /* See symtab.h. */
CORE_ADDR
linetable_entry::pc (const struct objfile *objfile) const
{
return m_pc + objfile->text_section_offset ();
}
/* See symtab.h. */
call_site * call_site *
compunit_symtab::find_call_site (CORE_ADDR pc) const compunit_symtab::find_call_site (CORE_ADDR pc) const
{ {
@ -3119,6 +3127,7 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
} }
bv = cust->blockvector (); bv = cust->blockvector ();
struct objfile *objfile = cust->objfile ();
/* Look at all the symtabs that share this blockvector. /* Look at all the symtabs that share this blockvector.
They all have the same apriori range, that we found was right; They all have the same apriori range, that we found was right;
@ -3145,18 +3154,21 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
/* Is this file's first line closer than the first lines of other files? /* Is this file's first line closer than the first lines of other files?
If so, record this file, and its first line, as best alternate. */ If so, record this file, and its first line, as best alternate. */
if (item->pc > pc && (!alt || item->pc < alt->pc)) if (item->pc (objfile) > pc
&& (!alt || item->raw_pc () < alt->raw_pc ()))
alt = item; alt = item;
auto pc_compare = [](const CORE_ADDR & comp_pc, auto pc_compare = [](const CORE_ADDR & comp_pc,
const struct linetable_entry & lhs)->bool const struct linetable_entry & lhs)->bool
{ {
return comp_pc < lhs.pc; return comp_pc < lhs.raw_pc ();
}; };
struct linetable_entry *first = item; struct linetable_entry *first = item;
struct linetable_entry *last = item + len; struct linetable_entry *last = item + len;
item = std::upper_bound (first, last, pc, pc_compare); item = std::upper_bound (first, last,
pc - objfile->text_section_offset (),
pc_compare);
if (item != first) if (item != first)
prev = item - 1; /* Found a matching item. */ prev = item - 1; /* Found a matching item. */
@ -3170,7 +3182,7 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
save prev if it represents the end of a function (i.e. line number save prev if it represents the end of a function (i.e. line number
0) instead of a real line. */ 0) instead of a real line. */
if (prev && prev->line && (!best || prev->pc > best->pc)) if (prev && prev->line && (!best || prev->raw_pc () > best->raw_pc ()))
{ {
best = prev; best = prev;
best_symtab = iter_s; best_symtab = iter_s;
@ -3185,7 +3197,7 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
if (!best->is_stmt) if (!best->is_stmt)
{ {
struct linetable_entry *tmp = best; struct linetable_entry *tmp = best;
while (tmp > first && (tmp - 1)->pc == tmp->pc while (tmp > first && (tmp - 1)->raw_pc () == tmp->raw_pc ()
&& (tmp - 1)->line != 0 && !tmp->is_stmt) && (tmp - 1)->line != 0 && !tmp->is_stmt)
--tmp; --tmp;
if (tmp->is_stmt) if (tmp->is_stmt)
@ -3193,16 +3205,16 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
} }
/* Discard BEST_END if it's before the PC of the current BEST. */ /* Discard BEST_END if it's before the PC of the current BEST. */
if (best_end <= best->pc) if (best_end <= best->pc (objfile))
best_end = 0; best_end = 0;
} }
/* If another line (denoted by ITEM) is in the linetable and its /* If another line (denoted by ITEM) is in the linetable and its
PC is after BEST's PC, but before the current BEST_END, then PC is after BEST's PC, but before the current BEST_END, then
use ITEM's PC as the new best_end. */ use ITEM's PC as the new best_end. */
if (best && item < last && item->pc > best->pc if (best && item < last && item->raw_pc () > best->raw_pc ()
&& (best_end == 0 || best_end > item->pc)) && (best_end == 0 || best_end > item->pc (objfile)))
best_end = item->pc; best_end = item->pc (objfile);
} }
if (!best_symtab) if (!best_symtab)
@ -3225,11 +3237,11 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
val.is_stmt = best->is_stmt; val.is_stmt = best->is_stmt;
val.symtab = best_symtab; val.symtab = best_symtab;
val.line = best->line; val.line = best->line;
val.pc = best->pc; val.pc = best->pc (objfile);
if (best_end && (!alt || best_end < alt->pc)) if (best_end && (!alt || best_end < alt->pc (objfile)))
val.end = best_end; val.end = best_end;
else if (alt) else if (alt)
val.end = alt->pc; val.end = alt->pc (objfile);
else else
val.end = bv->global_block ()->end (); val.end = bv->global_block ()->end ();
} }
@ -3380,6 +3392,7 @@ find_pcs_for_symtab_line (struct symtab *symtab, int line,
{ {
int start = 0; int start = 0;
std::vector<CORE_ADDR> result; std::vector<CORE_ADDR> result;
struct objfile *objfile = symtab->compunit ()->objfile ();
/* First, collect all the PCs that are at this line. */ /* First, collect all the PCs that are at this line. */
while (1) while (1)
@ -3403,7 +3416,7 @@ find_pcs_for_symtab_line (struct symtab *symtab, int line,
break; break;
} }
result.push_back (symtab->linetable ()->item[idx].pc); result.push_back (symtab->linetable ()->item[idx].pc (objfile));
start = idx + 1; start = idx + 1;
} }
@ -3429,7 +3442,7 @@ find_line_pc (struct symtab *symtab, int line, CORE_ADDR *pc)
if (symtab != NULL) if (symtab != NULL)
{ {
l = symtab->linetable (); l = symtab->linetable ();
*pc = l->item[ind].pc; *pc = l->item[ind].pc (symtab->compunit ()->objfile ());
return true; return true;
} }
else else
@ -3633,6 +3646,8 @@ skip_prologue_using_lineinfo (CORE_ADDR func_addr, struct symtab *symtab)
if (!find_pc_partial_function (func_addr, NULL, &func_start, &func_end)) if (!find_pc_partial_function (func_addr, NULL, &func_start, &func_end))
return func_addr; return func_addr;
struct objfile *objfile = symtab->compunit ()->objfile ();
/* Linetable entries are ordered by PC values, see the commentary in /* Linetable entries are ordered by PC values, see the commentary in
symtab.h where `struct linetable' is defined. Thus, the first symtab.h where `struct linetable' is defined. Thus, the first
entry whose PC is in the range [FUNC_START..FUNC_END[ is the entry whose PC is in the range [FUNC_START..FUNC_END[ is the
@ -3640,12 +3655,13 @@ skip_prologue_using_lineinfo (CORE_ADDR func_addr, struct symtab *symtab)
for (i = 0; i < l->nitems; i++) for (i = 0; i < l->nitems; i++)
{ {
struct linetable_entry *item = &(l->item[i]); struct linetable_entry *item = &(l->item[i]);
CORE_ADDR item_pc = item->pc (objfile);
/* Don't use line numbers of zero, they mark special entries in /* Don't use line numbers of zero, they mark special entries in
the table. See the commentary on symtab.h before the the table. See the commentary on symtab.h before the
definition of struct linetable. */ definition of struct linetable. */
if (item->line > 0 && func_start <= item->pc && item->pc < func_end) if (item->line > 0 && func_start <= item_pc && item_pc < func_end)
return item->pc; return item_pc;
} }
return func_addr; return func_addr;
@ -3672,18 +3688,22 @@ skip_prologue_using_linetable (CORE_ADDR func_addr)
{ {
struct linetable *linetable = prologue_sal.symtab->linetable (); struct linetable *linetable = prologue_sal.symtab->linetable ();
struct objfile *objfile = prologue_sal.symtab->compunit ()->objfile ();
start_pc -= objfile->text_section_offset ();
end_pc -= objfile->text_section_offset ();
auto it = std::lower_bound auto it = std::lower_bound
(linetable->item, linetable->item + linetable->nitems, start_pc, (linetable->item, linetable->item + linetable->nitems, start_pc,
[] (const linetable_entry &lte, CORE_ADDR pc) -> bool [] (const linetable_entry &lte, CORE_ADDR pc) -> bool
{ {
return lte.pc < pc; return lte.raw_pc () < pc;
}); });
for (; for (;
it < linetable->item + linetable->nitems && it->pc <= end_pc; it < linetable->item + linetable->nitems && it->raw_pc () <= end_pc;
it++) it++)
if (it->prologue_end) if (it->prologue_end)
return {it->pc}; return {it->pc (objfile)};
} }
return {}; return {};
@ -3917,18 +3937,20 @@ skip_prologue_using_sal (struct gdbarch *gdbarch, CORE_ADDR func_addr)
do this. */ do this. */
if (prologue_sal.symtab->language () != language_asm) if (prologue_sal.symtab->language () != language_asm)
{ {
struct objfile *objfile
= prologue_sal.symtab->compunit ()->objfile ();
struct linetable *linetable = prologue_sal.symtab->linetable (); struct linetable *linetable = prologue_sal.symtab->linetable ();
int idx = 0; int idx = 0;
/* Skip any earlier lines, and any end-of-sequence marker /* Skip any earlier lines, and any end-of-sequence marker
from a previous function. */ from a previous function. */
while (linetable->item[idx].pc != prologue_sal.pc while (linetable->item[idx].pc (objfile) != prologue_sal.pc
|| linetable->item[idx].line == 0) || linetable->item[idx].line == 0)
idx++; idx++;
if (idx+1 < linetable->nitems if (idx+1 < linetable->nitems
&& linetable->item[idx+1].line != 0 && linetable->item[idx+1].line != 0
&& linetable->item[idx+1].pc == start_pc) && linetable->item[idx+1].pc (objfile) == start_pc)
return start_pc; return start_pc;
} }

19
gdb/symtab.h
View file

@ -1547,18 +1547,29 @@ struct rust_vtable_symbol : public symbol
struct linetable_entry struct linetable_entry
{ {
/* Set the (unrelocated) PC for this entry. */
void set_raw_pc (CORE_ADDR pc)
{ m_pc = pc; }
/* Return the unrelocated PC for this entry. */
CORE_ADDR raw_pc () const
{ return m_pc; }
/* Return the relocated PC for this entry. */
CORE_ADDR pc (const struct objfile *objfile) const;
bool operator< (const linetable_entry &other) const bool operator< (const linetable_entry &other) const
{ {
if (pc == other.pc if (m_pc == other.m_pc
&& (line != 0) != (other.line != 0)) && (line != 0) != (other.line != 0))
return line == 0; return line == 0;
return pc < other.pc; return m_pc < other.m_pc;
} }
/* Two entries are equal if they have the same line and PC. The /* Two entries are equal if they have the same line and PC. The
other members are ignored. */ other members are ignored. */
bool operator== (const linetable_entry &other) const bool operator== (const linetable_entry &other) const
{ return line == other.line && pc == other.pc; } { return line == other.line && m_pc == other.m_pc; }
/* The line number for this entry. */ /* The line number for this entry. */
int line; int line;
@ -1571,7 +1582,7 @@ struct linetable_entry
bool prologue_end : 1; bool prologue_end : 1;
/* The address for this entry. */ /* The address for this entry. */
CORE_ADDR pc; CORE_ADDR m_pc;
}; };
/* The order of entries in the linetable is significant. They should /* The order of entries in the linetable is significant. They should

11
gdb/xcoffread.c
View file

@ -432,7 +432,7 @@ arrange_linetable (std::vector<linetable_entry> &old_linetable)
linetable_entry &e = fentries.back (); linetable_entry &e = fentries.back ();
e.line = ii; e.line = ii;
e.is_stmt = 1; e.is_stmt = 1;
e.pc = old_linetable[ii].pc; e.set_raw_pc (old_linetable[ii].raw_pc ());
} }
} }
@ -457,7 +457,7 @@ arrange_linetable (std::vector<linetable_entry> &old_linetable)
extra line to cover the function prologue. */ extra line to cover the function prologue. */
int jj = entry.line; int jj = entry.line;
if (jj + 1 < old_linetable.size () if (jj + 1 < old_linetable.size ()
&& old_linetable[jj].pc != old_linetable[jj + 1].pc) && old_linetable[jj].raw_pc () != old_linetable[jj + 1].raw_pc ())
{ {
new_linetable.push_back (old_linetable[jj]); new_linetable.push_back (old_linetable[jj]);
new_linetable.back ().line = old_linetable[jj + 1].line; new_linetable.back ().line = old_linetable[jj + 1].line;
@ -790,15 +790,16 @@ enter_line_range (struct subfile *subfile, unsigned beginoffset,
if (addr < startaddr || (endaddr && addr >= endaddr)) if (addr < startaddr || (endaddr && addr >= endaddr))
return; return;
CORE_ADDR record_addr = (gdbarch_addr_bits_remove (gdbarch, addr)
- objfile->text_section_offset ());
if (int_lnno.l_lnno == 0) if (int_lnno.l_lnno == 0)
{ {
*firstLine = read_symbol_lineno (int_lnno.l_addr.l_symndx); *firstLine = read_symbol_lineno (int_lnno.l_addr.l_symndx);
record_line (subfile, 0, gdbarch_addr_bits_remove (gdbarch, addr)); record_line (subfile, 0, record_addr);
--(*firstLine); --(*firstLine);
} }
else else
record_line (subfile, *firstLine + int_lnno.l_lnno, record_line (subfile, *firstLine + int_lnno.l_lnno, record_addr);
gdbarch_addr_bits_remove (gdbarch, addr));
curoffset += linesz; curoffset += linesz;
} }
} }