daily update

[deliverable/binutils-gdb.git] / gdb / monitor.c

diff --git a/gdb/monitor.c b/gdb/monitor.c
index 05d4fb267b8f1c9a82f78a09ddc33db07f376814..efcd047f23c94ebdcb48143acf76889587b2f5f2 100644 (file)
--- a/gdb/monitor.c
+++ b/gdb/monitor.c
@@ -1,7 +1,7 @@
 /* Remote debugging interface for boot monitors, for GDB.
 
 /* Remote debugging interface for boot monitors, for GDB.
 

-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2006, 2007 Free Software Foundation, Inc.

 
    Contributed by Cygnus Support.  Written by Rob Savoye for Cygnus.
    Resurrected from the ashes by Stu Grossman.
 
    Contributed by Cygnus Support.  Written by Rob Savoye for Cygnus.
    Resurrected from the ashes by Stu Grossman.


@@ -20,8 +20,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

 
 /* This file was derived from various remote-* modules. It is a collection
    of generic support functions so GDB can talk directly to a ROM based
 
 /* This file was derived from various remote-* modules. It is a collection
    of generic support functions so GDB can talk directly to a ROM based


@@ -43,6 +43,7 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "target.h"
 #include "defs.h"
 #include "gdbcore.h"
 #include "target.h"

+#include "exceptions.h"

 #include <signal.h>
 #include <ctype.h>
 #include "gdb_string.h"
 #include <signal.h>
 #include <ctype.h>
 #include "gdb_string.h"


@@ -59,51 +60,14 @@
 static char *dev_name;
 static struct target_ops *targ_ops;
 
 static char *dev_name;
 static struct target_ops *targ_ops;
 

-static void monitor_vsprintf (char *sndbuf, char *pattern, va_list args);
-
-static int readchar (int timeout);
-
-static void monitor_fetch_register (int regno);
-static void monitor_store_register (int regno);
-
-static void monitor_printable_string (char *newstr, char *oldstr, int len);
-static void monitor_error (char *function, char *message, CORE_ADDR memaddr, int len, char *string, int final_char);
-static void monitor_detach (char *args, int from_tty);
-static void monitor_resume (ptid_t ptid, int step, enum target_signal sig);
-static void monitor_interrupt (int signo);
-static void monitor_interrupt_twice (int signo);

 static void monitor_interrupt_query (void);
 static void monitor_interrupt_query (void);

-static void monitor_wait_cleanup (void *old_timeout);
-
-static ptid_t monitor_wait (ptid_t ptid, struct target_waitstatus *status);
-static void monitor_fetch_registers (int regno);
-static void monitor_store_registers (int regno);
-static void monitor_prepare_to_store (void);
-static int monitor_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len,
-                               int write, 
-                               struct mem_attrib *attrib,
-                               struct target_ops *target);
-static void monitor_files_info (struct target_ops *ops);
-static int monitor_insert_breakpoint (CORE_ADDR addr, char *shadow);
-static int monitor_remove_breakpoint (CORE_ADDR addr, char *shadow);
-static void monitor_kill (void);
-static void monitor_load (char *file, int from_tty);
-static void monitor_mourn_inferior (void);
+static void monitor_interrupt_twice (int);

 static void monitor_stop (void);
 static void monitor_stop (void);

+static void monitor_dump_regs (struct regcache *regcache);

 
 

-static int monitor_read_memory (CORE_ADDR addr, char *myaddr, int len);
-static int monitor_write_memory (CORE_ADDR addr, char *myaddr, int len);
-static int monitor_write_memory_bytes (CORE_ADDR addr, char *myaddr, int len);
-static int monitor_write_memory_block (CORE_ADDR memaddr,
-                                      char *myaddr, int len);
-static int monitor_expect_regexp (struct re_pattern_buffer *pat,
-                                 char *buf, int buflen);
-static void monitor_dump_regs (void);

 #if 0
 static int from_hex (int a);
 #if 0
 static int from_hex (int a);

-static unsigned long get_hex_word (void);

 #endif
 #endif

-static void parse_register_dump (char *, int);

 
 static struct monitor_ops *current_monitor;
 
 
 static struct monitor_ops *current_monitor;
 


@@ -153,7 +117,7 @@ static void monitor_debug (const char *fmt, ...) ATTR_FORMAT(printf, 1, 2);
 static int monitor_debug_p = 0;
 
 /* NOTE: This file alternates between monitor_debug_p and remote_debug
 static int monitor_debug_p = 0;
 
 /* NOTE: This file alternates between monitor_debug_p and remote_debug

-   when determining if debug information is printed.  Perhaphs this
+   when determining if debug information is printed.  Perhaps this

    could be simplified. */
 
 static void
    could be simplified. */
 
 static void


@@ -244,9 +208,9 @@ monitor_error (char *function, char *message,
   monitor_printable_string (safe_string, string, real_len);
 
   if (final_char)
   monitor_printable_string (safe_string, string, real_len);
 
   if (final_char)

-    error ("%s (0x%s): %s: %s%c", function, paddr_nz (memaddr), message, safe_string, final_char);
+    error (_("%s (0x%s): %s: %s%c"), function, paddr_nz (memaddr), message, safe_string, final_char);

   else
   else

-    error ("%s (0x%s): %s: %s", function, paddr_nz (memaddr), message, safe_string);
+    error (_("%s (0x%s): %s: %s"), function, paddr_nz (memaddr), message, safe_string);

 }
 
 /* Convert hex digit A to a number.  */
 }
 
 /* Convert hex digit A to a number.  */


