From 637f7d589ae8d57e1996dcc93167ded09aaea56d Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Thu, 10 May 2007 21:36:00 +0000 Subject: * inf-ptrace.c (inf_ptrace_register_u_offset): Adapt parameter list. (inf_ptrace_fetch_register): Add register_u_offset callback parameters GDBARCH and STORE_P. Handle callback (CORE_ADDR) -1 return value. (inf_ptrace_store_register): Likewise. (inf_ptrace_trad_target): Adapt register_u_offset parameter list. * inf-ptrace.h (inf_ptrace_trad_target): Likewise. * vax-nat.c (vax_register_u_offset): Adapt parameter list. * linux-nat.c (linux_trad_target): Adapt parameter list. * linux-nat.h (linux_trad_target): Likewise. * alpha-linux-nat.c (alpha_linux_register_u_offset): Adapt parameters. * mips-linux-nat.c (mips_linux_cannot_fetch_register): Remove. (mips_linux_cannot_store_register): Likewise. (mips_linux_register_addr): Add GDBARCH and STORE_P parameters. Return (CORE_ADDR) -1 for registers that cannot be fetched or stored via ptrace. Use GDBARCH instead of current_gdbarch. (mips64_linux_register_addr): Likewise. (mips_linux_register_u_offset): Adapt parameter list. Pass GDBARCH and STORE_P on to mips{64}_linux_register_addr. * config/mips/linux.mh (NAT_FILE): Set to config/nm-linux.h. * config/mips/nm-linux.h: Delete file. --- gdb/inf-ptrace.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gdb/inf-ptrace.c') diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c index bc3219ebc41..19826bd533c 100644 --- a/gdb/inf-ptrace.c +++ b/gdb/inf-ptrace.c @@ -612,7 +612,7 @@ inf_ptrace_target (void) /* Pointer to a function that returns the offset within the user area where a particular register is stored. */ -static CORE_ADDR (*inf_ptrace_register_u_offset)(int); +static CORE_ADDR (*inf_ptrace_register_u_offset)(struct gdbarch *, int, int); /* Fetch register REGNUM from the inferior. */ @@ -624,7 +624,9 @@ inf_ptrace_fetch_register (struct regcache *regcache, int regnum) PTRACE_TYPE_RET *buf; int pid, i; - if (CANNOT_FETCH_REGISTER (regnum)) + /* This isn't really an address, but ptrace thinks of it as one. */ + addr = inf_ptrace_register_u_offset (current_gdbarch, regnum, 0); + if (addr == (CORE_ADDR)-1 || CANNOT_FETCH_REGISTER (regnum)) { regcache_raw_supply (regcache, regnum, NULL); return; @@ -636,10 +638,7 @@ inf_ptrace_fetch_register (struct regcache *regcache, int regnum) if (pid == 0) pid = ptid_get_pid (inferior_ptid); - /* This isn't really an address, but ptrace thinks of it as one. */ - addr = inf_ptrace_register_u_offset (regnum); size = register_size (current_gdbarch, regnum); - gdb_assert ((size % sizeof (PTRACE_TYPE_RET)) == 0); buf = alloca (size); @@ -680,7 +679,9 @@ inf_ptrace_store_register (const struct regcache *regcache, int regnum) PTRACE_TYPE_RET *buf; int pid, i; - if (CANNOT_STORE_REGISTER (regnum)) + /* This isn't really an address, but ptrace thinks of it as one. */ + addr = inf_ptrace_register_u_offset (current_gdbarch, regnum, 1); + if (addr == (CORE_ADDR)-1 || CANNOT_STORE_REGISTER (regnum)) return; /* Cater for systems like GNU/Linux, that implement threads as @@ -689,10 +690,7 @@ inf_ptrace_store_register (const struct regcache *regcache, int regnum) if (pid == 0) pid = ptid_get_pid (inferior_ptid); - /* This isn't really an address, but ptrace thinks of it as one. */ - addr = inf_ptrace_register_u_offset (regnum); size = register_size (current_gdbarch, regnum); - gdb_assert ((size % sizeof (PTRACE_TYPE_RET)) == 0); buf = alloca (size); @@ -728,7 +726,8 @@ inf_ptrace_store_registers (struct regcache *regcache, int regnum) particular register is stored. */ struct target_ops * -inf_ptrace_trad_target (CORE_ADDR (*register_u_offset)(int)) +inf_ptrace_trad_target (CORE_ADDR (*register_u_offset) + (struct gdbarch *, int, int)) { struct target_ops *t = inf_ptrace_target(); -- cgit v1.2.1