* target.h (struct thread_resume): Delete leave_stopped member.

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

diff --git a/gdb/dbug-rom.c b/gdb/dbug-rom.c
index aadab6f5b065c4072c8d153b4724bca6b1bf2a4c..4bcb5a67f0171be9e1e98c50171718065d39bc8b 100644 (file)
--- a/gdb/dbug-rom.c
+++ b/gdb/dbug-rom.c
@@ -1,5 +1,6 @@
 /* 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, 1998, 1999, 2000, 2001, 2007, 2008, 2009
+   Free Software Foundation, Inc.

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


@@ -7,7 +8,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 +17,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


@@ -37,9 +36,11 @@
 static void dbug_open (char *args, int from_tty);
 
 static void
 static void dbug_open (char *args, int from_tty);
 
 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;


@@ -49,12 +50,12 @@ 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')
       break;
     case 'D':
       if (regname[1] < '0' || regname[1] > '7')


@@ -70,7 +71,7 @@ dbug_supply_register (char *regname, int regnamelen, char *val, int vallen)
       return;
     }
 
       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
 }
 
 /* This array of registers needs to match the indexes used by GDB. The


@@ -90,7 +91,7 @@ dbug_regname (int index)
   };
 
   if ((index >= (sizeof (regnames) / sizeof (regnames[0]))) 
   };
 
   if ((index >= (sizeof (regnames) / sizeof (regnames[0]))) 

-      || (index < 0) || (index >= NUM_REGS))
+      || (index < 0) || (index >= gdbarch_num_regs (current_gdbarch)))

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


@@ -140,7 +141,7 @@ init_dbug_cmds (void)
   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.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.supply_register = dbug_supply_register;

   dbug_cmds.load_routine = NULL;       /* load_routine (defaults to SRECs) */
   dbug_cmds.load = "dl\r";     /* download command */
   dbug_cmds.loadresp = "\n";   /* load response */
   dbug_cmds.load_routine = NULL;       /* load_routine (defaults to SRECs) */
   dbug_cmds.load = "dl\r";     /* download command */
   dbug_cmds.loadresp = "\n";   /* load response */


@@ -160,6 +161,8 @@ dbug_open (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)
 {