@@ -261,7 +225,7 @@ fromhex (int a)
   else if (a >= 'A' && a <= 'F')
     return a - 'A' + 10;
   else
   else if (a >= 'A' && a <= 'F')
     return a - 'A' + 10;
   else

-    error ("Invalid hex digit %d", a);
+    error (_("Invalid hex digit %d"), a);

 }
 
 /* monitor_vsprintf - similar to vsprintf but handles 64-bit addresses
 }
 
 /* monitor_vsprintf - similar to vsprintf but handles 64-bit addresses


@@ -345,7 +309,7 @@ monitor_printf_noecho (char *pattern,...)
 
   len = strlen (sndbuf);
   if (len + 1 > sizeof sndbuf)
 
   len = strlen (sndbuf);
   if (len + 1 > sizeof sndbuf)

-    internal_error (__FILE__, __LINE__, "failed internal consistency check");
+    internal_error (__FILE__, __LINE__, _("failed internal consistency check"));

 
   if (monitor_debug_p)
     {
 
   if (monitor_debug_p)
     {


@@ -373,7 +337,7 @@ monitor_printf (char *pattern,...)
 
   len = strlen (sndbuf);
   if (len + 1 > sizeof sndbuf)
 
   len = strlen (sndbuf);
   if (len + 1 > sizeof sndbuf)

-    internal_error (__FILE__, __LINE__, "failed internal consistency check");
+    internal_error (__FILE__, __LINE__, _("failed internal consistency check"));

 
   if (monitor_debug_p)
     {
 
   if (monitor_debug_p)
     {


@@ -428,9 +392,9 @@ monitor_readchar (void)
     return c;
 
   if (c == SERIAL_TIMEOUT)
     return c;
 
   if (c == SERIAL_TIMEOUT)

-    error ("Timeout reading from remote system.");
+    error (_("Timeout reading from remote system."));

 
 

-  perror_with_name ("remote-monitor");
+  perror_with_name (_("remote-monitor"));

 }
 
 
 }
 
 


@@ -499,13 +463,13 @@ readchar (int timeout)
     if (in_monitor_wait)       /* Watchdog went off */
       {
        target_mourn_inferior ();
     if (in_monitor_wait)       /* Watchdog went off */
       {
        target_mourn_inferior ();

-       error ("GDB serial timeout has expired.  Target detached.\n");
+       error (_("GDB serial timeout has expired.  Target detached."));

       }
     else
 #endif
       }
     else
 #endif

-      error ("Timeout reading from remote system.");
+      error (_("Timeout reading from remote system."));

 
 

-  perror_with_name ("remote-monitor");
+  perror_with_name (_("remote-monitor"));

 }
 
 /* Scan input from the remote system, until STRING is found.  If BUF is non-
 }
 
 /* Scan input from the remote system, until STRING is found.  If BUF is non-


@@ -521,7 +485,6 @@ monitor_expect (char *string, char *buf, int buflen)
   char *p = string;
   int obuflen = buflen;
   int c;
   char *p = string;
   int obuflen = buflen;
   int c;

-  extern struct target_ops *targ_ops;

 
   if (monitor_debug_p)
     {
 
   if (monitor_debug_p)
     {


@@ -569,12 +532,6 @@ monitor_expect (char *string, char *buf, int buflen)
                return 0;
            }
        }
                return 0;
            }
        }

-      else if ((c == '\021' || c == '\023') &&
-              (STREQ (targ_ops->to_shortname, "m32r")
-               || STREQ (targ_ops->to_shortname, "mon2000")))
-       {                       /* m32r monitor emits random DC1/DC3 chars */
-         continue;
-       }

       else
        {
          /* We got a character that doesn't match the string.  We need to
       else
        {
          /* We got a character that doesn't match the string.  We need to


@@ -723,7 +680,7 @@ compile_pattern (char *pattern, struct re_pattern_buffer *compiled_pattern,
   re_set_syntax (tmp);
 
   if (val)
   re_set_syntax (tmp);
 
   if (val)

-    error ("compile_pattern: Can't compile pattern string `%s': %s!", pattern, val);
+    error (_("compile_pattern: Can't compile pattern string `%s': %s!"), pattern, val);

 
   if (fastmap)
     re_compile_fastmap (compiled_pattern);
 
   if (fastmap)
     re_compile_fastmap (compiled_pattern);


@@ -739,14 +696,14 @@ monitor_open (char *args, struct monitor_ops *mon_ops, int from_tty)
   char **p;
 
   if (mon_ops->magic != MONITOR_OPS_MAGIC)
   char **p;
 
   if (mon_ops->magic != MONITOR_OPS_MAGIC)

-    error ("Magic number of monitor_ops struct wrong.");
+    error (_("Magic number of monitor_ops struct wrong."));

 
   targ_ops = mon_ops->target;
   name = targ_ops->to_shortname;
 
   if (!args)
 
   targ_ops = mon_ops->target;
   name = targ_ops->to_shortname;
 
   if (!args)

-    error ("Use `target %s DEVICE-NAME' to use a serial port, or \n\
-`target %s HOST-NAME:PORT-NUMBER' to use a network connection.", name, name);
+    error (_("Use `target %s DEVICE-NAME' to use a serial port, or \n\
+`target %s HOST-NAME:PORT-NUMBER' to use a network connection."), name, name);

 
   target_preopen (from_tty);
 
 
   target_preopen (from_tty);
 


@@ -845,7 +802,7 @@ monitor_open (char *args, struct monitor_ops *mon_ops, int from_tty)
     }
 
   if (from_tty)
     }
 
   if (from_tty)

-    printf_unfiltered ("Remote target %s connected to %s\n", name, dev_name);
+    printf_unfiltered (_("Remote target %s connected to %s\n"), name, dev_name);

 
   push_target (targ_ops);
 
 
   push_target (targ_ops);
 


@@ -855,7 +812,7 @@ monitor_open (char *args, struct monitor_ops *mon_ops, int from_tty)
 
   monitor_printf (current_monitor->line_term);
 
 
   monitor_printf (current_monitor->line_term);
 

-  start_remote ();
+  start_remote (from_tty);

 }
 
 /* Close out all files and local state before this target loses
 }
 
 /* Close out all files and local state before this target loses


@@ -885,16 +842,16 @@ monitor_detach (char *args, int from_tty)
 {
   pop_target ();               /* calls monitor_close to do the real work */
   if (from_tty)
 {
   pop_target ();               /* calls monitor_close to do the real work */
   if (from_tty)

-    printf_unfiltered ("Ending remote %s debugging\n", target_shortname);
+    printf_unfiltered (_("Ending remote %s debugging\n"), target_shortname);

 }
 
 /* Convert VALSTR into the target byte-ordered value of REGNO and store it.  */
 
 char *
 }
 
 /* Convert VALSTR into the target byte-ordered value of REGNO and store it.  */
 
 char *

