diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2022-04-12 15:31:24 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2022-04-21 15:05:51 -0400 |
| commit | ebf58f8eb185e49fa4ed05b5e2ff5d703229b9b7 (patch) | |
| tree | e0296324f703944b1a01e6ee8055aa550f171070 | |
| parent | 0b84fbd54ee44cc88fd95cf1993f0e704c4d78e2 (diff) | |
| download | gdb-ebf58f8eb185e49fa4ed05b5e2ff5d703229b9b7.zip gdb-ebf58f8eb185e49fa4ed05b5e2ff5d703229b9b7.tar.gz gdb-ebf58f8eb185e49fa4ed05b5e2ff5d703229b9b7.tar.bz2 | |
gdb/dwarf: remove line_header::total_length field
This doesn' have to be a field, it can simply be a local variable in
dwarf_decode_line_header. Name the local variable "unit_length", since
that's what the field in called in DWARF 4 and 5. It's always easier to
follow the code with the standard on the side when we use the same
terminology.
Change-Id: I3ad1022afd9410b193ea11b9b5437686c1e4e633
| -rw-r--r-- | gdb/dwarf2/line-header.c | 10 | ||||
| -rw-r--r-- | gdb/dwarf2/line-header.h | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/gdb/dwarf2/line-header.c b/gdb/dwarf2/line-header.c index 8f4eb4f..9a5f3fa 100644 --- a/gdb/dwarf2/line-header.c +++ b/gdb/dwarf2/line-header.c @@ -289,19 +289,19 @@ dwarf_decode_line_header (sect_offset sect_off, bool is_dwz, line_ptr = section->buffer + to_underlying (sect_off); /* Read in the header. */ - lh->total_length = - read_checked_initial_length_and_offset (abfd, line_ptr, cu_header, - &bytes_read, &offset_size); + LONGEST unit_length + = read_checked_initial_length_and_offset (abfd, line_ptr, cu_header, + &bytes_read, &offset_size); line_ptr += bytes_read; const gdb_byte *start_here = line_ptr; - if (line_ptr + lh->total_length > (section->buffer + section->size)) + if (line_ptr + unit_length > (section->buffer + section->size)) { dwarf2_statement_list_fits_in_line_number_section_complaint (); return 0; } - lh->statement_program_end = start_here + lh->total_length; + lh->statement_program_end = start_here + unit_length; lh->version = read_2_bytes (abfd, line_ptr); line_ptr += 2; if (lh->version > 5) diff --git a/gdb/dwarf2/line-header.h b/gdb/dwarf2/line-header.h index 4adfe91..25b9e7c 100644 --- a/gdb/dwarf2/line-header.h +++ b/gdb/dwarf2/line-header.h @@ -136,7 +136,6 @@ struct line_header /* OFFSET is for struct dwz_file associated with dwarf2_per_objfile. */ unsigned offset_in_dwz : 1; /* Can't initialize bitfields in-class. */ - unsigned int total_length {}; unsigned short version {}; unsigned int header_length {}; unsigned char minimum_instruction_length {}; |