From 450a1bfc7f60d4b37615a7d78aac83ca73cae159 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 25 Feb 2020 23:38:26 -0500 Subject: [PATCH] Move dwarf2_read_addr_index declaration to dwarf2/read.h The implementation is in dwarf2/read.c, so the declaration belongs in dwarf2/read.h. Also, move the documentation there. gdb/ChangeLog: * dwarf2/loc.h (dwarf2_read_addr_index): Move... * dwarf2/read.h (dwarf2_read_addr_index): ... here. * dwarf2/read.c (dwarf2_read_addr_index): Move doc to header. --- gdb/ChangeLog | 6 ++++++ gdb/dwarf2/loc.h | 3 --- gdb/dwarf2/read.c | 8 ++------ gdb/dwarf2/read.h | 8 ++++++++ 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cb3e1854ac2..aa4b01bac3b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-02-25 Simon Marchi + + * dwarf2/loc.h (dwarf2_read_addr_index): Move... + * dwarf2/read.h (dwarf2_read_addr_index): ... here. + * dwarf2/read.c (dwarf2_read_addr_index): Move doc to header. + 2020-02-25 Andrew Burgess * gdbtypes.c (create_array_type_with_stride): Handle negative diff --git a/gdb/dwarf2/loc.h b/gdb/dwarf2/loc.h index ab071c21b34..dfb6f05525c 100644 --- a/gdb/dwarf2/loc.h +++ b/gdb/dwarf2/loc.h @@ -138,9 +138,6 @@ void dwarf2_compile_property_to_c (string_file *stream, CORE_ADDR address, struct symbol *sym); -CORE_ADDR dwarf2_read_addr_index (struct dwarf2_per_cu_data *per_cu, - unsigned int addr_index); - /* The symbol location baton types used by the DWARF-2 reader (i.e. SYMBOL_LOCATION_BATON for a LOC_COMPUTED symbol). "struct dwarf2_locexpr_baton" is for a symbol with a single location diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 8c40ddb727a..37d4af14ea5 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -18867,14 +18867,10 @@ read_addr_index_from_leb128 (struct dwarf2_cu *cu, const gdb_byte *info_ptr, return read_addr_index (cu, addr_index); } -/* Given an index in .debug_addr, fetch the value. - NOTE: This can be called during dwarf expression evaluation, - long after the debug information has been read, and thus per_cu->cu - may no longer exist. */ +/* See read.h. */ CORE_ADDR -dwarf2_read_addr_index (struct dwarf2_per_cu_data *per_cu, - unsigned int addr_index) +dwarf2_read_addr_index (dwarf2_per_cu_data *per_cu, unsigned int addr_index) { struct dwarf2_per_objfile *dwarf2_per_objfile = per_cu->dwarf2_per_objfile; struct dwarf2_cu *cu = per_cu->cu; diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h index 640e19e4a0e..a3ae412379a 100644 --- a/gdb/dwarf2/read.h +++ b/gdb/dwarf2/read.h @@ -529,6 +529,14 @@ extern struct dwz_file *dwarf2_get_dwz_file struct type *dwarf2_get_die_type (cu_offset die_offset, struct dwarf2_per_cu_data *per_cu); +/* Given an index in .debug_addr, fetch the value. + NOTE: This can be called during dwarf expression evaluation, + long after the debug information has been read, and thus per_cu->cu + may no longer exist. */ + +CORE_ADDR dwarf2_read_addr_index (dwarf2_per_cu_data *per_cu, + unsigned int addr_index); + /* When non-zero, dump line number entries as they are read in. */ extern unsigned int dwarf_line_debug; -- 2.30.2