From f5c9a895bccae4fd0aca99667be0e7163690fbeb Mon Sep 17 00:00:00 2001 From: Paul Pluzhnikov Date: Fri, 6 Mar 2009 18:51:05 +0000 Subject: [PATCH] 2009-03-06 Paul Pluzhnikov Rename solib_address to solib_name_from_address. * breakpoint.c (insert_bp_location, disable_breakpoints_in_shlibs) (disable_breakpoints_in_unloaded_shlib): Update. * printcmd.c (display_uses_solib_p): Likewise. * stack.c (print_frame): Likewise. * solib.c: Rename. * solib.h: Rename. --- gdb/ChangeLog | 10 ++++++++++ gdb/breakpoint.c | 8 ++++---- gdb/printcmd.c | 4 ++-- gdb/solib.c | 7 ++++--- gdb/solib.h | 2 +- gdb/stack.c | 2 +- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5be5131f0db..412161c04d0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2009-03-06 Paul Pluzhnikov + + Rename solib_address to solib_name_from_address. + * breakpoint.c (insert_bp_location, disable_breakpoints_in_shlibs) + (disable_breakpoints_in_unloaded_shlib): Update. + * printcmd.c (display_uses_solib_p): Likewise. + * stack.c (print_frame): Likewise. + * solib.c: Rename. + * solib.h: Rename. + 2009-03-05 Paul Pluzhnikov * printcmd.c (do_one_display): Reparse exp_string. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 66252ba6136..893e1c294ed 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -1160,7 +1160,7 @@ Note: automatically using hardware breakpoints for read-only addresses.\n")); if (val) { /* Can't set the breakpoint. */ - if (solib_address (bpt->address)) + if (solib_name_from_address (bpt->address)) { /* See also: disable_breakpoints_in_shlibs. */ val = 0; @@ -1629,7 +1629,7 @@ remove_breakpoint (struct bp_location *b, insertion_state_t is) /* In some cases, we might not be able to remove a breakpoint in a shared library that has already been removed, but we have not yet processed the shlib unload event. */ - if (val && solib_address (b->address)) + if (val && solib_name_from_address (b->address)) val = 0; if (val) @@ -4439,7 +4439,7 @@ disable_breakpoints_in_shlibs (void) #ifdef PC_SOLIB && PC_SOLIB (loc->address) #else - && solib_address (loc->address) + && solib_name_from_address (loc->address) #endif ) { @@ -4475,7 +4475,7 @@ disable_breakpoints_in_unloaded_shlib (struct so_list *solib) #ifdef PC_SOLIB char *so_name = PC_SOLIB (loc->address); #else - char *so_name = solib_address (loc->address); + char *so_name = solib_name_from_address (loc->address); #endif if (so_name && !strcmp (so_name, solib->so_name)) { diff --git a/gdb/printcmd.c b/gdb/printcmd.c index 58621615ac0..8a746e49c4a 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -1767,7 +1767,7 @@ display_uses_solib_p (const struct display *d, struct expression *const exp = d->exp; if (d->block != NULL - && solib_address (d->block->startaddr) == solib->so_name) + && solib_name_from_address (d->block->startaddr) == solib->so_name) return 1; for (i = 0; i < exp->nelts; ) @@ -1783,7 +1783,7 @@ display_uses_solib_p (const struct display *d, SYMBOL_OBJ_SECTION (symbol); if (block != NULL - && solib_address (block->startaddr) == solib->so_name) + && solib_name_from_address (block->startaddr) == solib->so_name) return 1; if (section && section->objfile == solib->objfile) diff --git a/gdb/solib.c b/gdb/solib.c index 800319f0704..f2e68f5a7b7 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -838,11 +838,12 @@ info_sharedlibrary_command (char *ignore, int from_tty) GLOBAL FUNCTION - solib_address -- check to see if an address is in a shared lib + solib_name_from_address -- if an address is in a shared lib, return + its name. SYNOPSIS - char * solib_address (CORE_ADDR address) + char * solib_name_from_address (CORE_ADDR address) DESCRIPTION @@ -856,7 +857,7 @@ info_sharedlibrary_command (char *ignore, int from_tty) */ char * -solib_address (CORE_ADDR address) +solib_name_from_address (CORE_ADDR address) { struct so_list *so = 0; /* link map state variable */ diff --git a/gdb/solib.h b/gdb/solib.h index df044d0b5a6..e84ba0f72d3 100644 --- a/gdb/solib.h +++ b/gdb/solib.h @@ -45,7 +45,7 @@ extern void solib_create_inferior_hook (void); /* If ADDR lies in a shared library, return its name. */ -extern char *solib_address (CORE_ADDR); +extern char *solib_name_from_address (CORE_ADDR); /* Return 1 if PC lies in the dynamic symbol resolution code of the run time loader. */ diff --git a/gdb/stack.c b/gdb/stack.c index 3bcf758429b..d0c872e497a 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -730,7 +730,7 @@ print_frame (struct frame_info *frame, int print_level, #ifdef PC_SOLIB char *lib = PC_SOLIB (get_frame_pc (frame)); #else - char *lib = solib_address (get_frame_pc (frame)); + char *lib = solib_name_from_address (get_frame_pc (frame)); #endif if (lib) { -- 2.30.2