From bd9269f70c70b1218b0eb73a6f487d6ca481e5ac Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Thu, 11 Sep 2014 11:43:04 +0100 Subject: Introduce common/symbol.h This introduces common/symbol.h. This file declares a function that the shared code can use and that the clients must implement. It also changes some shared code to use these functions. gdb/ChangeLog: * common/symbol.h: New file. * Makefile.in (HFILES_NO_SRCDIR): Add common/symbol.h. * minsyms.c (find_minimal_symbol_address): New function. * common/agent.c: Include common/symbol.h. [!GDBSERVER]: Don't include objfiles.h. (agent_look_up_symbols): Use find_minimal_symbol_address. gdb/gdbserver/ChangeLog: * symbol.c: New file. * Makefile.in (SFILES): Add symbol.c. (OBS): Add symbol.o. --- gdb/common/agent.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gdb/common/agent.c') diff --git a/gdb/common/agent.c b/gdb/common/agent.c index 0ac73a9..433ae2a 100644 --- a/gdb/common/agent.c +++ b/gdb/common/agent.c @@ -21,9 +21,9 @@ #include "server.h" #else #include "defs.h" -#include "objfiles.h" #endif #include "target/target.h" +#include "common/symbol.h" #include #include "agent.h" #include "filestuff.h" @@ -98,18 +98,9 @@ agent_look_up_symbols (void *arg) { CORE_ADDR *addrp = (CORE_ADDR *) ((char *) &ipa_sym_addrs + symbol_list[i].offset); -#ifdef GDBSERVER - - if (look_up_one_symbol (symbol_list[i].name, addrp, 1) == 0) -#else - struct bound_minimal_symbol sym = - lookup_minimal_symbol (symbol_list[i].name, NULL, - (struct objfile *) arg); - if (sym.minsym != NULL) - *addrp = BMSYMBOL_VALUE_ADDRESS (sym); - else -#endif + if (find_minimal_symbol_address (symbol_list[i].name, addrp, + arg) != 0) { DEBUG_AGENT ("symbol `%s' not found\n", symbol_list[i].name); return -1; -- cgit v1.1