* serial.h (SERIAL_SET_TTY_STATE): Comment return value.

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

diff --git a/gdb/hppah-nat.c b/gdb/hppah-nat.c
index 138697b1dda49520fe822266ba9d870f9d454217..5681658654718c33c734f33db2d49647a8604cac 100644 (file)
--- a/gdb/hppah-nat.c
+++ b/gdb/hppah-nat.c
@@ -32,58 +32,6 @@ extern CORE_ADDR text_end;
 
 static void fetch_register ();
 
-/* This function simply calls ptrace with the given arguments.  
-   It exists so that all calls to ptrace are isolated in this 
-   machine-dependent file. */
-int
-call_ptrace (request, pid, addr, data)
-     int request, pid;
-     PTRACE_ARG3_TYPE addr;
-     int data;
-{
-  return ptrace (request, pid, addr, data, 0);
-}
-
-void
-kill_inferior ()
-{
-  if (inferior_pid == 0)
-    return;
-  ptrace (PT_EXIT, inferior_pid, (PTRACE_ARG3_TYPE) 0, 0, 0);
-  wait ((int *)0);
-  target_mourn_inferior ();
-}
-
-/* Start debugging the process whose number is PID.  */
-int
-attach (pid)
-     int pid;
-{
-  errno = 0;
-  ptrace (PT_ATTACH, pid, (PTRACE_ARG3_TYPE) 0, 0, 0);
-  if (errno)
-    perror_with_name ("ptrace");
-  attach_flag = 1;
-  return pid;
-}
-
-/* Stop debugging the process whose number is PID
-   and continue it with signal number SIGNAL.
-   SIGNAL = 0 means just continue it.  */
-
-void
-detach (signal)
-     int signal;
-{
-  errno = 0;
-  ptrace (PT_DETACH, inferior_pid, (PTRACE_ARG3_TYPE) 1, signal, 0);
-  if (errno)
-    perror_with_name ("ptrace");
-  attach_flag = 0;
-}
-
-/* Fetch all registers, or just one, from the child process.  */
-
 void
 fetch_inferior_registers (regno)
      int regno;
@@ -121,7 +69,9 @@ store_inferior_registers (regno)
                   scratch, 0);
           if (errno != 0)
             {
-              sprintf (buf, "writing register number %d(%d)", regno, i);
+             /* Error, even if attached.  Failing to write these two
+                registers is pretty serious.  */
+              sprintf (buf, "writing register number %d", regno);
               perror_with_name (buf);
             }
         }
@@ -133,8 +83,14 @@ store_inferior_registers (regno)
                    *(int *) &registers[REGISTER_BYTE (regno) + i], 0);
            if (errno != 0)
              {
-               sprintf (buf, "writing register number %d(%d)", regno, i);
-               perror_with_name (buf);
+               /* Warning, not error, in case we are attached; sometimes the
+                  kernel doesn't let us at the registers.  */
+               char *err = safe_strerror (errno);
+               char *msg = alloca (strlen (err) + 128);
+               sprintf (msg, "writing register %s: %s",
+                        reg_names[regno], err);
+               warning (msg);
+               goto error_exit;
              }
            regaddr += sizeof(int);
          }
@@ -145,34 +101,10 @@ store_inferior_registers (regno)
        {
          if (CANNOT_STORE_REGISTER (regno))
            continue;
-         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);
-              if (errno != 0)
-                {
-                  sprintf (buf, "writing register number %d(%d)", regno, i);
-                  perror_with_name (buf);
-                }
-            }
-          else
-           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);
-               if (errno != 0)
-                 {
-                   sprintf (buf, "writing register number %d(%d)", regno, i);
-                   perror_with_name (buf);
-                 }
-               regaddr += sizeof(int);
-             }
+         store_inferior_registers (regno);
        }
     }
+ error_exit:
   return;
 }
 
@@ -201,37 +133,19 @@ fetch_register (regno)
       regaddr += sizeof (int);
       if (errno != 0)
        {
-         sprintf (mess, "reading register %s (#%d)", reg_names[regno], regno);
-         perror_with_name (mess);
+         /* Warning, not error, in case we are attached; sometimes the
+            kernel doesn't let us at the registers.  */
+         char *err = safe_strerror (errno);
+         char *msg = alloca (strlen (err) + 128);
+         sprintf (msg, "reading register %s: %s", reg_names[regno], err);
+         warning (msg);
+         goto error_exit;
        }
     }
   if (regno == PCOQ_HEAD_REGNUM || regno == PCOQ_TAIL_REGNUM)
     buf[3] &= ~0x3;
   supply_register (regno, buf);
-}
-
-/* Resume execution of the inferior process.
-   If STEP is nonzero, single-step it.
-   If SIGNAL is nonzero, give it that signal.  */
-
-void
-child_resume (step, signal)
-     int step;
-     int signal;
-{
-  errno = 0;
-
-  /* An address of (PTRACE_ARG3_TYPE) 1 tells ptrace to continue from where
-     it was. (If GDB wanted it to start some other way, we have already
-     written a new PC value to the child.)  */
-
-  if (step)
-    ptrace (PT_SINGLE, inferior_pid, (PTRACE_ARG3_TYPE) 1, signal, 0);
-  else
-    ptrace (PT_CONTIN, inferior_pid, (PTRACE_ARG3_TYPE) 1, signal, 0);
-
-  if (errno)
-    perror_with_name ("ptrace");
+ error_exit:;
 }
 
 /* Copy LEN bytes to or from inferior's memory starting at MEMADDR
@@ -280,7 +194,7 @@ child_xfer_memory (memaddr, myaddr, len, write, target)
 
       /* Copy data to be written over corresponding part of buffer */
 
-      bcopy (myaddr, (char *) buffer + (memaddr & (sizeof (int) - 1)), len);
+      memcpy ((char *) buffer + (memaddr & (sizeof (int) - 1)), myaddr, len);
 
       /* Write the entire buffer.  */
 
@@ -312,7 +226,7 @@ child_xfer_memory (memaddr, myaddr, len, write, target)
        }
 
       /* Copy appropriate bytes out of the buffer.  */
-      bcopy ((char *) buffer + (memaddr & (sizeof (int) - 1)), myaddr, len);
+      memcpy (myaddr, (char *) buffer + (memaddr & (sizeof (int) - 1)), len);
     }
   return len;
 }