-monitor_supply_register (int regno, char *valstr)
+monitor_supply_register (struct regcache *regcache, int regno, char *valstr)

 {
   ULONGEST val;
 {
   ULONGEST val;

-  unsigned char regbuf[MAX_REGISTER_RAW_SIZE];
+  unsigned char regbuf[MAX_REGISTER_SIZE];

   char *p;
 
   val = 0;
   char *p;
 
   val = 0;


@@ -923,14 +880,14 @@ monitor_supply_register (int regno, char *valstr)
   monitor_debug ("Supplying Register %d %s\n", regno, valstr);
 
   if (val == 0 && valstr == p)
   monitor_debug ("Supplying Register %d %s\n", regno, valstr);
 
   if (val == 0 && valstr == p)

-    error ("monitor_supply_register (%d):  bad value from monitor: %s.",
+    error (_("monitor_supply_register (%d):  bad value from monitor: %s."),

           regno, valstr);
 
   /* supply register stores in target byte order, so swap here */
 
           regno, valstr);
 
   /* supply register stores in target byte order, so swap here */
 

-  store_unsigned_integer (regbuf, REGISTER_RAW_SIZE (regno), val);
+  store_unsigned_integer (regbuf, register_size (current_gdbarch, regno), val);

 
 

-  supply_register (regno, regbuf);
+  regcache_raw_supply (regcache, regno, regbuf);

 
   return p;
 }
 
   return p;
 }


@@ -969,7 +926,7 @@ monitor_resume (ptid_t ptid, int step, enum target_signal sig)
    string which are passed down to monitor specific code.  */
 
 static void
    string which are passed down to monitor specific code.  */
 
 static void

