X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fppc-bdm.c;h=d38b420a726bd065d717c27cf49318786b776f7e;hb=4e052eda914ce3a3c48b31a0d13bce89c364495e;hp=6731e9a16ddb2cb53b215652e7e1c3728220fd66;hpb=61a0d0227a46112b2b93b84506b937f1c6eca7ab;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/ppc-bdm.c b/gdb/ppc-bdm.c
index 6731e9a16d..d38b420a72 100644
--- a/gdb/ppc-bdm.c
+++ b/gdb/ppc-bdm.c
@@ -1,22 +1,23 @@
 /* Remote target communications for the Macraigor Systems BDM Wiggler
    talking to a Motorola PPC 8xx ADS board
-   Copyright 1996, 1997 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 2001 Free Software Foundation, Inc.
 
-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.  */
 
 #include "defs.h"
 #include "gdbcore.h"
@@ -27,27 +28,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "bfd.h"
 #include "symfile.h"
 #include "target.h"
-#include "wait.h"
 #include "gdbcmd.h"
 #include "objfiles.h"
 #include "gdb-stabs.h"
 #include <sys/types.h>
-#include <signal.h>
 #include "serial.h"
 #include "ocd.h"
+#include "ppc-tdep.h"
+#include "regcache.h"
 
-static void bdm_ppc_open PARAMS ((char *name, int from_tty));
+static void bdm_ppc_open (char *name, int from_tty);
 
-static int bdm_ppc_wait PARAMS ((int pid,
-				 struct target_waitstatus *target_status));
+static int bdm_ppc_wait (int pid, struct target_waitstatus *target_status);
 
-static void bdm_ppc_fetch_registers PARAMS ((int regno));
+static void bdm_ppc_fetch_registers (int regno);
 
-static void bdm_ppc_store_registers PARAMS ((int regno));
+static void bdm_ppc_store_registers (int regno);
 
 extern struct target_ops bdm_ppc_ops;	/* Forward decl */
 
-/*#define BDM_NUM_REGS 71*/
+/*#define BDM_NUM_REGS 71 */
 #define BDM_NUM_REGS 24
 
 #define BDM_REGMAP \
@@ -67,18 +67,17 @@ extern struct target_ops bdm_ppc_ops;	/* Forward decl */
 	8,         /* lr (SPR 8) */ \
 	9,         /* cnt (CTR (SPR 9)) */ \
 	1,         /* xer (SPR 1) */ \
-	0,         /* mq (SPR 0) */
-
+	0,			/* mq (SPR 0) */
 
-char nowatchdog[4] = {0xff,0xff,0xff,0x88};
+
+char nowatchdog[4] =
+{0xff, 0xff, 0xff, 0x88};
 
 /* Open a connection to a remote debugger.
    NAME is the filename used for communication.  */
 
 static void
-bdm_ppc_open (name, from_tty)
-     char *name;
-     int from_tty;
+bdm_ppc_open (char *name, int from_tty)
 {
   CORE_ADDR watchdogaddr = 0xff000004;
 
@@ -98,9 +97,7 @@ bdm_ppc_open (name, from_tty)
    means in the case of this target).  */
 
 static int
-bdm_ppc_wait (pid, target_status)
-     int pid;
-     struct target_waitstatus *target_status;
+bdm_ppc_wait (int pid, struct target_waitstatus *target_status)
 {
   int stop_reason;
 
@@ -114,14 +111,14 @@ bdm_ppc_wait (pid, target_status)
       return inferior_pid;
     }
 
-  target_status->value.sig = TARGET_SIGNAL_TRAP; /* XXX for now */
+  target_status->value.sig = TARGET_SIGNAL_TRAP;	/* XXX for now */
 
 #if 0
   {
     unsigned long ecr, der;
 
-    ecr = ocd_read_bdm_register (148); /* Read the exception cause register */
-    der = ocd_read_bdm_register (149); /* Read the debug enables register */
+    ecr = ocd_read_bdm_register (148);	/* Read the exception cause register */
+    der = ocd_read_bdm_register (149);	/* Read the debug enables register */
     fprintf_unfiltered (gdb_stdout, "ecr = 0x%x, der = 0x%x\n", ecr, der);
   }
 #endif
@@ -129,30 +126,30 @@ bdm_ppc_wait (pid, target_status)
   return inferior_pid;
 }
 
