From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v3 01/33] Split create_addrmap_from_aranges
Date: Sat, 4 Dec 2021 13:38:12 -0700 [thread overview]
Message-ID: <20211204203844.1188999-2-tom@tromey.com> (raw)
In-Reply-To: <20211204203844.1188999-1-tom@tromey.com>
This patch splits create_addrmap_from_aranges into a wrapper function
and a worker function. The worker function is then used in a later
patch.
---
gdb/dwarf2/read.c | 49 +++++++++++++++++++++++++++++++----------------
1 file changed, 32 insertions(+), 17 deletions(-)
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index ff5758eb0a4..ce579b1ed75 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -2579,12 +2579,14 @@ create_addrmap_from_index (dwarf2_per_objfile *per_objfile,
&per_bfd->obstack);
}
-/* Read the address map data from DWARF-5 .debug_aranges, and use it to
- populate the psymtabs_addrmap. */
+/* Read the address map data from DWARF-5 .debug_aranges, and use it
+ to populate given addrmap. Returns true on success, false on
+ failure. */
-static void
-create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
- struct dwarf2_section_info *section)
+static bool
+read_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
+ struct dwarf2_section_info *section,
+ addrmap *mutable_map)
{
struct objfile *objfile = per_objfile->objfile;
bfd *abfd = objfile->obfd;
@@ -2592,9 +2594,6 @@ create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
const CORE_ADDR baseaddr = objfile->text_section_offset ();
dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
- auto_obstack temp_obstack;
- addrmap *mutable_map = addrmap_create_mutable (&temp_obstack);
-
std::unordered_map<sect_offset,
dwarf2_per_cu_data *,
gdb::hash_enum<sect_offset>>
@@ -2615,7 +2614,7 @@ create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
warning (_("Section .debug_aranges in %s has duplicate "
"debug_info_offset %s, ignoring .debug_aranges."),
objfile_name (objfile), sect_offset_str (per_cu->sect_off));
- return;
+ return false;
}
}
@@ -2646,7 +2645,7 @@ create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
plongest (entry_addr - section->buffer),
plongest (bytes_read + entry_length),
pulongest (section->size));
- return;
+ return false;
}
/* The version number. */
@@ -2658,7 +2657,7 @@ create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
"has unsupported version %d, ignoring .debug_aranges."),
objfile_name (objfile),
plongest (entry_addr - section->buffer), version);
- return;
+ return false;
}
const uint64_t debug_info_offset
@@ -2674,7 +2673,7 @@ create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
objfile_name (objfile),
plongest (entry_addr - section->buffer),
pulongest (debug_info_offset));
- return;
+ return false;
}
dwarf2_per_cu_data *const per_cu = per_cu_it->second;
@@ -2685,7 +2684,7 @@ create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
"address_size %u is invalid, ignoring .debug_aranges."),
objfile_name (objfile),
plongest (entry_addr - section->buffer), address_size);
- return;
+ return false;
}
const uint8_t segment_selector_size = *addr++;
@@ -2697,7 +2696,7 @@ create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
objfile_name (objfile),
plongest (entry_addr - section->buffer),
segment_selector_size);
- return;
+ return false;
}
/* Must pad to an alignment boundary that is twice the address
@@ -2718,7 +2717,7 @@ create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
"ignoring .debug_aranges."),
objfile_name (objfile),
plongest (entry_addr - section->buffer));
- return;
+ return false;
}
ULONGEST start = extract_unsigned_integer (addr, address_size,
dwarf5_byte_order);
@@ -2742,8 +2741,24 @@ create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
}
}
- per_bfd->index_addrmap = addrmap_create_fixed (mutable_map,
- &per_bfd->obstack);
+ return true;
+}
+
+/* Read the address map data from DWARF-5 .debug_aranges, and use it to
+ populate the psymtabs_addrmap. */
+
+static void
+create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
+ struct dwarf2_section_info *section)
+{
+ dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
+
+ auto_obstack temp_obstack;
+ addrmap *mutable_map = addrmap_create_mutable (&temp_obstack);
+
+ if (read_addrmap_from_aranges (per_objfile, section, mutable_map))
+ per_bfd->index_addrmap = addrmap_create_fixed (mutable_map,
+ &per_bfd->obstack);
}
/* A helper function that reads the .gdb_index from BUFFER and fills
--
2.31.1
next prev parent reply other threads:[~2021-12-04 20:38 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-04 20:38 [PATCH v3 00/33] Rewrite the DWARF "partial" reader Tom Tromey
2021-12-04 20:38 ` Tom Tromey [this message]
2021-12-04 20:38 ` [PATCH v3 02/33] Fix latent bug in read_addrmap_from_aranges Tom Tromey
2021-12-04 20:38 ` [PATCH v3 03/33] Add dwarf2_per_cu_data::addresses_seen Tom Tromey
2021-12-04 20:38 ` [PATCH v3 04/33] Refactor dwarf2_get_pc_bounds Tom Tromey
2021-12-04 20:38 ` [PATCH v3 05/33] Allow ada_decode not to decode operators Tom Tromey
2021-12-04 20:38 ` [PATCH v3 06/33] Let skip_one_die not skip children Tom Tromey
2021-12-04 20:38 ` [PATCH v3 07/33] Add name splitting Tom Tromey
2021-12-04 20:38 ` [PATCH v3 08/33] Add new overload of dwarf5_djb_hash Tom Tromey
2021-12-04 20:38 ` [PATCH v3 09/33] Refactor build_type_psymtabs_reader Tom Tromey
2021-12-04 20:38 ` [PATCH v3 10/33] Add batching parameter to parallel_for_each Tom Tromey
2021-12-04 20:38 ` [PATCH v3 11/33] Return vector of results from parallel_for_each Tom Tromey
2022-03-29 17:36 ` Pedro Alves
2022-03-29 20:07 ` Tom Tromey
2021-12-04 20:38 ` [PATCH v3 12/33] Specialize std::hash for gdb_exception Tom Tromey
2021-12-04 20:38 ` [PATCH v3 13/33] Add "fullname" handling to file_and_directory Tom Tromey
2021-12-07 17:17 ` Tom Tromey
2021-12-04 20:38 ` [PATCH v3 14/33] Introduce DWARF abbrev cache Tom Tromey
2021-12-04 20:38 ` [PATCH v3 15/33] Statically examine abbrev properties Tom Tromey
2021-12-04 20:38 ` [PATCH v3 16/33] Update skip_one_die for new " Tom Tromey
2021-12-04 20:38 ` [PATCH v3 17/33] Introduce the new DWARF index class Tom Tromey
2021-12-04 20:38 ` [PATCH v3 18/33] The new DWARF indexer Tom Tromey
2022-03-29 18:04 ` Pedro Alves
2022-03-29 20:08 ` Tom Tromey
2021-12-04 20:38 ` [PATCH v3 19/33] Implement quick_symbol_functions for cooked DWARF index Tom Tromey
2021-12-04 20:38 ` [PATCH v3 20/33] Wire in the new DWARF indexer Tom Tromey
2021-12-04 20:38 ` [PATCH v3 21/33] Introduce thread-safe handling for complaints Tom Tromey
2021-12-04 20:38 ` [PATCH v3 22/33] Pre-read DWARF section data Tom Tromey
2021-12-04 20:38 ` [PATCH v3 23/33] Parallelize DWARF indexing Tom Tromey
2022-03-30 10:24 ` Pedro Alves
2022-03-30 20:23 ` Tom Tromey
2022-03-30 21:24 ` Tom Tromey
2021-12-04 20:38 ` [PATCH v3 24/33] "Finalize" the DWARF index in the background Tom Tromey
2021-12-04 20:38 ` [PATCH v3 25/33] Rename write_psymtabs_to_index Tom Tromey
2021-12-04 20:38 ` [PATCH v3 26/33] Change the key type in psym_index_map Tom Tromey
2021-12-04 20:38 ` [PATCH v3 27/33] Change parameters to write_address_map Tom Tromey
2021-12-04 20:38 ` [PATCH v3 28/33] Genericize addrmap handling in the DWARF index writer Tom Tromey
2021-12-04 20:38 ` [PATCH v3 29/33] Adapt .gdb_index writer to new DWARF scanner Tom Tromey
2021-12-04 20:38 ` [PATCH v3 30/33] Adapt .debug_names " Tom Tromey
2021-12-04 20:38 ` [PATCH v3 31/33] Enable the new DWARF indexer Tom Tromey
2021-12-04 20:38 ` [PATCH v3 32/33] Delete DWARF psymtab code Tom Tromey
2021-12-04 20:38 ` [PATCH v3 33/33] Remove dwarf2_per_cu_data::v Tom Tromey
2022-01-05 17:18 ` [PATCH v3 00/33] Rewrite the DWARF "partial" reader Tom Tromey
2022-03-24 16:18 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211204203844.1188999-2-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).