* symtab.c, dbxread.c, stabsread.c: Fix up ANSI-C isms. Fix

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

diff --git a/gdb/hppah-nat.c b/gdb/hppah-nat.c
index 5681658654718c33c734f33db2d49647a8604cac..19e0205e618ada5698d754f07c6eaf2947c2ab19 100644 (file)
--- a/gdb/hppah-nat.c
+++ b/gdb/hppah-nat.c
@@ -20,17 +20,18 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
 #include "defs.h"
 #include "inferior.h"
 #include "target.h"
 #include <sys/ptrace.h>
+#include "gdbcore.h"
 
 extern CORE_ADDR text_end;
 
-static void fetch_register ();
+static void fetch_register PARAMS ((int));
 
 void
 fetch_inferior_registers (regno)
@@ -60,13 +61,15 @@ store_inferior_registers (regno)
 
   if (regno >= 0)
     {
+      if (CANNOT_STORE_REGISTER (regno))
+       return;
       regaddr = register_addr (regno, offset);
       errno = 0;
       if (regno == PCOQ_HEAD_REGNUM || regno == PCOQ_TAIL_REGNUM)
         {
           scratch = *(int *) &registers[REGISTER_BYTE (regno)] | 0x3;
-          ptrace (PT_WUREGS, inferior_pid, (PTRACE_ARG3_TYPE) regaddr,
-                  scratch, 0);
+          call_ptrace (PT_WUREGS, inferior_pid, (PTRACE_ARG3_TYPE) regaddr,
+                  scratch);
           if (errno != 0)
             {
              /* Error, even if attached.  Failing to write these two
@@ -79,8 +82,8 @@ store_inferior_registers (regno)
        for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof(int))
          {
            errno = 0;
-           ptrace (PT_WUREGS, inferior_pid, (PTRACE_ARG3_TYPE) regaddr,
-                   *(int *) &registers[REGISTER_BYTE (regno) + i], 0);
+           call_ptrace (PT_WUREGS, inferior_pid, (PTRACE_ARG3_TYPE) regaddr,
+                   *(int *) &registers[REGISTER_BYTE (regno) + i]);
            if (errno != 0)
              {
                /* Warning, not error, in case we are attached; sometimes the
@@ -90,22 +93,14 @@ store_inferior_registers (regno)
                sprintf (msg, "writing register %s: %s",
                         reg_names[regno], err);
                warning (msg);
-               goto error_exit;
+               return;
              }
            regaddr += sizeof(int);
          }
     }
   else
-    {
-      for (regno = 0; regno < NUM_REGS; regno++)
-       {
-         if (CANNOT_STORE_REGISTER (regno))
-           continue;
-         store_inferior_registers (regno);
-       }
-    }
- error_exit:
-  return;
+    for (regno = 0; regno < NUM_REGS; regno++)
+      store_inferior_registers (regno);
 }
 
 /* Fetch one register.  */
@@ -116,7 +111,6 @@ fetch_register (regno)
 {
   register unsigned int regaddr;
   char buf[MAX_REGISTER_RAW_SIZE];
-  char mess[128];                              /* For messages */
   register int i;
 
   /* Offset of registers within the u area.  */
@@ -128,8 +122,8 @@ fetch_register (regno)
   for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (int))
     {
       errno = 0;
-      *(int *) &buf[i] = ptrace (PT_RUREGS, inferior_pid,
-                                (PTRACE_ARG3_TYPE) regaddr, 0, 0);
+      *(int *) &buf[i] = call_ptrace (PT_RUREGS, inferior_pid,
+                                (PTRACE_ARG3_TYPE) regaddr, 0);
       regaddr += sizeof (int);
       if (errno != 0)
        {
@@ -180,16 +174,16 @@ child_xfer_memory (memaddr, myaddr, len, write, target)
 
       if (addr != memaddr || len < (int)sizeof (int)) {
        /* Need part of initial word -- fetch it.  */
-        buffer[0] = ptrace (addr < text_end ? PT_RIUSER : PT_RDUSER, 
-                           inferior_pid, (PTRACE_ARG3_TYPE) addr, 0, 0);
+        buffer[0] = call_ptrace (addr < text_end ? PT_RIUSER : PT_RDUSER, 
+                           inferior_pid, (PTRACE_ARG3_TYPE) addr, 0);
       }
 
       if (count > 1)           /* FIXME, avoid if even boundary */
        {
          buffer[count - 1]
-           = ptrace (addr < text_end ? PT_RIUSER : PT_RDUSER, inferior_pid,
+           = call_ptrace (addr < text_end ? PT_RIUSER : PT_RDUSER, inferior_pid,
                      (PTRACE_ARG3_TYPE) (addr + (count - 1) * sizeof (int)),
-                     0, 0);
+                     0);
        }
 
       /* Copy data to be written over corresponding part of buffer */
@@ -205,9 +199,9 @@ child_xfer_memory (memaddr, myaddr, len, write, target)
    WIUSER, or do these idiots really expect us to figure out which segment
    the address is in, so we can use a separate system call for it??!  */
          errno = 0;
-         ptrace (addr < text_end ? PT_WIUSER : PT_WDUSER, inferior_pid, 
+         call_ptrace (addr < text_end ? PT_WIUSER : PT_WDUSER, inferior_pid, 
                  (PTRACE_ARG3_TYPE) addr,
-                 buffer[i], 0);
+                 buffer[i]);
          if (errno)
            return 0;
        }
@@ -218,8 +212,8 @@ child_xfer_memory (memaddr, myaddr, len, write, target)
       for (i = 0; i < count; i++, addr += sizeof (int))
        {
          errno = 0;
-         buffer[i] = ptrace (addr < text_end ? PT_RIUSER : PT_RDUSER, 
-                             inferior_pid, (PTRACE_ARG3_TYPE) addr, 0, 0);
+         buffer[i] = call_ptrace (addr < text_end ? PT_RIUSER : PT_RDUSER, 
+                             inferior_pid, (PTRACE_ARG3_TYPE) addr, 0);
          if (errno)
            return 0;
          QUIT;