Fix -Wuh and -Wnhu options so that they work.

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

diff --git a/gdb/ultra3-nat.c b/gdb/ultra3-nat.c
index d348c6f7cd35a39a6f54001d38d7d0ab0180641a..2b84cdd89429b83dd940e253054cf8335f446845 100644 (file)
--- a/gdb/ultra3-nat.c
+++ b/gdb/ultra3-nat.c
@@ -36,6 +36,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <sys/file.h>
 #include "gdb_stat.h"
 
+static void fetch_core_registers PARAMS ((char *, unsigned, int, CORE_ADDR));
+
 /* Assumes support for AMD's Binary Compatibility Standard
    for ptrace().  If you define ULTRA3, the ultra3 extensions to
    ptrace() are used allowing the reading of more than one register
@@ -146,7 +148,7 @@ store_inferior_registers (regno)
              (PTRACE_ARG3_TYPE) regaddr, read_register(regno));
       if (errno != 0)
        {
-         sprintf (buf, "writing register %s (#%d)", reg_names[regno],regno);
+         sprintf (buf, "writing register %s (#%d)", REGISTER_NAME (regno), regno);
          perror_with_name (buf);
        }
     }
@@ -227,7 +229,7 @@ fetch_register (regno)
     val = ptrace (PT_READ_U, inferior_pid,
                  (PTRACE_ARG3_TYPE) register_addr(regno,0), 0);
     if (errno != 0) {
-      sprintf(buf,"reading register %s (#%d)",reg_names[regno],regno);
+      sprintf(buf,"reading register %s (#%d)",REGISTER_NAME (regno), regno);
       perror_with_name (buf);
     } else {
       supply_register (regno, &val);
@@ -242,7 +244,11 @@ fetch_register (regno)
  */
 
 static void
-fetch_core_registers ()
+fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
+     char *core_reg_sect;      /* Unused in this version */
+     unsigned core_reg_size;   /* Unused in this version */
+     int which;                        /* Unused in this version */
+     CORE_ADDR reg_addr;       /* Unused in this version */
 {
   register int regno;
   int  val;
@@ -252,9 +258,9 @@ fetch_core_registers ()
     if (!CANNOT_FETCH_REGISTER(regno)) {
       val = bfd_seek (core_bfd, (file_ptr) register_addr (regno, 0), SEEK_SET);
       if (val < 0 || (val = bfd_read (buf, sizeof buf, 1, core_bfd)) < 0) {
-        char * buffer = (char *) alloca (strlen (reg_names[regno]) + 35);
+        char * buffer = (char *) alloca (strlen (REGISTER_NAME (regno)) + 35);
         strcpy (buffer, "Reading core register ");
-        strcat (buffer, reg_names[regno]);
+        strcat (buffer, REGISTER_NAME (regno));
         perror_with_name (buffer);
       }
       supply_register (regno, buf);
@@ -275,10 +281,10 @@ fetch_core_registers ()
  * available to the user is specified in 'regno', then an address that
  * will cause ptrace() to fail is returned.
  */
-unsigned int 
+CORE_ADDR
 register_addr (regno,blockend)
-     unsigned int      regno;
-     char              *blockend;
+     int       regno;
+     CORE_ADDR blockend;
 {
   if ((regno >= LR0_REGNUM) && (regno < LR0_REGNUM + 128)) {
     return(offsetof(struct ptrace_user,pt_lr[regno-LR0_REGNUM]));
@@ -299,7 +305,7 @@ register_addr (regno,blockend)
        case FC_REGNUM:  return(offsetof(struct ptrace_user,pt_fc));
        default:
             fprintf_filtered(gdb_stderr,"register_addr():Bad register %s (%d)\n", 
-                               reg_names[regno],regno);
+                             REGISTER_NAME (regno), regno);
             return(0xffffffff);        /* Should make ptrace() fail */
     }
   }