From eef401dce1f890921168598fec71495dbf122f59 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 11 Jan 2021 16:30:44 -0500 Subject: [PATCH] gdb: convert solib-aix to new-style debug macros This is only compile-tested. gdb/ChangeLog: * solib-aix.c (solib_aix_debug_printf): New, use throughout file. Change-Id: I7ec4baa15ab5b8ad786212b8b9de61c2c447bac1 --- gdb/ChangeLog | 5 +++++ gdb/solib-aix.c | 23 +++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8af2be62f7e..191da48a5e1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-01-11 Simon Marchi + + * solib-aix.c (solib_aix_debug_printf): New, use throughout + file. + 2021-01-11 Simon Marchi * jit.c (jit_debug): Change type to bool. diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c index 92a3345b06e..a0dbdde4d49 100644 --- a/gdb/solib-aix.c +++ b/gdb/solib-aix.c @@ -32,6 +32,11 @@ this module. */ static bool solib_aix_debug; +/* Print an "aix-solib" debug statement. */ + +#define solib_aix_debug_printf(fmt, ...) \ + debug_prefixed_printf_cond (solib_aix_debug, "aix-solib",fmt, ##__VA_ARGS__) + /* Our private data in struct so_list. */ struct lm_info_aix : public lm_info_base @@ -250,10 +255,8 @@ solib_aix_get_library_list (struct inferior *inf, const char *warning_msg) return data->library_list; } - if (solib_aix_debug) - fprintf_unfiltered (gdb_stdlog, - "DEBUG: TARGET_OBJECT_LIBRARIES_AIX = \n%s\n", - library_document->data ()); + solib_aix_debug_printf ("TARGET_OBJECT_LIBRARIES_AIX = %s", + library_document->data ()); data->library_list = solib_aix_parse_libraries (library_document->data ()); if (!data->library_list.has_value () && warning_msg != NULL) @@ -374,9 +377,7 @@ solib_aix_free_so (struct so_list *so) { lm_info_aix *li = (lm_info_aix *) so->lm_info; - if (solib_aix_debug) - fprintf_unfiltered (gdb_stdlog, "DEBUG: solib_aix_free_so (%s)\n", - so->so_name); + solib_aix_debug_printf ("%s", so->so_name); delete li; } @@ -685,11 +686,9 @@ solib_aix_get_toc_value (CORE_ADDR pc) result = (obj_section_addr (data_osect) + xcoff_get_toc_offset (pc_osect->objfile)); - if (solib_aix_debug) - fprintf_unfiltered (gdb_stdlog, - "DEBUG: solib_aix_get_toc_value (pc=%s) -> %s\n", - core_addr_to_string (pc), - core_addr_to_string (result)); + + solib_aix_debug_printf ("pc=%s -> %s", core_addr_to_string (pc), + core_addr_to_string (result)); return result; } -- 2.30.2