X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fi386v-nat.c;h=3f75085e1d4211d0045f9b4e6bbe8bbe2adff62c;hb=c65ecaf37b02a936e0d8c4074da3b5da8017e464;hp=0bf702c368c7c5f9ba9dca9fc69af0dd8aa68c7c;hpb=abd8680d6efd97e7ba848a6392ee3ad72be18cd0;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/i386v-nat.c b/gdb/i386v-nat.c
index 0bf702c368..3f75085e1d 100644
--- a/gdb/i386v-nat.c
+++ b/gdb/i386v-nat.c
@@ -1,5 +1,6 @@
 /* Intel 386 native support for SYSV systems (pre-SVR4).
-   Copyright (C) 1988, 89, 91, 92, 94, 96, 1998 Free Software Foundation, Inc.
+   Copyright 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999,
+   2000 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -87,9 +88,7 @@ static int regmap[] =
  */
 
 int
-i386_register_u_addr (blockend, regnum)
-     int blockend;
-     int regnum;
+i386_register_u_addr (int blockend, int regnum)
 {
   struct user u;
   int fpstate;
@@ -116,7 +115,7 @@ i386_register_u_addr (blockend, regnum)
 }
 
 int
-kernel_u_size ()
+kernel_u_size (void)
 {
   return (sizeof (struct user));
 }
@@ -134,32 +133,22 @@ static int debug_control_mirror;
 static CORE_ADDR address_lookup[DR_LASTADDR - DR_FIRSTADDR + 1];
 
 static int
-i386_insert_aligned_watchpoint PARAMS ((int, CORE_ADDR, CORE_ADDR, int,
-					int));
+i386_insert_aligned_watchpoint (int, CORE_ADDR, CORE_ADDR, int, int);
 
 static int
-i386_insert_nonaligned_watchpoint PARAMS ((int, CORE_ADDR, CORE_ADDR, int,
-					   int));
+i386_insert_nonaligned_watchpoint (int, CORE_ADDR, CORE_ADDR, int, int);
 
 /* Insert a watchpoint.  */
 
 int
-i386_insert_watchpoint (pid, addr, len, rw)
-     int pid;
-     CORE_ADDR addr;
-     int len;
-     int rw;
+i386_insert_watchpoint (int pid, CORE_ADDR addr, int len, int rw)
 {
   return i386_insert_aligned_watchpoint (pid, addr, addr, len, rw);
 }
 
 static int
-i386_insert_aligned_watchpoint (pid, waddr, addr, len, rw)
-     int pid;
-     CORE_ADDR waddr;
-     CORE_ADDR addr;
-     int len;
-     int rw;
+i386_insert_aligned_watchpoint (int pid, CORE_ADDR waddr, CORE_ADDR addr,
+				int len, int rw)
 {
   int i;
   int read_write_bits, len_bits;
@@ -218,23 +207,19 @@ i386_insert_aligned_watchpoint (pid, waddr, addr, len, rw)
 }
 
 static int
-i386_insert_nonaligned_watchpoint (pid, waddr, addr, len, rw)
-     int pid;
-     CORE_ADDR waddr;
-     CORE_ADDR addr;
-     int len;
-     int rw;
+i386_insert_nonaligned_watchpoint (int pid, CORE_ADDR waddr, CORE_ADDR addr,
+				   int len, int rw)
 {
   int align;
   int size;
   int rv;
 
-  static int size_try_array[16] =
+  static int size_try_array[4][4] =
   {
-    1, 1, 1, 1,			/* trying size one */
-    2, 1, 2, 1,			/* trying size two */
-    2, 1, 2, 1,			/* trying size three */
-    4, 1, 2, 1			/* trying size four */
+    { 1, 1, 1, 1 },		/* trying size one */
+    { 2, 1, 2, 1 },		/* trying size two */
+    { 2, 1, 2, 1 },		/* trying size three */
+    { 4, 1, 2, 1 }		/* trying size four */
   };
 
   rv = 0;
@@ -242,8 +227,7 @@ i386_insert_nonaligned_watchpoint (pid, waddr, addr, len, rw)
     {
       align = addr % 4;
       /* Four is the maximum length for 386.  */
-      size = (len > 4) ? 3 : len - 1;
-      size = size_try_array[size * 4 + align];
+      size = size_try_array[len > 4 ? 3 : len - 1][align];
 
       rv = i386_insert_aligned_watchpoint (pid, waddr, addr, size, rw);
       if (rv)
@@ -260,10 +244,7 @@ i386_insert_nonaligned_watchpoint (pid, waddr, addr, len, rw)
 /* Remove a watchpoint.  */
 
 int
-i386_remove_watchpoint (pid, addr, len)
-     int pid;
-     CORE_ADDR addr;
-     int len;
+i386_remove_watchpoint (int pid, CORE_ADDR addr, int len)
 {
   int i;
   int register_number;
@@ -288,8 +269,7 @@ i386_remove_watchpoint (pid, addr, len)
 /* Check if stopped by a watchpoint.  */
 
 CORE_ADDR
-i386_stopped_by_watchpoint (pid)
-     int pid;
+i386_stopped_by_watchpoint (int pid)
 {
   int i;
   int status;