1 files changed, 18 insertions, 39 deletions

diff --git a/gdb/gdbserver/low-linux.c b/gdb/gdbserver/low-linux.c
index 666dadf578a..7df5157e427 100644
--- a/gdb/gdbserver/low-linux.c
+++ b/gdb/gdbserver/low-linux.c
@@ -66,9 +66,7 @@ static void initialize_arch (void);
    ENV is the environment vector to pass.  */
 
 int
-create_inferior (program, allargs)
-     char *program;
-     char **allargs;
+create_inferior (char *program, char **allargs)
 {
   int pid;
 
@@ -94,7 +92,7 @@ create_inferior (program, allargs)
 /* Kill the inferior process.  Make us have no inferior.  */
 
 void
-kill_inferior ()
+kill_inferior (void)
 {
   if (inferior_pid == 0)
     return;
@@ -105,8 +103,7 @@ kill_inferior ()
 
 /* Return nonzero if the given thread is still alive.  */
 int
-mythread_alive (pid)
-     int pid;
+mythread_alive (int pid)
 {
   return 1;
 }
@@ -114,8 +111,7 @@ mythread_alive (pid)
 /* Wait for process, returns status */
 
 unsigned char
-mywait (status)
-     char *status;
+mywait (char *status)
 {
   int pid;
   union wait w;
@@ -148,9 +144,7 @@ mywait (status)
    If SIGNAL is nonzero, give it that signal.  */
 
 void
-myresume (step, signal)
-     int step;
-     int signal;
+myresume (int step, int signal)
 {
   errno = 0;
   ptrace (step ? PTRACE_SINGLESTEP : PTRACE_CONT, inferior_pid, 1, signal);
@@ -191,7 +185,7 @@ int i386_register_raw_size[MAX_NUM_REGS] = {
 int i386_register_byte[MAX_NUM_REGS];
 
 static void
-initialize_arch ()
+initialize_arch (void)
 {
   /* Initialize the table saying where each register starts in the
      register file.  */
@@ -218,9 +212,7 @@ static int regmap[] =
 };
 
 int
-i386_register_u_addr (blockend, regnum)
-     int blockend;
-     int regnum;
+i386_register_u_addr (int blockend, int regnum)
 {
 #if 0
   /* this will be needed if fp registers are reinstated */
@@ -242,7 +234,7 @@ i386_register_u_addr (blockend, regnum)
 }
 #elif defined(TARGET_M68K)
 static void
-initialize_arch ()
+initialize_arch (void)
 {
   return;
 }
@@ -270,9 +262,7 @@ static int regmap[] =
    is stored.  */
 
 int
-m68k_linux_register_u_addr (blockend, regnum)
-     int blockend;
-     int regnum;
+m68k_linux_register_u_addr (int blockend, int regnum)
 {
   return (blockend + 4 * regmap[regnum]);
 }
@@ -476,7 +466,7 @@ static int u_offsets[] =
     PT_PR,
     PT_CR_IIP,	/* ip */
     PT_CR_IPSR, /* psr */
-    PT_CR_IFS,	/* cfm */
+    PT_CFM,	/* cfm */
     /* kernel registers not visible via ptrace interface (?) */
     -1, -1, -1, -1, -1, -1, -1, -1,
     /* hole */
@@ -551,16 +541,14 @@ ia64_register_u_addr (int blockend, int regnum)
 }
 
 static void
-initialize_arch ()
+initialize_arch (void)
 {
   return;
 }
 #endif
 
 CORE_ADDR
-register_addr (regno, blockend)
-     int regno;
-     CORE_ADDR blockend;
+register_addr (int regno, CORE_ADDR blockend)
 {
   CORE_ADDR addr;
 
@@ -575,8 +563,7 @@ register_addr (regno, blockend)
 /* Fetch one register.  */
 
 static void
-fetch_register (regno)
-     int regno;
+fetch_register (int regno)
 {
   CORE_ADDR regaddr;
   register int i;
@@ -610,8 +597,7 @@ error_exit:;
 /* Fetch all registers, or just one, from the child process.  */
 
 void
-fetch_inferior_registers (regno)
-     int regno;
+fetch_inferior_registers (int regno)
 {
   if (regno == -1 || regno == 0)
     for (regno = 0; regno < NUM_REGS - NUM_FREGS; regno++)
@@ -625,8 +611,7 @@ fetch_inferior_registers (regno)
    Otherwise, REGNO specifies which register (so we can save time).  */
 
 void
-store_inferior_registers (regno)
-     int regno;
+store_inferior_registers (int regno)
 {
   CORE_ADDR regaddr;
   int i;
@@ -690,10 +675,7 @@ store_inferior_registers (regno)
    to debugger memory starting at MYADDR.  */
 
 void
-read_inferior_memory (memaddr, myaddr, len)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
+read_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len)
 {
   register int i;
   /* Round starting address down to longword boundary.  */
@@ -722,10 +704,7 @@ read_inferior_memory (memaddr, myaddr, len)
    returns the value of errno.  */
 
 int
-write_inferior_memory (memaddr, myaddr, len)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
+write_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len)
 {
   register int i;
   /* Round starting address down to longword boundary.  */
@@ -766,7 +745,7 @@ write_inferior_memory (memaddr, myaddr, len)
 }
 
 void
-initialize_low ()
+initialize_low (void)
 {
   initialize_arch ();
 }