From patchwork Fri Aug 1 10:19:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2277 Received: (qmail 1446 invoked by alias); 1 Aug 2014 10:28:04 -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 843 invoked by uid 89); 1 Aug 2014 10:28:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 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, 01 Aug 2014 10:28:00 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s71AJl3D027379 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 1 Aug 2014 06:19:47 -0400 Received: from blade.nx (ovpn-116-104.ams2.redhat.com [10.36.116.104]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s71AJkr1027906; Fri, 1 Aug 2014 06:19:46 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id A79882640DB; Fri, 1 Aug 2014 11:19:44 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Cc: Doug Evans , Pedro Alves , Tom Tromey Subject: [PATCH 06/11 v5] Add target/symbol.h Date: Fri, 1 Aug 2014 11:19:32 +0100 Message-Id: <1406888377-25795-7-git-send-email-gbenson@redhat.com> In-Reply-To: <1406888377-25795-1-git-send-email-gbenson@redhat.com> References: <1406888377-25795-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This adds 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. gdb/ 2014-08-01 Tom Tromey Gary Benson * target/symbol.h: New file. * Makefile.in (HFILES_NO_SRCDIR): Add target/symbol.h. * target.h: Include target/symbol.h. * target.c (target_look_up_symbol): New function. * common/agent.c: Include target/symbol.h. [!GDBSERVER]: Don't include objfiles.h. (agent_look_up_symbols): Use target_look_up_symbol. gdb/gdbserver/ 2014-08-01 Tom Tromey Gary Benson * target.c: Include target/symbol.h. (target_look_up_symbol): New function. --- gdb/ChangeLog | 11 +++++++++++ gdb/Makefile.in | 2 +- gdb/common/agent.c | 14 ++------------ gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/target.c | 12 ++++++++++++ gdb/target.c | 14 ++++++++++++++ gdb/target.h | 1 + gdb/target/symbol.h | 36 ++++++++++++++++++++++++++++++++++++ 8 files changed, 83 insertions(+), 13 deletions(-) create mode 100644 gdb/target/symbol.h diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 090c912..fea7550 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -936,7 +936,7 @@ ctf.h nat/i386-cpuid.h nat/i386-gcc-cpuid.h target/resume.h \ 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 target/target.h +common/common-debug.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 5c19454..d68e50e 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,8 @@ 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 (target_look_up_symbol (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/target.c b/gdb/gdbserver/target.c index 6ba375c..ad249a0 100644 --- a/gdb/gdbserver/target.c +++ b/gdb/gdbserver/target.c @@ -20,6 +20,7 @@ #include "server.h" #include "tracepoint.h" +#include "target/symbol.h" struct target_ops *the_target; @@ -168,6 +169,17 @@ target_resume (ptid_t ptid, int step, enum gdb_signal signal) (*the_target->resume) (&resume_info, 1); } +/* See target/symbol.h. */ + +int +target_look_up_symbol (const char *name, CORE_ADDR *addr, + struct objfile *objfile) +{ + gdb_assert (objfile == NULL); + + return look_up_one_symbol (name, addr, 1); +} + int start_non_stop (int nonstop) { diff --git a/gdb/target.c b/gdb/target.c index 1773eff..fd5a806 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1292,6 +1292,20 @@ target_read_uint32 (CORE_ADDR memaddr, unsigned int *result) return 0; } +/* See target/symbol.h. */ + +int +target_look_up_symbol (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; +} + /* Like target_read_memory, but specify explicitly that this is a read from the target's raw memory. That is, this read bypasses the dcache, breakpoint shadowing, etc. */ diff --git a/gdb/target.h b/gdb/target.h index 1a10744..f16c84c 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..bb37b72 --- /dev/null +++ b/gdb/target/symbol.h @@ -0,0 +1,36 @@ +/* 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. If a match is found, store the + matching symbol's address in ADDR and return nonzero. Return zero + 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. */ + +extern int target_look_up_symbol (const char *name, CORE_ADDR *addr, + struct objfile *objfile); + +#endif /* TARGET_SYMBOL_H */