import gdb-1999-07-07 post reformat

1 files changed, 183 insertions, 147 deletions

diff --git a/gdb/ultra3-nat.c b/gdb/ultra3-nat.c
index 2b84cdd8942..de8e33b0412 100644
--- a/gdb/ultra3-nat.c
+++ b/gdb/ultra3-nat.c
@@ -2,21 +2,22 @@
    Copyright (C) 1988, 1989, 1991, 1992 Free Software Foundation, Inc.
    Contributed by David Wood (wood@nyu.edu) at New York University.
 
-This file is part of GDB.
+   This file is part of GDB.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #define DEBUG
 #include "defs.h"
@@ -29,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <sys/param.h>
 #include <signal.h>
 #include <sys/ioctl.h>
-#include <fcntl.h>  
+#include <fcntl.h>
 
 #include "gdbcore.h"
 
@@ -50,7 +51,7 @@ static void fetch_core_registers PARAMS ((char *, unsigned, int, CORE_ADDR));
 #define	ULTRA3
 
 #if !defined (offsetof)
-# define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+#define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
 #endif
 
 extern int errno;
@@ -64,65 +65,74 @@ struct ptrace_user pt_struct;
 
 void
 fetch_inferior_registers (regno)
-  int regno;
+     int regno;
 {
-  register int i,j,ret_val=0;
+  register int i, j, ret_val = 0;
   char buf[128];
 
-  if (regno != -1) {
-    fetch_register (regno);
-    return;
-  }
+  if (regno != -1)
+    {
+      fetch_register (regno);
+      return;
+    }
 
 /* Global Registers */
 #ifdef ULTRA3
   errno = 0;
   ptrace (PT_READ_STRUCT, inferior_pid,
-	  (PTRACE_ARG3_TYPE) register_addr(GR96_REGNUM,0), 
-	  (int)&pt_struct.pt_gr[0], 32*4);
-  if (errno != 0) {
+	  (PTRACE_ARG3_TYPE) register_addr (GR96_REGNUM, 0),
+	  (int) &pt_struct.pt_gr[0], 32 * 4);
+  if (errno != 0)
+    {
       perror_with_name ("reading global registers");
       ret_val = -1;
-  } else for (regno=GR96_REGNUM, j=0 ; j<32 ; regno++, j++)  {
-      supply_register (regno, &pt_struct.pt_gr[j]);
-  }
+    }
+  else
+    for (regno = GR96_REGNUM, j = 0; j < 32; regno++, j++)
+      {
+	supply_register (regno, &pt_struct.pt_gr[j]);
+      }
 #else
-  for (regno=GR96_REGNUM ; !ret_val && regno < GR96_REGNUM+32 ; regno++)
-    fetch_register(regno);
+  for (regno = GR96_REGNUM; !ret_val && regno < GR96_REGNUM + 32; regno++)
+    fetch_register (regno);
 #endif
 
 /* Local Registers */
 #ifdef ULTRA3
   errno = 0;
   ptrace (PT_READ_STRUCT, inferior_pid,
-	  (PTRACE_ARG3_TYPE) register_addr(LR0_REGNUM,0), 
-	  (int)&pt_struct.pt_lr[0], 128*4);
-  if (errno != 0) {
+	  (PTRACE_ARG3_TYPE) register_addr (LR0_REGNUM, 0),
+	  (int) &pt_struct.pt_lr[0], 128 * 4);
+  if (errno != 0)
+    {
       perror_with_name ("reading local registers");
       ret_val = -1;
-  } else for (regno=LR0_REGNUM, j=0 ; j<128 ; regno++, j++)  {
-      supply_register (regno, &pt_struct.pt_lr[j]);
-  }
+    }
+  else
+    for (regno = LR0_REGNUM, j = 0; j < 128; regno++, j++)
+      {
+	supply_register (regno, &pt_struct.pt_lr[j]);
+      }
 #else
-  for (regno=LR0_REGNUM ; !ret_val && regno < LR0_REGNUM+128 ; regno++)
-    fetch_register(regno);
+  for (regno = LR0_REGNUM; !ret_val && regno < LR0_REGNUM + 128; regno++)
+    fetch_register (regno);
 #endif
 
 /* Special Registers */