-parse_register_dump (char *buf, int len)
+parse_register_dump (struct regcache *regcache, char *buf, int len)

 {
   monitor_debug ("MON Parsing  register dump\n");
   while (1)
 {
   monitor_debug ("MON Parsing  register dump\n");
   while (1)


@@ -991,7 +948,8 @@ parse_register_dump (char *buf, int len)
       vallen = register_strings.end[2] - register_strings.start[2];
       val = buf + register_strings.start[2];
 
       vallen = register_strings.end[2] - register_strings.start[2];
       val = buf + register_strings.start[2];
 

-      current_monitor->supply_register (regname, regnamelen, val, vallen);
+      current_monitor->supply_register (regcache, regname, regnamelen,
+                                       val, vallen);

 
       buf += register_strings.end[0];
       len -= register_strings.end[0];
 
       buf += register_strings.end[0];
       len -= register_strings.end[0];


@@ -1036,7 +994,7 @@ monitor_interrupt_query (void)
 Give up (and stop debugging it)? "))
     {
       target_mourn_inferior ();
 Give up (and stop debugging it)? "))
     {
       target_mourn_inferior ();

-      return_to_top_level (RETURN_QUIT);
+      deprecated_throw_reason (RETURN_QUIT);

     }
 
   target_terminal_inferior ();
     }
 
   target_terminal_inferior ();


@@ -1052,12 +1010,11 @@ monitor_wait_cleanup (void *old_timeout)
 
 
 
 
 
 

-void
+static void

 monitor_wait_filter (char *buf,
                     int bufmax,
                     int *ext_resp_len,
 monitor_wait_filter (char *buf,
                     int bufmax,
                     int *ext_resp_len,

-                    struct target_waitstatus *status
-)
+                    struct target_waitstatus *status)

 {
   int resp_len;
   do
 {
   int resp_len;
   do


@@ -1152,10 +1109,10 @@ monitor_wait (ptid_t ptid, struct target_waitstatus *status)
     }
 
   if (current_monitor->register_pattern)
     }
 
   if (current_monitor->register_pattern)

-    parse_register_dump (buf, resp_len);
+    parse_register_dump (get_current_regcache (), buf, resp_len);

 #else
   monitor_debug ("Wait fetching registers after stop\n");
 #else
   monitor_debug ("Wait fetching registers after stop\n");

-  monitor_dump_regs ();
+  monitor_dump_regs (get_current_regcache ());

 #endif
 
   status->kind = TARGET_WAITKIND_STOPPED;
 #endif
 
   status->kind = TARGET_WAITKIND_STOPPED;


@@ -1172,24 +1129,27 @@ monitor_wait (ptid_t ptid, struct target_waitstatus *status)
    errno value.  */
 
 static void
    errno value.  */
 
 static void

-monitor_fetch_register (int regno)
+monitor_fetch_register (struct regcache *regcache, int regno)

 {
 {

-  char *name;
+  const char *name;

   char *zerobuf;
   char *regbuf;
   int i;
 
   char *zerobuf;
   char *regbuf;
   int i;
 

-  regbuf  = alloca (MAX_REGISTER_RAW_SIZE * 2 + 1);
-  zerobuf = alloca (MAX_REGISTER_RAW_SIZE);
-  memset (zerobuf, 0, MAX_REGISTER_RAW_SIZE);
+  regbuf  = alloca (MAX_REGISTER_SIZE * 2 + 1);
+  zerobuf = alloca (MAX_REGISTER_SIZE);
+  memset (zerobuf, 0, MAX_REGISTER_SIZE);

 
 

-  name = current_monitor->regnames[regno];
+  if (current_monitor->regname != NULL)
+    name = current_monitor->regname (regno);
+  else
+    name = current_monitor->regnames[regno];

   monitor_debug ("MON fetchreg %d '%s'\n", regno, name ? name : "(null name)");
 
   if (!name || (*name == '\0'))
     {
       monitor_debug ("No register known for %d\n", regno);
   monitor_debug ("MON fetchreg %d '%s'\n", regno, name ? name : "(null name)");
 
   if (!name || (*name == '\0'))
     {
       monitor_debug ("No register known for %d\n", regno);

-      supply_register (regno, zerobuf);
+      regcache_raw_supply (regcache, regno, zerobuf);

       return;
     }
 
       return;
     }
 


@@ -1224,7 +1184,7 @@ monitor_fetch_register (int regno)
       if ((c == '0') && ((c = readchar (timeout)) == 'x'))
        ;
       else
       if ((c == '0') && ((c = readchar (timeout)) == 'x'))
        ;
       else

-       error ("Bad value returned from monitor while fetching register %x.",
+       error (_("Bad value returned from monitor while fetching register %x."),

               regno);
     }
 
               regno);
     }
 


@@ -1232,7 +1192,7 @@ monitor_fetch_register (int regno)
      spaces, but stop reading if something else is seen.  Some monitors
      like to drop leading zeros.  */
 
      spaces, but stop reading if something else is seen.  Some monitors
      like to drop leading zeros.  */
 

-  for (i = 0; i < REGISTER_RAW_SIZE (regno) * 2; i++)
+  for (i = 0; i < register_size (current_gdbarch, regno) * 2; i++)

     {
       int c;
       c = readchar (timeout);
     {
       int c;
       c = readchar (timeout);


@@ -1268,7 +1228,7 @@ monitor_fetch_register (int regno)
       current_monitor->getreg.term_cmd)                /* ack expected */
     monitor_expect_prompt (NULL, 0);   /* get response */
 
       current_monitor->getreg.term_cmd)                /* ack expected */
     monitor_expect_prompt (NULL, 0);   /* get response */
 

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

 }
 
 /* Sometimes, it takes several commands to dump the registers */
 }
 
 /* Sometimes, it takes several commands to dump the registers */


@@ -1276,13 +1236,13 @@ monitor_fetch_register (int regno)
    case they need to compose the operation.
  */
 int
    case they need to compose the operation.
  */
 int

-monitor_dump_reg_block (char *block_cmd)
+monitor_dump_reg_block (struct regcache *regcache, char *block_cmd)

 {
   char buf[TARGET_BUF_SIZE];
   int resp_len;
   monitor_printf (block_cmd);
   resp_len = monitor_expect_prompt (buf, sizeof (buf));
 {
   char buf[TARGET_BUF_SIZE];
   int resp_len;
   monitor_printf (block_cmd);
   resp_len = monitor_expect_prompt (buf, sizeof (buf));

-  parse_register_dump (buf, resp_len);
+  parse_register_dump (regcache, buf, resp_len);

   return 1;
 }
 
   return 1;
 }
 


@@ -1291,61 +1251,65 @@ monitor_dump_reg_block (char *block_cmd)
 /* Call the specific function if it has been provided */
 
 static void
 /* Call the specific function if it has been provided */
 
 static void

-monitor_dump_regs (void)
+monitor_dump_regs (struct regcache *regcache)

 {
   char buf[TARGET_BUF_SIZE];
   int resp_len;
   if (current_monitor->dumpregs)
 {
   char buf[TARGET_BUF_SIZE];
   int resp_len;
   if (current_monitor->dumpregs)

-    (*(current_monitor->dumpregs)) (); /* call supplied function */
+    (*(current_monitor->dumpregs)) (regcache); /* call supplied function */

   else if (current_monitor->dump_registers)    /* default version */
     {
       monitor_printf (current_monitor->dump_registers);
       resp_len = monitor_expect_prompt (buf, sizeof (buf));
   else if (current_monitor->dump_registers)    /* default version */
     {
       monitor_printf (current_monitor->dump_registers);
       resp_len = monitor_expect_prompt (buf, sizeof (buf));

-      parse_register_dump (buf, resp_len);
+      parse_register_dump (regcache, buf, resp_len);

     }
   else
     }
   else

-    internal_error (__FILE__, __LINE__, "failed internal consistency check");                  /* Need some way to read registers */
+    internal_error (__FILE__, __LINE__, _("failed internal consistency check"));                       /* Need some way to read registers */

 }
 
 static void
 }
 
 static void

