aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gdb/ChangeLog16
-rw-r--r--gdb/arm-tdep.c15
-rw-r--r--gdb/exec.c3
-rw-r--r--gdb/gcore.c6
-rw-r--r--gdb/hppa-bsd-tdep.c4
-rw-r--r--gdb/hppa-linux-tdep.c4
-rw-r--r--gdb/hppa-tdep.c6
-rw-r--r--gdb/ia64-tdep.c14
-rw-r--r--gdb/machoread.c2
-rw-r--r--gdb/maint.c3
-rw-r--r--gdb/minsyms.c8
-rw-r--r--gdb/objfiles.c27
-rw-r--r--gdb/objfiles.h93
-rw-r--r--gdb/printcmd.c3
-rw-r--r--gdb/solib-aix.c3
-rw-r--r--gdb/solib-dsbt.c2
-rw-r--r--gdb/solib-frv.c2
-rw-r--r--gdb/symfile.c14
-rw-r--r--gdb/symtab.c3
-rw-r--r--gdb/tilegx-tdep.c2
-rw-r--r--gdb/tui/tui-disasm.c2
-rw-r--r--gdb/xstormy16-tdep.c4
22 files changed, 134 insertions, 102 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e467b13..48a58e0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,21 @@
2021-06-28 Simon Marchi <simon.marchi@polymtl.ca>
+ * objfiles.h (struct obj_section): Move down.
+ <offset, set_offset, addr, endaddr>: New.
+ (obj_section_offset, obj_section_addr, obj_section_endaddr),
+ replace all users to use obj_section methods.
+ (struct objfile) <section_offset, set_section_offset>: New.
+
+2021-06-28 Simon Marchi <simon.marchi@polymtl.ca>
+
+ * objfiles.h (struct obj_section): Move down.
+ <offset, set_offset, addr, endaddr>: New.
+ (obj_section_offset, obj_section_addr, obj_section_endaddr),
+ replace all users to use obj_section methods.
+ (struct objfile) <section_offset, set_section_offset>: New.
+
+2021-06-28 Simon Marchi <simon.marchi@polymtl.ca>
+
* .flake8: New.
2021-06-28 Luis Machado <luis.machado@linaro.org>
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 339e032..09b38e5 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -395,8 +395,7 @@ arm_find_mapping_symbol (CORE_ADDR memaddr, CORE_ADDR *start)
data->section_maps_sorted[section_idx] = true;
}
- struct arm_mapping_symbol map_key
- = { memaddr - obj_section_addr (sec), 0 };
+ arm_mapping_symbol map_key = { memaddr - sec->addr (), 0 };
arm_mapping_symbol_vec::const_iterator it
= std::lower_bound (map.begin (), map.end (), map_key);
@@ -409,7 +408,7 @@ arm_find_mapping_symbol (CORE_ADDR memaddr, CORE_ADDR *start)
if (it->value == map_key.value)
{
if (start)
- *start = it->value + obj_section_addr (sec);
+ *start = it->value + sec->addr ();
return it->type;
}
}
@@ -420,7 +419,7 @@ arm_find_mapping_symbol (CORE_ADDR memaddr, CORE_ADDR *start)
= it - 1;
if (start)
- *start = prev_it->value + obj_section_addr (sec);
+ *start = prev_it->value + sec->addr ();
return prev_it->type;
}
}
@@ -2218,7 +2217,7 @@ arm_exidx_new_objfile (struct objfile *objfile)
NULL
};
- CORE_ADDR pc = pers + obj_section_offset (pers_sec);
+ CORE_ADDR pc = pers + pers_sec->offset ();
int k;
for (k = 0; personality[k]; k++)
@@ -2303,7 +2302,7 @@ arm_find_exidx_entry (CORE_ADDR memaddr, CORE_ADDR *start)
if (sec != NULL)
{
struct arm_exidx_data *data;
- struct arm_exidx_entry map_key = { memaddr - obj_section_addr (sec), 0 };
+ struct arm_exidx_entry map_key = { memaddr - sec->addr (), 0 };
data = arm_exidx_data_key.get (sec->objfile->obfd);
if (data != NULL)
@@ -2323,7 +2322,7 @@ arm_find_exidx_entry (CORE_ADDR memaddr, CORE_ADDR *start)
if (idx->addr == map_key.addr)
{
if (start)
- *start = idx->addr + obj_section_addr (sec);
+ *start = idx->addr + sec->addr ();
return idx->entry;
}
}
@@ -2332,7 +2331,7 @@ arm_find_exidx_entry (CORE_ADDR memaddr, CORE_ADDR *start)
{
idx = idx - 1;
if (start)
- *start = idx->addr + obj_section_addr (sec);
+ *start = idx->addr + sec->addr ();
return idx->entry;
}
}
diff --git a/gdb/exec.c b/gdb/exec.c
index ff0db82..35bf7bd 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -636,8 +636,7 @@ program_space::add_target_sections (struct objfile *objfile)
if (bfd_section_size (osect->the_bfd_section) == 0)
continue;
- m_target_sections.emplace_back (obj_section_addr (osect),
- obj_section_endaddr (osect),
+ m_target_sections.emplace_back (osect->addr (), osect->endaddr (),
osect->the_bfd_section, (void *) objfile);
}
}
diff --git a/gdb/gcore.c b/gdb/gcore.c
index 76e856d..8e504f3 100644
--- a/gdb/gcore.c
+++ b/gdb/gcore.c
@@ -404,8 +404,8 @@ gcore_create_callback (CORE_ADDR vaddr, unsigned long size, int read,
bfd *abfd = objfile->obfd;
asection *asec = objsec->the_bfd_section;
bfd_vma align = (bfd_vma) 1 << bfd_section_alignment (asec);
- bfd_vma start = obj_section_addr (objsec) & -align;
- bfd_vma end = (obj_section_endaddr (objsec) + align - 1) & -align;
+ bfd_vma start = objsec->addr () & -align;
+ bfd_vma end = (objsec->endaddr () + align - 1) & -align;
/* Match if either the entire memory region lies inside the
section (i.e. a mapping covering some pages of a large
@@ -479,7 +479,7 @@ objfile_find_memory_regions (struct target_ops *self,
int size = bfd_section_size (isec);
int ret;
- ret = (*func) (obj_section_addr (objsec), size,
+ ret = (*func) (objsec->addr (), size,
1, /* All sections will be readable. */
(flags & SEC_READONLY) == 0, /* Writable. */
(flags & SEC_CODE) != 0, /* Executable. */
diff --git a/gdb/hppa-bsd-tdep.c b/gdb/hppa-bsd-tdep.c
index b5289d3..c68aaf1 100644
--- a/gdb/hppa-bsd-tdep.c
+++ b/gdb/hppa-bsd-tdep.c
@@ -64,8 +64,8 @@ hppabsd_find_global_pointer (struct gdbarch *gdbarch, struct value *function)
if (sec < faddr_sec->objfile->sections_end)
{
- CORE_ADDR addr = obj_section_addr (sec);
- CORE_ADDR endaddr = obj_section_endaddr (sec);
+ CORE_ADDR addr = sec->addr ();
+ CORE_ADDR endaddr = sec->endaddr ();
while (addr < endaddr)
{
diff --git a/gdb/hppa-linux-tdep.c b/gdb/hppa-linux-tdep.c
index a4d1cee..cea6768 100644
--- a/gdb/hppa-linux-tdep.c
+++ b/gdb/hppa-linux-tdep.c
@@ -371,8 +371,8 @@ hppa_linux_find_global_pointer (struct gdbarch *gdbarch,
{
CORE_ADDR addr, endaddr;
- addr = obj_section_addr (osect);
- endaddr = obj_section_endaddr (osect);
+ addr = osect->addr ();
+ endaddr = osect->endaddr ();
while (addr < endaddr)
{
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 21e58f3..ffb3394 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -943,11 +943,7 @@ hppa64_convert_code_addr_to_fptr (struct gdbarch *gdbarch, CORE_ADDR code)
if (opd < sec->objfile->sections_end)
{
- CORE_ADDR addr;
-
- for (addr = obj_section_addr (opd);
- addr < obj_section_endaddr (opd);
- addr += 2 * 8)
+ for (CORE_ADDR addr = opd->addr (); addr < opd->endaddr (); addr += 2 * 8)
{
ULONGEST opdaddr;
gdb_byte tmp[8];
diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c
index 1c4fc4c..895808a 100644
--- a/gdb/ia64-tdep.c
+++ b/gdb/ia64-tdep.c
@@ -2859,7 +2859,7 @@ ia64_get_dyn_info_list (unw_addr_space_t as,
void *buf = NULL;
text_sec = objfile->sections + SECT_OFF_TEXT (objfile);
- ip = obj_section_addr (text_sec);
+ ip = text_sec->addr ();
ret = ia64_find_unwind_table (objfile, ip, &di, &buf);
if (ret >= 0)
{
@@ -3432,10 +3432,8 @@ ia64_find_global_pointer_from_dynamic_section (struct gdbarch *gdbarch,
if (osect < faddr_sect->objfile->sections_end)
{
- CORE_ADDR addr, endaddr;
-
- addr = obj_section_addr (osect);
- endaddr = obj_section_endaddr (osect);
+ CORE_ADDR addr = osect->addr ();
+ CORE_ADDR endaddr = osect->endaddr ();
while (addr < endaddr)
{
@@ -3515,10 +3513,8 @@ find_extant_func_descr (struct gdbarch *gdbarch, CORE_ADDR faddr)
if (osect < faddr_sect->objfile->sections_end)
{
- CORE_ADDR addr, endaddr;
-
- addr = obj_section_addr (osect);
- endaddr = obj_section_endaddr (osect);
+ CORE_ADDR addr = osect->addr ();
+ CORE_ADDR endaddr = osect->endaddr ();
while (addr < endaddr)
{
diff --git a/gdb/machoread.c b/gdb/machoread.c
index 17aa9ce..a0f0307 100644
--- a/gdb/machoread.c
+++ b/gdb/machoread.c
@@ -926,7 +926,7 @@ macho_symfile_offsets (struct objfile *objfile,
if (bfd_sect_name == addrs[i].name)
{
- obj_section_offset (osect) = addrs[i].addr;
+ osect->set_offset (addrs[i].addr);
break;
}
}
diff --git a/gdb/maint.c b/gdb/maint.c
index 26bacbf..4637fcb 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -319,8 +319,7 @@ print_objfile_section_info (bfd *abfd, struct obj_section *asect,
print_section_index (abfd, asect->the_bfd_section, index_digits);
maint_print_section_info (name, flags,
- obj_section_addr (asect),
- obj_section_endaddr (asect),
+ asect->addr (), asect->endaddr (),
asect->the_bfd_section->filepos,
addr_size);
}
diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index 80c3d43..33560e3 100644
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -687,9 +687,9 @@ frob_address (struct objfile *objfile, CORE_ADDR *pc)
ALL_OBJFILE_OSECTIONS (objfile, iter)
{
- if (*pc >= obj_section_addr (iter) && *pc < obj_section_endaddr (iter))
+ if (*pc >= iter->addr () && *pc < iter->endaddr ())
{
- *pc -= obj_section_offset (iter);
+ *pc -= iter->offset ();
return 1;
}
}
@@ -1616,12 +1616,12 @@ minimal_symbol_upper_bound (struct bound_minimal_symbol minsym)
obj_section = minsym.obj_section ();
if (iter != past_the_end
&& (MSYMBOL_VALUE_ADDRESS (minsym.objfile, iter)
- < obj_section_endaddr (obj_section)))
+ < obj_section->endaddr ()))
result = MSYMBOL_VALUE_ADDRESS (minsym.objfile, iter);
else
/* We got the start address from the last msymbol in the objfile.
So the end address is the end of the section. */
- result = obj_section_endaddr (obj_section);
+ result = obj_section->endaddr ();
return result;
}
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 16bbb91..b65fa88 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -729,7 +729,7 @@ objfile_relocate1 (struct objfile *objfile,
int idx = s - objfile->sections;
exec_set_section_address (bfd_get_filename (objfile->obfd), idx,
- obj_section_addr (s));
+ s->addr ());
}
/* Data changed. */
@@ -899,8 +899,8 @@ have_minimal_symbols (void)
static bool
sort_cmp (const struct obj_section *sect1, const obj_section *sect2)
{
- const CORE_ADDR sect1_addr = obj_section_addr (sect1);
- const CORE_ADDR sect2_addr = obj_section_addr (sect2);
+ const CORE_ADDR sect1_addr = sect1->addr ();
+ const CORE_ADDR sect2_addr = sect2->addr ();
if (sect1_addr < sect2_addr)
return true;
@@ -982,7 +982,7 @@ sort_cmp (const struct obj_section *sect1, const obj_section *sect2)
static struct obj_section *
preferred_obj_section (struct obj_section *a, struct obj_section *b)
{
- gdb_assert (obj_section_addr (a) == obj_section_addr (b));
+ gdb_assert (a->addr () == b->addr ());
gdb_assert ((a->objfile->separate_debug_objfile == b->objfile)
|| (b->objfile->separate_debug_objfile == a->objfile));
gdb_assert ((a->objfile->separate_debug_objfile_backlink == b->objfile)
@@ -1030,8 +1030,8 @@ filter_debuginfo_sections (struct obj_section **map, int map_size)
struct obj_section *const sect2 = map[i + 1];
const struct objfile *const objfile1 = sect1->objfile;
const struct objfile *const objfile2 = sect2->objfile;
- const CORE_ADDR sect1_addr = obj_section_addr (sect1);
- const CORE_ADDR sect2_addr = obj_section_addr (sect2);
+ const CORE_ADDR sect1_addr = sect1->addr ();
+ const CORE_ADDR sect2_addr = sect2->addr ();
if (sect1_addr == sect2_addr
&& (objfile1->separate_debug_objfile == objfile2
@@ -1075,9 +1075,9 @@ filter_overlapping_sections (struct obj_section **map, int map_size)
{
struct obj_section *const sect1 = map[i];
struct obj_section *const sect2 = map[k];
- const CORE_ADDR sect1_addr = obj_section_addr (sect1);
- const CORE_ADDR sect2_addr = obj_section_addr (sect2);
- const CORE_ADDR sect1_endaddr = obj_section_endaddr (sect1);
+ const CORE_ADDR sect1_addr = sect1->addr ();
+ const CORE_ADDR sect2_addr = sect2->addr ();
+ const CORE_ADDR sect1_endaddr = sect1->endaddr ();
gdb_assert (sect1_addr <= sect2_addr);
@@ -1093,7 +1093,7 @@ filter_overlapping_sections (struct obj_section **map, int map_size)
const struct bfd_section *const bfds1 = sect1->the_bfd_section;
const struct bfd_section *const bfds2 = sect2->the_bfd_section;
- const CORE_ADDR sect2_endaddr = obj_section_endaddr (sect2);
+ const CORE_ADDR sect2_endaddr = sect2->endaddr ();
struct gdbarch *const gdbarch = objf1->arch ();
@@ -1184,9 +1184,9 @@ bsearch_cmp (const void *key, const void *elt)
const CORE_ADDR pc = *(CORE_ADDR *) key;
const struct obj_section *section = *(const struct obj_section **) elt;
- if (pc < obj_section_addr (section))
+ if (pc < section->addr ())
return -1;
- if (pc < obj_section_endaddr (section))
+ if (pc < section->endaddr ())
return 0;
return 1;
}
@@ -1289,8 +1289,7 @@ is_addr_in_objfile (CORE_ADDR addr, const struct objfile *objfile)
if (section_is_overlay (osect) && !section_is_mapped (osect))
continue;
- if (obj_section_addr (osect) <= addr
- && addr < obj_section_endaddr (osect))
+ if (osect->addr () <= addr && addr < osect->endaddr ())
return true;
}
return false;
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index f947d69..766c4b4 100644
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -127,37 +127,6 @@ struct entry_info
unsigned initialized : 1;
};
-/* Sections in an objfile. The section offsets are stored in the
- OBJFILE. */
-
-struct obj_section
-{
- /* BFD section pointer */
- struct bfd_section *the_bfd_section;
-
- /* Objfile this section is part of. */
- struct objfile *objfile;
-
- /* True if this "overlay section" is mapped into an "overlay region". */
- int ovly_mapped;
-};
-
-/* Relocation offset applied to S. */
-#define obj_section_offset(s) \
- (((s)->objfile->section_offsets)[gdb_bfd_section_index ((s)->objfile->obfd, (s)->the_bfd_section)])
-
-/* The memory address of section S (vma + offset). */
-#define obj_section_addr(s) \
- (bfd_section_vma (s->the_bfd_section) \
- + obj_section_offset (s))
-
-/* The one-passed-the-end memory address of section S
- (vma + size + offset). */
-#define obj_section_endaddr(s) \
- (bfd_section_vma (s->the_bfd_section) \
- + bfd_section_size ((s)->the_bfd_section) \
- + obj_section_offset (s))
-
#define ALL_OBJFILE_OSECTIONS(objfile, osect) \
for (osect = objfile->sections; osect < objfile->sections_end; osect++) \
if (osect->the_bfd_section == NULL) \
@@ -664,6 +633,27 @@ public:
/* See quick_symbol_functions. */
void require_partial_symbols (bool verbose);
+ /* Return the relocation offset applied to SECTION. */
+ CORE_ADDR section_offset (bfd_section *section) const
+ {
+ /* The section's owner can be nullptr if it is one of the _bfd_std_section
+ section. */
+ gdb_assert (section->owner == nullptr || section->owner == this->obfd);
+
+ int idx = gdb_bfd_section_index (this->obfd, section);
+ return this->section_offsets[idx];
+ }
+
+ /* Set the relocation offset applied to SECTION. */
+ void set_section_offset (bfd_section *section, CORE_ADDR offset)
+ {
+ /* The section's owner can be nullptr if it is one of the _bfd_std_section
+ section. */
+ gdb_assert (section->owner == nullptr || section->owner == this->obfd);
+
+ int idx = gdb_bfd_section_index (this->obfd, section);
+ this->section_offsets[idx] = offset;
+ }
/* The object file's original name as specified by the user,
made absolute, and tilde-expanded. However, it is not canonicalized
@@ -836,6 +826,47 @@ struct objfile_deleter
typedef std::unique_ptr<objfile, objfile_deleter> objfile_up;
+
+/* Sections in an objfile. The section offsets are stored in the
+ OBJFILE. */
+
+struct obj_section
+{
+ /* Relocation offset applied to the section. */
+ CORE_ADDR offset () const
+ {
+ return this->objfile->section_offset (this->the_bfd_section);
+ }
+
+ /* Set the relocation offset applied to the section. */
+ void set_offset (CORE_ADDR offset)
+ {
+ this->objfile->set_section_offset (this->the_bfd_section, offset);
+ }
+
+ /* The memory address of the section (vma + offset). */
+ CORE_ADDR addr () const
+ {
+ return bfd_section_vma (this->the_bfd_section) + this->offset ();
+ }
+
+ /* The one-passed-the-end memory address of the section
+ (vma + size + offset). */
+ CORE_ADDR endaddr () const
+ {
+ return this->addr () + bfd_section_size (this->the_bfd_section);
+ }
+
+ /* BFD section pointer */
+ struct bfd_section *the_bfd_section;
+
+ /* Objfile this section is part of. */
+ struct objfile *objfile;
+
+ /* True if this "overlay section" is mapped into an "overlay region". */
+ int ovly_mapped;
+};
+
/* Declarations for functions defined in objfiles.c */
extern int entry_point_address_query (CORE_ADDR *entry_p);
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 22fa5c0..3cd42f8 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1525,8 +1525,7 @@ info_symbol_command (const char *arg, int from_tty)
sect_addr = overlay_mapped_address (addr, osect);
- if (obj_section_addr (osect) <= sect_addr
- && sect_addr < obj_section_endaddr (osect)
+ if (osect->addr () <= sect_addr && sect_addr < osect->endaddr ()
&& (msymbol
= lookup_minimal_symbol_by_pc_section (sect_addr,
osect).minsym))
diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c
index 4b58058..772cf23 100644
--- a/gdb/solib-aix.c
+++ b/gdb/solib-aix.c
@@ -685,8 +685,7 @@ solib_aix_get_toc_value (CORE_ADDR pc)
"(%s has no data section)"),
core_addr_to_string (pc), objfile_name (pc_osect->objfile));
- result = (obj_section_addr (data_osect)
- + xcoff_get_toc_offset (pc_osect->objfile));
+ result = data_osect->addr () + xcoff_get_toc_offset (pc_osect->objfile);
solib_aix_debug_printf ("pc=%s -> %s", core_addr_to_string (pc),
core_addr_to_string (result));
diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c
index c279435..803467d 100644
--- a/gdb/solib-dsbt.c
+++ b/gdb/solib-dsbt.c
@@ -925,7 +925,7 @@ dsbt_relocate_main_executable (void)
osect_idx = osect - objf->sections;
/* Current address of section. */
- addr = obj_section_addr (osect);
+ addr = osect->addr ();
/* Offset from where this section started. */
offset = objf->section_offsets[osect_idx];
/* Original address prior to any past relocations. */
diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c
index c78fd55..c0b546b 100644
--- a/gdb/solib-frv.c
+++ b/gdb/solib-frv.c
@@ -797,7 +797,7 @@ frv_relocate_main_executable (void)
osect_idx = osect - objf->sections;
/* Current address of section. */
- addr = obj_section_addr (osect);
+ addr = osect->addr ();
/* Offset from where this section started. */
offset = objf->section_offsets[osect_idx];
/* Original address prior to any past relocations. */
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 5ae3093..0eb48d0 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -3012,7 +3012,7 @@ pc_in_unmapped_range (CORE_ADDR pc, struct obj_section *section)
/* We assume the LMA is relocated by the same offset as the VMA. */
bfd_vma size = bfd_section_size (bfd_section);
- CORE_ADDR offset = obj_section_offset (section);
+ CORE_ADDR offset = section->offset ();
if (bfd_section_lma (bfd_section) + offset <= pc
&& pc < bfd_section_lma (bfd_section) + offset + size)
@@ -3030,8 +3030,8 @@ pc_in_mapped_range (CORE_ADDR pc, struct obj_section *section)
{
if (section_is_overlay (section))
{
- if (obj_section_addr (section) <= pc
- && pc < obj_section_endaddr (section))
+ if (section->addr () <= pc
+ && pc < section->endaddr ())
return 1;
}
@@ -3044,10 +3044,10 @@ pc_in_mapped_range (CORE_ADDR pc, struct obj_section *section)
static int
sections_overlap (struct obj_section *a, struct obj_section *b)
{
- CORE_ADDR a_start = obj_section_addr (a);
- CORE_ADDR a_end = obj_section_endaddr (a);
- CORE_ADDR b_start = obj_section_addr (b);
- CORE_ADDR b_end = obj_section_endaddr (b);
+ CORE_ADDR a_start = a->addr ();
+ CORE_ADDR a_end = a->endaddr ();
+ CORE_ADDR b_start = b->addr ();
+ CORE_ADDR b_end = b->endaddr ();
return (a_start < b_end && b_start < a_end);
}
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 7fd037f..6a9c3dc 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -1698,8 +1698,7 @@ fixup_section (struct general_symbol_info *ginfo,
if (fallback == -1)
fallback = idx;
- if (obj_section_addr (s) - offset <= addr
- && addr < obj_section_endaddr (s) - offset)
+ if (s->addr () - offset <= addr && addr < s->endaddr () - offset)
{
ginfo->set_section_index (idx);
return;
diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
index 9bd982f..73ed1d8 100644
--- a/gdb/tilegx-tdep.c
+++ b/gdb/tilegx-tdep.c
@@ -747,7 +747,7 @@ tilegx_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR start_pc)
s = find_pc_section (start_pc);
end_pc = start_pc + 8 * TILEGX_BUNDLE_SIZE_IN_BYTES;
if (s != NULL)
- end_pc = std::min (end_pc, obj_section_endaddr (s));
+ end_pc = std::min (end_pc, s->endaddr ());
/* Otherwise, try to skip prologue the hard way. */
return tilegx_analyze_prologue (gdbarch,
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 163552a..ad4f4a3 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -178,7 +178,7 @@ tui_find_backward_disassembly_start_address (CORE_ADDR addr)
section. */
struct obj_section *section = find_pc_section (addr);
if (section != NULL)
- return obj_section_addr (section);
+ return section->addr ();
return addr;
}
diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index 8a0199c..834c8f0 100644
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -562,8 +562,8 @@ xstormy16_find_jmp_table_entry (struct gdbarch *gdbarch, CORE_ADDR faddr)
{
CORE_ADDR addr, endaddr;
- addr = obj_section_addr (osect);
- endaddr = obj_section_endaddr (osect);
+ addr = osect->addr ();
+ endaddr = osect->endaddr ();
for (; addr < endaddr; addr += 2 * xstormy16_inst_size)
{
generated by cgit v1.1 at 2024-11-28 04:53:12 +0000