aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gdb/machoread.c2
-rw-r--r--gdb/maint.c6
-rw-r--r--gdb/objfiles.c12
-rw-r--r--gdb/objfiles.h20
-rw-r--r--gdb/solib-aix.c4
-rw-r--r--gdb/solib-dsbt.c2
-rw-r--r--gdb/solib-frv.c2
-rw-r--r--gdb/symfile.c2
-rw-r--r--gdb/symmisc.c2
-rw-r--r--gdb/symtab.c4
-rw-r--r--gdb/xcoffread.c3
11 files changed, 30 insertions, 29 deletions
diff --git a/gdb/machoread.c b/gdb/machoread.c
index 9735de8..dc841c3 100644
--- a/gdb/machoread.c
+++ b/gdb/machoread.c
@@ -926,7 +926,7 @@ macho_symfile_offsets (struct objfile *objfile,
ALL_OBJFILE_OSECTIONS (objfile, osect)
{
const char *bfd_sect_name = osect->the_bfd_section->name;
- int sect_index = osect - objfile->sections;;
+ int sect_index = osect - objfile->sections_start;
if (startswith (bfd_sect_name, "LC_SEGMENT."))
bfd_sect_name += 11;
diff --git a/gdb/maint.c b/gdb/maint.c
index a8afef0..3cd2c5e 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -331,11 +331,11 @@ maint_obj_section_from_bfd_section (bfd *abfd,
asection *asection,
objfile *ofile)
{
- if (ofile->sections == nullptr)
+ if (ofile->sections_start == nullptr)
return nullptr;
obj_section *osect
- = &ofile->sections[gdb_bfd_section_index (abfd, asection)];
+ = &ofile->sections_start[gdb_bfd_section_index (abfd, asection)];
if (osect >= ofile->sections_end)
return nullptr;
@@ -375,7 +375,7 @@ maint_print_all_sections (const char *header, bfd *abfd, objfile *objfile,
if (objfile != nullptr)
{
- gdb_assert (objfile->sections != nullptr);
+ gdb_assert (objfile->sections_start != nullptr);
osect
= maint_obj_section_from_bfd_section (abfd, sect, objfile);
if (osect->the_bfd_section == nullptr)
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 9caebfe..e3fa691 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -264,7 +264,7 @@ add_to_objfile_sections (struct bfd *abfd, struct bfd_section *asect,
return;
}
- section = &objfile->sections[gdb_bfd_section_index (abfd, asect)];
+ section = &objfile->sections_start[gdb_bfd_section_index (abfd, asect)];
section->objfile = objfile;
section->the_bfd_section = asect;
section->ovly_mapped = 0;
@@ -280,10 +280,10 @@ build_objfile_section_table (struct objfile *objfile)
{
int count = gdb_bfd_count_sections (objfile->obfd.get ());
- objfile->sections = OBSTACK_CALLOC (&objfile->objfile_obstack,
- count,
- struct obj_section);
- objfile->sections_end = (objfile->sections + count);
+ objfile->sections_start = OBSTACK_CALLOC (&objfile->objfile_obstack,
+ count,
+ struct obj_section);
+ objfile->sections_end = (objfile->sections_start + count);
for (asection *sect : gdb_bfd_sections (objfile->obfd))
add_to_objfile_sections (objfile->obfd.get (), sect, objfile, 0);
@@ -660,7 +660,7 @@ objfile_relocate1 (struct objfile *objfile,
struct obj_section *s;
ALL_OBJFILE_OSECTIONS (objfile, s)
{
- int idx = s - objfile->sections;
+ int idx = s - objfile->sections_start;
exec_set_section_address (bfd_get_filename (objfile->obfd.get ()), idx,
s->addr ());
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index 342aa09..1b059dd 100644
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -128,7 +128,7 @@ struct entry_info
};
#define ALL_OBJFILE_OSECTIONS(objfile, osect) \
- for (osect = objfile->sections; osect < objfile->sections_end; osect++) \
+ for (osect = objfile->sections_start; osect < objfile->sections_end; osect++) \
if (osect->the_bfd_section == NULL) \
{ \
/* Nothing. */ \
@@ -713,16 +713,16 @@ public:
int sect_index_bss = -1;
int sect_index_rodata = -1;
- /* These pointers are used to locate the section table, which
- among other things, is used to map pc addresses into sections.
- SECTIONS points to the first entry in the table, and
- SECTIONS_END points to the first location past the last entry
- in the table. The table is stored on the objfile_obstack. The
- sections are indexed by the BFD section index; but the
- structure data is only valid for certain sections
- (e.g. non-empty, SEC_ALLOC). */
+ /* These pointers are used to locate the section table, which among
+ other things, is used to map pc addresses into sections.
+ SECTIONS_START points to the first entry in the table, and
+ SECTIONS_END points to the first location past the last entry in
+ the table. The table is stored on the objfile_obstack. The
+ sections are indexed by the BFD section index; but the structure
+ data is only valid for certain sections (e.g. non-empty,
+ SEC_ALLOC). */
- struct obj_section *sections = nullptr;
+ struct obj_section *sections_start = nullptr;
struct obj_section *sections_end = nullptr;
/* GDB allows to have debug symbols in separate object files. This is
diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c
index d7062b4..d3119db 100644
--- a/gdb/solib-aix.c
+++ b/gdb/solib-aix.c
@@ -400,7 +400,7 @@ solib_aix_get_section_offsets (struct objfile *objfile,
if (objfile->sect_index_text != -1)
{
struct bfd_section *sect
- = objfile->sections[objfile->sect_index_text].the_bfd_section;
+ = objfile->sections_start[objfile->sect_index_text].the_bfd_section;
offsets[objfile->sect_index_text]
= info->text_addr + sect->filepos - bfd_section_vma (sect);
@@ -411,7 +411,7 @@ solib_aix_get_section_offsets (struct objfile *objfile,
if (objfile->sect_index_data != -1)
{
struct bfd_section *sect
- = objfile->sections[objfile->sect_index_data].the_bfd_section;
+ = objfile->sections_start[objfile->sect_index_data].the_bfd_section;
offsets[objfile->sect_index_data]
= info->data_addr - bfd_section_vma (sect);
diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c
index 866087e..8106c34 100644
--- a/gdb/solib-dsbt.c
+++ b/gdb/solib-dsbt.c
@@ -822,7 +822,7 @@ dsbt_relocate_main_executable (void)
int osect_idx;
int seg;
- osect_idx = osect - objf->sections;
+ osect_idx = osect - objf->sections_start;
/* Current address of section. */
addr = osect->addr ();
diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c
index 240b4da..7cce11d 100644
--- a/gdb/solib-frv.c
+++ b/gdb/solib-frv.c
@@ -757,7 +757,7 @@ frv_relocate_main_executable (void)
int osect_idx;
int seg;
- osect_idx = osect - objf->sections;
+ osect_idx = osect - objf->sections_start;
/* Current address of section. */
addr = osect->addr ();
diff --git a/gdb/symfile.c b/gdb/symfile.c
index d0cb5cb..d1ab3cc 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -2571,7 +2571,7 @@ reread_symbols (int from_tty)
/* NB: after this call to obstack_free, objfiles_changed
will need to be called (see discussion below). */
obstack_free (&objfile->objfile_obstack, 0);
- objfile->sections = NULL;
+ objfile->sections_start = NULL;
objfile->section_offsets.clear ();
objfile->sect_index_bss = -1;
objfile->sect_index_data = -1;
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 4b68f2b..ee764a5 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -212,7 +212,7 @@ dump_msymbols (struct objfile *objfile, struct ui_file *outfile)
bfd_section_name (section->the_bfd_section));
else
gdb_printf (outfile, " spurious section %ld",
- (long) (section - objfile->sections));
+ (long) (section - objfile->sections_start));
}
if (msymbol->demangled_name () != NULL)
{
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 27611a3..594b13f 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -1099,7 +1099,7 @@ struct obj_section *
general_symbol_info::obj_section (const struct objfile *objfile) const
{
if (section_index () >= 0)
- return &objfile->sections[section_index ()];
+ return &objfile->sections_start[section_index ()];
return nullptr;
}
@@ -1777,7 +1777,7 @@ fixup_symbol_section (struct symbol *sym, struct objfile *objfile)
if ((bfd_section_flags (s->the_bfd_section) & SEC_ALLOC) == 0)
continue;
- int idx = s - objfile->sections;
+ int idx = s - objfile->sections_start;
CORE_ADDR offset = objfile->section_offsets[idx];
if (fallback == -1)
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index e5b8e8a..a660e1c 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -2890,7 +2890,8 @@ xcoff_symfile_offsets (struct objfile *objfile,
if (objfile->section_offsets.empty ())
return; /* Is that even possible? Better safe than sorry. */
- first_section_name = bfd_section_name (objfile->sections[0].the_bfd_section);
+ first_section_name
+ = bfd_section_name (objfile->sections_start[0].the_bfd_section);
if (objfile->sect_index_text == 0
&& strcmp (first_section_name, ".text") != 0)
generated by cgit v1.1 at 2024-11-10 07:24:46 +0000