-static int bdm_regmap[] = {BDM_REGMAP};
+static int bdm_regmap[] =
+{BDM_REGMAP};
 
 /* Read the remote registers into regs.
    Fetch register REGNO, or all registers if REGNO == -1
 
    The Wiggler uses the following codes to access the registers:
 
-   0 -> 1023		SPR 0 -> 1023
-	0 - SPR 0 - MQ
-	1 - SPR 1 - XER
-	8 - SPR 8 - LR
-	9 - SPR 9 - CTR (known as cnt in GDB)
-	26 - SPR 26 - SRR0 - pc
-   1024 -> 2047		DCR 0 -> DCR 1023 (IBM PPC 4xx only)
-   2048 -> 2079		R0 -> R31
-   2080 -> 2143		FP0 -> FP31 (64 bit regs) (IBM PPC 5xx only)
-   2144			CR (known as cnd in GDB)
-   2145			FPCSR
-   2146			MSR (known as ps in GDB)
+   0 -> 1023            SPR 0 -> 1023
+   0 - SPR 0 - MQ
+   1 - SPR 1 - XER
+   8 - SPR 8 - LR
+   9 - SPR 9 - CTR (known as cnt in GDB)
+   26 - SPR 26 - SRR0 - pc
+   1024 -> 2047         DCR 0 -> DCR 1023 (IBM PPC 4xx only)
+   2048 -> 2079         R0 -> R31
+   2080 -> 2143         FP0 -> FP31 (64 bit regs) (IBM PPC 5xx only)
+   2144                 CR (known as cnd in GDB)
+   2145                 FPCSR
+   2146                 MSR (known as ps in GDB)
  */
 
 static void
-bdm_ppc_fetch_registers (regno)
-     int regno;
+bdm_ppc_fetch_registers (int regno)
 {
   int i;
   unsigned char *regs, *beginregs, *endregs, *almostregs;
@@ -183,8 +180,8 @@ bdm_ppc_fetch_registers (regno)
       first_regno = regno;
       last_regno = regno;
 
-      first_bdm_regno = bdm_regmap [regno];
-      last_bdm_regno = bdm_regmap [regno];
+      first_bdm_regno = bdm_regmap[regno];
+      last_bdm_regno = bdm_regmap[regno];
     }
 
   if (first_bdm_regno == -1)
@@ -201,27 +198,28 @@ bdm_ppc_fetch_registers (regno)
 /*      printf("Asking for register %d\n", first_regno); */
 
       /* if asking for an invalid register */
-      if ((first_regno == MQ_REGNUM) ||
-          ((first_regno >= FP0_REGNUM) && (first_regno <= FPLAST_REGNUM)))
+      if ((first_regno == PPC_MQ_REGNUM) ||
+	  ((first_regno >= FP0_REGNUM) && (first_regno <= FPLAST_REGNUM)))
 	{
 /*          printf("invalid reg request!\n"); */
-          supply_register (first_regno, NULL);
-          return;                   /* Unsupported register */
-        }
+	  supply_register (first_regno, NULL);
+	  return;		/* Unsupported register */
+	}
       else
 	{
-          regs = ocd_read_bdm_registers (first_bdm_regno,
-						last_bdm_regno, &reglen);
-        }
+	  regs = ocd_read_bdm_registers (first_bdm_regno,
+					 last_bdm_regno, &reglen);
+	}
     }
-  else		/* want all regs */
+  else
+    /* want all regs */
     {
 /*      printf("Asking for registers %d to %d\n", first_regno, last_regno); */
       beginregs = ocd_read_bdm_registers (first_bdm_regno,
-					FP0_REGNUM - 1, &beginreglen);
-      endregs = (strcat (midregs, 
-				ocd_read_bdm_registers (FPLAST_REGNUM + 1,
-					last_bdm_regno - 1, &endreglen)));
+					  FP0_REGNUM - 1, &beginreglen);
+      endregs = (strcat (midregs,
+			 ocd_read_bdm_registers (FPLAST_REGNUM + 1,
+					  last_bdm_regno - 1, &endreglen)));
       almostregs = (strcat (beginregs, endregs));
       regs = (strcat (almostregs, mqreg));
       reglen = beginreglen + 32 + endreglen + 1;
@@ -236,7 +234,7 @@ bdm_ppc_fetch_registers (regno)
     {
       int bdm_regno, regoffset;
 
-      bdm_regno = bdm_regmap [i];
+      bdm_regno = bdm_regmap[i];
       if (bdm_regno != -1)
 	{
 	  regoffset = bdm_regno - first_bdm_regno;
@@ -247,7 +245,7 @@ bdm_ppc_fetch_registers (regno)
 	  supply_register (i, regs + 4 * regoffset);
 	}
       else
-	supply_register (i, NULL); /* Unsupported register */
+	supply_register (i, NULL);	/* Unsupported register */
     }
 }
 
@@ -255,8 +253,7 @@ bdm_ppc_fetch_registers (regno)
    of REGISTERS.  FIXME: ignores errors.  */
 
 static void
