[PATCH 12/15] Add target/symbol.h, update users

Gary Benson
2014-07-09T11:25:57Z

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-09 Tom Tromey <tromey@redhat.com>

* 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-09 Tom Tromey <tromey@redhat.com>

* target.c: Include target/symbol.h.
(target_look_up_symbol): New function.
---
gdb/ChangeLog | 8 ++++++++
gdb/common/agent.c | 13 ++-----------
gdb/gdbserver/ChangeLog | 5 +++++
gdb/gdbserver/target.c | 9 +++++++++
gdb/target.c | 13 +++++++++++++
gdb/target.h | 1 +
gdb/target/symbol.h | 26 ++++++++++++++++++++++++++
7 files changed, 64 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 f93163e..58b3d8c 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,14 @@ 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, void *data)
+{
+ 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 0796059..047f6ec 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -1322,6 +1322,19 @@ 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, void *data)
+{
+ struct bound_minimal_symbol sym
+ = lookup_minimal_symbol (name, NULL, (struct objfile *) data);
+
+ 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..3e4591f
--- /dev/null
+++ b/gdb/target/symbol.h
@@ -0,0 +1,26 @@
+/* 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 <http://www.gnu.org/licenses/>. */
+
+#ifndef TARGET_SYMBOL_H
+#define TARGET_SYMBOL_H
+
+extern int target_look_up_symbol (const char *name, CORE_ADDR *addr,
+ void *data);
+
+#endif /* TARGET_SYMBOL_H */
--
1.7.1