espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 18:08:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor build_type_psymtabs_reader

Browse Source 
The new DWARF scanner needs to save the entire cutu_reader object, not
just parts of it.  In order to make this possible, this patch
refactors build_type_psymtabs_reader.  This change is done separately
because it is easy to review in isolation and it helps make the later
patches smaller.
This commit is contained in:
Tom Tromey
2021-06-18 15:36:40 -06:00
parent 4e9e4fcda5
commit c0892a1d5d
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gdb/dwarf2/read.c
View File

@ -1104,9 +1104,7 @@ static dwarf2_psymtab *create_partial_symtab
(dwarf2_per_cu_data *per_cu, dwarf2_per_objfile *per_objfile, (dwarf2_per_cu_data *per_cu, dwarf2_per_objfile *per_objfile,
const char *name); const char *name);
static void build_type_psymtabs_reader (const struct die_reader_specs *reader, static void build_type_psymtabs_reader (cutu_reader *reader);
const gdb_byte *info_ptr,
struct die_info *type_unit_die);
static void dwarf2_build_psymtabs_hard (dwarf2_per_objfile *per_objfile); static void dwarf2_build_psymtabs_hard (dwarf2_per_objfile *per_objfile);
@ -7162,8 +7160,7 @@ process_psymtab_comp_unit (dwarf2_per_cu_data *this_cu,
/* Nothing. */ /* Nothing. */
} }
else if (this_cu->is_debug_types) else if (this_cu->is_debug_types)
build_type_psymtabs_reader (&reader, reader.info_ptr, build_type_psymtabs_reader (&reader);
reader.comp_unit_die);
else if (want_partial_unit else if (want_partial_unit
|| reader.comp_unit_die->tag != DW_TAG_partial_unit) || reader.comp_unit_die->tag != DW_TAG_partial_unit)
process_psymtab_comp_unit_reader (&reader, reader.info_ptr, process_psymtab_comp_unit_reader (&reader, reader.info_ptr,
@ -7177,9 +7174,7 @@ process_psymtab_comp_unit (dwarf2_per_cu_data *this_cu,
/* Reader function for build_type_psymtabs. */ /* Reader function for build_type_psymtabs. */
static void static void
build_type_psymtabs_reader (const struct die_reader_specs *reader, build_type_psymtabs_reader (cutu_reader *reader)
const gdb_byte *info_ptr,
struct die_info *type_unit_die)
{ {
dwarf2_per_objfile *per_objfile = reader->cu->per_objfile; dwarf2_per_objfile *per_objfile = reader->cu->per_objfile;
struct dwarf2_cu *cu = reader->cu; struct dwarf2_cu *cu = reader->cu;
@ -7190,6 +7185,8 @@ build_type_psymtabs_reader (const struct die_reader_specs *reader,
struct partial_die_info *first_die; struct partial_die_info *first_die;
CORE_ADDR lowpc, highpc; CORE_ADDR lowpc, highpc;
dwarf2_psymtab *pst; dwarf2_psymtab *pst;
const gdb_byte *info_ptr = reader->info_ptr;
struct die_info *type_unit_die = reader->comp_unit_die;
gdb_assert (per_cu->is_debug_types); gdb_assert (per_cu->is_debug_types);
sig_type = (struct signatured_type *) per_cu; sig_type = (struct signatured_type *) per_cu;
@ -7322,8 +7319,7 @@ build_type_psymtabs (dwarf2_per_objfile *per_objfile)
cutu_reader reader (tu.sig_type, per_objfile, cutu_reader reader (tu.sig_type, per_objfile,
abbrev_table.get (), nullptr, false); abbrev_table.get (), nullptr, false);
if (!reader.dummy_p) if (!reader.dummy_p)
build_type_psymtabs_reader (&reader, reader.info_ptr, build_type_psymtabs_reader (&reader);
reader.comp_unit_die);
} }
} }
@ -7411,8 +7407,7 @@ process_skeletonless_type_unit (void **slot, void *info)
/* This does the job that build_type_psymtabs would have done. */ /* This does the job that build_type_psymtabs would have done. */
cutu_reader reader (entry, per_objfile, nullptr, nullptr, false); cutu_reader reader (entry, per_objfile, nullptr, nullptr, false);
if (!reader.dummy_p) if (!reader.dummy_p)
build_type_psymtabs_reader (&reader, reader.info_ptr, build_type_psymtabs_reader (&reader);
reader.comp_unit_die);
return 1; return 1;
} }