X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsparc-nat.c;h=3685e5af410a9bd7bdc7e33abb0a82faf27bc7c5;hb=cd18a823d1ad0787cb0745bf71c7ba447db10c58;hp=bb2b8a398d81acf9057a271e89e781db062aada3;hpb=dfd4cc6311a8cf56cd6f4e0249fc243cface5a7f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c index bb2b8a398d..3685e5af41 100644 --- a/gdb/sparc-nat.c +++ b/gdb/sparc-nat.c @@ -1,6 +1,6 @@ /* Native-dependent code for SPARC. - Copyright (C) 2003-2013 Free Software Foundation, Inc. + Copyright (C) 2003-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -22,11 +22,9 @@ #include "regcache.h" #include "target.h" -#include "gdb_assert.h" #include -#include "gdb_string.h" #include -#include "gdb_wait.h" +#include "gdbsupport/gdb_wait.h" #ifdef HAVE_MACHINE_REG_H #include #endif @@ -81,15 +79,15 @@ typedef struct fp_status fpregset_t; #endif /* Register set description. */ -const struct sparc_gregset *sparc_gregset; -const struct sparc_fpregset *sparc_fpregset; -void (*sparc_supply_gregset) (const struct sparc_gregset *, +const struct sparc_gregmap *sparc_gregmap; +const struct sparc_fpregmap *sparc_fpregmap; +void (*sparc_supply_gregset) (const struct sparc_gregmap *, struct regcache *, int , const void *); -void (*sparc_collect_gregset) (const struct sparc_gregset *, +void (*sparc_collect_gregset) (const struct sparc_gregmap *, const struct regcache *, int, void *); -void (*sparc_supply_fpregset) (const struct sparc_fpregset *, +void (*sparc_supply_fpregset) (const struct sparc_fpregmap *, struct regcache *, int , const void *); -void (*sparc_collect_fpregset) (const struct sparc_fpregset *, +void (*sparc_collect_fpregset) (const struct sparc_fpregmap *, const struct regcache *, int , void *); int (*sparc_gregset_supplies_p) (struct gdbarch *, int); int (*sparc_fpregset_supplies_p) (struct gdbarch *, int); @@ -136,11 +134,10 @@ sparc32_fpregset_supplies_p (struct gdbarch *gdbarch, int regnum) for all registers (including the floating-point registers). */ void -sparc_fetch_inferior_registers (struct target_ops *ops, - struct regcache *regcache, int regnum) +sparc_fetch_inferior_registers (struct regcache *regcache, int regnum) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); - int pid; + struct gdbarch *gdbarch = regcache->arch (); + pid_t pid; /* NOTE: cagney/2002-12-03: This code assumes that the currently selected light weight processes' registers can be written @@ -155,15 +152,13 @@ sparc_fetch_inferior_registers (struct target_ops *ops, These functions should instead be paramaterized with an explicit object (struct regcache, struct thread_info?) into which the LWPs registers can be written. */ - pid = ptid_get_lwp (inferior_ptid); - if (pid == 0) - pid = ptid_get_pid (inferior_ptid); + pid = get_ptrace_pid (regcache->ptid ()); if (regnum == SPARC_G0_REGNUM) { gdb_byte zero[8] = { 0 }; - regcache_raw_supply (regcache, SPARC_G0_REGNUM, &zero); + regcache->raw_supply (SPARC_G0_REGNUM, &zero); return; } @@ -174,7 +169,7 @@ sparc_fetch_inferior_registers (struct target_ops *ops, if (ptrace (PTRACE_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) perror_with_name (_("Couldn't get registers")); - sparc_supply_gregset (sparc_gregset, regcache, -1, ®s); + sparc_supply_gregset (sparc_gregmap, regcache, -1, ®s); if (regnum != -1) return; } @@ -186,22 +181,19 @@ sparc_fetch_inferior_registers (struct target_ops *ops, if (ptrace (PTRACE_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) perror_with_name (_("Couldn't get floating point status")); - sparc_supply_fpregset (sparc_fpregset, regcache, -1, &fpregs); + sparc_supply_fpregset (sparc_fpregmap, regcache, -1, &fpregs); } } void -sparc_store_inferior_registers (struct target_ops *ops, - struct regcache *regcache, int regnum) +sparc_store_inferior_registers (struct regcache *regcache, int regnum) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); - int pid; + struct gdbarch *gdbarch = regcache->arch (); + pid_t pid; /* NOTE: cagney/2002-12-02: See comment in fetch_inferior_registers about threaded assumptions. */ - pid = ptid_get_lwp (inferior_ptid); - if (pid == 0) - pid = ptid_get_pid (inferior_ptid); + pid = get_ptrace_pid (regcache->ptid ()); if (regnum == -1 || sparc_gregset_supplies_p (gdbarch, regnum)) { @@ -210,7 +202,7 @@ sparc_store_inferior_registers (struct target_ops *ops, if (ptrace (PTRACE_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) perror_with_name (_("Couldn't get registers")); - sparc_collect_gregset (sparc_gregset, regcache, regnum, ®s); + sparc_collect_gregset (sparc_gregmap, regcache, regnum, ®s); if (ptrace (PTRACE_SETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) perror_with_name (_("Couldn't write registers")); @@ -237,7 +229,7 @@ sparc_store_inferior_registers (struct target_ops *ops, perror_with_name (_("Couldn't get floating-point registers")); memcpy (&saved_fpregs, &fpregs, sizeof (fpregs)); - sparc_collect_fpregset (sparc_fpregset, regcache, regnum, &fpregs); + sparc_collect_fpregset (sparc_fpregmap, regcache, regnum, &fpregs); /* Writing the floating-point registers will fail on NetBSD with EINVAL if the inferior process doesn't have an FPU state @@ -256,12 +248,14 @@ sparc_store_inferior_registers (struct target_ops *ops, } -/* Fetch StackGhost Per-Process XOR cookie. */ +/* Implement the to_xfer_partial target_ops method for + TARGET_OBJECT_WCOOKIE. Fetch StackGhost Per-Process XOR cookie. */ -static LONGEST +enum target_xfer_status sparc_xfer_wcookie (struct target_ops *ops, enum target_object object, const char *annex, gdb_byte *readbuf, - const gdb_byte *writebuf, ULONGEST offset, LONGEST len) + const gdb_byte *writebuf, ULONGEST offset, ULONGEST len, + ULONGEST *xfered_len) { unsigned long wcookie = 0; char *buf = (char *)&wcookie; @@ -270,9 +264,9 @@ sparc_xfer_wcookie (struct target_ops *ops, enum target_object object, gdb_assert (readbuf && writebuf == NULL); if (offset == sizeof (unsigned long)) - return 0; /* Signal EOF. */ + return TARGET_XFER_EOF; /* Signal EOF. */ if (offset > sizeof (unsigned long)) - return -1; + return TARGET_XFER_E_IO; #ifdef PT_WCOOKIE /* If PT_WCOOKIE is defined (by ), assume we're @@ -280,11 +274,7 @@ sparc_xfer_wcookie (struct target_ops *ops, enum target_object object, later). Since release 3.6, OpenBSD uses a fully randomized cookie. */ { - int pid; - - pid = ptid_get_lwp (inferior_ptid); - if (pid == 0) - pid = ptid_get_pid (inferior_ptid); + int pid = inferior_ptid.pid (); /* Sanity check. The proper type for a cookie is register_t, but we can't assume that this type exists on all systems supported @@ -310,54 +300,19 @@ sparc_xfer_wcookie (struct target_ops *ops, enum target_object object, len = sizeof (unsigned long) - offset; memcpy (readbuf, buf + offset, len); - return len; -} - -LONGEST (*inf_ptrace_xfer_partial) (struct target_ops *, enum target_object, - const char *, gdb_byte *, const gdb_byte *, - ULONGEST, LONGEST); - -static LONGEST -sparc_xfer_partial (struct target_ops *ops, enum target_object object, - const char *annex, gdb_byte *readbuf, - const gdb_byte *writebuf, ULONGEST offset, LONGEST len) -{ - if (object == TARGET_OBJECT_WCOOKIE) - return sparc_xfer_wcookie (ops, object, annex, readbuf, writebuf, - offset, len); - - return inf_ptrace_xfer_partial (ops, object, annex, readbuf, writebuf, - offset, len); -} - -/* Create a prototype generic SPARC target. The client can override - it with local methods. */ - -struct target_ops * -sparc_target (void) -{ - struct target_ops *t; - - t = inf_ptrace_target (); - t->to_fetch_registers = sparc_fetch_inferior_registers; - t->to_store_registers = sparc_store_inferior_registers; - inf_ptrace_xfer_partial = t->to_xfer_partial; - t->to_xfer_partial = sparc_xfer_partial; - return t; + *xfered_len = (ULONGEST) len; + return TARGET_XFER_OK; } - -/* Provide a prototype to silence -Wmissing-prototypes. */ -void _initialize_sparc_nat (void); void _initialize_sparc_nat (void) { /* Deafult to using SunOS 4 register sets. */ - if (sparc_gregset == NULL) - sparc_gregset = &sparc32_sunos4_gregset; - if (sparc_fpregset == NULL) - sparc_fpregset = &sparc32_sunos4_fpregset; + if (sparc_gregmap == NULL) + sparc_gregmap = &sparc32_sunos4_gregmap; + if (sparc_fpregmap == NULL) + sparc_fpregmap = &sparc32_sunos4_fpregmap; if (sparc_supply_gregset == NULL) sparc_supply_gregset = sparc32_supply_gregset; if (sparc_collect_gregset == NULL)