-monitor_fetch_registers (int regno)
+monitor_fetch_registers (struct regcache *regcache, int regno)

 {
   monitor_debug ("MON fetchregs\n");
   if (current_monitor->getreg.cmd)
     {
       if (regno >= 0)
        {
 {
   monitor_debug ("MON fetchregs\n");
   if (current_monitor->getreg.cmd)
     {
       if (regno >= 0)
        {

-         monitor_fetch_register (regno);
+         monitor_fetch_register (regcache, regno);

          return;
        }
 
          return;
        }
 

-      for (regno = 0; regno < NUM_REGS; regno++)
-       monitor_fetch_register (regno);
+      for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++)
+       monitor_fetch_register (regcache, regno);

     }
   else
     {
     }
   else
     {

-      monitor_dump_regs ();
+      monitor_dump_regs (regcache);

     }
 }
 
 /* Store register REGNO, or all if REGNO == 0.  Return errno value.  */
 
 static void
     }
 }
 
 /* Store register REGNO, or all if REGNO == 0.  Return errno value.  */
 
 static void

-monitor_store_register (int regno)
+monitor_store_register (struct regcache *regcache, int regno)

 {
 {

-  char *name;
+  const char *name;

   ULONGEST val;
   ULONGEST val;

-
-  name = current_monitor->regnames[regno];
+  
+  if (current_monitor->regname != NULL)
+    name = current_monitor->regname (regno);
+  else
+    name = current_monitor->regnames[regno];
+  

   if (!name || (*name == '\0'))
     {
       monitor_debug ("MON Cannot store unknown register\n");
       return;
     }
 
   if (!name || (*name == '\0'))
     {
       monitor_debug ("MON Cannot store unknown register\n");
       return;
     }
 

-  val = read_register (regno);
+  regcache_cooked_read_unsigned (regcache, regno, &val);

   monitor_debug ("MON storeg %d %s\n", regno,
   monitor_debug ("MON storeg %d %s\n", regno,

-                phex (val, REGISTER_RAW_SIZE (regno)));
+                phex (val, register_size (current_gdbarch, regno)));

 
   /* send the register deposit command */
 
 
   /* send the register deposit command */
 


@@ -1384,16 +1348,16 @@ monitor_store_register (int regno)
 /* Store the remote registers.  */
 
 static void
 /* Store the remote registers.  */
 
 static void

-monitor_store_registers (int regno)
+monitor_store_registers (struct regcache *regcache, int regno)

 {
   if (regno >= 0)
     {
 {
   if (regno >= 0)
     {

-      monitor_store_register (regno);
+      monitor_store_register (regcache, regno);

       return;
     }
 
       return;
     }
 

-  for (regno = 0; regno < NUM_REGS; regno++)
-    monitor_store_register (regno);
+  for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++)
+    monitor_store_register (regcache, regno);

 }
 
 /* Get ready to modify the registers array.  On machines which store
 }
 
 /* Get ready to modify the registers array.  On machines which store


@@ -1403,7 +1367,7 @@ monitor_store_registers (int regno)
    debugged.  */
 
 static void
    debugged.  */
 
 static void

-monitor_prepare_to_store (void)
+monitor_prepare_to_store (struct regcache *regcache)

 {
   /* Do nothing, since we can store individual regs */
 }
 {
   /* Do nothing, since we can store individual regs */
 }


@@ -1411,7 +1375,7 @@ monitor_prepare_to_store (void)
 static void
 monitor_files_info (struct target_ops *ops)
 {
 static void
 monitor_files_info (struct target_ops *ops)
 {

-  printf_unfiltered ("\tAttached to %s at %d baud.\n", dev_name, baud_rate);
+  printf_unfiltered (_("\tAttached to %s at %d baud.\n"), dev_name, baud_rate);

 }
 
 static int
 }
 
 static int


@@ -1424,7 +1388,7 @@ monitor_write_memory (CORE_ADDR memaddr, char *myaddr, int len)
   monitor_debug ("MON write %d %s\n", len, paddr (memaddr));
 
   if (current_monitor->flags & MO_ADDR_BITS_REMOVE)
   monitor_debug ("MON write %d %s\n", len, paddr (memaddr));
 
   if (current_monitor->flags & MO_ADDR_BITS_REMOVE)

-    memaddr = ADDR_BITS_REMOVE (memaddr);
+    memaddr = gdbarch_addr_bits_remove (current_gdbarch, memaddr);

 
   /* Use memory fill command for leading 0 bytes.  */
 
 
   /* Use memory fill command for leading 0 bytes.  */
 


@@ -1516,33 +1480,6 @@ monitor_write_memory (CORE_ADDR memaddr, char *myaddr, int len)
 }
 
 
 }
 
 

