aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2012-03-06 19:51:10 +0000
committerTom Tromey <tromey@redhat.com>2012-03-06 19:51:10 +0000
commitc988ad8730c12b2b3b7c936e522152fe1fe188ad (patch)
tree0c7c153b2864773889cc8be530215cc52907e9db
parent8131799e803904f7ebcd0c32a531ac1bb903fca1 (diff)
downloadgdb-c988ad8730c12b2b3b7c936e522152fe1fe188ad.zip
gdb-c988ad8730c12b2b3b7c936e522152fe1fe188ad.tar.gz
gdb-c988ad8730c12b2b3b7c936e522152fe1fe188ad.tar.bz2
* proc-service.c (ps_pglobal_lookup): Set the current program
space.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/proc-service.c16
2 files changed, 18 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6fe3ae9..f28fbfd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-06 Tom Tromey <tromey@redhat.com>
+
+ * proc-service.c (ps_pglobal_lookup): Set the current program
+ space.
+
2012-03-06 Pedro Alves <palves@redhat.com>
* gregset.h [HAVE_SYS_PROCFS_H]: Include <sys/procfs.h>.
diff --git a/gdb/proc-service.c b/gdb/proc-service.c
index e317414..a1f90a8 100644
--- a/gdb/proc-service.c
+++ b/gdb/proc-service.c
@@ -201,14 +201,24 @@ ps_pglobal_lookup (gdb_ps_prochandle_t ph, const char *obj,
const char *name, psaddr_t *sym_addr)
{
struct minimal_symbol *ms;
+ struct cleanup *old_chain = save_current_program_space ();
+ struct inferior *inf = find_inferior_pid (ptid_get_pid (ph->ptid));
+ ps_err_e result;
+
+ set_current_program_space (inf->pspace);
/* FIXME: kettenis/2000-09-03: What should we do with OBJ? */
ms = lookup_minimal_symbol (name, NULL, NULL);
if (ms == NULL)
- return PS_NOSYM;
+ result = PS_NOSYM;
+ else
+ {
+ *sym_addr = core_addr_to_ps_addr (SYMBOL_VALUE_ADDRESS (ms));
+ result = PS_OK;
+ }
- *sym_addr = core_addr_to_ps_addr (SYMBOL_VALUE_ADDRESS (ms));
- return PS_OK;
+ do_cleanups (old_chain);
+ return result;
}
/* Read SIZE bytes from the target process PH at address ADDR and copy