From patchwork Fri Aug 29 13:51:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2587 Received: (qmail 20029 invoked by alias); 29 Aug 2014 13:51:52 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 20010 invoked by uid 89); 29 Aug 2014 13:51:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL, BAYES_00, KAM_STOCKGEN, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 29 Aug 2014 13:51:50 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7TDplMP022252 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 29 Aug 2014 09:51:48 -0400 Received: from blade.nx (ovpn-116-113.ams2.redhat.com [10.36.116.113]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7TDpk7C019738; Fri, 29 Aug 2014 09:51:46 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 259C12640ED; Fri, 29 Aug 2014 14:51:44 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Cc: Pedro Alves , Doug Evans Subject: [PATCH 4/9 v7] Introduce target/symbol.h Date: Fri, 29 Aug 2014 14:51:34 +0100 Message-Id: <1409320299-6812-5-git-send-email-gbenson@redhat.com> In-Reply-To: <1409320299-6812-1-git-send-email-gbenson@redhat.com> References: <1409320299-6812-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This introduces target/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. This patch differs from the version I posted on August 1 (https://sourceware.org/ml/gdb-patches/2014-08/msg00013.html) in that the new function has been renamed as find_minimal_symbol_address and that it lives in minsyms.c for GDB and a new file symbol.c for gdbserver rather than in target.c for both. gdb/ChangeLog: * target/symbol.h: New file. * Makefile.in (HFILES_NO_SRCDIR): Add target/symbol.h. * target.h: Include target/symbol.h. * minsyms.c (find_minimal_symbol_address): New function. * common/agent.c: Include target/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/ChangeLog | 11 +++++++++++ gdb/Makefile.in | 2 +- gdb/common/agent.c | 15 +++------------ gdb/gdbserver/ChangeLog | 7 +++++++ gdb/gdbserver/Makefile.in | 4 ++-- gdb/gdbserver/symbol.c | 32 ++++++++++++++++++++++++++++++++ gdb/minsyms.c | 15 +++++++++++++++ gdb/target.h | 1 + gdb/target/symbol.h | 37 +++++++++++++++++++++++++++++++++++++ 9 files changed, 109 insertions(+), 15 deletions(-) create mode 100644 gdb/gdbserver/symbol.c create mode 100644 gdb/target/symbol.h diff --git a/gdb/Makefile.in b/gdb/Makefile.in index bb33d38..49b7c74 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -938,7 +938,7 @@ target/wait.h target/waitstatus.h nat/linux-nat.h nat/linux-waitpid.h \ common/print-utils.h common/rsp-low.h nat/i386-dregs.h x86-linux-nat.h \ i386-linux-nat.h common/common-defs.h common/errors.h common/common-types.h \ common/common-debug.h common/cleanups.h common/gdb_setjmp.h \ -common/common-exceptions.h target/target.h +common/common-exceptions.h target/target.h target/symbol.h # Header files that already have srcdir in them, or which are in objdir. diff --git a/gdb/common/agent.c b/gdb/common/agent.c index 0ac73a9..239497f 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 "target/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; diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 21ac6f2..8a313f9 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -171,7 +171,7 @@ SFILES= $(srcdir)/gdbreplay.c $(srcdir)/inferiors.c $(srcdir)/dll.c \ $(srcdir)/nat/mips-linux-watch.c $(srcdir)/common/print-utils.c \ $(srcdir)/common/rsp-low.c $(srcdir)/common/errors.c \ $(srcdir)/common/common-debug.c $(srcdir)/common/cleanups.c \ - $(srcdir)/common/common-exceptions.c + $(srcdir)/common/common-exceptions.c $(srcdir)/symbol.c DEPFILES = @GDBSERVER_DEPFILES@ @@ -185,7 +185,7 @@ OBS = agent.o ax.o inferiors.o regcache.o remote-utils.o server.o signals.o \ mem-break.o hostio.o event-loop.o tracepoint.o xml-utils.o \ common-utils.o ptid.o buffer.o format.o filestuff.o dll.o notif.o \ tdesc.o print-utils.o rsp-low.o errors.o common-debug.o cleanups.o \ - common-exceptions.o \ + common-exceptions.o symbol.o \ $(XML_BUILTIN) $(DEPFILES) $(LIBOBJS) GDBREPLAY_OBS = gdbreplay.o version.o GDBSERVER_LIBS = @GDBSERVER_LIBS@ diff --git a/gdb/gdbserver/symbol.c b/gdb/gdbserver/symbol.c new file mode 100644 index 0000000..6b967d1 --- /dev/null +++ b/gdb/gdbserver/symbol.c @@ -0,0 +1,32 @@ +/* Symbol manipulating routines for the remote server for GDB. + + Copyright (C) 2014 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include "server.h" +#include "target/symbol.h" + +/* See target/symbol.h. */ + +int +find_minimal_symbol_address (const char *name, CORE_ADDR *addr, + struct objfile *objfile) +{ + gdb_assert (objfile == NULL); + + return look_up_one_symbol (name, addr, 1) != 1; +} diff --git a/gdb/minsyms.c b/gdb/minsyms.c index fd7fcd9..f4a20f8 100644 --- a/gdb/minsyms.c +++ b/gdb/minsyms.c @@ -299,6 +299,21 @@ lookup_bound_minimal_symbol (const char *name) return lookup_minimal_symbol (name, NULL, NULL); } +/* See target/symbol.h. */ + +int +find_minimal_symbol_address (const char *name, CORE_ADDR *addr, + struct objfile *objfile) +{ + struct bound_minimal_symbol sym + = lookup_minimal_symbol (name, NULL, objfile); + + if (sym.minsym != NULL) + *addr = BMSYMBOL_VALUE_ADDRESS (sym); + + return sym.minsym == NULL; +} + /* See minsyms.h. */ void diff --git a/gdb/target.h b/gdb/target.h index 2ea7a2d..b07ab3e 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -62,6 +62,7 @@ struct dcache_struct; #include "target/resume.h" #include "target/wait.h" #include "target/waitstatus.h" +#include "target/symbol.h" #include "bfd.h" #include "symtab.h" #include "memattr.h" diff --git a/gdb/target/symbol.h b/gdb/target/symbol.h new file mode 100644 index 0000000..8191b89 --- /dev/null +++ b/gdb/target/symbol.h @@ -0,0 +1,37 @@ +/* Declarations of target symbol functions. + + Copyright (C) 1986-2014 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef TARGET_SYMBOL_H +#define TARGET_SYMBOL_H + +struct objfile; + +/* Find a symbol that matches NAME. Limit the search to OBJFILE if + OBJFILE is non-NULL and the implementation supports limiting the + search to specific object files. NAME may be mangled or demangled. + If a match is found, store the matching symbol's address in ADDR + and return zero. Returns nonzero if no symbol matching NAME is + found. Raise an exception if OBJFILE is non-NULL and the + implementation does not support limiting searches to specific + object files. This function must be provided by the client. */ + +extern int find_minimal_symbol_address (const char *name, CORE_ADDR *addr, + struct objfile *objfile); + +#endif /* TARGET_SYMBOL_H */