-static int
-monitor_write_even_block (CORE_ADDR memaddr, char *myaddr, int len)
-{
-  unsigned int val;
-  int written = 0;;
-  /* Enter the sub mode */
-  monitor_printf (current_monitor->setmem.cmdl, memaddr);
-  monitor_expect_prompt (NULL, 0);
-
-  while (len)
-    {
-      val = extract_unsigned_integer (myaddr, 4);      /* REALLY */
-      monitor_printf ("%x\r", val);
-      myaddr += 4;
-      memaddr += 4;
-      written += 4;
-      monitor_debug (" @ %s\n", paddr (memaddr));
-      /* If we wanted to, here we could validate the address */
-      monitor_expect_prompt (NULL, 0);
-    }
-  /* Now exit the sub mode */
-  monitor_printf (current_monitor->getreg.term_cmd);
-  monitor_expect_prompt (NULL, 0);
-  return written;
-}
-
-

 static int
 monitor_write_memory_bytes (CORE_ADDR memaddr, char *myaddr, int len)
 {
 static int
 monitor_write_memory_bytes (CORE_ADDR memaddr, char *myaddr, int len)
 {


@@ -1694,17 +1631,6 @@ monitor_write_memory_block (CORE_ADDR memaddr, char *myaddr, int len)
     {
       return monitor_write_memory_longlongs (memaddr, myaddr, len);
     }
     {
       return monitor_write_memory_longlongs (memaddr, myaddr, len);
     }

-#endif
-#if 0
-  if (len > 4)
-    {
-      int sublen;
-      written = monitor_write_even_block (memaddr, myaddr, len);
-      /* Adjust calling parameters by written amount */
-      memaddr += written;
-      myaddr += written;
-      len -= written;
-    }

 #endif
   written = monitor_write_memory_bytes (memaddr, myaddr, len);
   return written;
 #endif
   written = monitor_write_memory_bytes (memaddr, myaddr, len);
   return written;


@@ -1861,7 +1787,7 @@ monitor_read_memory (CORE_ADDR memaddr, char *myaddr, int len)
                 paddr_nz (memaddr), (long) myaddr, len);
 
   if (current_monitor->flags & MO_ADDR_BITS_REMOVE)
                 paddr_nz (memaddr), (long) myaddr, len);
 
   if (current_monitor->flags & MO_ADDR_BITS_REMOVE)

-    memaddr = ADDR_BITS_REMOVE (memaddr);
+    memaddr = gdbarch_addr_bits_remove (current_gdbarch, memaddr);

 
   if (current_monitor->flags & MO_GETMEM_READ_SINGLE)
     return monitor_read_memory_single (memaddr, myaddr, len);
 
   if (current_monitor->flags & MO_GETMEM_READ_SINGLE)
     return monitor_read_memory_single (memaddr, myaddr, len);


@@ -1974,7 +1900,7 @@ monitor_read_memory (CORE_ADDR memaddr, char *myaddr, int len)
          c = *p;
        }
       if (fetched == 0)
          c = *p;
        }
       if (fetched == 0)

-       error ("Failed to read via monitor");
+       error (_("Failed to read via monitor"));

       if (monitor_debug_p || remote_debug)
        fprintf_unfiltered (gdb_stdlog, "\n");
       return fetched;          /* Return the number of bytes actually read */
       if (monitor_debug_p || remote_debug)
        fprintf_unfiltered (gdb_stdlog, "\n");
       return fetched;          /* Return the number of bytes actually read */


@@ -2020,7 +1946,7 @@ monitor_read_memory (CORE_ADDR memaddr, char *myaddr, int len)
    unused. */
 
 static int
    unused. */
 
 static int

-monitor_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+monitor_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write,

                     struct mem_attrib *attrib, struct target_ops *target)
 {
   int res;
                     struct mem_attrib *attrib, struct target_ops *target)
 {
   int res;


@@ -2046,18 +1972,18 @@ monitor_kill (void)
   return;                      /* ignore attempts to kill target system */
 }
 
   return;                      /* ignore attempts to kill target system */
 }
 

-/* All we actually do is set the PC to the start address of exec_bfd, and start
-   the program at that point.  */
+/* All we actually do is set the PC to the start address of exec_bfd.  */

 
 static void
 
 static void

