Rephrase error message in infcall.c:call_function_by_hand

[deliverable/binutils-gdb.git] / gdb / sparc-nat.c

diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c
index f2d73c0d4ea17cce83548cb675d3bd116500ee86..3d936fcc8fc9fec7e14aea8b0cfd65e726ea9295 100644 (file)
--- a/gdb/sparc-nat.c
+++ b/gdb/sparc-nat.c
@@ -1,12 +1,13 @@
 /* Native-dependent code for SPARC.
 
 /* Native-dependent code for SPARC.
 

-   Copyright 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011
+   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
 
    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 2 of the License, or
+   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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "inferior.h"
 
 #include "defs.h"
 #include "inferior.h"


@@ -90,13 +89,13 @@ void (*sparc_collect_gregset) (const struct sparc_gregset *,
                               const struct regcache *, int, void *);
 void (*sparc_supply_fpregset) (struct regcache *, int , const void *);
 void (*sparc_collect_fpregset) (const struct regcache *, int , void *);
                               const struct regcache *, int, void *);
 void (*sparc_supply_fpregset) (struct regcache *, int , const void *);
 void (*sparc_collect_fpregset) (const struct regcache *, int , void *);

-int (*sparc_gregset_supplies_p) (int);
-int (*sparc_fpregset_supplies_p) (int);
+int (*sparc_gregset_supplies_p) (struct gdbarch *, int);
+int (*sparc_fpregset_supplies_p) (struct gdbarch *, int);

 
 /* Determine whether `gregset_t' contains register REGNUM.  */
 
 int
 
 /* Determine whether `gregset_t' contains register REGNUM.  */
 
 int

