X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmonitor.c;h=5bff3d35fa6a87bf2c81341aa26a334fe4ff107f;hb=24b06219744627c597d799c1aafb2b2322ac3c3e;hp=44c8e8f1e869c15a497633120e30e8591ed33271;hpb=1c617db829e6a6fbcfebd3ad86fa93c88ee3c222;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/monitor.c b/gdb/monitor.c index 44c8e8f1e8..5bff3d35fa 100644 --- a/gdb/monitor.c +++ b/gdb/monitor.c @@ -1,6 +1,6 @@ /* Remote debugging interface for boot monitors, for GDB. - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. Contributed by Cygnus Support. Written by Rob Savoye for Cygnus. @@ -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 - 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 @@ -43,6 +43,7 @@ #include "defs.h" #include "gdbcore.h" #include "target.h" +#include "exceptions.h" #include #include #include "gdb_string.h" @@ -79,13 +80,13 @@ 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, +static int monitor_xfer_memory (CORE_ADDR memaddr, gdb_byte *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 int monitor_insert_breakpoint (CORE_ADDR addr, gdb_byte *shadow); +static int monitor_remove_breakpoint (CORE_ADDR addr, gdb_byte *shadow); static void monitor_kill (void); static void monitor_load (char *file, int from_tty); static void monitor_mourn_inferior (void); @@ -153,7 +154,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 - when determining if debug information is printed. Perhaphs this + when determining if debug information is printed. Perhaps this could be simplified. */ static void @@ -244,9 +245,9 @@ monitor_error (char *function, char *message, 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 - 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. */ @@ -261,7 +262,7 @@ fromhex (int a) 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 @@ -345,7 +346,7 @@ monitor_printf_noecho (char *pattern,...) 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) { @@ -373,7 +374,7 @@ monitor_printf (char *pattern,...) 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) { @@ -428,9 +429,9 @@ monitor_readchar (void) 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 +500,13 @@ readchar (int timeout) 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 - 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- @@ -521,7 +522,6 @@ monitor_expect (char *string, char *buf, int buflen) char *p = string; int obuflen = buflen; int c; - extern struct target_ops *targ_ops; if (monitor_debug_p) { @@ -569,12 +569,6 @@ monitor_expect (char *string, char *buf, int buflen) 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 @@ -723,7 +717,7 @@ compile_pattern (char *pattern, struct re_pattern_buffer *compiled_pattern, 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); @@ -739,14 +733,14 @@ monitor_open (char *args, struct monitor_ops *mon_ops, int from_tty) 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) - 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); @@ -845,7 +839,7 @@ monitor_open (char *args, struct monitor_ops *mon_ops, int 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); @@ -885,7 +879,7 @@ monitor_detach (char *args, int 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. */ @@ -894,7 +888,7 @@ char * monitor_supply_register (int regno, char *valstr) { ULONGEST val; - unsigned char regbuf[MAX_REGISTER_RAW_SIZE]; + unsigned char regbuf[MAX_REGISTER_SIZE]; char *p; val = 0; @@ -923,14 +917,14 @@ monitor_supply_register (int regno, char *valstr) 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 */ - 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 (current_regcache, regno, regbuf); return p; } @@ -1036,7 +1030,7 @@ monitor_interrupt_query (void) Give up (and stop debugging it)? ")) { target_mourn_inferior (); - throw_exception (RETURN_QUIT); + deprecated_throw_reason (RETURN_QUIT); } target_terminal_inferior (); @@ -1052,12 +1046,11 @@ monitor_wait_cleanup (void *old_timeout) -void +static void monitor_wait_filter (char *buf, int bufmax, int *ext_resp_len, - struct target_waitstatus *status -) + struct target_waitstatus *status) { int resp_len; do @@ -1174,14 +1167,14 @@ monitor_wait (ptid_t ptid, struct target_waitstatus *status) static void monitor_fetch_register (int regno) { - char *name; + const char *name; 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); if (current_monitor->regname != NULL) name = current_monitor->regname (regno); @@ -1192,7 +1185,7 @@ monitor_fetch_register (int regno) if (!name || (*name == '\0')) { monitor_debug ("No register known for %d\n", regno); - supply_register (regno, zerobuf); + regcache_raw_supply (current_regcache, regno, zerobuf); return; } @@ -1227,7 +1220,7 @@ monitor_fetch_register (int regno) 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); } @@ -1235,7 +1228,7 @@ monitor_fetch_register (int regno) 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); @@ -1307,7 +1300,7 @@ monitor_dump_regs (void) parse_register_dump (buf, resp_len); } 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 @@ -1336,7 +1329,7 @@ monitor_fetch_registers (int regno) static void monitor_store_register (int regno) { - char *name; + const char *name; ULONGEST val; if (current_monitor->regname != NULL) @@ -1352,7 +1345,7 @@ monitor_store_register (int regno) val = read_register (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 */ @@ -1418,7 +1411,7 @@ monitor_prepare_to_store (void) 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 @@ -1523,33 +1516,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) { @@ -1701,17 +1667,6 @@ monitor_write_memory_block (CORE_ADDR memaddr, char *myaddr, int 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; @@ -1981,7 +1936,7 @@ monitor_read_memory (CORE_ADDR memaddr, char *myaddr, int len) 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 */ @@ -2027,7 +1982,7 @@ monitor_read_memory (CORE_ADDR memaddr, char *myaddr, int len) 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; @@ -2057,10 +2012,11 @@ monitor_kill (void) the program at that point. */ 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')) - error ("Args are not supported by the monitor."); + error (_("Args are not supported by the monitor.")); first_time = 1; clear_proceed_status (); @@ -2082,7 +2038,7 @@ monitor_mourn_inferior (void) /* Tell the monitor to add a breakpoint. */ static int -monitor_insert_breakpoint (CORE_ADDR addr, char *shadow) +monitor_insert_breakpoint (CORE_ADDR addr, gdb_byte *shadow) { int i; const unsigned char *bp; @@ -2090,13 +2046,13 @@ monitor_insert_breakpoint (CORE_ADDR addr, char *shadow) 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) addr = ADDR_BITS_REMOVE (addr); /* Determine appropriate breakpoint size for this address. */ - bp = memory_breakpoint_from_pc (&addr, &bplen); + bp = gdbarch_breakpoint_from_pc (current_gdbarch, &addr, &bplen); for (i = 0; i < current_monitor->num_breakpoints; i++) { @@ -2110,19 +2066,19 @@ monitor_insert_breakpoint (CORE_ADDR addr, char *shadow) } } - 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 -monitor_remove_breakpoint (CORE_ADDR addr, char *shadow) +monitor_remove_breakpoint (CORE_ADDR addr, gdb_byte *shadow) { int i; monitor_debug ("MON rmbkpt %s\n", paddr (addr)); if (current_monitor->clr_break == NULL) - error ("No clr_break defined for this monitor"); + error (_("No clr_break defined for this monitor")); if (current_monitor->flags & MO_ADDR_BITS_REMOVE) addr = ADDR_BITS_REMOVE (addr); @@ -2252,7 +2208,7 @@ monitor_rcmd (char *command, char buf[1000]; if (monitor_desc == NULL) - error ("monitor target not open."); + error (_("monitor target not open.")); p = current_monitor->prompt; @@ -2279,7 +2235,7 @@ from_hex (int a) 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 @@ -2294,68 +2250,29 @@ static struct target_ops monitor_ops; 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_attach = NULL; - monitor_ops.to_post_attach = NULL; - monitor_ops.to_require_attach = NULL; 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_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_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_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_lookup_symbol = 0; 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_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_pid_to_exec_file = NULL; 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_sections = 0; - monitor_ops.to_sections_end = 0; monitor_ops.to_magic = OPS_MAGIC; } /* init_base_monitor_ops */ @@ -2372,22 +2289,26 @@ init_monitor_ops (struct target_ops *ops) /* 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 (); - 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\ -is displayed.", &setdebuglist), - &showdebuglist); +is displayed."), + NULL, + NULL, /* FIXME: i18n: */ + &setdebuglist, &showdebuglist); }