Tue Sep 28 09:45:38 1993 Peter Schauer (pes@regent.e-technik.tu-muenchen.de)

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

diff --git a/gdb/hppah-nat.c b/gdb/hppah-nat.c
index 138697b1dda49520fe822266ba9d870f9d454217..7c0459368d6413d8108660a6fb83c840913ca76e 100644 (file)
--- a/gdb/hppah-nat.c
+++ b/gdb/hppah-nat.c
@@ -121,7 +121,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 +135,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 +153,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,21 +185,28 @@ 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);
+ error_exit:;
 }
 
-/* Resume execution of the inferior process.
+/* Resume execution of process PID.
    If STEP is nonzero, single-step it.
    If SIGNAL is nonzero, give it that signal.  */
 
 void
-child_resume (step, signal)
+child_resume (pid, step, signal)
+     int pid;
      int step;
      int signal;
 {
@@ -226,9 +217,9 @@ child_resume (step, signal)
      written a new PC value to the child.)  */
 
   if (step)
-    ptrace (PT_SINGLE, inferior_pid, (PTRACE_ARG3_TYPE) 1, signal, 0);
+    ptrace (PT_SINGLE, pid, (PTRACE_ARG3_TYPE) 1, signal, 0);
   else
-    ptrace (PT_CONTIN, inferior_pid, (PTRACE_ARG3_TYPE) 1, signal, 0);
+    ptrace (PT_CONTIN, pid, (PTRACE_ARG3_TYPE) 1, signal, 0);
 
   if (errno)
     perror_with_name ("ptrace");
@@ -280,7 +271,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 +303,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;
 }