Update comment of linespec_lexer_lex_keyword.

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

diff --git a/gdb/dbug-rom.c b/gdb/dbug-rom.c
index bd20184c006ec6905ce66c28fd96439a42a18fd6..f771e1ca132dabbe9c86e17f883cb0072a777088 100644 (file)
--- a/gdb/dbug-rom.c
+++ b/gdb/dbug-rom.c
@@ -1,5 +1,5 @@
 /* Remote debugging interface to dBUG ROM monitor for GDB, the GNU debugger.
 /* Remote debugging interface to dBUG ROM monitor for GDB, the GNU debugger.

-   Copyright 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1996-2015 Free Software Foundation, Inc.

 
    Written by Stan Shebs of Cygnus Support.
 
 
    Written by Stan Shebs of Cygnus Support.
 


@@ -7,7 +7,7 @@
 
    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
 
    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
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* dBUG is a monitor supplied on various Motorola boards, including
    m68k, ColdFire, and PowerPC-based designs.  The code here assumes
 
 /* dBUG is a monitor supplied on various Motorola boards, including
    m68k, ColdFire, and PowerPC-based designs.  The code here assumes


@@ -32,12 +30,14 @@
 #include "serial.h"
 #include "regcache.h"
 
 #include "serial.h"
 #include "regcache.h"
 

-static void dbug_open (char *args, int from_tty);
+#include "m68k-tdep.h"

 
 static void
 
 static void

-dbug_supply_register (char *regname, int regnamelen, char *val, int vallen)
+dbug_supply_register (struct regcache *regcache, char *regname,
+                     int regnamelen, char *val, int vallen)

 {
   int regno;
 {
   int regno;

+  struct gdbarch *gdbarch = get_regcache_arch (regcache);

 
   if (regnamelen != 2)
     return;
 
   if (regnamelen != 2)
     return;


@@ -47,34 +47,34 @@ dbug_supply_register (char *regname, int regnamelen, char *val, int vallen)
     case 'S':
       if (regname[1] != 'R')
        return;
     case 'S':
       if (regname[1] != 'R')
        return;

-      regno = PS_REGNUM;
+      regno = gdbarch_ps_regnum (gdbarch);

       break;
     case 'P':
       if (regname[1] != 'C')
        return;
       break;
     case 'P':
       if (regname[1] != 'C')
        return;

-      regno = PC_REGNUM;
+      regno = gdbarch_pc_regnum (gdbarch);

       break;
     case 'D':
       if (regname[1] < '0' || regname[1] > '7')
        return;
       break;
     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;
       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;
     }
 
       break;
     default:
       return;
     }
 

-  monitor_supply_register (regno, val);
+  monitor_supply_register (regcache, regno, val);

 }
 
 }
 

-/* This array of registers needs to match the indexes used by GDB. The
-   whole reason this exists is because the various ROM monitors use
-   different names than GDB does, and don't support all the registers
-   either. So, typing "info reg sp" becomes an "A7". */
+/* This array of registers needs to match the indexes used by GDB.
+   The whole reason this exists is because the various ROM monitors
+   use different names than GDB does, and don't support all the
+   registers either.  So, typing "info reg sp" becomes an "A7".  */

 
 static const char *
 dbug_regname (int index)
 
 static const char *
 dbug_regname (int index)


@@ -87,8 +87,7 @@ dbug_regname (int index)
     /* no float registers */
   };
 
     /* no float registers */
   };
 

-  if ((index >= (sizeof (regnames) / sizeof (regnames[0]))) 
-      || (index < 0) || (index >= NUM_REGS))
+  if (index >= ARRAY_SIZE (regnames) || index < 0)

     return NULL;
   else
     return regnames[index];
     return NULL;
   else
     return regnames[index];


@@ -105,7 +104,8 @@ static char *dbug_inits[] =
 static void
 init_dbug_cmds (void)
 {
 static void
 init_dbug_cmds (void)
 {

-  dbug_cmds.flags = MO_CLR_BREAK_USES_ADDR | MO_GETMEM_NEEDS_RANGE | MO_FILL_USES_ADDR;
+  dbug_cmds.flags = MO_CLR_BREAK_USES_ADDR
+    | MO_GETMEM_NEEDS_RANGE | MO_FILL_USES_ADDR;

   dbug_cmds.init = dbug_inits; /* Init strings */
   dbug_cmds.cont = "go\r";     /* continue command */
   dbug_cmds.step = "trace\r";  /* single step */
   dbug_cmds.init = dbug_inits; /* Init strings */
   dbug_cmds.cont = "go\r";     /* continue command */
   dbug_cmds.step = "trace\r";  /* single step */


@@ -137,9 +137,9 @@ init_dbug_cmds (void)
   dbug_cmds.getreg.term = NULL;        /* getreg.term */
   dbug_cmds.getreg.term_cmd = NULL;    /* getreg.term_cmd */
   dbug_cmds.dump_registers = "rd\r";   /* dump_registers */
   dbug_cmds.getreg.term = NULL;        /* getreg.term */
   dbug_cmds.getreg.term_cmd = NULL;    /* getreg.term_cmd */
   dbug_cmds.dump_registers = "rd\r";   /* dump_registers */

-  dbug_cmds.register_pattern = "\\(\\w+\\) +:\\([0-9a-fA-F]+\\b\\)";   /* register_pattern */
-  dbug_cmds.supply_register = dbug_supply_register;    /* supply_register */
-  dbug_cmds.load_routine = NULL;       /* load_routine (defaults to SRECs) */
+                                       /* register_pattern */
+  dbug_cmds.register_pattern = "\\(\\w+\\) +:\\([0-9a-fA-F]+\\b\\)";
+  dbug_cmds.supply_register = dbug_supply_register;

   dbug_cmds.load = "dl\r";     /* download command */
   dbug_cmds.loadresp = "\n";   /* load response */
   dbug_cmds.prompt = "dBUG>";  /* monitor command prompt */
   dbug_cmds.load = "dl\r";     /* download command */
   dbug_cmds.loadresp = "\n";   /* load response */
   dbug_cmds.prompt = "dBUG>";  /* monitor command prompt */


@@ -153,11 +153,13 @@ init_dbug_cmds (void)
 }                              /* init_debug_ops */
 
 static void
 }                              /* init_debug_ops */
 
 static void

-dbug_open (char *args, int from_tty)
+dbug_open (const char *args, int from_tty)

 {
   monitor_open (args, &dbug_cmds, from_tty);
 }
 
 {
   monitor_open (args, &dbug_cmds, from_tty);
 }
 

+extern initialize_file_ftype _initialize_dbug_rom; /* -Wmissing-prototypes */
+

 void
 _initialize_dbug_rom (void)
 {
 void
 _initialize_dbug_rom (void)
 {