-  fetch_register(GR1_REGNUM);
-  fetch_register(CPS_REGNUM);
-  fetch_register(PC_REGNUM);
-  fetch_register(NPC_REGNUM);
-  fetch_register(PC2_REGNUM);
-  fetch_register(IPC_REGNUM);
-  fetch_register(IPA_REGNUM);
-  fetch_register(IPB_REGNUM);
-  fetch_register(Q_REGNUM);
-  fetch_register(BP_REGNUM);
-  fetch_register(FC_REGNUM);
-
-/* Fake any registers that are in REGISTER_NAMES, but not available to gdb */ 
-  registers_fetched();
+  fetch_register (GR1_REGNUM);
+  fetch_register (CPS_REGNUM);
+  fetch_register (PC_REGNUM);
+  fetch_register (NPC_REGNUM);
+  fetch_register (PC2_REGNUM);
+  fetch_register (IPC_REGNUM);
+  fetch_register (IPA_REGNUM);
+  fetch_register (IPB_REGNUM);
+  fetch_register (Q_REGNUM);
+  fetch_register (BP_REGNUM);
+  fetch_register (FC_REGNUM);
+
+/* Fake any registers that are in REGISTER_NAMES, but not available to gdb */
+  registers_fetched ();
 }
 
 /* Store our register values back into the inferior.
@@ -140,12 +150,12 @@ store_inferior_registers (regno)
 
   if (regno >= 0)
     {
-      if (CANNOT_STORE_REGISTER(regno)) 
+      if (CANNOT_STORE_REGISTER (regno))
 	return;
       regaddr = register_addr (regno, 0);
       errno = 0;
       ptrace (PT_WRITE_U, inferior_pid,
-	      (PTRACE_ARG3_TYPE) regaddr, read_register(regno));
+	      (PTRACE_ARG3_TYPE) regaddr, read_register (regno));
       if (errno != 0)
 	{
 	  sprintf (buf, "writing register %s (#%d)", REGISTER_NAME (regno), regno);
@@ -155,57 +165,57 @@ store_inferior_registers (regno)
   else
     {
 #ifdef ULTRA3
-      pt_struct.pt_gr1 = read_register(GR1_REGNUM);
-      for (regno = GR96_REGNUM; regno < GR96_REGNUM+32; regno++)
-	pt_struct.pt_gr[regno] = read_register(regno);
-      for (regno = LR0_REGNUM; regno < LR0_REGNUM+128; regno++)
-	pt_struct.pt_gr[regno] = read_register(regno);
+      pt_struct.pt_gr1 = read_register (GR1_REGNUM);
+      for (regno = GR96_REGNUM; regno < GR96_REGNUM + 32; regno++)
+	pt_struct.pt_gr[regno] = read_register (regno);
+      for (regno = LR0_REGNUM; regno < LR0_REGNUM + 128; regno++)
+	pt_struct.pt_gr[regno] = read_register (regno);
       errno = 0;
       ptrace (PT_WRITE_STRUCT, inferior_pid,
-	      (PTRACE_ARG3_TYPE) register_addr(GR1_REGNUM,0), 
-	      (int)&pt_struct.pt_gr1,(1*32*128)*4);
+	      (PTRACE_ARG3_TYPE) register_addr (GR1_REGNUM, 0),
+	      (int) &pt_struct.pt_gr1, (1 * 32 * 128) * 4);
       if (errno != 0)
 	{
-	   sprintf (buf, "writing all local/global registers");
-	   perror_with_name (buf);
+	  sprintf (buf, "writing all local/global registers");
+	  perror_with_name (buf);
 	}
-      pt_struct.pt_psr = read_register(CPS_REGNUM);
-      pt_struct.pt_pc0 = read_register(NPC_REGNUM);
-      pt_struct.pt_pc1 = read_register(PC_REGNUM);
-      pt_struct.pt_pc2 = read_register(PC2_REGNUM);
-      pt_struct.pt_ipc = read_register(IPC_REGNUM);
-      pt_struct.pt_ipa = read_register(IPA_REGNUM);
-      pt_struct.pt_ipb = read_register(IPB_REGNUM);
-      pt_struct.pt_q   = read_register(Q_REGNUM);
-      pt_struct.pt_bp  = read_register(BP_REGNUM);
-      pt_struct.pt_fc  = read_register(FC_REGNUM);
+      pt_struct.pt_psr = read_register (CPS_REGNUM);
+      pt_struct.pt_pc0 = read_register (NPC_REGNUM);
+      pt_struct.pt_pc1 = read_register (PC_REGNUM);
+      pt_struct.pt_pc2 = read_register (PC2_REGNUM);
+      pt_struct.pt_ipc = read_register (IPC_REGNUM);
+      pt_struct.pt_ipa = read_register (IPA_REGNUM);
+      pt_struct.pt_ipb = read_register (IPB_REGNUM);
+      pt_struct.pt_q = read_register (Q_REGNUM);
+      pt_struct.pt_bp = read_register (BP_REGNUM);
+      pt_struct.pt_fc = read_register (FC_REGNUM);
       errno = 0;
       ptrace (PT_WRITE_STRUCT, inferior_pid,
-	      (PTRACE_ARG3_TYPE) register_addr(CPS_REGNUM,0), 
-	      (int)&pt_struct.pt_psr,(10)*4);
+	      (PTRACE_ARG3_TYPE) register_addr (CPS_REGNUM, 0),
+	      (int) &pt_struct.pt_psr, (10) * 4);
       if (errno != 0)
 	{
-	   sprintf (buf, "writing all special registers");
-	   perror_with_name (buf);
-	   return;
+	  sprintf (buf, "writing all special registers");
+	  perror_with_name (buf);
+	  return;
 	}
 #else
-      store_inferior_registers(GR1_REGNUM);
-      for (regno=GR96_REGNUM ; regno<GR96_REGNUM+32 ; regno++)
-	store_inferior_registers(regno);
-      for (regno=LR0_REGNUM ; regno<LR0_REGNUM+128 ; regno++)
-	store_inferior_registers(regno);
-      store_inferior_registers(CPS_REGNUM);
-      store_inferior_registers(PC_REGNUM);
-      store_inferior_registers(NPC_REGNUM);
-      store_inferior_registers(PC2_REGNUM);
-      store_inferior_registers(IPC_REGNUM);
-      store_inferior_registers(IPA_REGNUM);
-      store_inferior_registers(IPB_REGNUM);
-      store_inferior_registers(Q_REGNUM);
-      store_inferior_registers(BP_REGNUM);
-      store_inferior_registers(FC_REGNUM);
-#endif	/* ULTRA3 */
+      store_inferior_registers (GR1_REGNUM);
+      for (regno = GR96_REGNUM; regno < GR96_REGNUM + 32; regno++)
+	store_inferior_registers (regno);
+      for (regno = LR0_REGNUM; regno < LR0_REGNUM + 128; regno++)
+	store_inferior_registers (regno);
+      store_inferior_registers (CPS_REGNUM);
+      store_inferior_registers (PC_REGNUM);
+      store_inferior_registers (NPC_REGNUM);
+      store_inferior_registers (PC2_REGNUM);
+      store_inferior_registers (IPC_REGNUM);
+      store_inferior_registers (IPA_REGNUM);
+      store_inferior_registers (IPB_REGNUM);
+      store_inferior_registers (Q_REGNUM);
+      store_inferior_registers (BP_REGNUM);
+      store_inferior_registers (FC_REGNUM);
+#endif /* ULTRA3 */
     }
 }
 
