This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 5/7] Remove one argument abbrev_len in read_partial_die
- From: Yao Qi <qiyaoltc at gmail dot com>
- To: gdb-patches at sourceware dot org
- Date: Thu, 22 Feb 2018 15:36:34 +0000
- Subject: [PATCH 5/7] Remove one argument abbrev_len in read_partial_die
- Authentication-results: sourceware.org; auth=none
- References: <1519313796-2397-1-git-send-email-yao.qi@linaro.org>
gdb:
2018-01-11 Yao Qi <yao.qi@linaro.org>
* dwarf2read.c (read_partial_die): Update the declaration.
(load_partial_dies): Caller update.
(read_partial_die): Remove one argument abbrev_len.
---
gdb/dwarf2read.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index b01d9f3..333a890 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -1834,7 +1834,6 @@ static struct partial_die_info *load_partial_dies
static const gdb_byte *read_partial_die (const struct die_reader_specs *,
struct partial_die_info *,
struct abbrev_info *,
- unsigned int,
const gdb_byte *);
static struct partial_die_info *find_partial_die (sect_offset, int,
@@ -18348,8 +18347,8 @@ load_partial_dies (const struct die_reader_specs *reader,
struct partial_die_info pdi ((sect_offset) (info_ptr - reader->buffer),
abbrev);
- info_ptr = read_partial_die (reader, &pdi, abbrev, bytes_read,
- info_ptr);
+ info_ptr = read_partial_die (reader, &pdi, abbrev,
+ (const gdb_byte *) info_ptr + bytes_read);
/* This two-pass algorithm for processing partial symbols has a
high cost in cache pressure. Thus, handle some simple cases
@@ -18524,13 +18523,13 @@ partial_die_info::partial_die_info (sect_offset sect_off_,
{
}
-/* Read a minimal amount of information into the minimal die structure. */
+/* Read a minimal amount of information into the minimal die structure.
+ INFO_PTR should point just after the initial uleb128 of a DIE. */
static const gdb_byte *
read_partial_die (const struct die_reader_specs *reader,
struct partial_die_info *part_die,
- struct abbrev_info *abbrev, unsigned int abbrev_len,
- const gdb_byte *info_ptr)
+ struct abbrev_info *abbrev, const gdb_byte *info_ptr)
{
struct dwarf2_cu *cu = reader->cu;
struct dwarf2_per_objfile *dwarf2_per_objfile
@@ -18543,8 +18542,6 @@ read_partial_die (const struct die_reader_specs *reader,
int has_high_pc_attr = 0;
int high_pc_relative = 0;
- info_ptr += abbrev_len;
-
for (i = 0; i < abbrev->num_attrs; ++i)
{
info_ptr = read_attribute (reader, &attr, &abbrev->attrs[i], info_ptr);
--
1.9.1