X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fmonitor.c;h=81c4876cd302fbe642c954d791eef62ee8ae9b54;hb=e2e0b3e57f11bb2539724fc955af7e22380613c1;hp=ede61bb6998ef5b36bfe61100980215f0c080c00;hpb=123a958e016784942d494e94a55827db9c11fd9a;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/monitor.c b/gdb/monitor.c index ede61bb699..81c4876cd3 100644 --- a/gdb/monitor.c +++ b/gdb/monitor.c @@ -43,6 +43,7 @@ #include "defs.h" #include "gdbcore.h" #include "target.h" +#include "exceptions.h" #include #include #include "gdb_string.h" @@ -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,14 +569,6 @@ monitor_expect (char *string, char *buf, int buflen) return 0; } } -#if 0 - // OBSOLETE else if ((c == '\021' || c == '\023') && - // OBSOLETE (STREQ (targ_ops->to_shortname, "m32r") - // OBSOLETE || STREQ (targ_ops->to_shortname, "mon2000"))) - // OBSOLETE { /* m32r monitor emits random DC1/DC3 chars */ - // OBSOLETE continue; - // OBSOLETE } -#endif else { /* We got a character that doesn't match the string. We need to @@ -725,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); @@ -741,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); @@ -925,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; } @@ -1038,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 (); @@ -1054,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 @@ -1194,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; } @@ -1229,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); } @@ -1237,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); @@ -1309,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 @@ -1354,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 */ @@ -1525,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) { @@ -1703,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; @@ -1983,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 */ @@ -2059,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 (); @@ -2092,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++) { @@ -2112,7 +2066,7 @@ 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. */ @@ -2124,7 +2078,7 @@ monitor_remove_breakpoint (CORE_ADDR addr, char *shadow) 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); @@ -2254,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; @@ -2281,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 @@ -2303,7 +2257,7 @@ init_base_monitor_ops (void) 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; @@ -2335,18 +2289,21 @@ 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\ + deprecated_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); + &setlist), + &showlist); - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("monitor", no_class, var_zinteger, (char *) &monitor_debug_p, "Set debugging of remote monitor communication.\n\