aboutsummaryrefslogtreecommitdiff
path: root/gdb/symtab.c
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2023-04-21 09:36:54 -0600
committerTom Tromey <tromey@adacore.com>2023-06-05 09:59:18 -0600
commit0434c3ef8dc4cfa17e6bce21da206e312f5722fb (patch)
tree26d7ef80161a08f1797f880f329a67e6685ea23b /gdb/symtab.c
parentd8175bcb7e35fb98ef40c458c8475a6d7122d813 (diff)
downloadgdb-0434c3ef8dc4cfa17e6bce21da206e312f5722fb.zip
gdb-0434c3ef8dc4cfa17e6bce21da206e312f5722fb.tar.gz
gdb-0434c3ef8dc4cfa17e6bce21da206e312f5722fb.tar.bz2
Use "unrelocated" terminology in linetable_entry
I forgot to convert struct linetable_entry to use the "unrelocated" (as opposed to "raw") terminology. This patch corrects the oversight.
Diffstat (limited to 'gdb/symtab.c')
-rw-r--r--gdb/symtab.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/gdb/symtab.c b/gdb/symtab.c
index e3030e4..0117a2a 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -3164,13 +3164,13 @@ 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?
If so, record this file, and its first line, as best alternate. */
if (item->pc (objfile) > pc
- && (!alt || item->raw_pc () < alt->raw_pc ()))
+ && (!alt || item->unrelocated_pc () < alt->unrelocated_pc ()))
alt = item;
auto pc_compare = [] (const unrelocated_addr &comp_pc,
const struct linetable_entry & lhs)
{
- return comp_pc < lhs.raw_pc ();
+ return comp_pc < lhs.unrelocated_pc ();
};
const linetable_entry *first = item;
@@ -3192,7 +3192,8 @@ 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
0) instead of a real line. */
- if (prev && prev->line && (!best || prev->raw_pc () > best->raw_pc ()))
+ if (prev && prev->line
+ && (!best || prev->unrelocated_pc () > best->unrelocated_pc ()))
{
best = prev;
best_symtab = iter_s;
@@ -3207,7 +3208,8 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
if (!best->is_stmt)
{
const linetable_entry *tmp = best;
- while (tmp > first && (tmp - 1)->raw_pc () == tmp->raw_pc ()
+ while (tmp > first
+ && (tmp - 1)->unrelocated_pc () == tmp->unrelocated_pc ()
&& (tmp - 1)->line != 0 && !tmp->is_stmt)
--tmp;
if (tmp->is_stmt)
@@ -3222,7 +3224,8 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
/* 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
use ITEM's PC as the new best_end. */
- if (best && item < last && item->raw_pc () > best->raw_pc ()
+ if (best && item < last
+ && item->unrelocated_pc () > best->unrelocated_pc ()
&& (best_end == 0 || best_end > item->pc (objfile)))
best_end = item->pc (objfile);
}
@@ -3709,12 +3712,12 @@ skip_prologue_using_linetable (CORE_ADDR func_addr)
(linetable->item, linetable->item + linetable->nitems, unrel_start,
[] (const linetable_entry &lte, unrelocated_addr pc)
{
- return lte.raw_pc () < pc;
+ return lte.unrelocated_pc () < pc;
});
for (;
(it < linetable->item + linetable->nitems
- && it->raw_pc () < unrel_end);
+ && it->unrelocated_pc () < unrel_end);
it++)
if (it->prologue_end)
return {it->pc (objfile)};