From patchwork Wed Jul 16 14:17:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2091 Received: (qmail 4028 invoked by alias); 16 Jul 2014 17:04:01 -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 4018 invoked by uid 89); 16 Jul 2014 17:04:00 -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; Wed, 16 Jul 2014 17:03:58 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6GGJbjP004113 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Jul 2014 12:19:37 -0400 Received: from blade.nx (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6GGJZjS007781; Wed, 16 Jul 2014 12:19:36 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 9CE2A2640D2; Wed, 16 Jul 2014 15:17:31 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Cc: Tom Tromey , Doug Evans Subject: [PATCH 12/15 v2] Add target/symbol.h, update users Date: Wed, 16 Jul 2014 15:17:20 +0100 Message-Id: <1405520243-17282-13-git-send-email-gbenson@redhat.com> In-Reply-To: <1405520243-17282-1-git-send-email-gbenson@redhat.com> References: <1405520243-17282-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This adds a new "target/symbol.h" file, that declares a symbol-lookup function used by code in common. It follows the usual pattern, where clients of "common" have their own definitions of this function. This simplifies agent.c a bit. gdb/ 2014-07-16 Tom Tromey Gary Benson * target/symbol.h: New file. * target.h: Include target/symbol.h. * target.c (target_look_up_symbol): New function. * common/agent.c: Include target/symbol.h. (agent_look_up_symbols): Use target_look_up_symbol. gdb/gdbserver/ 2014-07-16 Tom Tromey Gary Benson * target.c: Include target/symbol.h. (target_look_up_symbol): New function. --- gdb/ChangeLog | 9 +++++++++ gdb/common/agent.c | 13 ++----------- gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/target.c | 12 ++++++++++++ gdb/target.c | 14 ++++++++++++++ gdb/target.h | 1 + gdb/target/symbol.h | 36 ++++++++++++++++++++++++++++++++++++ 7 files changed, 80 insertions(+), 11 deletions(-) create mode 100644 gdb/target/symbol.h diff --git a/gdb/common/agent.c b/gdb/common/agent.c index 0fde2fd..798dd1d 100644 --- a/gdb/common/agent.c +++ b/gdb/common/agent.c @@ -31,6 +31,7 @@ #include "common-types.h" #include "target/target.h" +#include "target/symbol.h" #include "errors.h" #include "ptid.h" #include "gdb_locale.h" @@ -111,18 +112,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 d4907b6..44a324b 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1322,6 +1322,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 2a4783c..bb776e4 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 */