@@ -219,22 +229,28 @@ fetch_register (regno)
      int regno;
 {
   char buf[128];
-  int	val;
-
-  if (CANNOT_FETCH_REGISTER(regno)) {
-    val = -1;
-    supply_register (regno, &val);
-  } else {
-    errno = 0;
-    val = ptrace (PT_READ_U, inferior_pid,
-		  (PTRACE_ARG3_TYPE) register_addr(regno,0), 0);
-    if (errno != 0) {
-      sprintf(buf,"reading register %s (#%d)",REGISTER_NAME (regno), regno);
-      perror_with_name (buf);
-    } else {
+  int val;
+
+  if (CANNOT_FETCH_REGISTER (regno))
+    {
+      val = -1;
       supply_register (regno, &val);
     }
-  }
+  else
+    {
+      errno = 0;
+      val = ptrace (PT_READ_U, inferior_pid,
+		    (PTRACE_ARG3_TYPE) register_addr (regno, 0), 0);
+      if (errno != 0)
+	{
+	  sprintf (buf, "reading register %s (#%d)", REGISTER_NAME (regno), regno);
+	  perror_with_name (buf);
+	}
+      else
+	{
+	  supply_register (regno, &val);
+	}
+    }
 }
 
 
@@ -251,24 +267,27 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
      CORE_ADDR reg_addr;	/* Unused in this version */
 {
   register int regno;
-  int	val;
-  char	buf[4];
-
-  for (regno = 0 ; regno < NUM_REGS; regno++) {
-    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 (REGISTER_NAME (regno)) + 35);
-        strcpy (buffer, "Reading core register ");
-        strcat (buffer, REGISTER_NAME (regno));
-        perror_with_name (buffer);
-      }
-      supply_register (regno, buf);
+  int val;
+  char buf[4];
+
+  for (regno = 0; regno < NUM_REGS; regno++)
+    {
+      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 (REGISTER_NAME (regno)) + 35);
+	      strcpy (buffer, "Reading core register ");
+	      strcat (buffer, REGISTER_NAME (regno));
+	      perror_with_name (buffer);
+	    }
+	  supply_register (regno, buf);
+	}
     }
