diff options
| -rw-r--r-- | gdb/ChangeLog | 13 | ||||
| -rw-r--r-- | gdb/arch-utils.c | 3 | ||||
| -rw-r--r-- | gdb/arch-utils.h | 3 | ||||
| -rw-r--r-- | gdb/corelow.c | 2 | ||||
| -rw-r--r-- | gdb/gdbarch.c | 2 | ||||
| -rw-r--r-- | gdb/gdbarch.h | 4 | ||||
| -rwxr-xr-x | gdb/gdbarch.sh | 2 | ||||
| -rw-r--r-- | gdb/linux-tdep.c | 7 |
8 files changed, 23 insertions, 13 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b839159..d0a0031 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2020-11-19 Simon Marchi <simon.marchi@polymtl.ca> + + * gdbarch.sh (read_core_file_mappings): Remove `other` parameter + in `loop_cb` parameter. + * gdbarch.c: Re-generate. + * gdbarch.h: Re-generate. + * arch-utils.c (default_read_core_file_mappings): Remove `other` + parameter. + * arch-utils.h (default_read_core_file_mappings): Likewise. + * corelow.c (core_target::build_file_mappings): Likewise. + * linux-tdep.c (linux_read_core_file_mappings): Likewise. + (linux_core_info_proc_mappings): Likewise. + 2020-11-19 Andrew Burgess <andrew.burgess@embecosm.com> * Makefile.in (HFILES_NO_SRCDIR): Add f-array-walker.h. diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index e50df82..2786544 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -1045,8 +1045,7 @@ default_read_core_file_mappings (struct gdbarch *gdbarch, ULONGEST start, ULONGEST end, ULONGEST file_ofs, - const char *filename, - const void *other)> + const char *filename)> loop_cb) { } diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h index 7eea838..c9589e1 100644 --- a/gdb/arch-utils.h +++ b/gdb/arch-utils.h @@ -287,7 +287,6 @@ extern void default_read_core_file_mappings (struct gdbarch *gdbarch, ULONGEST start, ULONGEST end, ULONGEST file_ofs, - const char *filename, - const void *other)> + const char *filename)> loop_cb); #endif /* ARCH_UTILS_H */ diff --git a/gdb/corelow.c b/gdb/corelow.c index aef1a02..4c1f068 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -199,7 +199,7 @@ core_target::build_file_mappings () /* read_core_file_mappings will invoke this lambda for each mapping that it finds. */ [&] (int num, ULONGEST start, ULONGEST end, ULONGEST file_ofs, - const char *filename, const void *other) + const char *filename) { /* Architecture-specific read_core_mapping methods are expected to weed out non-file-backed mappings. */ diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 0b43ae4..cd93411 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -5189,7 +5189,7 @@ set_gdbarch_get_pc_address_flags (struct gdbarch *gdbarch, } void -gdbarch_read_core_file_mappings (struct gdbarch *gdbarch, struct bfd *cbfd,gdb::function_view<void (ULONGEST count)> pre_loop_cb,gdb::function_view<void (int num, ULONGEST start, ULONGEST end, ULONGEST file_ofs, const char *filename, const void *other)> loop_cb) +gdbarch_read_core_file_mappings (struct gdbarch *gdbarch, struct bfd *cbfd, gdb::function_view<void (ULONGEST count)> pre_loop_cb, gdb::function_view<void (int num, ULONGEST start, ULONGEST end, ULONGEST file_ofs, const char *filename)> loop_cb) { gdb_assert (gdbarch != NULL); gdb_assert (gdbarch->read_core_file_mappings != NULL); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index b620bb2..70bd8a6 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -1634,8 +1634,8 @@ extern void set_gdbarch_get_pc_address_flags (struct gdbarch *gdbarch, gdbarch_g /* Read core file mappings */ -typedef void (gdbarch_read_core_file_mappings_ftype) (struct gdbarch *gdbarch, struct bfd *cbfd,gdb::function_view<void (ULONGEST count)> pre_loop_cb,gdb::function_view<void (int num, ULONGEST start, ULONGEST end, ULONGEST file_ofs, const char *filename, const void *other)> loop_cb); -extern void gdbarch_read_core_file_mappings (struct gdbarch *gdbarch, struct bfd *cbfd,gdb::function_view<void (ULONGEST count)> pre_loop_cb,gdb::function_view<void (int num, ULONGEST start, ULONGEST end, ULONGEST file_ofs, const char *filename, const void *other)> loop_cb); +typedef void (gdbarch_read_core_file_mappings_ftype) (struct gdbarch *gdbarch, struct bfd *cbfd, gdb::function_view<void (ULONGEST count)> pre_loop_cb, gdb::function_view<void (int num, ULONGEST start, ULONGEST end, ULONGEST file_ofs, const char *filename)> loop_cb); +extern void gdbarch_read_core_file_mappings (struct gdbarch *gdbarch, struct bfd *cbfd, gdb::function_view<void (ULONGEST count)> pre_loop_cb, gdb::function_view<void (int num, ULONGEST start, ULONGEST end, ULONGEST file_ofs, const char *filename)> loop_cb); extern void set_gdbarch_read_core_file_mappings (struct gdbarch *gdbarch, gdbarch_read_core_file_mappings_ftype *read_core_file_mappings); extern struct gdbarch_tdep *gdbarch_tdep (struct gdbarch *gdbarch); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index d27318a..86f2c79 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -1178,7 +1178,7 @@ m;ULONGEST;type_align;struct type *type;type;;default_type_align;;0 f;std::string;get_pc_address_flags;frame_info *frame, CORE_ADDR pc;frame, pc;;default_get_pc_address_flags;;0 # Read core file mappings -m;void;read_core_file_mappings;struct bfd *cbfd,gdb::function_view<void (ULONGEST count)> pre_loop_cb,gdb::function_view<void (int num, ULONGEST start, ULONGEST end, ULONGEST file_ofs, const char *filename, const void *other)> loop_cb;cbfd, pre_loop_cb, loop_cb;;default_read_core_file_mappings;;0 +m;void;read_core_file_mappings;struct bfd *cbfd, gdb::function_view<void (ULONGEST count)> pre_loop_cb, gdb::function_view<void (int num, ULONGEST start, ULONGEST end, ULONGEST file_ofs, const char *filename)> loop_cb;cbfd, pre_loop_cb, loop_cb;;default_read_core_file_mappings;;0 EOF } diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index 8f7bbd5..a651d1b 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -1072,8 +1072,7 @@ linux_read_core_file_mappings (struct gdbarch *gdbarch, ULONGEST start, ULONGEST end, ULONGEST file_ofs, - const char *filename, - const void *other)> + const char *filename)> loop_cb) { /* Ensure that ULONGEST is big enough for reading 64-bit core files. */ @@ -1157,7 +1156,7 @@ linux_read_core_file_mappings (struct gdbarch *gdbarch, char * filename = filenames; filenames += strlen ((char *) filenames) + 1; - loop_cb (i, start, end, file_ofs, filename, nullptr); + loop_cb (i, start, end, file_ofs, filename); } } @@ -1186,7 +1185,7 @@ linux_core_info_proc_mappings (struct gdbarch *gdbarch, const char *args) } }, [=] (int num, ULONGEST start, ULONGEST end, ULONGEST file_ofs, - const char *filename, const void *other) + const char *filename) { if (gdbarch_addr_bit (gdbarch) == 32) printf_filtered ("\t%10s %10s %10s %10s %s\n", |