2003-01-09 Andrew Cagney <ac131313@redhat.com>

[deliverable/binutils-gdb.git] / gdb / abug-rom.c

diff --git a/gdb/abug-rom.c b/gdb/abug-rom.c
index b4c44a94b541e08b8ba790286ec3f33e8caedba5..d3a9c2e82df28698a096e3cad33dba06804213ca 100644 (file)
--- a/gdb/abug-rom.c
+++ b/gdb/abug-rom.c
@@ -28,6 +28,8 @@
 #include "serial.h"
 #include "regcache.h"
 
+#include "m68k-tdep.h"
+
 /* Prototypes for local functions. */
 
 static void abug_open (char *args, int from_tty);
@@ -55,12 +57,12 @@ abug_supply_register (char *regname, int regnamelen, char *val, int 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 +78,22 @@ abug_supply_register (char *regname, int regnamelen, char *val, int vallen)
  * registers either. So, typing "info reg sp" becomes an "A7".
  */
 
-static char *abug_regnames[NUM_REGS] =
+static const char *
+abug_regname (int index)
 {
-  "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
-  "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7",
-  "PC",
-};
+  static char *regnames[] =
+  {
+    "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
+    "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7",
+    "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,7 +153,8 @@ init_abug_cmds (void)
   abug_cmds.cmd_end = NULL;    /* optional command terminator */
   abug_cmds.target = &abug_ops;        /* target operations */
   abug_cmds.stopbits = SERIAL_1_STOPBITS;      /* number of stop bits */
-  abug_cmds.regnames = abug_regnames;  /* registers names */
+  abug_cmds.regnames = NULL;   /* registers names */
+  abug_cmds.regname = abug_regname;
   abug_cmds.magic = MONITOR_OPS_MAGIC; /* magic */
 };