-bdm_ppc_store_registers (regno)
-     int regno;
+bdm_ppc_store_registers (int regno)
 {
   int i;
   int first_regno, last_regno;
@@ -275,8 +272,8 @@ bdm_ppc_store_registers (regno)
       first_regno = regno;
       last_regno = regno;
 
-      first_bdm_regno = bdm_regmap [regno];
-      last_bdm_regno = bdm_regmap [regno];
+      first_bdm_regno = bdm_regmap[regno];
+      last_bdm_regno = bdm_regmap[regno];
     }
 
   if (first_bdm_regno == -1)
@@ -286,74 +283,102 @@ bdm_ppc_store_registers (regno)
     {
       int bdm_regno;
 
-      bdm_regno = bdm_regmap [i];
+      bdm_regno = bdm_regmap[i];
 
       /* only attempt to write if it's a valid ppc 8xx register */
       /* (need to avoid FP regs and MQ reg) */
-      if ((i != MQ_REGNUM) && ((i < FP0_REGNUM) || (i > FPLAST_REGNUM)))
+      if ((i != PPC_MQ_REGNUM) && ((i < FP0_REGNUM) || (i > FPLAST_REGNUM)))
 	{
 /*          printf("write valid reg %d\n", bdm_regno); */
-          ocd_write_bdm_registers (bdm_regno, registers + REGISTER_BYTE (i), 4);
-        }
+	  ocd_write_bdm_registers (bdm_regno, registers + REGISTER_BYTE (i), 4);
+	}
 /*
-      else if (i == MQ_REGNUM)
-        printf("don't write invalid reg %d (MQ_REGNUM)\n", bdm_regno);
-      else
-        printf("don't write invalid reg %d\n", bdm_regno);
-*/
+   else if (i == PPC_MQ_REGNUM)
+   printf("don't write invalid reg %d (PPC_MQ_REGNUM)\n", bdm_regno);
+   else
+   printf("don't write invalid reg %d\n", bdm_regno);
+ */
     }
 }
 
 /* Define the target subroutine names */
 