-sparc32_gregset_supplies_p (int regnum)
+sparc32_gregset_supplies_p (struct gdbarch *gdbarch, int regnum)

 {
   /* Integer registers.  */
   if ((regnum >= SPARC_G1_REGNUM && regnum <= SPARC_G7_REGNUM)
 {
   /* Integer registers.  */
   if ((regnum >= SPARC_G1_REGNUM && regnum <= SPARC_G7_REGNUM)


@@ -118,7 +117,7 @@ sparc32_gregset_supplies_p (int regnum)
 /* Determine whether `fpregset_t' contains register REGNUM.  */
 
 int
 /* Determine whether `fpregset_t' contains register REGNUM.  */
 
 int

-sparc32_fpregset_supplies_p (int regnum)
+sparc32_fpregset_supplies_p (struct gdbarch *gdbarch, int regnum)

 {
   /* Floating-point registers.  */
   if (regnum >= SPARC_F0_REGNUM && regnum <= SPARC_F31_REGNUM)
 {
   /* Floating-point registers.  */
   if (regnum >= SPARC_F0_REGNUM && regnum <= SPARC_F31_REGNUM)


@@ -135,9 +134,10 @@ sparc32_fpregset_supplies_p (int regnum)
    for all registers (including the floating-point registers).  */
 
 void
    for all registers (including the floating-point registers).  */
 
 void

-fetch_inferior_registers (int regnum)
+sparc_fetch_inferior_registers (struct target_ops *ops,
+                               struct regcache *regcache, int regnum)

 {
 {

-  struct regcache *regcache = current_regcache;
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);

   int pid;
 
   /* NOTE: cagney/2002-12-03: This code assumes that the currently
   int pid;
 
   /* NOTE: cagney/2002-12-03: This code assumes that the currently


@@ -159,11 +159,13 @@ fetch_inferior_registers (int regnum)
 
   if (regnum == SPARC_G0_REGNUM)
     {
 
   if (regnum == SPARC_G0_REGNUM)
     {

-      regcache_raw_supply (regcache, SPARC_G0_REGNUM, NULL);
+      gdb_byte zero[8] = { 0 };
+
+      regcache_raw_supply (regcache, SPARC_G0_REGNUM, &zero);

       return;
     }
 
       return;
     }
 

-  if (regnum == -1 || sparc_gregset_supplies_p (regnum))
+  if (regnum == -1 || sparc_gregset_supplies_p (gdbarch, regnum))

     {
       gregset_t regs;
 
     {
       gregset_t regs;
 


@@ -175,7 +177,7 @@ fetch_inferior_registers (int regnum)
        return;
     }
 
        return;
     }
 

-  if (regnum == -1 || sparc_fpregset_supplies_p (regnum))
+  if (regnum == -1 || sparc_fpregset_supplies_p (gdbarch, regnum))

     {
       fpregset_t fpregs;
 
     {
       fpregset_t fpregs;
 


@@ -187,9 +189,10 @@ fetch_inferior_registers (int regnum)
 }
 
 void
 }
 
 void

-store_inferior_registers (int regnum)
+sparc_store_inferior_registers (struct target_ops *ops,
+                               struct regcache *regcache, int regnum)

 {
 {

-  struct regcache *regcache = current_regcache;
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);

   int pid;
 
   /* NOTE: cagney/2002-12-02: See comment in fetch_inferior_registers
   int pid;
 
   /* NOTE: cagney/2002-12-02: See comment in fetch_inferior_registers


@@ -198,7 +201,7 @@ store_inferior_registers (int regnum)
   if (pid == 0)
     pid = PIDGET (inferior_ptid);
 
   if (pid == 0)
     pid = PIDGET (inferior_ptid);
 

-  if (regnum == -1 || sparc_gregset_supplies_p (regnum))
+  if (regnum == -1 || sparc_gregset_supplies_p (gdbarch, regnum))

     {
       gregset_t regs;
 
     {
       gregset_t regs;
 


@@ -224,7 +227,7 @@ store_inferior_registers (int regnum)
        return;
     }
 
        return;
     }
 

-  if (regnum == -1 || sparc_fpregset_supplies_p (regnum))
+  if (regnum == -1 || sparc_fpregset_supplies_p (gdbarch, regnum))

     {
       fpregset_t fpregs, saved_fpregs;
 
     {
       fpregset_t fpregs, saved_fpregs;
 


@@ -255,8 +258,8 @@ store_inferior_registers (int regnum)
 
 LONGEST
 sparc_xfer_wcookie (struct target_ops *ops, enum target_object object,
 
 LONGEST
 sparc_xfer_wcookie (struct target_ops *ops, enum target_object object,

-                   const char *annex, void *readbuf, const void *writebuf,
-                   ULONGEST offset, LONGEST len)
+                   const char *annex, gdb_byte *readbuf,
+                   const gdb_byte *writebuf, ULONGEST offset, LONGEST len)

 {
   unsigned long wcookie = 0;
   char *buf = (char *)&wcookie;
 {
   unsigned long wcookie = 0;
   char *buf = (char *)&wcookie;


@@ -264,14 +267,16 @@ sparc_xfer_wcookie (struct target_ops *ops, enum target_object object,
   gdb_assert (object == TARGET_OBJECT_WCOOKIE);
   gdb_assert (readbuf && writebuf == NULL);
 
   gdb_assert (object == TARGET_OBJECT_WCOOKIE);
   gdb_assert (readbuf && writebuf == NULL);
 

-  if (offset >= sizeof (unsigned long))
+  if (offset == sizeof (unsigned long))
+    return 0;                  /* Signal EOF.  */
+  if (offset > sizeof (unsigned long))

     return -1;
 
 #ifdef PT_WCOOKIE
   /* If PT_WCOOKIE is defined (by <sys/ptrace.h>), assume we're
      running on an OpenBSD release that uses StackGhost (3.1 or
     return -1;
 
 #ifdef PT_WCOOKIE
   /* If PT_WCOOKIE is defined (by <sys/ptrace.h>), assume we're
      running on an OpenBSD release that uses StackGhost (3.1 or

-     later).  As of release 3.4, OpenBSD doesn't use a randomized
-     cookie yet, but a future release probably will.  */
+     later).  Since release 3.6, OpenBSD uses a fully randomized
+     cookie.  */

   {
     int pid;
 
   {
     int pid;
 


@@ -307,13 +312,13 @@ sparc_xfer_wcookie (struct target_ops *ops, enum target_object object,
 }
 
 LONGEST (*inf_ptrace_xfer_partial) (struct target_ops *, enum target_object,
 }
 
 LONGEST (*inf_ptrace_xfer_partial) (struct target_ops *, enum target_object,

-                                   const char *, void *, const void *,
+                                   const char *, gdb_byte *, const gdb_byte *,

                                    ULONGEST, LONGEST);
 
 static LONGEST
 sparc_xfer_partial (struct target_ops *ops, enum target_object object,
                                    ULONGEST, LONGEST);
 
 static LONGEST
 sparc_xfer_partial (struct target_ops *ops, enum target_object object,

-                   const char *annex, void *readbuf, const void *writebuf,
-                   ULONGEST offset, LONGEST len)
+                   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, 
 {
   if (object == TARGET_OBJECT_WCOOKIE)
     return sparc_xfer_wcookie (ops, object, annex, readbuf, writebuf, 


@@ -332,8 +337,8 @@ sparc_target (void)
   struct target_ops *t;
 
   t = inf_ptrace_target ();
   struct target_ops *t;
 
   t = inf_ptrace_target ();

-  t->to_fetch_registers = fetch_inferior_registers;
-  t->to_store_registers = store_inferior_registers;
+  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;
   inf_ptrace_xfer_partial = t->to_xfer_partial;
   t->to_xfer_partial = sparc_xfer_partial;
   return t;