X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcpu32bug-rom.c;h=4341789e1656e8ce2c6a2586be700b3d9859c9d9;hb=b3f71a301e0e75ae3fc610f061d76374c33a11c2;hp=8bd0ea20040b2f4a48e4b9911fd3a8004e3663df;hpb=d0352a18a504a4e7b761f6b3264cf11347d8d056;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/cpu32bug-rom.c b/gdb/cpu32bug-rom.c
index 8bd0ea2004..4341789e16 100644
--- a/gdb/cpu32bug-rom.c
+++ b/gdb/cpu32bug-rom.c
@@ -1,5 +1,6 @@
 /* Remote debugging interface for CPU32Bug Rom monitor for GDB, the GNU debugger.
-   Copyright 1995 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.
 
    Written by Stu Grossman of Cygnus Support
 
@@ -25,15 +26,14 @@
 #include "target.h"
 #include "monitor.h"
 #include "serial.h"
+#include "regcache.h"
+
+#include "m68k-tdep.h"
 
 static void cpu32bug_open (char *args, int from_tty);
 
 static void
-cpu32bug_supply_register (regname, regnamelen, val, vallen)
-     char *regname;
-     int regnamelen;
-     char *val;
-     int vallen;
+cpu32bug_supply_register (char *regname, int regnamelen, char *val, int vallen)
 {
   int regno;
 
@@ -55,12 +55,12 @@ cpu32bug_supply_register (regname, regnamelen, val, vallen)
     case 'D':
       if (regname[1] < '0' || regname[1] > '7')
 	return;
-      regno = regname[1] - '0' + D0_REGNUM;
+      regno = regname[1] - '0' + M68K_D0_REGNUM;
       break;
     case 'A':
       if (regname[1] < '0' || regname[1] > '7')
 	return;
-      regno = regname[1] - '0' + A0_REGNUM;
+      regno = regname[1] - '0' + M68K_A0_REGNUM;
       break;
     default:
       return;
@@ -76,12 +76,22 @@ cpu32bug_supply_register (regname, regnamelen, val, vallen)
  * registers either. So, typing "info reg sp" becomes an "A7".
  */
 
-static char *cpu32bug_regnames[NUM_REGS] =
+static const char *
+cpu32bug_regname (int index)
 {
-  "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
-  "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7",
-  "SR", "PC",
-};
+  static char *regnames[] =
+  {
+    "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
+    "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7",
+    "SR", "PC"
+  };
+
+  if ((index >= (sizeof (regnames) / sizeof (regnames[0]))) 
+       || (index < 0) || (index >= NUM_REGS))
+    return NULL;
+  else
+    return regnames[index];
+}
 
 /*
  * Define the monitor command strings. Since these are passed directly
@@ -141,20 +151,19 @@ init_cpu32bug_cmds (void)
   cpu32bug_cmds.cmd_end = NULL;	/* optional command terminator */
   cpu32bug_cmds.target = &cpu32bug_ops;		/* target operations */
   cpu32bug_cmds.stopbits = SERIAL_1_STOPBITS;	/* number of stop bits */
-  cpu32bug_cmds.regnames = cpu32bug_regnames;	/* registers names */
+  cpu32bug_cmds.regnames = NULL;	/* registers names */
+  cpu32bug_cmds.regname = cpu32bug_regname;
   cpu32bug_cmds.magic = MONITOR_OPS_MAGIC;	/* magic */
 };				/* init_cpu32bug_cmds */
 
 static void
-cpu32bug_open (args, from_tty)
-     char *args;
-     int from_tty;
+cpu32bug_open (char *args, int from_tty)
 {
   monitor_open (args, &cpu32bug_cmds, from_tty);
 }
 
 void
-_initialize_cpu32bug_rom ()
+_initialize_cpu32bug_rom (void)
 {
   init_cpu32bug_cmds ();
   init_monitor_ops (&cpu32bug_ops);