-monitor_create_inferior (char *exec_file, char *args, char **env)
+monitor_create_inferior (char *exec_file, char *args, char **env,
+                        int from_tty)

 {
   if (args && (*args != '\000'))
 {
   if (args && (*args != '\000'))

-    error ("Args are not supported by the monitor.");
+    error (_("Args are not supported by the monitor."));

 
   first_time = 1;
   clear_proceed_status ();
 
   first_time = 1;
   clear_proceed_status ();

-  proceed (bfd_get_start_address (exec_bfd), TARGET_SIGNAL_0, 0);
+  write_pc (bfd_get_start_address (exec_bfd));

 }
 
 /* Clean up when a program exits.
 }
 
 /* Clean up when a program exits.


@@ -2075,50 +2001,50 @@ monitor_mourn_inferior (void)
 /* Tell the monitor to add a breakpoint.  */
 
 static int
 /* Tell the monitor to add a breakpoint.  */
 
 static int

-monitor_insert_breakpoint (CORE_ADDR addr, char *shadow)
+monitor_insert_breakpoint (struct bp_target_info *bp_tgt)

 {
 {

+  CORE_ADDR addr = bp_tgt->placed_address;

   int i;
   int i;

-  unsigned char *bp;
+  const unsigned char *bp;

   int bplen;
 
   monitor_debug ("MON inst bkpt %s\n", paddr (addr));
   if (current_monitor->set_break == NULL)
   int bplen;
 
   monitor_debug ("MON inst bkpt %s\n", paddr (addr));
   if (current_monitor->set_break == NULL)

-    error ("No set_break defined for this monitor");
+    error (_("No set_break defined for this monitor"));

 
   if (current_monitor->flags & MO_ADDR_BITS_REMOVE)
 
   if (current_monitor->flags & MO_ADDR_BITS_REMOVE)

-    addr = ADDR_BITS_REMOVE (addr);
+    addr = gdbarch_addr_bits_remove (current_gdbarch, addr);

 
   /* Determine appropriate breakpoint size for this address.  */
 
   /* Determine appropriate breakpoint size for this address.  */

-  bp = memory_breakpoint_from_pc (&addr, &bplen);
+  bp = gdbarch_breakpoint_from_pc (current_gdbarch, &addr, &bplen);
+  bp_tgt->placed_address = addr;
+  bp_tgt->placed_size = bplen;

 
   for (i = 0; i < current_monitor->num_breakpoints; i++)
     {
       if (breakaddr[i] == 0)
        {
          breakaddr[i] = addr;
 
   for (i = 0; i < current_monitor->num_breakpoints; i++)
     {
       if (breakaddr[i] == 0)
        {
          breakaddr[i] = addr;

-         monitor_read_memory (addr, shadow, bplen);

          monitor_printf (current_monitor->set_break, addr);
          monitor_expect_prompt (NULL, 0);
          return 0;
        }
     }
 
          monitor_printf (current_monitor->set_break, addr);
          monitor_expect_prompt (NULL, 0);
          return 0;
        }
     }
 

-  error ("Too many breakpoints (> %d) for monitor.", current_monitor->num_breakpoints);
+  error (_("Too many breakpoints (> %d) for monitor."), current_monitor->num_breakpoints);

 }
 
 /* Tell the monitor to remove a breakpoint.  */
 
 static int
 }
 
 /* Tell the monitor to remove a breakpoint.  */
 
 static int

-monitor_remove_breakpoint (CORE_ADDR addr, char *shadow)
+monitor_remove_breakpoint (struct bp_target_info *bp_tgt)

 {
 {

+  CORE_ADDR addr = bp_tgt->placed_address;

   int i;
 
   monitor_debug ("MON rmbkpt %s\n", paddr (addr));
   if (current_monitor->clr_break == NULL)
   int i;
 
   monitor_debug ("MON rmbkpt %s\n", paddr (addr));
   if (current_monitor->clr_break == NULL)

-    error ("No clr_break defined for this monitor");
-
-  if (current_monitor->flags & MO_ADDR_BITS_REMOVE)
-    addr = ADDR_BITS_REMOVE (addr);
+    error (_("No clr_break defined for this monitor"));

 
   for (i = 0; i < current_monitor->num_breakpoints; i++)
     {
 
   for (i = 0; i < current_monitor->num_breakpoints; i++)
     {


@@ -2245,7 +2171,7 @@ monitor_rcmd (char *command,
   char buf[1000];
 
   if (monitor_desc == NULL)
   char buf[1000];
 
   if (monitor_desc == NULL)

-    error ("monitor target not open.");
+    error (_("monitor target not open."));

 
   p = current_monitor->prompt;
 
 
   p = current_monitor->prompt;
 


@@ -2272,7 +2198,7 @@ from_hex (int a)
   if (a >= 'A' && a <= 'F')
     return a - 'A' + 10;
 
   if (a >= 'A' && a <= 'F')
     return a - 'A' + 10;
 

-  error ("Reply contains invalid hex digit 0x%x", a);
+  error (_("Reply contains invalid hex digit 0x%x"), a);

 }
 #endif
 
 }
 #endif
 


@@ -2287,68 +2213,29 @@ static struct target_ops monitor_ops;
 static void
 init_base_monitor_ops (void)
 {
 static void
 init_base_monitor_ops (void)
 {

-  monitor_ops.to_shortname = NULL;
-  monitor_ops.to_longname = NULL;
-  monitor_ops.to_doc = NULL;
-  monitor_ops.to_open = NULL;

   monitor_ops.to_close = monitor_close;
   monitor_ops.to_close = monitor_close;

-  monitor_ops.to_attach = NULL;
-  monitor_ops.to_post_attach = NULL;
-  monitor_ops.to_require_attach = NULL;

   monitor_ops.to_detach = monitor_detach;
   monitor_ops.to_detach = monitor_detach;

-  monitor_ops.to_require_detach = NULL;

   monitor_ops.to_resume = monitor_resume;
   monitor_ops.to_wait = monitor_wait;
   monitor_ops.to_resume = monitor_resume;
   monitor_ops.to_wait = monitor_wait;

-  monitor_ops.to_post_wait = NULL;

   monitor_ops.to_fetch_registers = monitor_fetch_registers;
   monitor_ops.to_store_registers = monitor_store_registers;
   monitor_ops.to_prepare_to_store = monitor_prepare_to_store;
   monitor_ops.to_fetch_registers = monitor_fetch_registers;
   monitor_ops.to_store_registers = monitor_store_registers;
   monitor_ops.to_prepare_to_store = monitor_prepare_to_store;

-  monitor_ops.to_xfer_memory = monitor_xfer_memory;
+  monitor_ops.deprecated_xfer_memory = monitor_xfer_memory;

   monitor_ops.to_files_info = monitor_files_info;
   monitor_ops.to_insert_breakpoint = monitor_insert_breakpoint;
   monitor_ops.to_remove_breakpoint = monitor_remove_breakpoint;
   monitor_ops.to_files_info = monitor_files_info;
   monitor_ops.to_insert_breakpoint = monitor_insert_breakpoint;
   monitor_ops.to_remove_breakpoint = monitor_remove_breakpoint;

-  monitor_ops.to_terminal_init = 0;
-  monitor_ops.to_terminal_inferior = 0;
-  monitor_ops.to_terminal_ours_for_output = 0;
-  monitor_ops.to_terminal_ours = 0;
-  monitor_ops.to_terminal_info = 0;

   monitor_ops.to_kill = monitor_kill;
   monitor_ops.to_load = monitor_load;
   monitor_ops.to_kill = monitor_kill;
   monitor_ops.to_load = monitor_load;

-  monitor_ops.to_lookup_symbol = 0;

   monitor_ops.to_create_inferior = monitor_create_inferior;
   monitor_ops.to_create_inferior = monitor_create_inferior;

-  monitor_ops.to_post_startup_inferior = NULL;
-  monitor_ops.to_acknowledge_created_inferior = NULL;
-  monitor_ops.to_clone_and_follow_inferior = NULL;
-  monitor_ops.to_post_follow_inferior_by_clone = NULL;
-  monitor_ops.to_insert_fork_catchpoint = NULL;
-  monitor_ops.to_remove_fork_catchpoint = NULL;
-  monitor_ops.to_insert_vfork_catchpoint = NULL;
-  monitor_ops.to_remove_vfork_catchpoint = NULL;
-  monitor_ops.to_has_forked = NULL;
-  monitor_ops.to_has_vforked = NULL;
-  monitor_ops.to_can_follow_vfork_prior_to_exec = NULL;
-  monitor_ops.to_post_follow_vfork = NULL;
-  monitor_ops.to_insert_exec_catchpoint = NULL;
-  monitor_ops.to_remove_exec_catchpoint = NULL;
-  monitor_ops.to_has_execd = NULL;
-  monitor_ops.to_reported_exec_events_per_exec_call = NULL;
-  monitor_ops.to_has_exited = NULL;

   monitor_ops.to_mourn_inferior = monitor_mourn_inferior;
   monitor_ops.to_mourn_inferior = monitor_mourn_inferior;

-  monitor_ops.to_can_run = 0;
-  monitor_ops.to_notice_signals = 0;
-  monitor_ops.to_thread_alive = 0;

   monitor_ops.to_stop = monitor_stop;
   monitor_ops.to_rcmd = monitor_rcmd;
   monitor_ops.to_stop = monitor_stop;
   monitor_ops.to_rcmd = monitor_rcmd;

-  monitor_ops.to_pid_to_exec_file = NULL;

   monitor_ops.to_stratum = process_stratum;
   monitor_ops.to_stratum = process_stratum;

-  monitor_ops.DONT_USE = 0;

   monitor_ops.to_has_all_memory = 1;
   monitor_ops.to_has_memory = 1;
   monitor_ops.to_has_stack = 1;
   monitor_ops.to_has_registers = 1;
   monitor_ops.to_has_execution = 1;
   monitor_ops.to_has_all_memory = 1;
   monitor_ops.to_has_memory = 1;
   monitor_ops.to_has_stack = 1;
   monitor_ops.to_has_registers = 1;
   monitor_ops.to_has_execution = 1;

-  monitor_ops.to_sections = 0;
-  monitor_ops.to_sections_end = 0;

   monitor_ops.to_magic = OPS_MAGIC;
 }                              /* init_base_monitor_ops */
 
   monitor_ops.to_magic = OPS_MAGIC;
 }                              /* init_base_monitor_ops */
 


@@ -2365,22 +2252,26 @@ init_monitor_ops (struct target_ops *ops)
 
 /* Define additional commands that are usually only used by monitors.  */
 
 
 /* Define additional commands that are usually only used by monitors.  */
 

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

 void
 _initialize_remote_monitors (void)
 {
   init_base_monitor_ops ();
 void
 _initialize_remote_monitors (void)
 {
   init_base_monitor_ops ();

-  add_show_from_set (add_set_cmd ("hash", no_class, var_boolean,
-                                 (char *) &hashmark,
-                                 "Set display of activity while downloading a file.\n\
-When enabled, a hashmark \'#\' is displayed.",
-                                 &setlist),
-                    &showlist);
-
-  add_show_from_set
-    (add_set_cmd ("monitor", no_class, var_zinteger,
-                 (char *) &monitor_debug_p,
-                 "Set debugging of remote monitor communication.\n\
+  add_setshow_boolean_cmd ("hash", no_class, &hashmark, _("\
+Set display of activity while downloading a file."), _("\
+Show display of activity while downloading a file."), _("\
+When enabled, a hashmark \'#\' is displayed."),
+                          NULL,
+                          NULL, /* FIXME: i18n: */
+                          &setlist, &showlist);
+
+  add_setshow_zinteger_cmd ("monitor", no_class, &monitor_debug_p, _("\
+Set debugging of remote monitor communication."), _("\
+Show debugging of remote monitor communication."), _("\

 When enabled, communication between GDB and the remote monitor\n\
 When enabled, communication between GDB and the remote monitor\n\

-is displayed.", &setdebuglist),
-     &showdebuglist);
+is displayed."),
+                           NULL,
+                           NULL, /* FIXME: i18n: */
+                           &setdebuglist, &showdebuglist);

 }
 }