-struct target_ops bdm_ppc_ops = {
-  "ocd",			/* to_shortname */
-  "Remote target with On-Chip Debugging",	/* to_longname */
-  "Use a remote target with On-Chip Debugging.  To use a target box,\n\
+struct target_ops bdm_ppc_ops;
+
+static void
+init_bdm_ppc_ops (void)
+{
+  bdm_ppc_ops.to_shortname = "ocd";
+  bdm_ppc_ops.to_longname = "Remote target with On-Chip Debugging";
+  bdm_ppc_ops.to_doc = "Use a remote target with On-Chip Debugging.  To use a target box;\n\
 specify the serial device it is connected to (e.g. /dev/ttya).  To use\n\
 a wiggler, specify wiggler and then the port it is connected to\n\
-(e.g. wiggler lpt1).",	/* to_doc */
-  bdm_ppc_open,			/* to_open */
-  ocd_close,		/* to_close */
-  NULL,				/* to_attach */
-  ocd_detach,		/* to_detach */
-  ocd_resume,		/* to_resume */
-  bdm_ppc_wait,			/* to_wait */
-  bdm_ppc_fetch_registers,	/* to_fetch_registers */
-  bdm_ppc_store_registers,	/* to_store_registers */
-  ocd_prepare_to_store,	/* to_prepare_to_store */
-  ocd_xfer_memory,		/* to_xfer_memory */
-  ocd_files_info,		/* to_files_info */
-  ocd_insert_breakpoint,	/* to_insert_breakpoint */
-  ocd_remove_breakpoint,	/* to_remove_breakpoint */
-  NULL,				/* to_terminal_init */
-  NULL,				/* to_terminal_inferior */
-  NULL,				/* to_terminal_ours_for_output */
-  NULL,				/* to_terminal_ours */
-  NULL,				/* to_terminal_info */
-  ocd_kill,			/* to_kill */
-  ocd_load,			/* to_load */
-  NULL,				/* to_lookup_symbol */
-  ocd_create_inferior,	/* to_create_inferior */
-  ocd_mourn,		/* to_mourn_inferior */
-  0,				/* to_can_run */
-  0,				/* to_notice_signals */
-  ocd_thread_alive,		/* to_thread_alive */
-  ocd_stop,			/* to_stop */
-  process_stratum,		/* to_stratum */
-  NULL,				/* to_next */
-  1,				/* to_has_all_memory */
-  1,				/* to_has_memory */
-  1,				/* to_has_stack */
-  1,				/* to_has_registers */
-  1,				/* to_has_execution */
-  NULL,				/* sections */
-  NULL,				/* sections_end */
-  OPS_MAGIC			/* to_magic */
-};
+(e.g. wiggler lpt1).";		/* to_doc */
+  bdm_ppc_ops.to_open = bdm_ppc_open;
+  bdm_ppc_ops.to_close = ocd_close;
+  bdm_ppc_ops.to_attach = NULL;
+  bdm_ppc_ops.to_post_attach = NULL;
+  bdm_ppc_ops.to_require_attach = NULL;
+  bdm_ppc_ops.to_detach = ocd_detach;
+  bdm_ppc_ops.to_require_detach = NULL;
+  bdm_ppc_ops.to_resume = ocd_resume;
+  bdm_ppc_ops.to_wait = bdm_ppc_wait;
+  bdm_ppc_ops.to_post_wait = NULL;
+  bdm_ppc_ops.to_fetch_registers = bdm_ppc_fetch_registers;
+  bdm_ppc_ops.to_store_registers = bdm_ppc_store_registers;
+  bdm_ppc_ops.to_prepare_to_store = ocd_prepare_to_store;
+  bdm_ppc_ops.to_xfer_memory = ocd_xfer_memory;
+  bdm_ppc_ops.to_files_info = ocd_files_info;
+  bdm_ppc_ops.to_insert_breakpoint = ocd_insert_breakpoint;
+  bdm_ppc_ops.to_remove_breakpoint = ocd_remove_breakpoint;
+  bdm_ppc_ops.to_terminal_init = NULL;
+  bdm_ppc_ops.to_terminal_inferior = NULL;
+  bdm_ppc_ops.to_terminal_ours_for_output = NULL;
+  bdm_ppc_ops.to_terminal_ours = NULL;
+  bdm_ppc_ops.to_terminal_info = NULL;
+  bdm_ppc_ops.to_kill = ocd_kill;
+  bdm_ppc_ops.to_load = ocd_load;
+  bdm_ppc_ops.to_lookup_symbol = NULL;
+  bdm_ppc_ops.to_create_inferior = ocd_create_inferior;
+  bdm_ppc_ops.to_post_startup_inferior = NULL;
+  bdm_ppc_ops.to_acknowledge_created_inferior = NULL;
+  bdm_ppc_ops.to_clone_and_follow_inferior = NULL;
+  bdm_ppc_ops.to_post_follow_inferior_by_clone = NULL;
+  bdm_ppc_ops.to_insert_fork_catchpoint = NULL;
+  bdm_ppc_ops.to_remove_fork_catchpoint = NULL;
+  bdm_ppc_ops.to_insert_vfork_catchpoint = NULL;
+  bdm_ppc_ops.to_remove_vfork_catchpoint = NULL;
+  bdm_ppc_ops.to_has_forked = NULL;
+  bdm_ppc_ops.to_has_vforked = NULL;
+  bdm_ppc_ops.to_can_follow_vfork_prior_to_exec = NULL;
+  bdm_ppc_ops.to_post_follow_vfork = NULL;
+  bdm_ppc_ops.to_insert_exec_catchpoint = NULL;
+  bdm_ppc_ops.to_remove_exec_catchpoint = NULL;
+  bdm_ppc_ops.to_has_execd = NULL;
+  bdm_ppc_ops.to_reported_exec_events_per_exec_call = NULL;
+  bdm_ppc_ops.to_has_exited = NULL;
+  bdm_ppc_ops.to_mourn_inferior = ocd_mourn;
+  bdm_ppc_ops.to_can_run = 0;
+  bdm_ppc_ops.to_notice_signals = 0;
+  bdm_ppc_ops.to_thread_alive = ocd_thread_alive;
+  bdm_ppc_ops.to_stop = ocd_stop;
+  bdm_ppc_ops.to_pid_to_exec_file = NULL;
+  bdm_ppc_ops.to_core_file_to_sym_file = NULL;
+  bdm_ppc_ops.to_stratum = process_stratum;
+  bdm_ppc_ops.DONT_USE = NULL;
+  bdm_ppc_ops.to_has_all_memory = 1;
+  bdm_ppc_ops.to_has_memory = 1;
+  bdm_ppc_ops.to_has_stack = 1;
+  bdm_ppc_ops.to_has_registers = 1;
+  bdm_ppc_ops.to_has_execution = 1;
+  bdm_ppc_ops.to_sections = NULL;
+  bdm_ppc_ops.to_sections_end = NULL;
+  bdm_ppc_ops.to_magic = OPS_MAGIC;
+}				/* init_bdm_ppc_ops */
 
 void
-_initialize_bdm_ppc ()
+_initialize_bdm_ppc (void)
 {
+  init_bdm_ppc_ops ();
   add_target (&bdm_ppc_ops);
 }