aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Weigand <uweigand@de.ibm.com>2007-10-30 21:58:01 +0000
committerUlrich Weigand <uweigand@de.ibm.com>2007-10-30 21:58:01 +0000
commit3b3b142300dd9f35e12311263b1004b9618baa6b (patch)
treeab2e28cd0ba626bd160486379405b01d57753d82
parent8d90747a2d91f82f8ed34558d36fa6994cb56fb5 (diff)
downloadgdb-3b3b142300dd9f35e12311263b1004b9618baa6b.zip
gdb-3b3b142300dd9f35e12311263b1004b9618baa6b.tar.gz
gdb-3b3b142300dd9f35e12311263b1004b9618baa6b.tar.bz2
2007-10-30 Markus Deuling <deuling@de.ibm.com>
* inf-ptrace.c (inf_ptrace_fetch_registers) (inf_ptrace_fetch_register, inf_ptrace_store_register) (inf_ptrace_store_registers): Use get_regcache_arch to get at the current architecture by regcache.
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/inf-ptrace.c26
2 files changed, 23 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1509684..d9cecfd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
2007-10-30 Markus Deuling <deuling@de.ibm.com>
+ * inf-ptrace.c (inf_ptrace_fetch_registers)
+ (inf_ptrace_fetch_register, inf_ptrace_store_register)
+ (inf_ptrace_store_registers): Use get_regcache_arch to get at the
+ current architecture by regcache.
+
+2007-10-30 Markus Deuling <deuling@de.ibm.com>
+
* hpux-thread.c (hpux_thread_fetch_registers)
(hpux_thread_store_registers): Use get_regcache_arch to get at the
current architecture by regcache.
diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index 7a9957b..af0b1b8 100644
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -617,15 +617,16 @@ static CORE_ADDR (*inf_ptrace_register_u_offset)(struct gdbarch *, int, int);
static void
inf_ptrace_fetch_register (struct regcache *regcache, int regnum)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
CORE_ADDR addr;
size_t size;
PTRACE_TYPE_RET *buf;
int pid, i;
/* This isn't really an address, but ptrace thinks of it as one. */
- addr = inf_ptrace_register_u_offset (current_gdbarch, regnum, 0);
+ addr = inf_ptrace_register_u_offset (gdbarch, regnum, 0);
if (addr == (CORE_ADDR)-1
- || gdbarch_cannot_fetch_register (current_gdbarch, regnum))
+ || gdbarch_cannot_fetch_register (gdbarch, regnum))
{
regcache_raw_supply (regcache, regnum, NULL);
return;
@@ -637,7 +638,7 @@ inf_ptrace_fetch_register (struct regcache *regcache, int regnum)
if (pid == 0)
pid = ptid_get_pid (inferior_ptid);
- size = register_size (current_gdbarch, regnum);
+ size = register_size (gdbarch, regnum);
gdb_assert ((size % sizeof (PTRACE_TYPE_RET)) == 0);
buf = alloca (size);
@@ -648,7 +649,7 @@ inf_ptrace_fetch_register (struct regcache *regcache, int regnum)
buf[i] = ptrace (PT_READ_U, pid, (PTRACE_TYPE_ARG3)(uintptr_t)addr, 0);
if (errno != 0)
error (_("Couldn't read register %s (#%d): %s."),
- gdbarch_register_name (current_gdbarch, regnum),
+ gdbarch_register_name (gdbarch, regnum),
regnum, safe_strerror (errno));
addr += sizeof (PTRACE_TYPE_RET);
@@ -663,7 +664,9 @@ static void
inf_ptrace_fetch_registers (struct regcache *regcache, int regnum)
{
if (regnum == -1)
- for (regnum = 0; regnum < gdbarch_num_regs (current_gdbarch); regnum++)
+ for (regnum = 0;
+ regnum < gdbarch_num_regs (get_regcache_arch (regcache));
+ regnum++)
inf_ptrace_fetch_register (regcache, regnum);
else
inf_ptrace_fetch_register (regcache, regnum);
@@ -674,15 +677,16 @@ inf_ptrace_fetch_registers (struct regcache *regcache, int regnum)
static void
inf_ptrace_store_register (const struct regcache *regcache, int regnum)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
CORE_ADDR addr;
size_t size;
PTRACE_TYPE_RET *buf;
int pid, i;
/* This isn't really an address, but ptrace thinks of it as one. */
- addr = inf_ptrace_register_u_offset (current_gdbarch, regnum, 1);
+ addr = inf_ptrace_register_u_offset (gdbarch, regnum, 1);
if (addr == (CORE_ADDR)-1
- || gdbarch_cannot_store_register (current_gdbarch, regnum))
+ || gdbarch_cannot_store_register (gdbarch, regnum))
return;
/* Cater for systems like GNU/Linux, that implement threads as
@@ -691,7 +695,7 @@ inf_ptrace_store_register (const struct regcache *regcache, int regnum)
if (pid == 0)
pid = ptid_get_pid (inferior_ptid);
- size = register_size (current_gdbarch, regnum);
+ size = register_size (gdbarch, regnum);
gdb_assert ((size % sizeof (PTRACE_TYPE_RET)) == 0);
buf = alloca (size);
@@ -703,7 +707,7 @@ inf_ptrace_store_register (const struct regcache *regcache, int regnum)
ptrace (PT_WRITE_U, pid, (PTRACE_TYPE_ARG3)(uintptr_t)addr, buf[i]);
if (errno != 0)
error (_("Couldn't write register %s (#%d): %s."),
- gdbarch_register_name (current_gdbarch, regnum),
+ gdbarch_register_name (gdbarch, regnum),
regnum, safe_strerror (errno));
addr += sizeof (PTRACE_TYPE_RET);
@@ -717,7 +721,9 @@ void
inf_ptrace_store_registers (struct regcache *regcache, int regnum)
{
if (regnum == -1)
- for (regnum = 0; regnum < gdbarch_num_regs (current_gdbarch); regnum++)
+ for (regnum = 0;
+ regnum < gdbarch_num_regs (get_regcache_arch (regcache));
+ regnum++)
inf_ptrace_store_register (regcache, regnum);
else
inf_ptrace_store_register (regcache, regnum);