-  }
 
-  /* Fake any registers that are in REGISTER_NAMES, but not available to gdb */ 
-  registers_fetched();
+  /* Fake any registers that are in REGISTER_NAMES, but not available to gdb */
+  registers_fetched ();
 }
 
 
@@ -282,36 +301,53 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
  * will cause ptrace() to fail is returned.
  */
 CORE_ADDR
-register_addr (regno,blockend)
-     int	regno;
-     CORE_ADDR	blockend;
+register_addr (regno, blockend)
+     int regno;
+     CORE_ADDR blockend;
 {
-  if ((regno >= LR0_REGNUM) && (regno < LR0_REGNUM + 128)) {
-    return(offsetof(struct ptrace_user,pt_lr[regno-LR0_REGNUM]));
-  } else if ((regno >= GR96_REGNUM) && (regno < GR96_REGNUM + 32)) {
-    return(offsetof(struct ptrace_user,pt_gr[regno-GR96_REGNUM]));
-  } else {
-    switch (regno) {
-	case GR1_REGNUM: return(offsetof(struct ptrace_user,pt_gr1));
-	case CPS_REGNUM: return(offsetof(struct ptrace_user,pt_psr));
-	case NPC_REGNUM: return(offsetof(struct ptrace_user,pt_pc0));
-	case PC_REGNUM:  return(offsetof(struct ptrace_user,pt_pc1));
-	case PC2_REGNUM: return(offsetof(struct ptrace_user,pt_pc2));
-	case IPC_REGNUM: return(offsetof(struct ptrace_user,pt_ipc));
-	case IPA_REGNUM: return(offsetof(struct ptrace_user,pt_ipa));
-	case IPB_REGNUM: return(offsetof(struct ptrace_user,pt_ipb));
-	case Q_REGNUM:   return(offsetof(struct ptrace_user,pt_q));
-	case BP_REGNUM:  return(offsetof(struct ptrace_user,pt_bp));
-	case FC_REGNUM:  return(offsetof(struct ptrace_user,pt_fc));
+  if ((regno >= LR0_REGNUM) && (regno < LR0_REGNUM + 128))
+    {
+      return (offsetof (struct ptrace_user, pt_lr[regno - LR0_REGNUM]));
+    }
+  else if ((regno >= GR96_REGNUM) && (regno < GR96_REGNUM + 32))
+    {
+      return (offsetof (struct ptrace_user, pt_gr[regno - GR96_REGNUM]));
+    }
+  else
+    {
+      switch (regno)
+	{
+	case GR1_REGNUM:
+	  return (offsetof (struct ptrace_user, pt_gr1));
+	case CPS_REGNUM:
+	  return (offsetof (struct ptrace_user, pt_psr));
+	case NPC_REGNUM:
+	  return (offsetof (struct ptrace_user, pt_pc0));
+	case PC_REGNUM:
+	  return (offsetof (struct ptrace_user, pt_pc1));
+	case PC2_REGNUM:
+	  return (offsetof (struct ptrace_user, pt_pc2));
+	case IPC_REGNUM:
+	  return (offsetof (struct ptrace_user, pt_ipc));
+	case IPA_REGNUM:
+	  return (offsetof (struct ptrace_user, pt_ipa));
+	case IPB_REGNUM:
+	  return (offsetof (struct ptrace_user, pt_ipb));
+	case Q_REGNUM:
+	  return (offsetof (struct ptrace_user, pt_q));
+	case BP_REGNUM:
+	  return (offsetof (struct ptrace_user, pt_bp));
+	case FC_REGNUM:
+	  return (offsetof (struct ptrace_user, pt_fc));
 	default:
-	     fprintf_filtered(gdb_stderr,"register_addr():Bad register %s (%d)\n", 
-			      REGISTER_NAME (regno), regno);
-	     return(0xffffffff);	/* Should make ptrace() fail */
+	  fprintf_filtered (gdb_stderr, "register_addr():Bad register %s (%d)\n",
+			    REGISTER_NAME (regno), regno);
+	  return (0xffffffff);	/* Should make ptrace() fail */
+	}
     }
-  }
 }
-
 
+
 /* Register that we are able to handle ultra3 core file formats.
    FIXME: is this really bfd_target_unknown_flavour? */