1999-04-16 01:35:26 +00:00
|
|
|
/* Remote debugging interface for boot monitors, for GDB.
|
2002-01-19 03:32:43 +00:00
|
|
|
|
2005-12-17 22:34:03 +00:00
|
|
|
Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
|
2006-01-24 22:09:28 +00:00
|
|
|
1999, 2000, 2001, 2002, 2006 Free Software Foundation, Inc.
|
2002-01-19 03:32:43 +00:00
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
Contributed by Cygnus Support. Written by Rob Savoye for Cygnus.
|
|
|
|
Resurrected from the ashes by Stu Grossman.
|
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
This file is part of GDB.
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
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
|
|
|
|
(at your option) any later version.
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
2005-12-17 22:34:03 +00:00
|
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
Boston, MA 02110-1301, USA. */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* 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
|
|
|
|
monitor. This saves use from having to hack an exception based handler
|
* gdbarch.sh, hp-psymtab-read.c, hpread.c, m3-nat.c, mcore-tdep.c,
mips-tdep.c, monitor.c, regcache.c, remote-es.c, ser-unix.c,
somread.c, tracepoint.c: Fix spelling errors in comments.
* gdbarch.c: Regenerate.
* gnu-nat.c (S_exception_raise_request): Fix typos and spelling
errors in strings.
* m3-nat.c (intercept_exec_calls, mach_thread_parse_id): Likewise.
* mcore-tdep.c (mcore_analyze_prologue): Likewise.
* mips-tdep.c (mips16_next_pc, _initialize_mips_tdep): Likewise.
* remote-e7000.c (e7000_start_remote): Likewise.
* remote-rdp.c (handle_swi): Likewise.
* remote-vx.c (vx_load_command): Likewise.
* sh-tdep.c (sh_do_pseudo_register): Likewise.
* sol-thread.c (td_err_string): Likewise.
* symtab.c (decode_line_2): Likewise.
-------------------------------------------------------------------
2000-10-30 21:50:58 +00:00
|
|
|
into existence, and makes for quick porting.
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
This module talks to a debug monitor called 'MONITOR', which
|
|
|
|
We communicate with MONITOR via either a direct serial line, or a TCP
|
|
|
|
(or possibly TELNET) stream to a terminal multiplexor,
|
|
|
|
which in turn talks to the target board. */
|
|
|
|
|
|
|
|
/* FIXME 32x64: This code assumes that registers and addresses are at
|
|
|
|
most 32 bits long. If they can be larger, you will need to declare
|
|
|
|
values as LONGEST and use %llx or some such to print values when
|
|
|
|
building commands to send to the monitor. Since we don't know of
|
|
|
|
any actual 64-bit targets with ROM monitors that use this code,
|
|
|
|
it's not an issue right now. -sts 4/18/96 */
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "gdbcore.h"
|
|
|
|
#include "target.h"
|
2005-01-12 Andrew Cagney <cagney@gnu.org>
* exceptions.h (enum return_reason, RETURN_MASK)
(RETURN_MASK_QUIT, RETURN_MASK_ERROR, RETURN_MASK_ALL)
(return_mask, throw_exception, catch_exceptions_ftype)
(catch_exceptions_with_msg, catch_errors_ftype, catch_errors)
(catch_command_errors_ftype, catch_command_errors): Move to
exceptions.h.
* exceptions.c, exceptions.h: New files.
* top.c: Do not include <setjmp.h>.
(SIGJMP_BUF, SIGSETJMP, SIGLONGJMP, catch_return)
(throw_exception, catcher, catch_exceptions)
(catch_exceptions_with_msg, struct catch_errors_args)
(do_catch_errors, catch_errors, struct captured_command_args)
(do_captured_command, catch_command_errors): Move to exceptions.c.
* wrapper.c, wince.c, win32-nat.c, utils.c: Include "exceptions.h".
* tui/tui-interp.c, top.c, thread.c, symmisc.c: Ditto.
* symfile-mem.c, stack.c, solib.c, rs6000-nat.c: Ditto.
* remote-sds.c, remote-mips.c, remote-fileio.c: Ditto.
* remote-e7000.c, objc-lang.c, ocd.c: Ditto.
* remote.c, nto-procfs.c, monitor.c, mi/mi-main.c: Ditto.
* main.c, m32r-rom.c, infrun.c, inf-loop.c: Ditto.
* hppa-hpux-tdep.c, frame.c, event-top.c, event-loop.c: Ditto.
* corelow.c, corefile.c, cli/cli-interp.c, breakpoint.c: Ditto.
* ada-valprint.c, ada-lang.c: Ditto.
* Makefile.in (HFILES_NO_SRCDIR, COMMON_OBS): Add exceptions.h and
exceptions.o. Update all dependencies.
2005-01-12 18:31:35 +00:00
|
|
|
#include "exceptions.h"
|
1999-04-16 01:35:26 +00:00
|
|
|
#include <signal.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include "gdb_string.h"
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include "command.h"
|
|
|
|
#include "serial.h"
|
|
|
|
#include "monitor.h"
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
#include "inferior.h"
|
2000-04-04 02:08:52 +00:00
|
|
|
#include "gdb_regex.h"
|
1999-04-16 01:35:26 +00:00
|
|
|
#include "srec.h"
|
2001-03-01 01:39:22 +00:00
|
|
|
#include "regcache.h"
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
static char *dev_name;
|
|
|
|
static struct target_ops *targ_ops;
|
|
|
|
|
2000-05-28 01:12:42 +00:00
|
|
|
static void monitor_vsprintf (char *sndbuf, char *pattern, va_list args);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2000-05-28 01:12:42 +00:00
|
|
|
static int readchar (int timeout);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2000-05-28 01:12:42 +00:00
|
|
|
static void monitor_fetch_register (int regno);
|
|
|
|
static void monitor_store_register (int regno);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
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);
|
2000-05-28 01:12:42 +00:00
|
|
|
static void monitor_detach (char *args, int from_tty);
|
2001-05-04 04:15:33 +00:00
|
|
|
static void monitor_resume (ptid_t ptid, int step, enum target_signal sig);
|
2000-05-28 01:12:42 +00:00
|
|
|
static void monitor_interrupt (int signo);
|
|
|
|
static void monitor_interrupt_twice (int signo);
|
|
|
|
static void monitor_interrupt_query (void);
|
|
|
|
static void monitor_wait_cleanup (void *old_timeout);
|
|
|
|
|
2001-05-04 04:15:33 +00:00
|
|
|
static ptid_t monitor_wait (ptid_t ptid, struct target_waitstatus *status);
|
2000-05-28 01:12:42 +00:00
|
|
|
static void monitor_fetch_registers (int regno);
|
|
|
|
static void monitor_store_registers (int regno);
|
|
|
|
static void monitor_prepare_to_store (void);
|
2005-11-02 15:22:24 +00:00
|
|
|
static int monitor_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len,
|
* exec.c (xfer_memory): Add attrib argument.
* infptrace.c (child_xfer_memory): Likewise.
* monitor.c (monitor_xfer_memory): Likewise.
* remote-adapt.c (adapt_xfer_inferior_memory): Likewise.
* remote-array.c (array_xfer_memory): Likewise.
* remote-bug.c (bug_xfer_memory): Likewise.
* remote-e7000.c (e7000_xfer_inferior_memory): Likewise.
* remote-eb.c (eb_xfer_inferior_memory): Likewise.
* remote-es.c (es1800_xfer_inferior_memory): Likewise.
* remote-mips.c (mips_xfer_memory): Likewise.
* remote-mm.c (mm_xfer_inferior_memory): Likewise.
* remote-nindy.c (nindy_xfer_inferior_memory): Likewise.
* remote-os9k.c (rombug_xfer_inferior_memory): Likewise.
* remote-rdi.c (arm_rdi_xfer_memory): Likewise.
* remote-rdp.c (remote_rdp_xfer_inferior_memory): Likewise.
* remote-sds.c (sds_xfer_memory): Likewise.
* remote-sim.c (gdbsim_xfer_inferior_memory): Likewise.
* remote-st.c (st2000_xfer_inferior_memory): Likewise.
* remote-udi.c (udi_xfer_inferior_memory): Likewise.
* remote-vx.c (vx_xfer_memory): Likewise.
* remote.c (remote_xfer_memory): Likewise.
* target.c (debug_to_xfer_memory, do_xfer_memory): Likewise.
* target.h (child_xfer_memory, do_xfer_memory, xfer_memory): Likewise.
* target.h (#include "memattr.h"): Added.
(target_ops.to_xfer_memory): Add attrib argument.
* wince.c (_initialize_inftarg): Removed call to set_dcache_state.
* dcache.h (set_dcache_state): Removed declaration.
* dcache.c (set_dcache_state): Removed definition
* dcache.c: Update module comment, as dcache is now enabled and
disabled with memory region attributes instead of by the global
variable "remotecache". Add comment describing the interaction
between dcache and memory region attributes.
(dcache_xfer_memory): Add comment describing benefits of moving
cache writeback to a higher level.
(dcache_struct): Removed cache_has_stuff field. This was used to
record whether the cache had been accessed in order to invalidate
it when it was disabled. However, this is not needed because the
cache is write through and the code that enables, disables, and
deletes memory regions invalidate the cache. Add comment which
suggests that we could be more selective and only invalidate those
cache lines containing data from those memory regions.
(dcache_invalidate): Updated.
(dcache_xfer_memory): Updated.
(dcache_alloc): Don't abort() if dcache_enabled_p is clear.
(dcache_xfer_memory): Removed code that called do_xfer_memory() to
perform a uncached transfer if dcache_enabled_p was clear. This
function is now only called if caching is enabled for the memory
region.
(dcache_info): Always print cache info.
* target.c (do_xfer_memory): Add attrib argument.
(target_xfer_memory, target_xfer_memory_partial): Break transfer
into chunks defined by memory regions, pass region attributes to
do_xfer_memory().
* dcache.c (dcache_read_line, dcache_write_line): Likewise.
* Makefile.in (SFILES): Add memattr.c.
(COMMON_OBS): Add memattr.o.
(dcache.o): Add target.h to dependencies.
* memattr.c: New file.
* memattr.h: Likewise.
2001-01-23 22:48:56 +00:00
|
|
|
int write,
|
|
|
|
struct mem_attrib *attrib,
|
|
|
|
struct target_ops *target);
|
2000-05-28 01:12:42 +00:00
|
|
|
static void monitor_files_info (struct target_ops *ops);
|
|
|
|
static void monitor_kill (void);
|
|
|
|
static void monitor_load (char *file, int from_tty);
|
|
|
|
static void monitor_mourn_inferior (void);
|
|
|
|
static void monitor_stop (void);
|
|
|
|
|
|
|
|
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);
|
1999-04-16 01:35:26 +00:00
|
|
|
#if 0
|
2000-05-28 01:12:42 +00:00
|
|
|
static int from_hex (int a);
|
|
|
|
static unsigned long get_hex_word (void);
|
1999-04-16 01:35:26 +00:00
|
|
|
#endif
|
2000-05-28 01:12:42 +00:00
|
|
|
static void parse_register_dump (char *, int);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
static struct monitor_ops *current_monitor;
|
|
|
|
|
|
|
|
static int hashmark; /* flag set by "set hash" */
|
|
|
|
|
|
|
|
static int timeout = 30;
|
|
|
|
|
|
|
|
static int in_monitor_wait = 0; /* Non-zero means we are in monitor_wait() */
|
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
static void (*ofunc) (); /* Old SIGINT signal handler */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-05-19 19:58:41 +00:00
|
|
|
static CORE_ADDR *breakaddr;
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
/* Descriptor for I/O to remote machine. Initialize it to NULL so
|
|
|
|
that monitor_open knows that we don't have a file open when the
|
|
|
|
program starts. */
|
|
|
|
|
2001-07-10 21:06:34 +00:00
|
|
|
static struct serial *monitor_desc = NULL;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* Pointer to regexp pattern matching data */
|
|
|
|
|
|
|
|
static struct re_pattern_buffer register_pattern;
|
|
|
|
static char register_fastmap[256];
|
|
|
|
|
|
|
|
static struct re_pattern_buffer getmem_resp_delim_pattern;
|
|
|
|
static char getmem_resp_delim_fastmap[256];
|
|
|
|
|
2001-06-28 20:03:10 +00:00
|
|
|
static struct re_pattern_buffer setmem_resp_delim_pattern;
|
|
|
|
static char setmem_resp_delim_fastmap[256];
|
|
|
|
|
|
|
|
static struct re_pattern_buffer setreg_resp_delim_pattern;
|
|
|
|
static char setreg_resp_delim_fastmap[256];
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
static int dump_reg_flag; /* Non-zero means do a dump_registers cmd when
|
|
|
|
monitor_wait wakes up. */
|
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
static int first_time = 0; /* is this the first time we're executing after
|
|
|
|
gaving created the child proccess? */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-09-09 00:02:17 +00:00
|
|
|
#define TARGET_BUF_SIZE 2048
|
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
/* Monitor specific debugging information. Typically only useful to
|
|
|
|
the developer of a new monitor interface. */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
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
|
2004-07-10 01:17:53 +00:00
|
|
|
when determining if debug information is printed. Perhaps this
|
1999-10-12 04:37:53 +00:00
|
|
|
could be simplified. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
monitor_debug (const char *fmt, ...)
|
|
|
|
{
|
|
|
|
if (monitor_debug_p)
|
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
va_start (args, fmt);
|
|
|
|
vfprintf_filtered (gdb_stdlog, fmt, args);
|
|
|
|
va_end (args);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Convert a string into a printable representation, Return # byte in
|
|
|
|
the new string. When LEN is >0 it specifies the size of the
|
|
|
|
string. Otherwize strlen(oldstr) is used. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
monitor_printable_string (char *newstr, char *oldstr, int len)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int ch;
|
1999-10-12 04:37:53 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
if (len <= 0)
|
|
|
|
len = strlen (oldstr);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
for (i = 0; i < len; i++)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
ch = oldstr[i];
|
1999-04-16 01:35:26 +00:00
|
|
|
switch (ch)
|
1999-07-07 20:19:36 +00:00
|
|
|
{
|
1999-04-16 01:35:26 +00:00
|
|
|
default:
|
|
|
|
if (isprint (ch))
|
|
|
|
*newstr++ = ch;
|
|
|
|
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sprintf (newstr, "\\x%02x", ch & 0xff);
|
|
|
|
newstr += 4;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
case '\\':
|
|
|
|
*newstr++ = '\\';
|
|
|
|
*newstr++ = '\\';
|
|
|
|
break;
|
|
|
|
case '\b':
|
|
|
|
*newstr++ = '\\';
|
|
|
|
*newstr++ = 'b';
|
|
|
|
break;
|
|
|
|
case '\f':
|
|
|
|
*newstr++ = '\\';
|
|
|
|
*newstr++ = 't';
|
|
|
|
break;
|
|
|
|
case '\n':
|
|
|
|
*newstr++ = '\\';
|
|
|
|
*newstr++ = 'n';
|
|
|
|
break;
|
|
|
|
case '\r':
|
|
|
|
*newstr++ = '\\';
|
|
|
|
*newstr++ = 'r';
|
|
|
|
break;
|
|
|
|
case '\t':
|
|
|
|
*newstr++ = '\\';
|
|
|
|
*newstr++ = 't';
|
|
|
|
break;
|
|
|
|
case '\v':
|
|
|
|
*newstr++ = '\\';
|
|
|
|
*newstr++ = 'v';
|
|
|
|
break;
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
*newstr++ = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Print monitor errors with a string, converting the string to printable
|
|
|
|
representation. */
|
|
|
|
|
|
|
|
static void
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_error (char *function, char *message,
|
|
|
|
CORE_ADDR memaddr, int len, char *string, int final_char)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
int real_len = (len == 0 && string != (char *) 0) ? strlen (string) : len;
|
1999-04-16 01:35:26 +00:00
|
|
|
char *safe_string = alloca ((real_len * 4) + 1);
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_printable_string (safe_string, string, real_len);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
if (final_char)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("%s (0x%s): %s: %s%c"), function, paddr_nz (memaddr), message, safe_string, final_char);
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("%s (0x%s): %s: %s"), function, paddr_nz (memaddr), message, safe_string);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Convert hex digit A to a number. */
|
|
|
|
|
|
|
|
static int
|
2000-07-30 01:48:28 +00:00
|
|
|
fromhex (int a)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
if (a >= '0' && a <= '9')
|
|
|
|
return a - '0';
|
|
|
|
else if (a >= 'a' && a <= 'f')
|
|
|
|
return a - 'a' + 10;
|
1999-07-07 20:19:36 +00:00
|
|
|
else if (a >= 'A' && a <= 'F')
|
|
|
|
return a - 'A' + 10;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("Invalid hex digit %d"), a);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* monitor_vsprintf - similar to vsprintf but handles 64-bit addresses
|
|
|
|
|
|
|
|
This function exists to get around the problem that many host platforms
|
|
|
|
don't have a printf that can print 64-bit addresses. The %A format
|
|
|
|
specification is recognized as a special case, and causes the argument
|
|
|
|
to be printed as a 64-bit hexadecimal address.
|
|
|
|
|
|
|
|
Only format specifiers of the form "[0-9]*[a-z]" are recognized.
|
|
|
|
If it is a '%s' format, the argument is a string; otherwise the
|
|
|
|
argument is assumed to be a long integer.
|
|
|
|
|
|
|
|
%% is also turned into a single %.
|
1999-07-07 20:19:36 +00:00
|
|
|
*/
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_vsprintf (char *sndbuf, char *pattern, va_list args)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
char format[10];
|
|
|
|
char fmt;
|
|
|
|
char *p;
|
|
|
|
int i;
|
|
|
|
long arg_int;
|
|
|
|
CORE_ADDR arg_addr;
|
|
|
|
char *arg_string;
|
|
|
|
|
|
|
|
for (p = pattern; *p; p++)
|
|
|
|
{
|
|
|
|
if (*p == '%')
|
|
|
|
{
|
|
|
|
/* Copy the format specifier to a separate buffer. */
|
|
|
|
format[0] = *p++;
|
|
|
|
for (i = 1; *p >= '0' && *p <= '9' && i < (int) sizeof (format) - 2;
|
|
|
|
i++, p++)
|
|
|
|
format[i] = *p;
|
|
|
|
format[i] = fmt = *p;
|
1999-07-07 20:19:36 +00:00
|
|
|
format[i + 1] = '\0';
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* Fetch the next argument and print it. */
|
|
|
|
switch (fmt)
|
|
|
|
{
|
|
|
|
case '%':
|
|
|
|
strcpy (sndbuf, "%");
|
|
|
|
break;
|
|
|
|
case 'A':
|
|
|
|
arg_addr = va_arg (args, CORE_ADDR);
|
|
|
|
strcpy (sndbuf, paddr_nz (arg_addr));
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
arg_string = va_arg (args, char *);
|
|
|
|
sprintf (sndbuf, format, arg_string);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
arg_int = va_arg (args, long);
|
|
|
|
sprintf (sndbuf, format, arg_int);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
sndbuf += strlen (sndbuf);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*sndbuf++ = *p;
|
|
|
|
}
|
|
|
|
*sndbuf = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* monitor_printf_noecho -- Send data to monitor, but don't expect an echo.
|
|
|
|
Works just like printf. */
|
|
|
|
|
|
|
|
void
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_printf_noecho (char *pattern,...)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
char sndbuf[2000];
|
|
|
|
int len;
|
|
|
|
|
|
|
|
va_start (args, pattern);
|
|
|
|
|
|
|
|
monitor_vsprintf (sndbuf, pattern, args);
|
|
|
|
|
|
|
|
len = strlen (sndbuf);
|
|
|
|
if (len + 1 > sizeof sndbuf)
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
|
|
|
internal_error (__FILE__, __LINE__, _("failed internal consistency check"));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
if (monitor_debug_p)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
char *safe_string = (char *) alloca ((strlen (sndbuf) * 4) + 1);
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_printable_string (safe_string, sndbuf, 0);
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "sent[%s]\n", safe_string);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
monitor_write (sndbuf, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* monitor_printf -- Send data to monitor and check the echo. Works just like
|
|
|
|
printf. */
|
|
|
|
|
|
|
|
void
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_printf (char *pattern,...)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
char sndbuf[2000];
|
|
|
|
int len;
|
|
|
|
|
|
|
|
va_start (args, pattern);
|
|
|
|
|
|
|
|
monitor_vsprintf (sndbuf, pattern, args);
|
|
|
|
|
|
|
|
len = strlen (sndbuf);
|
|
|
|
if (len + 1 > sizeof sndbuf)
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
|
|
|
internal_error (__FILE__, __LINE__, _("failed internal consistency check"));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
if (monitor_debug_p)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
char *safe_string = (char *) alloca ((len * 4) + 1);
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_printable_string (safe_string, sndbuf, 0);
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "sent[%s]\n", safe_string);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
monitor_write (sndbuf, len);
|
|
|
|
|
|
|
|
/* We used to expect that the next immediate output was the characters we
|
|
|
|
just output, but sometimes some extra junk appeared before the characters
|
|
|
|
we expected, like an extra prompt, or a portmaster sending telnet negotiations.
|
|
|
|
So, just start searching for what we sent, and skip anything unknown. */
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("ExpectEcho\n");
|
|
|
|
monitor_expect (sndbuf, (char *) 0, 0);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Write characters to the remote system. */
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_write (char *buf, int buflen)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2001-07-15 20:34:14 +00:00
|
|
|
if (serial_write (monitor_desc, buf, buflen))
|
|
|
|
fprintf_unfiltered (gdb_stderr, "serial_write failed: %s\n",
|
1999-04-16 01:35:26 +00:00
|
|
|
safe_strerror (errno));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Read a binary character from the remote system, doing all the fancy
|
|
|
|
timeout stuff, but without interpreting the character in any way,
|
|
|
|
and without printing remote debug information. */
|
|
|
|
|
|
|
|
int
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_readchar (void)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int c;
|
|
|
|
int looping;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
looping = 0;
|
2001-07-15 20:34:14 +00:00
|
|
|
c = serial_readchar (monitor_desc, timeout);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
if (c >= 0)
|
1999-07-07 20:19:36 +00:00
|
|
|
c &= 0xff; /* don't lose bit 7 */
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
while (looping);
|
|
|
|
|
|
|
|
if (c >= 0)
|
|
|
|
return c;
|
|
|
|
|
|
|
|
if (c == SERIAL_TIMEOUT)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("Timeout reading from remote system."));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
|
|
|
perror_with_name (_("remote-monitor"));
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Read a character from the remote system, doing all the fancy
|
|
|
|
timeout stuff. */
|
|
|
|
|
|
|
|
static int
|
2000-07-30 01:48:28 +00:00
|
|
|
readchar (int timeout)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int c;
|
1999-07-07 20:19:36 +00:00
|
|
|
static enum
|
|
|
|
{
|
|
|
|
last_random, last_nl, last_cr, last_crnl
|
|
|
|
}
|
|
|
|
state = last_random;
|
1999-04-16 01:35:26 +00:00
|
|
|
int looping;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
looping = 0;
|
2001-07-15 20:34:14 +00:00
|
|
|
c = serial_readchar (monitor_desc, timeout);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
if (c >= 0)
|
|
|
|
{
|
|
|
|
c &= 0x7f;
|
|
|
|
/* This seems to interfere with proper function of the
|
|
|
|
input stream */
|
1999-10-12 04:37:53 +00:00
|
|
|
if (monitor_debug_p || remote_debug)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
char buf[2];
|
|
|
|
buf[0] = c;
|
|
|
|
buf[1] = '\0';
|
|
|
|
puts_debug ("read -->", buf, "<--");
|
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Canonicialize \n\r combinations into one \r */
|
|
|
|
if ((current_monitor->flags & MO_HANDLE_NL) != 0)
|
|
|
|
{
|
|
|
|
if ((c == '\r' && state == last_nl)
|
|
|
|
|| (c == '\n' && state == last_cr))
|
|
|
|
{
|
|
|
|
state = last_crnl;
|
|
|
|
looping = 1;
|
|
|
|
}
|
|
|
|
else if (c == '\r')
|
|
|
|
state = last_cr;
|
|
|
|
else if (c != '\n')
|
|
|
|
state = last_random;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
state = last_nl;
|
|
|
|
c = '\r';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (looping);
|
|
|
|
|
|
|
|
if (c >= 0)
|
|
|
|
return c;
|
|
|
|
|
|
|
|
if (c == SERIAL_TIMEOUT)
|
1999-04-26 18:34:20 +00:00
|
|
|
#if 0
|
1999-04-16 01:35:26 +00:00
|
|
|
/* I fail to see how detaching here can be useful */
|
|
|
|
if (in_monitor_wait) /* Watchdog went off */
|
|
|
|
{
|
|
|
|
target_mourn_inferior ();
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("GDB serial timeout has expired. Target detached."));
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("Timeout reading from remote system."));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
|
|
|
perror_with_name (_("remote-monitor"));
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Scan input from the remote system, until STRING is found. If BUF is non-
|
|
|
|
zero, then collect input until we have collected either STRING or BUFLEN-1
|
|
|
|
chars. In either case we terminate BUF with a 0. If input overflows BUF
|
|
|
|
because STRING can't be found, return -1, else return number of chars in BUF
|
|
|
|
(minus the terminating NUL). Note that in the non-overflow case, STRING
|
|
|
|
will be at the end of BUF. */
|
|
|
|
|
|
|
|
int
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_expect (char *string, char *buf, int buflen)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
char *p = string;
|
|
|
|
int obuflen = buflen;
|
|
|
|
int c;
|
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
if (monitor_debug_p)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
char *safe_string = (char *) alloca ((strlen (string) * 4) + 1);
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_printable_string (safe_string, string, 0);
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "MON Expecting '%s'\n", safe_string);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
2000-09-01 00:12:10 +00:00
|
|
|
immediate_quit++;
|
1999-04-16 01:35:26 +00:00
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
if (buf)
|
|
|
|
{
|
|
|
|
if (buflen < 2)
|
|
|
|
{
|
|
|
|
*buf = '\000';
|
2000-09-01 00:12:10 +00:00
|
|
|
immediate_quit--;
|
1999-04-16 01:35:26 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
c = readchar (timeout);
|
|
|
|
if (c == '\000')
|
|
|
|
continue;
|
|
|
|
*buf++ = c;
|
|
|
|
buflen--;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
c = readchar (timeout);
|
|
|
|
|
|
|
|
/* Don't expect any ^C sent to be echoed */
|
1999-07-07 20:19:36 +00:00
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
if (*p == '\003' || c == *p)
|
|
|
|
{
|
|
|
|
p++;
|
|
|
|
if (*p == '\0')
|
|
|
|
{
|
2000-09-01 00:12:10 +00:00
|
|
|
immediate_quit--;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
if (buf)
|
|
|
|
{
|
|
|
|
*buf++ = '\000';
|
|
|
|
return obuflen - buflen;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
1999-08-02 23:48:37 +00:00
|
|
|
/* We got a character that doesn't match the string. We need to
|
|
|
|
back up p, but how far? If we're looking for "..howdy" and the
|
|
|
|
monitor sends "...howdy"? There's certainly a match in there,
|
|
|
|
but when we receive the third ".", we won't find it if we just
|
|
|
|
restart the matching at the beginning of the string.
|
|
|
|
|
|
|
|
This is a Boyer-Moore kind of situation. We want to reset P to
|
|
|
|
the end of the longest prefix of STRING that is a suffix of
|
|
|
|
what we've read so far. In the example above, that would be
|
|
|
|
".." --- the longest prefix of "..howdy" that is a suffix of
|
|
|
|
"...". This longest prefix could be the empty string, if C
|
|
|
|
is nowhere to be found in STRING.
|
|
|
|
|
|
|
|
If this longest prefix is not the empty string, it must contain
|
|
|
|
C, so let's search from the end of STRING for instances of C,
|
|
|
|
and see if the portion of STRING before that is a suffix of
|
|
|
|
what we read before C. Actually, we can search backwards from
|
|
|
|
p, since we know no prefix can be longer than that.
|
|
|
|
|
|
|
|
Note that we can use STRING itself, along with C, as a record
|
|
|
|
of what we've received so far. :) */
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = (p - string) - 1; i >= 0; i--)
|
|
|
|
if (string[i] == c)
|
|
|
|
{
|
|
|
|
/* Is this prefix a suffix of what we've read so far?
|
|
|
|
In other words, does
|
|
|
|
string[0 .. i-1] == string[p - i, p - 1]? */
|
|
|
|
if (! memcmp (string, p - i, i))
|
|
|
|
{
|
|
|
|
p = string + i + 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (i < 0)
|
|
|
|
p = string;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Search for a regexp. */
|
|
|
|
|
|
|
|
static int
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_expect_regexp (struct re_pattern_buffer *pat, char *buf, int buflen)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
char *mybuf;
|
|
|
|
char *p;
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON Expecting regexp\n");
|
1999-04-16 01:35:26 +00:00
|
|
|
if (buf)
|
|
|
|
mybuf = buf;
|
|
|
|
else
|
|
|
|
{
|
1999-09-09 00:02:17 +00:00
|
|
|
mybuf = alloca (TARGET_BUF_SIZE);
|
|
|
|
buflen = TARGET_BUF_SIZE;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
p = mybuf;
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
if (p - mybuf >= buflen)
|
|
|
|
{ /* Buffer about to overflow */
|
|
|
|
|
|
|
|
/* On overflow, we copy the upper half of the buffer to the lower half. Not
|
|
|
|
great, but it usually works... */
|
|
|
|
|
|
|
|
memcpy (mybuf, mybuf + buflen / 2, buflen / 2);
|
|
|
|
p = mybuf + buflen / 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
*p++ = readchar (timeout);
|
|
|
|
|
|
|
|
retval = re_search (pat, mybuf, p - mybuf, 0, p - mybuf, NULL);
|
|
|
|
if (retval >= 0)
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Keep discarding input until we see the MONITOR prompt.
|
|
|
|
|
|
|
|
The convention for dealing with the prompt is that you
|
|
|
|
o give your command
|
|
|
|
o *then* wait for the prompt.
|
|
|
|
|
|
|
|
Thus the last thing that a procedure does with the serial line will
|
|
|
|
be an monitor_expect_prompt(). Exception: monitor_resume does not
|
|
|
|
wait for the prompt, because the terminal is being handed over to
|
|
|
|
the inferior. However, the next thing which happens after that is
|
|
|
|
a monitor_wait which does wait for the prompt. Note that this
|
|
|
|
includes abnormal exit, e.g. error(). This is necessary to prevent
|
|
|
|
getting into states from which we can't recover. */
|
|
|
|
|
|
|
|
int
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_expect_prompt (char *buf, int buflen)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON Expecting prompt\n");
|
|
|
|
return monitor_expect (current_monitor->prompt, buf, buflen);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Get N 32-bit words from remote, each preceded by a space, and put
|
|
|
|
them in registers starting at REGNO. */
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
static unsigned long
|
2000-07-30 01:48:28 +00:00
|
|
|
get_hex_word (void)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
unsigned long val;
|
|
|
|
int i;
|
|
|
|
int ch;
|
|
|
|
|
|
|
|
do
|
|
|
|
ch = readchar (timeout);
|
1999-07-07 20:19:36 +00:00
|
|
|
while (isspace (ch));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
val = from_hex (ch);
|
|
|
|
|
|
|
|
for (i = 7; i >= 1; i--)
|
|
|
|
{
|
|
|
|
ch = readchar (timeout);
|
|
|
|
if (!isxdigit (ch))
|
|
|
|
break;
|
|
|
|
val = (val << 4) | from_hex (ch);
|
|
|
|
}
|
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
compile_pattern (char *pattern, struct re_pattern_buffer *compiled_pattern,
|
|
|
|
char *fastmap)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int tmp;
|
|
|
|
const char *val;
|
|
|
|
|
|
|
|
compiled_pattern->fastmap = fastmap;
|
|
|
|
|
|
|
|
tmp = re_set_syntax (RE_SYNTAX_EMACS);
|
|
|
|
val = re_compile_pattern (pattern,
|
|
|
|
strlen (pattern),
|
|
|
|
compiled_pattern);
|
|
|
|
re_set_syntax (tmp);
|
|
|
|
|
|
|
|
if (val)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("compile_pattern: Can't compile pattern string `%s': %s!"), pattern, val);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
if (fastmap)
|
|
|
|
re_compile_fastmap (compiled_pattern);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Open a connection to a remote debugger. NAME is the filename used
|
|
|
|
for communication. */
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_open (char *args, struct monitor_ops *mon_ops, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
char **p;
|
|
|
|
|
|
|
|
if (mon_ops->magic != MONITOR_OPS_MAGIC)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("Magic number of monitor_ops struct wrong."));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
targ_ops = mon_ops->target;
|
|
|
|
name = targ_ops->to_shortname;
|
|
|
|
|
|
|
|
if (!args)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
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);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
target_preopen (from_tty);
|
|
|
|
|
|
|
|
/* Setup pattern for register dump */
|
|
|
|
|
|
|
|
if (mon_ops->register_pattern)
|
|
|
|
compile_pattern (mon_ops->register_pattern, ®ister_pattern,
|
|
|
|
register_fastmap);
|
|
|
|
|
|
|
|
if (mon_ops->getmem.resp_delim)
|
|
|
|
compile_pattern (mon_ops->getmem.resp_delim, &getmem_resp_delim_pattern,
|
|
|
|
getmem_resp_delim_fastmap);
|
|
|
|
|
2001-06-28 20:03:10 +00:00
|
|
|
if (mon_ops->setmem.resp_delim)
|
|
|
|
compile_pattern (mon_ops->setmem.resp_delim, &setmem_resp_delim_pattern,
|
|
|
|
setmem_resp_delim_fastmap);
|
|
|
|
|
|
|
|
if (mon_ops->setreg.resp_delim)
|
|
|
|
compile_pattern (mon_ops->setreg.resp_delim, &setreg_resp_delim_pattern,
|
|
|
|
setreg_resp_delim_fastmap);
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
unpush_target (targ_ops);
|
|
|
|
|
|
|
|
if (dev_name)
|
2000-12-15 01:01:51 +00:00
|
|
|
xfree (dev_name);
|
2001-01-31 01:24:03 +00:00
|
|
|
dev_name = xstrdup (args);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2001-07-15 20:34:14 +00:00
|
|
|
monitor_desc = serial_open (dev_name);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
if (!monitor_desc)
|
|
|
|
perror_with_name (dev_name);
|
|
|
|
|
|
|
|
if (baud_rate != -1)
|
|
|
|
{
|
2001-07-15 20:34:14 +00:00
|
|
|
if (serial_setbaudrate (monitor_desc, baud_rate))
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2001-07-15 20:34:14 +00:00
|
|
|
serial_close (monitor_desc);
|
1999-04-16 01:35:26 +00:00
|
|
|
perror_with_name (dev_name);
|
|
|
|
}
|
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
|
2001-07-15 20:34:14 +00:00
|
|
|
serial_raw (monitor_desc);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2001-07-15 20:34:14 +00:00
|
|
|
serial_flush_input (monitor_desc);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* some systems only work with 2 stop bits */
|
|
|
|
|
2001-07-15 20:34:14 +00:00
|
|
|
serial_setstopbits (monitor_desc, mon_ops->stopbits);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
current_monitor = mon_ops;
|
|
|
|
|
|
|
|
/* See if we can wake up the monitor. First, try sending a stop sequence,
|
|
|
|
then send the init strings. Last, remove all breakpoints. */
|
|
|
|
|
|
|
|
if (current_monitor->stop)
|
|
|
|
{
|
|
|
|
monitor_stop ();
|
|
|
|
if ((current_monitor->flags & MO_NO_ECHO_ON_OPEN) == 0)
|
1999-07-07 20:19:36 +00:00
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("EXP Open echo\n");
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* wake up the monitor and see if it's alive */
|
|
|
|
for (p = mon_ops->init; *p != NULL; p++)
|
|
|
|
{
|
|
|
|
/* Some of the characters we send may not be echoed,
|
1999-07-07 20:19:36 +00:00
|
|
|
but we hope to get a prompt at the end of it all. */
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
if ((current_monitor->flags & MO_NO_ECHO_ON_OPEN) == 0)
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_printf (*p);
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_printf_noecho (*p);
|
1999-04-16 01:35:26 +00:00
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
}
|
|
|
|
|
2001-07-15 20:34:14 +00:00
|
|
|
serial_flush_input (monitor_desc);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-05-19 19:58:41 +00:00
|
|
|
/* Alloc breakpoints */
|
|
|
|
if (mon_ops->set_break != NULL)
|
|
|
|
{
|
|
|
|
if (mon_ops->num_breakpoints == 0)
|
|
|
|
mon_ops->num_breakpoints = 8;
|
|
|
|
|
|
|
|
breakaddr = (CORE_ADDR *) xmalloc (mon_ops->num_breakpoints * sizeof (CORE_ADDR));
|
|
|
|
memset (breakaddr, 0, mon_ops->num_breakpoints * sizeof (CORE_ADDR));
|
|
|
|
}
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
/* Remove all breakpoints */
|
|
|
|
|
|
|
|
if (mon_ops->clr_all_break)
|
|
|
|
{
|
|
|
|
monitor_printf (mon_ops->clr_all_break);
|
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (from_tty)
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 00:39:24 +00:00
|
|
|
printf_unfiltered (_("Remote target %s connected to %s\n"), name, dev_name);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
push_target (targ_ops);
|
|
|
|
|
2001-05-04 04:15:33 +00:00
|
|
|
inferior_ptid = pid_to_ptid (42000); /* Make run command think we are busy... */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* Give monitor_wait something to read */
|
|
|
|
|
|
|
|
monitor_printf (current_monitor->line_term);
|
|
|
|
|
|
|
|
start_remote ();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Close out all files and local state before this target loses
|
|
|
|
control. */
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_close (int quitting)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
if (monitor_desc)
|
2001-07-15 20:34:14 +00:00
|
|
|
serial_close (monitor_desc);
|
1999-05-19 19:58:41 +00:00
|
|
|
|
|
|
|
/* Free breakpoint memory */
|
|
|
|
if (breakaddr != NULL)
|
|
|
|
{
|
2000-12-15 01:01:51 +00:00
|
|
|
xfree (breakaddr);
|
1999-05-19 19:58:41 +00:00
|
|
|
breakaddr = NULL;
|
|
|
|
}
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
monitor_desc = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Terminate the open connection to the remote debugger. Use this
|
|
|
|
when you want to detach and do something else with your gdb. */
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_detach (char *args, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
pop_target (); /* calls monitor_close to do the real work */
|
|
|
|
if (from_tty)
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 00:39:24 +00:00
|
|
|
printf_unfiltered (_("Ending remote %s debugging\n"), target_shortname);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Convert VALSTR into the target byte-ordered value of REGNO and store it. */
|
|
|
|
|
|
|
|
char *
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_supply_register (int regno, char *valstr)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-09-09 00:02:17 +00:00
|
|
|
ULONGEST val;
|
2003-05-08 Andrew Cagney <cagney@redhat.com>
* regcache.h (max_register_size): Delete declaration.
* regcache.c (max_register_size): Delete function.
(struct regcache_descr): Delete field "max_register_size".
(init_regcache_descr, init_legacy_regcache_descr): Assert that all
registers fit in MAX_REGISTER_SIZE.
(regcache_save): Replace max_register_size with MAX_REGISTER_SIZE.
(regcache_restore, regcache_xfer_part, regcache_dump): Ditto.
* thread-db.c: Replace max_register_size with MAX_REGISTER_SIZE.
* sh-tdep.c, rom68k-rom.c, remote-sim.c, remote-mips.c: Ditto.
* remote-e7000.c, monitor.c, mipsv4-nat.c, mips-nat.c: Ditto.
* m68klinux-nat.c, lynx-nat.c, irix4-nat.c: Ditto.
* hpux-thread.c, hppah-nat.c, hppab-nat.c, hppa-tdep.c: Ditto.
* dve3900-rom.c, hppa-tdep.c: Ditto.
2003-05-08 22:33:14 +00:00
|
|
|
unsigned char regbuf[MAX_REGISTER_SIZE];
|
1999-04-16 01:35:26 +00:00
|
|
|
char *p;
|
|
|
|
|
1999-11-17 02:31:06 +00:00
|
|
|
val = 0;
|
1999-09-09 00:02:17 +00:00
|
|
|
p = valstr;
|
|
|
|
while (p && *p != '\0')
|
|
|
|
{
|
|
|
|
if (*p == '\r' || *p == '\n')
|
|
|
|
{
|
|
|
|
while (*p != '\0')
|
|
|
|
p++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (isspace (*p))
|
|
|
|
{
|
|
|
|
p++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!isxdigit (*p) && *p != 'x')
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
val <<= 4;
|
|
|
|
val += fromhex (*p++);
|
|
|
|
}
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("Supplying Register %d %s\n", regno, valstr);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2001-04-05 17:44:06 +00:00
|
|
|
if (val == 0 && valstr == p)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("monitor_supply_register (%d): bad value from monitor: %s."),
|
1999-04-16 01:35:26 +00:00
|
|
|
regno, valstr);
|
|
|
|
|
|
|
|
/* supply register stores in target byte order, so swap here */
|
|
|
|
|
2004-08-02 Andrew Cagney <cagney@gnu.org>
Replace DEPRECATED_REGISTER_RAW_SIZE with register_size.
* rs6000-tdep.c (rs6000_push_dummy_call)
(rs6000_extract_return_value): Use register_size.
* xstormy16-tdep.c (xstormy16_get_saved_register)
(xstormy16_extract_return_value): Ditto.
* valops.c (value_assign): Ditto.
* v850ice.c (v850ice_fetch_registers, v850ice_store_registers):
* v850-tdep.c (v850_extract_return_value): Ditto.
* tracepoint.c (collect_symbol): Ditto.
* target.c (debug_print_register): Ditto.
* stack.c (frame_info): Ditto.
* rs6000-nat.c (ARCH64, fetch_register, store_register): Ditto.
* rom68k-rom.c (rom68k_supply_one_register): Ditto.
* remote.c (struct packet_reg, remote_wait, remote_async_wait)
(store_register_using_P): Ditto.
* remote-vxmips.c (vx_read_register, vx_write_register): Ditto.
* remote-sim.c (gdbsim_fetch_register, gdbsim_store_register): Ditto.
* remote-mips.c (mips_wait, mips_fetch_registers): Ditto.
* remote-e7000.c (fetch_regs_from_dump, sub2_from_pc): Ditto.
* regcache.c (deprecated_read_register_bytes)
(deprecated_write_register_bytes, read_register)
(write_register): Ditto.
* ppc-linux-nat.c (fetch_altivec_register, fetch_register)
(supply_vrregset, store_altivec_register, fill_vrregset): Ditto.
* monitor.c (monitor_supply_register, monitor_fetch_register)
(monitor_store_register): Ditto.
* mn10300-tdep.c (mn10300_pop_frame_regular)
(mn10300_print_register): Ditto.
* mipsv4-nat.c (fill_fpregset): Ditto.
* mips-linux-tdep.c (supply_32bit_reg, fill_fpregset)
(mips64_fill_fpregset): Ditto.
* mi/mi-main.c (register_changed_p, get_register)
(mi_cmd_data_write_register_values): Ditto.
* lynx-nat.c (fetch_inferior_registers, store_inferior_registers):
* irix5-nat.c (fill_gregset, fetch_core_registers):
* infrun.c (write_inferior_status_register): Ditto.
* infptrace.c (fetch_register, store_register): Ditto.
* infcmd.c (default_print_registers_info): Ditto.
* ia64-linux-nat.c (COPY_REG, fill_fpregset): Ditto.
* ia64-aix-nat.c (COPY_REG, fill_gregset): Ditto.
* i386gnu-nat.c (gnu_store_registers, fill): Ditto.
* hpux-thread.c (hpux_thread_fetch_registers)
(hpux_thread_store_registers): Ditto.
* hppah-nat.c (store_inferior_registers, fetch_register):
* findvar.c (value_from_register): Ditto.
* dve3900-rom.c (fetch_bitmapped_register):
* cris-tdep.c (cris_gdbarch_init): Ditto.
* alpha-tdep.h: Ditto.
* aix-thread.c (pd_enable, fill_sprs64, fill_sprs32): Ditto.
2004-08-03 00:57:27 +00:00
|
|
|
store_unsigned_integer (regbuf, register_size (current_gdbarch, regno), val);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-07-21 Andrew Cagney <cagney@gnu.org>
Use regcache_raw_supply instead of supply_register.
* regcache.h (supply_register): Delete declaration.
* regcache.c (supply_register): Delete function.
* wince.c (do_child_fetch_inferior_registers): Update.
* win32-nat.c (do_child_fetch_inferior_registers)
(fetch_elf_core_registers): Update.
* v850ice.c (v850ice_fetch_registers): Update.
* thread-db.c (thread_db_store_registers): Update.
* sol-thread.c (sol_thread_store_registers): Update.
* shnbsd-tdep.c (shnbsd_supply_reg): Update.
* rs6000-nat.c (fetch_register): Update.
* rom68k-rom.c (rom68k_supply_one_register): Update.
* remote.c (remote_wait, remote_async_wait): Update.
* remote-st.c (get_hex_regs): Update.
* remote-sim.c (gdbsim_fetch_register): Update.
* remote-sds.c (sds_fetch_registers): Update.
* remote-rdp.c (remote_rdp_fetch_register): Update.
* remote-rdi.c (arm_rdi_fetch_registers): Update.
* remote-mips.c (mips_wait, mips_fetch_registers): Update.
* remote-m32r-sdi.c (m32r_fetch_register): Update.
* remote-hms.c (init_hms_cmds): Update.
* remote-est.c (init_est_cmds): Update.
* remote-e7000.c (get_hex_regs, fetch_regs_from_dump)
(e7000_fetch_registers, sub2_from_pc, e7000_wait): Update.
* ppcnbsd-tdep.c (ppcnbsd_supply_reg, ppcnbsd_supply_fpreg): Update.
* ppc-linux-nat.c (fetch_altivec_register, fetch_spe_register)
(fetch_register, supply_vrregset, supply_vrregset)
(fetch_spe_registers): Update.
* ppc-bdm.c (bdm_ppc_fetch_registers): Update.
* monitor.c (monitor_supply_register): Update.
* mipsv4-nat.c (supply_gregset, supply_fpregset): Update.
* mipsnbsd-tdep.c (mipsnbsd_supply_reg)
(mipsnbsd_supply_fpreg): Update.
* mips-nat.c (fetch_inferior_registers)
(fetch_core_registers): Update.
* mips-linux-tdep.c (supply_32bit_reg, supply_gregset)
(supply_fpregset, mips64_supply_gregset)
(mips64_supply_fpregset): Update.
* m68klinux-nat.c (fetch_register, supply_gregset)
(supply_fpregset): Update.
* m68k-tdep.c (supply_gregset, supply_fpregset): Update.
* m32r-rom.c (init_m32r_cmds, init_mon2000_cmds): Update.
* lynx-nat.c (fetch_inferior_registers, fetch_core_registers): Update.
* irix5-nat.c (supply_gregset, supply_fpregset): Update.
* infptrace.c (fetch_register): Update.
* ia64-linux-nat.c (supply_gregset, supply_fpregset): Update.
* ia64-aix-nat.c (supply_gregset, supply_fpregset): Update.
* i386gnu-nat.c (fetch_fpregs, supply_gregset)
(gnu_fetch_registers, gnu_store_registers): Update.
* i386-nto-tdep.c (i386nto_supply_gregset): Update.
* i386-linux-nat.c (fetch_register, supply_gregset)
(dummy_sse_values): Update.
* hpux-thread.c (hpux_thread_fetch_registers): Update.
* hppah-nat.c (fetch_register): Update.
* hppa-linux-nat.c (fetch_register, supply_gregset)
(supply_fpregset): Update.
* go32-nat.c (fetch_register): Update.
* dve3900-rom.c (fetch_bitmapped_register)
(_initialize_r3900_rom): Update.
* cris-tdep.c (supply_gregset): Update.
* abug-rom.c (init_abug_cmds): Update.
* core-aout.c (fetch_core_registers): Update.
* armnbsd-nat.c (supply_gregset, supply_fparegset)
(fetch_register, fetch_fp_register): Update.
* arm-linux-nat.c (fetch_nwfpe_single, fetch_nwfpe_none)
(fetch_nwfpe_extended, fetch_fpregister, fetch_fpregs)
(fetch_register, fetch_regs, supply_gregset, supply_fpregset): Update.
* alphanbsd-tdep.c (fetch_core_registers): Update.
* alpha-tdep.c (alpha_supply_int_regs, alpha_supply_fp_regs): Update.
* alpha-nat.c (fetch_osf_core_registers)
(fetch_osf_core_registers, fetch_osf_core_registers): Update.
* aix-thread.c (supply_gprs64, supply_reg32, supply_fprs)
(supply_sprs64, supply_sprs32, fetch_regs_kernel_thread): Update.
2004-07-22 01:31:49 +00:00
|
|
|
regcache_raw_supply (current_regcache, regno, regbuf);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Tell the remote machine to resume. */
|
|
|
|
|
|
|
|
static void
|
2001-05-04 04:15:33 +00:00
|
|
|
monitor_resume (ptid_t ptid, int step, enum target_signal sig)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
/* Some monitors require a different command when starting a program */
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON resume\n");
|
1999-04-16 01:35:26 +00:00
|
|
|
if (current_monitor->flags & MO_RUN_FIRST_TIME && first_time == 1)
|
|
|
|
{
|
|
|
|
first_time = 0;
|
|
|
|
monitor_printf ("run\r");
|
|
|
|
if (current_monitor->flags & MO_NEED_REGDUMP_AFTER_CONT)
|
1999-07-07 20:19:36 +00:00
|
|
|
dump_reg_flag = 1;
|
1999-04-16 01:35:26 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (step)
|
|
|
|
monitor_printf (current_monitor->step);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (current_monitor->continue_hook)
|
1999-07-07 20:19:36 +00:00
|
|
|
(*current_monitor->continue_hook) ();
|
|
|
|
else
|
|
|
|
monitor_printf (current_monitor->cont);
|
1999-04-16 01:35:26 +00:00
|
|
|
if (current_monitor->flags & MO_NEED_REGDUMP_AFTER_CONT)
|
|
|
|
dump_reg_flag = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Parse the output of a register dump command. A monitor specific
|
|
|
|
regexp is used to extract individual register descriptions of the
|
|
|
|
form REG=VAL. Each description is split up into a name and a value
|
|
|
|
string which are passed down to monitor specific code. */
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
parse_register_dump (char *buf, int len)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON Parsing register dump\n");
|
|
|
|
while (1)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int regnamelen, vallen;
|
|
|
|
char *regname, *val;
|
|
|
|
/* Element 0 points to start of register name, and element 1
|
1999-07-07 20:19:36 +00:00
|
|
|
points to the start of the register value. */
|
1999-04-16 01:35:26 +00:00
|
|
|
struct re_registers register_strings;
|
|
|
|
|
|
|
|
memset (®ister_strings, 0, sizeof (struct re_registers));
|
|
|
|
|
|
|
|
if (re_search (®ister_pattern, buf, len, 0, len,
|
|
|
|
®ister_strings) == -1)
|
|
|
|
break;
|
|
|
|
|
|
|
|
regnamelen = register_strings.end[1] - register_strings.start[1];
|
|
|
|
regname = buf + register_strings.start[1];
|
|
|
|
vallen = register_strings.end[2] - register_strings.start[2];
|
|
|
|
val = buf + register_strings.start[2];
|
|
|
|
|
|
|
|
current_monitor->supply_register (regname, regnamelen, val, vallen);
|
|
|
|
|
|
|
|
buf += register_strings.end[0];
|
|
|
|
len -= register_strings.end[0];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Send ^C to target to halt it. Target will respond, and send us a
|
|
|
|
packet. */
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_interrupt (int signo)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
/* If this doesn't work, try more severe steps. */
|
|
|
|
signal (signo, monitor_interrupt_twice);
|
1999-07-07 20:19:36 +00:00
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
if (monitor_debug_p || remote_debug)
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "monitor_interrupt called\n");
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
target_stop ();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The user typed ^C twice. */
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_interrupt_twice (int signo)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
signal (signo, ofunc);
|
1999-07-07 20:19:36 +00:00
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
monitor_interrupt_query ();
|
|
|
|
|
|
|
|
signal (signo, monitor_interrupt);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ask the user what to do when an interrupt is received. */
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_interrupt_query (void)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
target_terminal_ours ();
|
|
|
|
|
|
|
|
if (query ("Interrupted while waiting for the program.\n\
|
|
|
|
Give up (and stop debugging it)? "))
|
|
|
|
{
|
|
|
|
target_mourn_inferior ();
|
2005-01-19 21:15:44 +00:00
|
|
|
deprecated_throw_reason (RETURN_QUIT);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
target_terminal_inferior ();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_wait_cleanup (void *old_timeout)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
timeout = *(int *) old_timeout;
|
1999-04-16 01:35:26 +00:00
|
|
|
signal (SIGINT, ofunc);
|
|
|
|
in_monitor_wait = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-06-11 13:16:30 +00:00
|
|
|
static void
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_wait_filter (char *buf,
|
|
|
|
int bufmax,
|
|
|
|
int *ext_resp_len,
|
2003-06-11 13:16:30 +00:00
|
|
|
struct target_waitstatus *status)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
int resp_len;
|
1999-04-16 01:35:26 +00:00
|
|
|
do
|
|
|
|
{
|
|
|
|
resp_len = monitor_expect_prompt (buf, bufmax);
|
1999-07-07 20:19:36 +00:00
|
|
|
*ext_resp_len = resp_len;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
if (resp_len <= 0)
|
|
|
|
fprintf_unfiltered (gdb_stderr, "monitor_wait: excessive response from monitor: %s.", buf);
|
|
|
|
}
|
|
|
|
while (resp_len < 0);
|
|
|
|
|
|
|
|
/* Print any output characters that were preceded by ^O. */
|
|
|
|
/* FIXME - This would be great as a user settabgle flag */
|
1999-10-12 04:37:53 +00:00
|
|
|
if (monitor_debug_p || remote_debug
|
|
|
|
|| current_monitor->flags & MO_PRINT_PROGRAM_OUTPUT)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < resp_len - 1; i++)
|
|
|
|
if (buf[i] == 0x0f)
|
|
|
|
putchar_unfiltered (buf[++i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Wait until the remote machine stops, then return, storing status in
|
|
|
|
status just as `wait' would. */
|
|
|
|
|
2001-05-04 04:15:33 +00:00
|
|
|
static ptid_t
|
|
|
|
monitor_wait (ptid_t ptid, struct target_waitstatus *status)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int old_timeout = timeout;
|
1999-09-09 00:02:17 +00:00
|
|
|
char buf[TARGET_BUF_SIZE];
|
1999-04-16 01:35:26 +00:00
|
|
|
int resp_len;
|
|
|
|
struct cleanup *old_chain;
|
|
|
|
|
|
|
|
status->kind = TARGET_WAITKIND_EXITED;
|
|
|
|
status->value.integer = 0;
|
|
|
|
|
|
|
|
old_chain = make_cleanup (monitor_wait_cleanup, &old_timeout);
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON wait\n");
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-04-26 18:34:20 +00:00
|
|
|
#if 0
|
1999-07-07 20:19:36 +00:00
|
|
|
/* This is somthing other than a maintenance command */
|
|
|
|
in_monitor_wait = 1;
|
1999-04-16 01:35:26 +00:00
|
|
|
timeout = watchdog > 0 ? watchdog : -1;
|
|
|
|
#else
|
1999-10-12 04:37:53 +00:00
|
|
|
timeout = -1; /* Don't time out -- user program is running. */
|
1999-04-16 01:35:26 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
ofunc = (void (*)()) signal (SIGINT, monitor_interrupt);
|
|
|
|
|
|
|
|
if (current_monitor->wait_filter)
|
1999-07-07 20:19:36 +00:00
|
|
|
(*current_monitor->wait_filter) (buf, sizeof (buf), &resp_len, status);
|
|
|
|
else
|
|
|
|
monitor_wait_filter (buf, sizeof (buf), &resp_len, status);
|
|
|
|
|
|
|
|
#if 0 /* Transferred to monitor wait filter */
|
1999-04-16 01:35:26 +00:00
|
|
|
do
|
|
|
|
{
|
|
|
|
resp_len = monitor_expect_prompt (buf, sizeof (buf));
|
|
|
|
|
|
|
|
if (resp_len <= 0)
|
|
|
|
fprintf_unfiltered (gdb_stderr, "monitor_wait: excessive response from monitor: %s.", buf);
|
|
|
|
}
|
|
|
|
while (resp_len < 0);
|
|
|
|
|
|
|
|
/* Print any output characters that were preceded by ^O. */
|
|
|
|
/* FIXME - This would be great as a user settabgle flag */
|
1999-10-12 04:37:53 +00:00
|
|
|
if (monitor_debug_p || remote_debug
|
|
|
|
|| current_monitor->flags & MO_PRINT_PROGRAM_OUTPUT)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < resp_len - 1; i++)
|
|
|
|
if (buf[i] == 0x0f)
|
|
|
|
putchar_unfiltered (buf[++i]);
|
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
#endif
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
signal (SIGINT, ofunc);
|
|
|
|
|
|
|
|
timeout = old_timeout;
|
|
|
|
#if 0
|
|
|
|
if (dump_reg_flag && current_monitor->dump_registers)
|
|
|
|
{
|
|
|
|
dump_reg_flag = 0;
|
|
|
|
monitor_printf (current_monitor->dump_registers);
|
|
|
|
resp_len = monitor_expect_prompt (buf, sizeof (buf));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (current_monitor->register_pattern)
|
|
|
|
parse_register_dump (buf, resp_len);
|
|
|
|
#else
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("Wait fetching registers after stop\n");
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_dump_regs ();
|
|
|
|
#endif
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
status->kind = TARGET_WAITKIND_STOPPED;
|
|
|
|
status->value.sig = TARGET_SIGNAL_TRAP;
|
|
|
|
|
|
|
|
discard_cleanups (old_chain);
|
|
|
|
|
|
|
|
in_monitor_wait = 0;
|
|
|
|
|
2001-05-04 04:15:33 +00:00
|
|
|
return inferior_ptid;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Fetch register REGNO, or all registers if REGNO is -1. Returns
|
|
|
|
errno value. */
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_fetch_register (int regno)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2002-07-11 21:00:39 +00:00
|
|
|
const char *name;
|
2000-05-03 18:21:52 +00:00
|
|
|
char *zerobuf;
|
|
|
|
char *regbuf;
|
1999-04-16 01:35:26 +00:00
|
|
|
int i;
|
|
|
|
|
2003-05-08 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh: Delete references to MAX_REGISTER_RAW_SIZE.
* gdbarch.h: Re-generate.
* defs.h (MAX_REGISTER_RAW_SIZE): Delete macro.
(legacy_max_register_raw_size): Delete declaration.
* regcache.c (legacy_max_register_raw_size): Delete function.
* valops.c: Replace MAX_REGISTER_RAW_SIZE with MAX_REGISTER_SIZE.
* target.c, stack.c, sparc-tdep.c, sh-tdep.c: Update.
* rs6000-tdep.c, rs6000-nat.c, remote.c, remote-sim.c: Update.
* remote-rdp.c, remote-array.c, regcache.c: Update.
* ppc-linux-nat.c, monitor.c, mn10300-tdep.c: Update.
* mips-tdep.c, mips-linux-tdep.c, m68klinux-nat.c: Update.
* infptrace.c, ia64-tdep.c, i386-tdep.c, frame.c: Update.
* findvar.c, dwarf2cfi.c: Update.
Index: tui/ChangeLog
2003-05-08 Andrew Cagney <cagney@redhat.com>
* tuiRegs.c: Use MAX_REGISTER_SIZE instead of
MAX_REGISTER_RAW_SIZE.
Index: mi/ChangeLog
2003-05-08 Andrew Cagney <cagney@redhat.com>
* mi-main.c (register_changed_p): Use MAX_REGISTER_SIZE instead of
MAX_REGISTER_RAW_SIZE.
2003-05-08 20:52:49 +00:00
|
|
|
regbuf = alloca (MAX_REGISTER_SIZE * 2 + 1);
|
|
|
|
zerobuf = alloca (MAX_REGISTER_SIZE);
|
|
|
|
memset (zerobuf, 0, MAX_REGISTER_SIZE);
|
2000-05-03 18:21:52 +00:00
|
|
|
|
2002-06-26 15:14:32 +00:00
|
|
|
if (current_monitor->regname != NULL)
|
|
|
|
name = current_monitor->regname (regno);
|
|
|
|
else
|
|
|
|
name = current_monitor->regnames[regno];
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON fetchreg %d '%s'\n", regno, name ? name : "(null name)");
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
if (!name || (*name == '\0'))
|
1999-04-26 18:34:20 +00:00
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("No register known for %d\n", regno);
|
2004-07-21 Andrew Cagney <cagney@gnu.org>
Use regcache_raw_supply instead of supply_register.
* regcache.h (supply_register): Delete declaration.
* regcache.c (supply_register): Delete function.
* wince.c (do_child_fetch_inferior_registers): Update.
* win32-nat.c (do_child_fetch_inferior_registers)
(fetch_elf_core_registers): Update.
* v850ice.c (v850ice_fetch_registers): Update.
* thread-db.c (thread_db_store_registers): Update.
* sol-thread.c (sol_thread_store_registers): Update.
* shnbsd-tdep.c (shnbsd_supply_reg): Update.
* rs6000-nat.c (fetch_register): Update.
* rom68k-rom.c (rom68k_supply_one_register): Update.
* remote.c (remote_wait, remote_async_wait): Update.
* remote-st.c (get_hex_regs): Update.
* remote-sim.c (gdbsim_fetch_register): Update.
* remote-sds.c (sds_fetch_registers): Update.
* remote-rdp.c (remote_rdp_fetch_register): Update.
* remote-rdi.c (arm_rdi_fetch_registers): Update.
* remote-mips.c (mips_wait, mips_fetch_registers): Update.
* remote-m32r-sdi.c (m32r_fetch_register): Update.
* remote-hms.c (init_hms_cmds): Update.
* remote-est.c (init_est_cmds): Update.
* remote-e7000.c (get_hex_regs, fetch_regs_from_dump)
(e7000_fetch_registers, sub2_from_pc, e7000_wait): Update.
* ppcnbsd-tdep.c (ppcnbsd_supply_reg, ppcnbsd_supply_fpreg): Update.
* ppc-linux-nat.c (fetch_altivec_register, fetch_spe_register)
(fetch_register, supply_vrregset, supply_vrregset)
(fetch_spe_registers): Update.
* ppc-bdm.c (bdm_ppc_fetch_registers): Update.
* monitor.c (monitor_supply_register): Update.
* mipsv4-nat.c (supply_gregset, supply_fpregset): Update.
* mipsnbsd-tdep.c (mipsnbsd_supply_reg)
(mipsnbsd_supply_fpreg): Update.
* mips-nat.c (fetch_inferior_registers)
(fetch_core_registers): Update.
* mips-linux-tdep.c (supply_32bit_reg, supply_gregset)
(supply_fpregset, mips64_supply_gregset)
(mips64_supply_fpregset): Update.
* m68klinux-nat.c (fetch_register, supply_gregset)
(supply_fpregset): Update.
* m68k-tdep.c (supply_gregset, supply_fpregset): Update.
* m32r-rom.c (init_m32r_cmds, init_mon2000_cmds): Update.
* lynx-nat.c (fetch_inferior_registers, fetch_core_registers): Update.
* irix5-nat.c (supply_gregset, supply_fpregset): Update.
* infptrace.c (fetch_register): Update.
* ia64-linux-nat.c (supply_gregset, supply_fpregset): Update.
* ia64-aix-nat.c (supply_gregset, supply_fpregset): Update.
* i386gnu-nat.c (fetch_fpregs, supply_gregset)
(gnu_fetch_registers, gnu_store_registers): Update.
* i386-nto-tdep.c (i386nto_supply_gregset): Update.
* i386-linux-nat.c (fetch_register, supply_gregset)
(dummy_sse_values): Update.
* hpux-thread.c (hpux_thread_fetch_registers): Update.
* hppah-nat.c (fetch_register): Update.
* hppa-linux-nat.c (fetch_register, supply_gregset)
(supply_fpregset): Update.
* go32-nat.c (fetch_register): Update.
* dve3900-rom.c (fetch_bitmapped_register)
(_initialize_r3900_rom): Update.
* cris-tdep.c (supply_gregset): Update.
* abug-rom.c (init_abug_cmds): Update.
* core-aout.c (fetch_core_registers): Update.
* armnbsd-nat.c (supply_gregset, supply_fparegset)
(fetch_register, fetch_fp_register): Update.
* arm-linux-nat.c (fetch_nwfpe_single, fetch_nwfpe_none)
(fetch_nwfpe_extended, fetch_fpregister, fetch_fpregs)
(fetch_register, fetch_regs, supply_gregset, supply_fpregset): Update.
* alphanbsd-tdep.c (fetch_core_registers): Update.
* alpha-tdep.c (alpha_supply_int_regs, alpha_supply_fp_regs): Update.
* alpha-nat.c (fetch_osf_core_registers)
(fetch_osf_core_registers, fetch_osf_core_registers): Update.
* aix-thread.c (supply_gprs64, supply_reg32, supply_fprs)
(supply_sprs64, supply_sprs32, fetch_regs_kernel_thread): Update.
2004-07-22 01:31:49 +00:00
|
|
|
regcache_raw_supply (current_regcache, regno, zerobuf);
|
1999-04-16 01:35:26 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* send the register examine command */
|
|
|
|
|
|
|
|
monitor_printf (current_monitor->getreg.cmd, name);
|
|
|
|
|
|
|
|
/* If RESP_DELIM is specified, we search for that as a leading
|
|
|
|
delimiter for the register value. Otherwise, we just start
|
|
|
|
searching from the start of the buf. */
|
|
|
|
|
|
|
|
if (current_monitor->getreg.resp_delim)
|
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("EXP getreg.resp_delim\n");
|
|
|
|
monitor_expect (current_monitor->getreg.resp_delim, NULL, 0);
|
1999-04-16 01:35:26 +00:00
|
|
|
/* Handle case of first 32 registers listed in pairs. */
|
|
|
|
if (current_monitor->flags & MO_32_REGS_PAIRED
|
1999-04-26 18:34:20 +00:00
|
|
|
&& (regno & 1) != 0 && regno < 32)
|
1999-07-07 20:19:36 +00:00
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("EXP getreg.resp_delim\n");
|
1999-04-16 01:35:26 +00:00
|
|
|
monitor_expect (current_monitor->getreg.resp_delim, NULL, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Skip leading spaces and "0x" if MO_HEX_PREFIX flag is set */
|
1999-07-07 20:19:36 +00:00
|
|
|
if (current_monitor->flags & MO_HEX_PREFIX)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int c;
|
|
|
|
c = readchar (timeout);
|
|
|
|
while (c == ' ')
|
|
|
|
c = readchar (timeout);
|
|
|
|
if ((c == '0') && ((c = readchar (timeout)) == 'x'))
|
|
|
|
;
|
|
|
|
else
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("Bad value returned from monitor while fetching register %x."),
|
1999-07-07 20:19:36 +00:00
|
|
|
regno);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Read upto the maximum number of hex digits for this register, skipping
|
|
|
|
spaces, but stop reading if something else is seen. Some monitors
|
|
|
|
like to drop leading zeros. */
|
|
|
|
|
2004-08-02 Andrew Cagney <cagney@gnu.org>
Replace DEPRECATED_REGISTER_RAW_SIZE with register_size.
* rs6000-tdep.c (rs6000_push_dummy_call)
(rs6000_extract_return_value): Use register_size.
* xstormy16-tdep.c (xstormy16_get_saved_register)
(xstormy16_extract_return_value): Ditto.
* valops.c (value_assign): Ditto.
* v850ice.c (v850ice_fetch_registers, v850ice_store_registers):
* v850-tdep.c (v850_extract_return_value): Ditto.
* tracepoint.c (collect_symbol): Ditto.
* target.c (debug_print_register): Ditto.
* stack.c (frame_info): Ditto.
* rs6000-nat.c (ARCH64, fetch_register, store_register): Ditto.
* rom68k-rom.c (rom68k_supply_one_register): Ditto.
* remote.c (struct packet_reg, remote_wait, remote_async_wait)
(store_register_using_P): Ditto.
* remote-vxmips.c (vx_read_register, vx_write_register): Ditto.
* remote-sim.c (gdbsim_fetch_register, gdbsim_store_register): Ditto.
* remote-mips.c (mips_wait, mips_fetch_registers): Ditto.
* remote-e7000.c (fetch_regs_from_dump, sub2_from_pc): Ditto.
* regcache.c (deprecated_read_register_bytes)
(deprecated_write_register_bytes, read_register)
(write_register): Ditto.
* ppc-linux-nat.c (fetch_altivec_register, fetch_register)
(supply_vrregset, store_altivec_register, fill_vrregset): Ditto.
* monitor.c (monitor_supply_register, monitor_fetch_register)
(monitor_store_register): Ditto.
* mn10300-tdep.c (mn10300_pop_frame_regular)
(mn10300_print_register): Ditto.
* mipsv4-nat.c (fill_fpregset): Ditto.
* mips-linux-tdep.c (supply_32bit_reg, fill_fpregset)
(mips64_fill_fpregset): Ditto.
* mi/mi-main.c (register_changed_p, get_register)
(mi_cmd_data_write_register_values): Ditto.
* lynx-nat.c (fetch_inferior_registers, store_inferior_registers):
* irix5-nat.c (fill_gregset, fetch_core_registers):
* infrun.c (write_inferior_status_register): Ditto.
* infptrace.c (fetch_register, store_register): Ditto.
* infcmd.c (default_print_registers_info): Ditto.
* ia64-linux-nat.c (COPY_REG, fill_fpregset): Ditto.
* ia64-aix-nat.c (COPY_REG, fill_gregset): Ditto.
* i386gnu-nat.c (gnu_store_registers, fill): Ditto.
* hpux-thread.c (hpux_thread_fetch_registers)
(hpux_thread_store_registers): Ditto.
* hppah-nat.c (store_inferior_registers, fetch_register):
* findvar.c (value_from_register): Ditto.
* dve3900-rom.c (fetch_bitmapped_register):
* cris-tdep.c (cris_gdbarch_init): Ditto.
* alpha-tdep.h: Ditto.
* aix-thread.c (pd_enable, fill_sprs64, fill_sprs32): Ditto.
2004-08-03 00:57:27 +00:00
|
|
|
for (i = 0; i < register_size (current_gdbarch, regno) * 2; i++)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int c;
|
|
|
|
c = readchar (timeout);
|
|
|
|
while (c == ' ')
|
|
|
|
c = readchar (timeout);
|
|
|
|
|
|
|
|
if (!isxdigit (c))
|
|
|
|
break;
|
|
|
|
|
|
|
|
regbuf[i] = c;
|
|
|
|
}
|
|
|
|
|
|
|
|
regbuf[i] = '\000'; /* terminate the number */
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("REGVAL '%s'\n", regbuf);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* If TERM is present, we wait for that to show up. Also, (if TERM
|
|
|
|
is present), we will send TERM_CMD if that is present. In any
|
|
|
|
case, we collect all of the output into buf, and then wait for
|
|
|
|
the normal prompt. */
|
|
|
|
|
|
|
|
if (current_monitor->getreg.term)
|
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("EXP getreg.term\n");
|
|
|
|
monitor_expect (current_monitor->getreg.term, NULL, 0); /* get response */
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (current_monitor->getreg.term_cmd)
|
1999-07-07 20:19:36 +00:00
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("EMIT getreg.term.cmd\n");
|
|
|
|
monitor_printf (current_monitor->getreg.term_cmd);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
if (!current_monitor->getreg.term || /* Already expected or */
|
|
|
|
current_monitor->getreg.term_cmd) /* ack expected */
|
|
|
|
monitor_expect_prompt (NULL, 0); /* get response */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
monitor_supply_register (regno, regbuf);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sometimes, it takes several commands to dump the registers */
|
|
|
|
/* This is a primitive for use by variations of monitor interfaces in
|
|
|
|
case they need to compose the operation.
|
1999-07-07 20:19:36 +00:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
monitor_dump_reg_block (char *block_cmd)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-09-09 00:02:17 +00:00
|
|
|
char buf[TARGET_BUF_SIZE];
|
1999-04-16 01:35:26 +00:00
|
|
|
int resp_len;
|
|
|
|
monitor_printf (block_cmd);
|
|
|
|
resp_len = monitor_expect_prompt (buf, sizeof (buf));
|
|
|
|
parse_register_dump (buf, resp_len);
|
1999-07-07 20:19:36 +00:00
|
|
|
return 1;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Read the remote registers into the block regs. */
|
|
|
|
/* Call the specific function if it has been provided */
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_dump_regs (void)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-09-09 00:02:17 +00:00
|
|
|
char buf[TARGET_BUF_SIZE];
|
1999-04-16 01:35:26 +00:00
|
|
|
int resp_len;
|
|
|
|
if (current_monitor->dumpregs)
|
1999-07-07 20:19:36 +00:00
|
|
|
(*(current_monitor->dumpregs)) (); /* call supplied function */
|
|
|
|
else if (current_monitor->dump_registers) /* default version */
|
|
|
|
{
|
|
|
|
monitor_printf (current_monitor->dump_registers);
|
1999-04-16 01:35:26 +00:00
|
|
|
resp_len = monitor_expect_prompt (buf, sizeof (buf));
|
|
|
|
parse_register_dump (buf, resp_len);
|
|
|
|
}
|
|
|
|
else
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up error_no_arg, query, perror_with_name, complaint, and
internal_error.
* breakpoint.c, cp-abi.c, cp-namespace.c, cp-support.c: Update.
* cris-tdep.c, dbxread.c, dictionary.c, dsrec.c: Update.
* dummy-frame.c, dve3900-rom.c, dwarf2-frame.c, dwarf2expr.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, event-loop.c: Update.
* exceptions.c, exec.c, f-lang.c, findvar.c, fork-child.c: Update.
* frame-unwind.c, frame.c, frv-linux-tdep.c, frv-tdep.c: Update.
* gdb_assert.h, gdbarch.c, gdbtypes.c, gnu-nat.c: Update.
* go32-nat.c, hppa-tdep.c, hppabsd-nat.c, hpread.c: Update.
* i386-linux-nat.c, i386-nat.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386fbsd-nat.c, inf-ptrace.c, inf-ttrace.c, infcall.c: Update.
* infcmd.c, inflow.c, infptrace.c, infrun.c, inftarg.c: Update.
* interps.c, language.c, linespec.c, linux-nat.c: Update.
* m32r-linux-nat.c, m68k-tdep.c, m68kbsd-nat.c: Update.
* m68klinux-nat.c, m88kbsd-nat.c, macroexp.c, macroscope.c: Update.
* macrotab.c, maint.c, mdebugread.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mips64obsd-nat.c: Update.
* mipsnbsd-nat.c, mn10300-tdep.c, monitor.c, nto-procfs.c: Update.
* objc-lang.c, objfiles.c, objfiles.h, ocd.c, osabi.c: Update.
* parse.c, ppc-bdm.c, ppc-linux-nat.c, ppc-sysv-tdep.c: Update.
* ppcnbsd-nat.c, ppcobsd-nat.c, printcmd.c, procfs.c: Update.
* regcache.c, reggroups.c, remote-e7000.c, remote-mips.c: Update.
* remote-rdp.c, remote-sds.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote.c, rs6000-nat.c, rs6000-tdep.c: Update.
* s390-nat.c, s390-tdep.c, sentinel-frame.c, serial.c: Update.
* sh-tdep.c, sh3-rom.c, sh64-tdep.c, shnbsd-nat.c: Update.
* solib-aix5.c, solib-svr4.c, solib.c, source.c: Update.
* sparc-nat.c, stabsread.c, stack.c, symfile.c, symtab.c: Update.
* symtab.h, target.c, tracepoint.c, ui-file.c, ui-out.c: Update.
* utils.c, valops.c, valprint.c, vax-nat.c, vaxbsd-nat.c: Update.
* win32-nat.c, xcoffread.c, xstormy16-tdep.c: Update.
* cli/cli-cmds.c, cli/cli-logging.c, cli/cli-script.c: Update.
* cli/cli-setshow.c, mi/mi-cmd-break.c, mi/mi-cmds.c: Update.
* mi/mi-console.c, mi/mi-getopt.c, mi/mi-out.c: Update.
* tui/tui-file.c, tui/tui-interp.c: Update.
2005-02-11 18:13:55 +00:00
|
|
|
internal_error (__FILE__, __LINE__, _("failed internal consistency check")); /* Need some way to read registers */
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_fetch_registers (int regno)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON fetchregs\n");
|
1999-07-07 20:19:36 +00:00
|
|
|
if (current_monitor->getreg.cmd)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
if (regno >= 0)
|
|
|
|
{
|
|
|
|
monitor_fetch_register (regno);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (regno = 0; regno < NUM_REGS; regno++)
|
|
|
|
monitor_fetch_register (regno);
|
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
monitor_dump_regs ();
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Store register REGNO, or all if REGNO == 0. Return errno value. */
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_store_register (int regno)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2002-07-11 21:00:39 +00:00
|
|
|
const char *name;
|
1999-09-09 00:02:17 +00:00
|
|
|
ULONGEST val;
|
2002-06-26 15:14:32 +00:00
|
|
|
|
|
|
|
if (current_monitor->regname != NULL)
|
|
|
|
name = current_monitor->regname (regno);
|
|
|
|
else
|
|
|
|
name = current_monitor->regnames[regno];
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
if (!name || (*name == '\0'))
|
1999-07-07 20:19:36 +00:00
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON Cannot store unknown register\n");
|
|
|
|
return;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
val = read_register (regno);
|
2000-05-22 02:07:19 +00:00
|
|
|
monitor_debug ("MON storeg %d %s\n", regno,
|
2004-08-02 Andrew Cagney <cagney@gnu.org>
Replace DEPRECATED_REGISTER_RAW_SIZE with register_size.
* rs6000-tdep.c (rs6000_push_dummy_call)
(rs6000_extract_return_value): Use register_size.
* xstormy16-tdep.c (xstormy16_get_saved_register)
(xstormy16_extract_return_value): Ditto.
* valops.c (value_assign): Ditto.
* v850ice.c (v850ice_fetch_registers, v850ice_store_registers):
* v850-tdep.c (v850_extract_return_value): Ditto.
* tracepoint.c (collect_symbol): Ditto.
* target.c (debug_print_register): Ditto.
* stack.c (frame_info): Ditto.
* rs6000-nat.c (ARCH64, fetch_register, store_register): Ditto.
* rom68k-rom.c (rom68k_supply_one_register): Ditto.
* remote.c (struct packet_reg, remote_wait, remote_async_wait)
(store_register_using_P): Ditto.
* remote-vxmips.c (vx_read_register, vx_write_register): Ditto.
* remote-sim.c (gdbsim_fetch_register, gdbsim_store_register): Ditto.
* remote-mips.c (mips_wait, mips_fetch_registers): Ditto.
* remote-e7000.c (fetch_regs_from_dump, sub2_from_pc): Ditto.
* regcache.c (deprecated_read_register_bytes)
(deprecated_write_register_bytes, read_register)
(write_register): Ditto.
* ppc-linux-nat.c (fetch_altivec_register, fetch_register)
(supply_vrregset, store_altivec_register, fill_vrregset): Ditto.
* monitor.c (monitor_supply_register, monitor_fetch_register)
(monitor_store_register): Ditto.
* mn10300-tdep.c (mn10300_pop_frame_regular)
(mn10300_print_register): Ditto.
* mipsv4-nat.c (fill_fpregset): Ditto.
* mips-linux-tdep.c (supply_32bit_reg, fill_fpregset)
(mips64_fill_fpregset): Ditto.
* mi/mi-main.c (register_changed_p, get_register)
(mi_cmd_data_write_register_values): Ditto.
* lynx-nat.c (fetch_inferior_registers, store_inferior_registers):
* irix5-nat.c (fill_gregset, fetch_core_registers):
* infrun.c (write_inferior_status_register): Ditto.
* infptrace.c (fetch_register, store_register): Ditto.
* infcmd.c (default_print_registers_info): Ditto.
* ia64-linux-nat.c (COPY_REG, fill_fpregset): Ditto.
* ia64-aix-nat.c (COPY_REG, fill_gregset): Ditto.
* i386gnu-nat.c (gnu_store_registers, fill): Ditto.
* hpux-thread.c (hpux_thread_fetch_registers)
(hpux_thread_store_registers): Ditto.
* hppah-nat.c (store_inferior_registers, fetch_register):
* findvar.c (value_from_register): Ditto.
* dve3900-rom.c (fetch_bitmapped_register):
* cris-tdep.c (cris_gdbarch_init): Ditto.
* alpha-tdep.h: Ditto.
* aix-thread.c (pd_enable, fill_sprs64, fill_sprs32): Ditto.
2004-08-03 00:57:27 +00:00
|
|
|
phex (val, register_size (current_gdbarch, regno)));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* send the register deposit command */
|
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
if (current_monitor->flags & MO_REGISTER_VALUE_FIRST)
|
1999-04-16 01:35:26 +00:00
|
|
|
monitor_printf (current_monitor->setreg.cmd, val, name);
|
|
|
|
else if (current_monitor->flags & MO_SETREG_INTERACTIVE)
|
|
|
|
monitor_printf (current_monitor->setreg.cmd, name);
|
|
|
|
else
|
|
|
|
monitor_printf (current_monitor->setreg.cmd, name, val);
|
|
|
|
|
2001-06-28 20:03:10 +00:00
|
|
|
if (current_monitor->setreg.resp_delim)
|
|
|
|
{
|
|
|
|
monitor_debug ("EXP setreg.resp_delim\n");
|
|
|
|
monitor_expect_regexp (&setreg_resp_delim_pattern, NULL, 0);
|
|
|
|
if (current_monitor->flags & MO_SETREG_INTERACTIVE)
|
|
|
|
monitor_printf ("%s\r", paddr_nz (val));
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
if (current_monitor->setreg.term)
|
1999-07-07 20:19:36 +00:00
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("EXP setreg.term\n");
|
|
|
|
monitor_expect (current_monitor->setreg.term, NULL, 0);
|
1999-04-16 01:35:26 +00:00
|
|
|
if (current_monitor->flags & MO_SETREG_INTERACTIVE)
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_printf ("%s\r", paddr_nz (val));
|
1999-04-16 01:35:26 +00:00
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
monitor_expect_prompt (NULL, 0);
|
1999-07-07 20:19:36 +00:00
|
|
|
if (current_monitor->setreg.term_cmd) /* Mode exit required */
|
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("EXP setreg_termcmd\n");
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_printf ("%s", current_monitor->setreg.term_cmd);
|
|
|
|
monitor_expect_prompt (NULL, 0);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
} /* monitor_store_register */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* Store the remote registers. */
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_store_registers (int regno)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
if (regno >= 0)
|
|
|
|
{
|
|
|
|
monitor_store_register (regno);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (regno = 0; regno < NUM_REGS; regno++)
|
|
|
|
monitor_store_register (regno);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get ready to modify the registers array. On machines which store
|
|
|
|
individual registers, this doesn't need to do anything. On machines
|
|
|
|
which store all the registers in one fell swoop, this makes sure
|
|
|
|
that registers contains all the registers from the program being
|
|
|
|
debugged. */
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_prepare_to_store (void)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
/* Do nothing, since we can store individual regs */
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_files_info (struct target_ops *ops)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
2005-02-12 00:39:24 +00:00
|
|
|
printf_unfiltered (_("\tAttached to %s at %d baud.\n"), dev_name, baud_rate);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_write_memory (CORE_ADDR memaddr, char *myaddr, int len)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
unsigned int val, hostval;
|
1999-04-16 01:35:26 +00:00
|
|
|
char *cmd;
|
|
|
|
int i;
|
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON write %d %s\n", len, paddr (memaddr));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
if (current_monitor->flags & MO_ADDR_BITS_REMOVE)
|
1999-04-16 01:35:26 +00:00
|
|
|
memaddr = ADDR_BITS_REMOVE (memaddr);
|
|
|
|
|
|
|
|
/* Use memory fill command for leading 0 bytes. */
|
|
|
|
|
|
|
|
if (current_monitor->fill)
|
|
|
|
{
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
if (myaddr[i] != 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (i > 4) /* More than 4 zeros is worth doing */
|
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON FILL %d\n", i);
|
|
|
|
if (current_monitor->flags & MO_FILL_USES_ADDR)
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_printf (current_monitor->fill, memaddr, (memaddr + i) - 1, 0);
|
|
|
|
else
|
|
|
|
monitor_printf (current_monitor->fill, memaddr, i, 0);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* Can't actually use long longs if VAL is an int (nice idea, though). */
|
|
|
|
if ((memaddr & 0x7) == 0 && len >= 8 && current_monitor->setmem.cmdll)
|
|
|
|
{
|
|
|
|
len = 8;
|
|
|
|
cmd = current_monitor->setmem.cmdll;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
if ((memaddr & 0x3) == 0 && len >= 4 && current_monitor->setmem.cmdl)
|
|
|
|
{
|
|
|
|
len = 4;
|
|
|
|
cmd = current_monitor->setmem.cmdl;
|
|
|
|
}
|
|
|
|
else if ((memaddr & 0x1) == 0 && len >= 2 && current_monitor->setmem.cmdw)
|
|
|
|
{
|
|
|
|
len = 2;
|
|
|
|
cmd = current_monitor->setmem.cmdw;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
len = 1;
|
|
|
|
cmd = current_monitor->setmem.cmdb;
|
|
|
|
}
|
|
|
|
|
|
|
|
val = extract_unsigned_integer (myaddr, len);
|
1999-07-07 20:19:36 +00:00
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
if (len == 4)
|
1999-07-07 20:19:36 +00:00
|
|
|
{
|
|
|
|
hostval = *(unsigned int *) myaddr;
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("Hostval(%08x) val(%08x)\n", hostval, val);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (current_monitor->flags & MO_NO_ECHO_ON_SETMEM)
|
|
|
|
monitor_printf_noecho (cmd, memaddr, val);
|
|
|
|
else if (current_monitor->flags & MO_SETMEM_INTERACTIVE)
|
|
|
|
{
|
|
|
|
|
|
|
|
monitor_printf_noecho (cmd, memaddr);
|
|
|
|
|
2001-06-28 20:03:10 +00:00
|
|
|
if (current_monitor->setmem.resp_delim)
|
|
|
|
{
|
|
|
|
monitor_debug ("EXP setmem.resp_delim");
|
|
|
|
monitor_expect_regexp (&setmem_resp_delim_pattern, NULL, 0);
|
|
|
|
monitor_printf ("%x\r", val);
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
if (current_monitor->setmem.term)
|
1999-07-07 20:19:36 +00:00
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("EXP setmem.term");
|
1999-04-16 01:35:26 +00:00
|
|
|
monitor_expect (current_monitor->setmem.term, NULL, 0);
|
|
|
|
monitor_printf ("%x\r", val);
|
|
|
|
}
|
|
|
|
if (current_monitor->setmem.term_cmd)
|
1999-07-07 20:19:36 +00:00
|
|
|
{ /* Emit this to get out of the memory editing state */
|
|
|
|
monitor_printf ("%s", current_monitor->setmem.term_cmd);
|
1999-04-16 01:35:26 +00:00
|
|
|
/* Drop through to expecting a prompt */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
monitor_printf (cmd, memaddr, val);
|
|
|
|
|
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
static int
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_write_memory_bytes (CORE_ADDR memaddr, char *myaddr, int len)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
unsigned char val;
|
|
|
|
int written = 0;
|
|
|
|
if (len == 0)
|
|
|
|
return 0;
|
1999-04-16 01:35:26 +00:00
|
|
|
/* Enter the sub mode */
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_printf (current_monitor->setmem.cmdb, memaddr);
|
|
|
|
monitor_expect_prompt (NULL, 0);
|
1999-04-16 01:35:26 +00:00
|
|
|
while (len)
|
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
val = *myaddr;
|
|
|
|
monitor_printf ("%x\r", val);
|
|
|
|
myaddr++;
|
|
|
|
memaddr++;
|
|
|
|
written++;
|
1999-04-16 01:35:26 +00:00
|
|
|
/* If we wanted to, here we could validate the address */
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
len--;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
/* Now exit the sub mode */
|
|
|
|
monitor_printf (current_monitor->getreg.term_cmd);
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
return written;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
1999-07-07 20:19:36 +00:00
|
|
|
longlongendswap (unsigned char *a)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
int i, j;
|
|
|
|
unsigned char x;
|
|
|
|
i = 0;
|
|
|
|
j = 7;
|
1999-04-16 01:35:26 +00:00
|
|
|
while (i < 4)
|
1999-07-07 20:19:36 +00:00
|
|
|
{
|
|
|
|
x = *(a + i);
|
|
|
|
*(a + i) = *(a + j);
|
|
|
|
*(a + j) = x;
|
|
|
|
i++, j--;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Format 32 chars of long long value, advance the pointer */
|
1999-07-07 20:19:36 +00:00
|
|
|
static char *hexlate = "0123456789abcdef";
|
|
|
|
static char *
|
|
|
|
longlong_hexchars (unsigned long long value,
|
|
|
|
char *outbuff)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
if (value == 0)
|
|
|
|
{
|
|
|
|
*outbuff++ = '0';
|
|
|
|
return outbuff;
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
1999-07-07 20:19:36 +00:00
|
|
|
{
|
|
|
|
static unsigned char disbuf[8]; /* disassembly buffer */
|
|
|
|
unsigned char *scan, *limit; /* loop controls */
|
|
|
|
unsigned char c, nib;
|
|
|
|
int leadzero = 1;
|
|
|
|
scan = disbuf;
|
|
|
|
limit = scan + 8;
|
|
|
|
{
|
|
|
|
unsigned long long *dp;
|
|
|
|
dp = (unsigned long long *) scan;
|
|
|
|
*dp = value;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
longlongendswap (disbuf); /* FIXME: ONly on big endian hosts */
|
1999-04-16 01:35:26 +00:00
|
|
|
while (scan < limit)
|
1999-04-26 18:34:20 +00:00
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
c = *scan++; /* a byte of our long long value */
|
1999-04-16 01:35:26 +00:00
|
|
|
if (leadzero)
|
1999-04-26 18:34:20 +00:00
|
|
|
{
|
|
|
|
if (c == 0)
|
|
|
|
continue;
|
|
|
|
else
|
1999-07-07 20:19:36 +00:00
|
|
|
leadzero = 0; /* henceforth we print even zeroes */
|
1999-04-26 18:34:20 +00:00
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
nib = c >> 4; /* high nibble bits */
|
1999-04-26 18:34:20 +00:00
|
|
|
*outbuff++ = hexlate[nib];
|
1999-07-07 20:19:36 +00:00
|
|
|
nib = c & 0x0f; /* low nibble bits */
|
1999-04-26 18:34:20 +00:00
|
|
|
*outbuff++ = hexlate[nib];
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
return outbuff;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
} /* longlong_hexchars */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* I am only going to call this when writing virtual byte streams.
|
|
|
|
Which possably entails endian conversions
|
1999-07-07 20:19:36 +00:00
|
|
|
*/
|
|
|
|
static int
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_write_memory_longlongs (CORE_ADDR memaddr, char *myaddr, int len)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
static char hexstage[20]; /* At least 16 digits required, plus null */
|
|
|
|
char *endstring;
|
|
|
|
long long *llptr;
|
|
|
|
long long value;
|
|
|
|
int written = 0;
|
|
|
|
llptr = (unsigned long long *) myaddr;
|
|
|
|
if (len == 0)
|
|
|
|
return 0;
|
|
|
|
monitor_printf (current_monitor->setmem.cmdll, memaddr);
|
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
while (len >= 8)
|
|
|
|
{
|
|
|
|
value = *llptr;
|
|
|
|
endstring = longlong_hexchars (*llptr, hexstage);
|
|
|
|
*endstring = '\0'; /* NUll terminate for printf */
|
|
|
|
monitor_printf ("%s\r", hexstage);
|
|
|
|
llptr++;
|
|
|
|
memaddr += 8;
|
|
|
|
written += 8;
|
1999-04-16 01:35:26 +00:00
|
|
|
/* If we wanted to, here we could validate the address */
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
len -= 8;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
/* Now exit the sub mode */
|
|
|
|
monitor_printf (current_monitor->getreg.term_cmd);
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
return written;
|
|
|
|
} /* */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* ----- MONITOR_WRITE_MEMORY_BLOCK ---------------------------- */
|
|
|
|
/* This is for the large blocks of memory which may occur in downloading.
|
|
|
|
And for monitors which use interactive entry,
|
|
|
|
And for monitors which do not have other downloading methods.
|
|
|
|
Without this, we will end up calling monitor_write_memory many times
|
|
|
|
and do the entry and exit of the sub mode many times
|
|
|
|
This currently assumes...
|
1999-07-07 20:19:36 +00:00
|
|
|
MO_SETMEM_INTERACTIVE
|
|
|
|
! MO_NO_ECHO_ON_SETMEM
|
|
|
|
To use this, the you have to patch the monitor_cmds block with
|
|
|
|
this function. Otherwise, its not tuned up for use by all
|
|
|
|
monitor variations.
|
|
|
|
*/
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
static int
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_write_memory_block (CORE_ADDR memaddr, char *myaddr, int len)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
int written;
|
|
|
|
written = 0;
|
1999-04-16 01:35:26 +00:00
|
|
|
/* FIXME: This would be a good place to put the zero test */
|
1999-07-07 20:19:36 +00:00
|
|
|
#if 1
|
1999-04-16 01:35:26 +00:00
|
|
|
if ((len > 8) && (((len & 0x07)) == 0) && current_monitor->setmem.cmdll)
|
1999-07-07 20:19:36 +00:00
|
|
|
{
|
|
|
|
return monitor_write_memory_longlongs (memaddr, myaddr, len);
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
#endif
|
1999-07-07 20:19:36 +00:00
|
|
|
written = monitor_write_memory_bytes (memaddr, myaddr, len);
|
|
|
|
return written;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* This is an alternate form of monitor_read_memory which is used for monitors
|
|
|
|
which can only read a single byte/word/etc. at a time. */
|
|
|
|
|
|
|
|
static int
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_read_memory_single (CORE_ADDR memaddr, char *myaddr, int len)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
unsigned int val;
|
1999-07-07 20:19:36 +00:00
|
|
|
char membuf[sizeof (int) * 2 + 1];
|
1999-04-16 01:35:26 +00:00
|
|
|
char *p;
|
|
|
|
char *cmd;
|
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON read single\n");
|
1999-04-16 01:35:26 +00:00
|
|
|
#if 0
|
|
|
|
/* Can't actually use long longs (nice idea, though). In fact, the
|
|
|
|
call to strtoul below will fail if it tries to convert a value
|
|
|
|
that's too big to fit in a long. */
|
|
|
|
if ((memaddr & 0x7) == 0 && len >= 8 && current_monitor->getmem.cmdll)
|
|
|
|
{
|
|
|
|
len = 8;
|
|
|
|
cmd = current_monitor->getmem.cmdll;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
if ((memaddr & 0x3) == 0 && len >= 4 && current_monitor->getmem.cmdl)
|
|
|
|
{
|
|
|
|
len = 4;
|
|
|
|
cmd = current_monitor->getmem.cmdl;
|
|
|
|
}
|
|
|
|
else if ((memaddr & 0x1) == 0 && len >= 2 && current_monitor->getmem.cmdw)
|
|
|
|
{
|
|
|
|
len = 2;
|
|
|
|
cmd = current_monitor->getmem.cmdw;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
len = 1;
|
|
|
|
cmd = current_monitor->getmem.cmdb;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Send the examine command. */
|
|
|
|
|
|
|
|
monitor_printf (cmd, memaddr);
|
|
|
|
|
|
|
|
/* If RESP_DELIM is specified, we search for that as a leading
|
|
|
|
delimiter for the memory value. Otherwise, we just start
|
|
|
|
searching from the start of the buf. */
|
|
|
|
|
|
|
|
if (current_monitor->getmem.resp_delim)
|
1999-07-07 20:19:36 +00:00
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("EXP getmem.resp_delim\n");
|
1999-04-16 01:35:26 +00:00
|
|
|
monitor_expect_regexp (&getmem_resp_delim_pattern, NULL, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now, read the appropriate number of hex digits for this loc,
|
|
|
|
skipping spaces. */
|
|
|
|
|
|
|
|
/* Skip leading spaces and "0x" if MO_HEX_PREFIX flag is set. */
|
1999-07-07 20:19:36 +00:00
|
|
|
if (current_monitor->flags & MO_HEX_PREFIX)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int c;
|
|
|
|
|
|
|
|
c = readchar (timeout);
|
|
|
|
while (c == ' ')
|
|
|
|
c = readchar (timeout);
|
|
|
|
if ((c == '0') && ((c = readchar (timeout)) == 'x'))
|
|
|
|
;
|
|
|
|
else
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_error ("monitor_read_memory_single",
|
|
|
|
"bad response from monitor",
|
2001-03-28 21:42:32 +00:00
|
|
|
memaddr, 0, NULL, 0);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
2001-03-28 21:42:32 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < len * 2; i++)
|
|
|
|
{
|
|
|
|
int c;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2001-03-28 21:42:32 +00:00
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
c = readchar (timeout);
|
|
|
|
if (isxdigit (c))
|
|
|
|
break;
|
|
|
|
if (c == ' ')
|
|
|
|
continue;
|
|
|
|
|
|
|
|
monitor_error ("monitor_read_memory_single",
|
|
|
|
"bad response from monitor",
|
|
|
|
memaddr, i, membuf, 0);
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
membuf[i] = c;
|
|
|
|
}
|
2001-03-28 21:42:32 +00:00
|
|
|
membuf[i] = '\000'; /* terminate the number */
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* If TERM is present, we wait for that to show up. Also, (if TERM is
|
|
|
|
present), we will send TERM_CMD if that is present. In any case, we collect
|
|
|
|
all of the output into buf, and then wait for the normal prompt. */
|
|
|
|
|
|
|
|
if (current_monitor->getmem.term)
|
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_expect (current_monitor->getmem.term, NULL, 0); /* get response */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
if (current_monitor->getmem.term_cmd)
|
|
|
|
{
|
|
|
|
monitor_printf (current_monitor->getmem.term_cmd);
|
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_expect_prompt (NULL, 0); /* get response */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
p = membuf;
|
|
|
|
val = strtoul (membuf, &p, 16);
|
|
|
|
|
|
|
|
if (val == 0 && membuf == p)
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_error ("monitor_read_memory_single",
|
|
|
|
"bad value from monitor",
|
1999-04-16 01:35:26 +00:00
|
|
|
memaddr, 0, membuf, 0);
|
|
|
|
|
|
|
|
/* supply register stores in target byte order, so swap here */
|
|
|
|
|
|
|
|
store_unsigned_integer (myaddr, len, val);
|
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy LEN bytes of data from debugger memory at MYADDR to inferior's
|
|
|
|
memory at MEMADDR. Returns length moved. Currently, we do no more
|
|
|
|
than 16 bytes at a time. */
|
|
|
|
|
|
|
|
static int
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_read_memory (CORE_ADDR memaddr, char *myaddr, int len)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
unsigned int val;
|
|
|
|
char buf[512];
|
|
|
|
char *p, *p1;
|
|
|
|
int resp_len;
|
|
|
|
int i;
|
|
|
|
CORE_ADDR dumpaddr;
|
|
|
|
|
|
|
|
if (len <= 0)
|
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("Zero length call to monitor_read_memory\n");
|
1999-04-16 01:35:26 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON read block ta(%s) ha(%lx) %d\n",
|
|
|
|
paddr_nz (memaddr), (long) myaddr, len);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
if (current_monitor->flags & MO_ADDR_BITS_REMOVE)
|
|
|
|
memaddr = ADDR_BITS_REMOVE (memaddr);
|
|
|
|
|
|
|
|
if (current_monitor->flags & MO_GETMEM_READ_SINGLE)
|
|
|
|
return monitor_read_memory_single (memaddr, myaddr, len);
|
|
|
|
|
|
|
|
len = min (len, 16);
|
|
|
|
|
|
|
|
/* Some dumpers align the first data with the preceeding 16
|
|
|
|
byte boundary. Some print blanks and start at the
|
|
|
|
requested boundary. EXACT_DUMPADDR
|
1999-07-07 20:19:36 +00:00
|
|
|
*/
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
dumpaddr = (current_monitor->flags & MO_EXACT_DUMPADDR)
|
1999-07-07 20:19:36 +00:00
|
|
|
? memaddr : memaddr & ~0x0f;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* See if xfer would cross a 16 byte boundary. If so, clip it. */
|
|
|
|
if (((memaddr ^ (memaddr + len - 1)) & ~0xf) != 0)
|
|
|
|
len = ((memaddr + len) & ~0xf) - memaddr;
|
|
|
|
|
|
|
|
/* send the memory examine command */
|
|
|
|
|
|
|
|
if (current_monitor->flags & MO_GETMEM_NEEDS_RANGE)
|
1999-04-26 18:34:20 +00:00
|
|
|
monitor_printf (current_monitor->getmem.cmdb, memaddr, memaddr + len);
|
1999-04-16 01:35:26 +00:00
|
|
|
else if (current_monitor->flags & MO_GETMEM_16_BOUNDARY)
|
|
|
|
monitor_printf (current_monitor->getmem.cmdb, dumpaddr);
|
|
|
|
else
|
|
|
|
monitor_printf (current_monitor->getmem.cmdb, memaddr, len);
|
|
|
|
|
|
|
|
/* If TERM is present, we wait for that to show up. Also, (if TERM
|
|
|
|
is present), we will send TERM_CMD if that is present. In any
|
|
|
|
case, we collect all of the output into buf, and then wait for
|
|
|
|
the normal prompt. */
|
|
|
|
|
|
|
|
if (current_monitor->getmem.term)
|
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
resp_len = monitor_expect (current_monitor->getmem.term, buf, sizeof buf); /* get response */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
if (resp_len <= 0)
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_error ("monitor_read_memory",
|
|
|
|
"excessive response from monitor",
|
1999-04-16 01:35:26 +00:00
|
|
|
memaddr, resp_len, buf, 0);
|
|
|
|
|
|
|
|
if (current_monitor->getmem.term_cmd)
|
|
|
|
{
|
2001-07-15 20:34:14 +00:00
|
|
|
serial_write (monitor_desc, current_monitor->getmem.term_cmd,
|
1999-04-16 01:35:26 +00:00
|
|
|
strlen (current_monitor->getmem.term_cmd));
|
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
1999-07-07 20:19:36 +00:00
|
|
|
resp_len = monitor_expect_prompt (buf, sizeof buf); /* get response */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
p = buf;
|
|
|
|
|
|
|
|
/* If RESP_DELIM is specified, we search for that as a leading
|
|
|
|
delimiter for the values. Otherwise, we just start searching
|
|
|
|
from the start of the buf. */
|
|
|
|
|
|
|
|
if (current_monitor->getmem.resp_delim)
|
|
|
|
{
|
|
|
|
int retval, tmp;
|
|
|
|
struct re_registers resp_strings;
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON getmem.resp_delim %s\n", current_monitor->getmem.resp_delim);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
memset (&resp_strings, 0, sizeof (struct re_registers));
|
|
|
|
tmp = strlen (p);
|
|
|
|
retval = re_search (&getmem_resp_delim_pattern, p, tmp, 0, tmp,
|
|
|
|
&resp_strings);
|
|
|
|
|
|
|
|
if (retval < 0)
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_error ("monitor_read_memory",
|
|
|
|
"bad response from monitor",
|
1999-04-16 01:35:26 +00:00
|
|
|
memaddr, resp_len, buf, 0);
|
|
|
|
|
|
|
|
p += resp_strings.end[0];
|
|
|
|
#if 0
|
|
|
|
p = strstr (p, current_monitor->getmem.resp_delim);
|
|
|
|
if (!p)
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_error ("monitor_read_memory",
|
|
|
|
"bad response from monitor",
|
1999-04-16 01:35:26 +00:00
|
|
|
memaddr, resp_len, buf, 0);
|
|
|
|
p += strlen (current_monitor->getmem.resp_delim);
|
|
|
|
#endif
|
|
|
|
}
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON scanning %d ,%lx '%s'\n", len, (long) p, p);
|
1999-04-16 01:35:26 +00:00
|
|
|
if (current_monitor->flags & MO_GETMEM_16_BOUNDARY)
|
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
char c;
|
|
|
|
int fetched = 0;
|
1999-04-16 01:35:26 +00:00
|
|
|
i = len;
|
1999-07-07 20:19:36 +00:00
|
|
|
c = *p;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
|
|
|
|
while (!(c == '\000' || c == '\n' || c == '\r') && i > 0)
|
|
|
|
{
|
|
|
|
if (isxdigit (c))
|
|
|
|
{
|
|
|
|
if ((dumpaddr >= memaddr) && (i > 0))
|
|
|
|
{
|
|
|
|
val = fromhex (c) * 16 + fromhex (*(p + 1));
|
1999-04-16 01:35:26 +00:00
|
|
|
*myaddr++ = val;
|
1999-10-12 04:37:53 +00:00
|
|
|
if (monitor_debug_p || remote_debug)
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "[%02x]", val);
|
1999-04-16 01:35:26 +00:00
|
|
|
--i;
|
1999-07-07 20:19:36 +00:00
|
|
|
fetched++;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
++dumpaddr;
|
|
|
|
++p;
|
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
++p; /* skip a blank or other non hex char */
|
|
|
|
c = *p;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
if (fetched == 0)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("Failed to read via monitor"));
|
1999-10-12 04:37:53 +00:00
|
|
|
if (monitor_debug_p || remote_debug)
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "\n");
|
1999-07-07 20:19:36 +00:00
|
|
|
return fetched; /* Return the number of bytes actually read */
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON scanning bytes\n");
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
for (i = len; i > 0; i--)
|
|
|
|
{
|
|
|
|
/* Skip non-hex chars, but bomb on end of string and newlines */
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
if (isxdigit (*p))
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (*p == '\000' || *p == '\n' || *p == '\r')
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_error ("monitor_read_memory",
|
|
|
|
"badly terminated response from monitor",
|
1999-04-16 01:35:26 +00:00
|
|
|
memaddr, resp_len, buf, 0);
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
|
|
|
|
val = strtoul (p, &p1, 16);
|
|
|
|
|
|
|
|
if (val == 0 && p == p1)
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_error ("monitor_read_memory",
|
|
|
|
"bad value from monitor",
|
1999-04-16 01:35:26 +00:00
|
|
|
memaddr, resp_len, buf, 0);
|
|
|
|
|
|
|
|
*myaddr++ = val;
|
|
|
|
|
|
|
|
if (i == 1)
|
|
|
|
break;
|
|
|
|
|
|
|
|
p = p1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2000-09-24 04:42:12 +00:00
|
|
|
/* Transfer LEN bytes between target address MEMADDR and GDB address
|
|
|
|
MYADDR. Returns 0 for success, errno code for failure. TARGET is
|
|
|
|
unused. */
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
static int
|
2005-11-02 15:22:24 +00:00
|
|
|
monitor_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write,
|
2002-01-19 03:32:43 +00:00
|
|
|
struct mem_attrib *attrib, struct target_ops *target)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2000-11-03 22:00:56 +00:00
|
|
|
int res;
|
|
|
|
|
|
|
|
if (write)
|
|
|
|
{
|
|
|
|
if (current_monitor->flags & MO_HAS_BLOCKWRITES)
|
|
|
|
res = monitor_write_memory_block(memaddr, myaddr, len);
|
|
|
|
else
|
|
|
|
res = monitor_write_memory(memaddr, myaddr, len);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
res = monitor_read_memory(memaddr, myaddr, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_kill (void)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
return; /* ignore attempts to kill target system */
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
2006-01-24 22:09:28 +00:00
|
|
|
/* All we actually do is set the PC to the start address of exec_bfd. */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
static void
|
2004-05-25 14:58:31 +00:00
|
|
|
monitor_create_inferior (char *exec_file, char *args, char **env,
|
|
|
|
int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
if (args && (*args != '\000'))
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("Args are not supported by the monitor."));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
first_time = 1;
|
|
|
|
clear_proceed_status ();
|
2006-01-24 22:09:28 +00:00
|
|
|
write_pc (bfd_get_start_address (exec_bfd));
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Clean up when a program exits.
|
|
|
|
The program actually lives on in the remote processor's RAM, and may be
|
|
|
|
run again without a download. Don't leave it full of breakpoint
|
|
|
|
instructions. */
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_mourn_inferior (void)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
unpush_target (targ_ops);
|
|
|
|
generic_mourn_inferior (); /* Do all the proper things now */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Tell the monitor to add a breakpoint. */
|
|
|
|
|
|
|
|
static int
|
gdb/
* breakpoint.c (deprecated_read_memory_nobpt): Update to use
shadow_len.
(insert_bp_location, reattach_breakpoints, remove_breakpoint)
(delete_breakpoint): Update calls to changed methods.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(single_step_breakpoints, insert_single_step_breakpoint)
(remove_single_step_breakpoints): New.
* breakpoint.h (struct bp_target_info): New.
(struct bp_location): Replace shadow_contents with
target_info and overlay_target_info.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(insert_single_step_breakpoint, remove_single_step_breakpoints): New
prototypes.
* gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h.
(memory_insert_breakpoint, memory_remove_breakpoint): Update second
argument.
* mem-break.c (default_memory_insert_breakpoint): Update. Set
placed_address, placed_size, and shadow_len.
(default_memory_remove_breakpoint): Update. Don't use
BREAKPOINT_FROM_PC.
(memory_insert_breakpoint, memory_remove_breakpoint): Update.
* target.c (update_current_target): Update prototypes for changed
functions.
(debug_to_insert_breakpoint, debug_to_remove_breakpoint)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint):
Update.
* target.h: Forward declare struct bp_target_info.
(struct target_ops): Use a bp_target_info argument for
to_insert_breakpoint, to_remove_breakpoint,
to_insert_hw_breakpoint, and to_remove_hw_breakpoint.
(target_insert_breakpoint, target_remove_breakpoint)
(target_insert_hw_breakpoint, target_remove_hw_breakpoint)
(memory_insert_breakpoint, memory_remove_breakpoint)
(default_memory_insert_breakpoint, default_memory_remove_breakpoint):
Update.
* config/i386/nm-i386.h: Forward declare struct bp_target_info.
(i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update.
(target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise.
* gdbarch.c, gdbarch.h: Regenerated.
* alpha-tdep.c (alpha_software_single_step): Use
insert_single_step_breakpoint and remove_single_step_breakpoints.
Remove unused statics.
* arm-tdep.c (arm_software_single_step): Likewise. Add a note.
* cris-tdep.c (cris_software_single_step): Likewise.
* mips-tdep.c (mips_software_single_step): Likewise.
* rs6000-tdep.c (rs6000_software_single_step): Likewise.
* sparc-tdep.c (sparc_software_single_step): Likewise.
* wince.c (struct thread_info_struct): Remove step_prev.
(undoSStep): Use remove_single_step_breakpoints.
(wince_software_single_step): Use insert_single_step_breakpoint.
* corelow.c (ignore): Remove unneeded prototype. Update arguments.
* exec.c (ignore): Likewise.
* sol-thread.c (ignore): Likewise.
* procfs.c (dbx_link_shadow_contents): Delete.
(dbx_link_bpt): New.
(procfs_mourn_inferior): Remove it if necessary.
(remove_dbx_link_breakpoint): Use it.
(insert_dbx_link_bpt_in_file): Set it.
(procfs_init_inferior): Don't update dbx_link_bpt_addr.
* rs6000-nat.c (exec_one_dummy_insn): Use
deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* solib-irix.c (shadow_contents, breakpoint_addr): Delete.
(base_breakpoint): New.
(disable_break): Use it.
(enable_break): Set it.
* i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint):
Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint)
(ia64_memory_remove_breakpoint): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint): Likewise.
* monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint):
Likewise. Remove unnecessary prototypes. Use placed_address
and placed_size. Removed useless read from memory.
* nto-procfs.c (procfs_insert_breakpoint)
(procfs_remove_breakpoint, procfs_insert_hw_breakpoint)
(procfs_remove_hw_breakpoint): Update.
* ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise.
* ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise.
* remote-e7000.c (e7000_insert_breakpoint)
(e7000_remove_breakpoint): Likewise.
* remote-m32r-sdi.c (m32r_insert_breakpoint)
(m32r_remove_breakpoint): Likewise.
* remote-mips.c (mips_insert_breakpoint)
(mips_remove_breakpoint): Likewise.
* remote-rdp.c (remote_rdp_insert_breakpoint)
(remote_rdp_remove_breakpoint): Likewise.
(rdp_step): Use deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint):
Update.
* remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint):
Delete.
(init_gdbsim_ops): Use memory_insert_breakpoint and
memory_remove_breakpoint.
* remote-st.c (st2000_insert_breakpoint)
(st2000_remove_breakpoint): Update. Remove unused
BREAKPOINT_FROM_PC.
* remote.c (remote_insert_breakpoint, remote_remove_breakpoint):
Update. Use placed_address and placed_size.
(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise.
gdb/doc/
* gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert
and remove breakpoint prototypes.
(Watchpoints): Move description of target_insert_hw_breakpoint and
target_remove_hw_breakpoint ...
(Breakpoints): ... to here. Document target_insert_breakpoint and
target_remove_breakpoint.
2006-04-18 19:20:08 +00:00
|
|
|
monitor_insert_breakpoint (struct bp_target_info *bp_tgt)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
gdb/
* breakpoint.c (deprecated_read_memory_nobpt): Update to use
shadow_len.
(insert_bp_location, reattach_breakpoints, remove_breakpoint)
(delete_breakpoint): Update calls to changed methods.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(single_step_breakpoints, insert_single_step_breakpoint)
(remove_single_step_breakpoints): New.
* breakpoint.h (struct bp_target_info): New.
(struct bp_location): Replace shadow_contents with
target_info and overlay_target_info.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(insert_single_step_breakpoint, remove_single_step_breakpoints): New
prototypes.
* gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h.
(memory_insert_breakpoint, memory_remove_breakpoint): Update second
argument.
* mem-break.c (default_memory_insert_breakpoint): Update. Set
placed_address, placed_size, and shadow_len.
(default_memory_remove_breakpoint): Update. Don't use
BREAKPOINT_FROM_PC.
(memory_insert_breakpoint, memory_remove_breakpoint): Update.
* target.c (update_current_target): Update prototypes for changed
functions.
(debug_to_insert_breakpoint, debug_to_remove_breakpoint)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint):
Update.
* target.h: Forward declare struct bp_target_info.
(struct target_ops): Use a bp_target_info argument for
to_insert_breakpoint, to_remove_breakpoint,
to_insert_hw_breakpoint, and to_remove_hw_breakpoint.
(target_insert_breakpoint, target_remove_breakpoint)
(target_insert_hw_breakpoint, target_remove_hw_breakpoint)
(memory_insert_breakpoint, memory_remove_breakpoint)
(default_memory_insert_breakpoint, default_memory_remove_breakpoint):
Update.
* config/i386/nm-i386.h: Forward declare struct bp_target_info.
(i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update.
(target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise.
* gdbarch.c, gdbarch.h: Regenerated.
* alpha-tdep.c (alpha_software_single_step): Use
insert_single_step_breakpoint and remove_single_step_breakpoints.
Remove unused statics.
* arm-tdep.c (arm_software_single_step): Likewise. Add a note.
* cris-tdep.c (cris_software_single_step): Likewise.
* mips-tdep.c (mips_software_single_step): Likewise.
* rs6000-tdep.c (rs6000_software_single_step): Likewise.
* sparc-tdep.c (sparc_software_single_step): Likewise.
* wince.c (struct thread_info_struct): Remove step_prev.
(undoSStep): Use remove_single_step_breakpoints.
(wince_software_single_step): Use insert_single_step_breakpoint.
* corelow.c (ignore): Remove unneeded prototype. Update arguments.
* exec.c (ignore): Likewise.
* sol-thread.c (ignore): Likewise.
* procfs.c (dbx_link_shadow_contents): Delete.
(dbx_link_bpt): New.
(procfs_mourn_inferior): Remove it if necessary.
(remove_dbx_link_breakpoint): Use it.
(insert_dbx_link_bpt_in_file): Set it.
(procfs_init_inferior): Don't update dbx_link_bpt_addr.
* rs6000-nat.c (exec_one_dummy_insn): Use
deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* solib-irix.c (shadow_contents, breakpoint_addr): Delete.
(base_breakpoint): New.
(disable_break): Use it.
(enable_break): Set it.
* i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint):
Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint)
(ia64_memory_remove_breakpoint): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint): Likewise.
* monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint):
Likewise. Remove unnecessary prototypes. Use placed_address
and placed_size. Removed useless read from memory.
* nto-procfs.c (procfs_insert_breakpoint)
(procfs_remove_breakpoint, procfs_insert_hw_breakpoint)
(procfs_remove_hw_breakpoint): Update.
* ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise.
* ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise.
* remote-e7000.c (e7000_insert_breakpoint)
(e7000_remove_breakpoint): Likewise.
* remote-m32r-sdi.c (m32r_insert_breakpoint)
(m32r_remove_breakpoint): Likewise.
* remote-mips.c (mips_insert_breakpoint)
(mips_remove_breakpoint): Likewise.
* remote-rdp.c (remote_rdp_insert_breakpoint)
(remote_rdp_remove_breakpoint): Likewise.
(rdp_step): Use deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint):
Update.
* remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint):
Delete.
(init_gdbsim_ops): Use memory_insert_breakpoint and
memory_remove_breakpoint.
* remote-st.c (st2000_insert_breakpoint)
(st2000_remove_breakpoint): Update. Remove unused
BREAKPOINT_FROM_PC.
* remote.c (remote_insert_breakpoint, remote_remove_breakpoint):
Update. Use placed_address and placed_size.
(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise.
gdb/doc/
* gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert
and remove breakpoint prototypes.
(Watchpoints): Move description of target_insert_hw_breakpoint and
target_remove_hw_breakpoint ...
(Breakpoints): ... to here. Document target_insert_breakpoint and
target_remove_breakpoint.
2006-04-18 19:20:08 +00:00
|
|
|
CORE_ADDR addr = bp_tgt->placed_address;
|
1999-04-16 01:35:26 +00:00
|
|
|
int i;
|
2002-04-18 18:09:09 +00:00
|
|
|
const unsigned char *bp;
|
1999-04-16 01:35:26 +00:00
|
|
|
int bplen;
|
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON inst bkpt %s\n", paddr (addr));
|
|
|
|
if (current_monitor->set_break == NULL)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("No set_break defined for this monitor"));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
if (current_monitor->flags & MO_ADDR_BITS_REMOVE)
|
|
|
|
addr = ADDR_BITS_REMOVE (addr);
|
|
|
|
|
|
|
|
/* Determine appropriate breakpoint size for this address. */
|
2003-05-15 22:58:39 +00:00
|
|
|
bp = gdbarch_breakpoint_from_pc (current_gdbarch, &addr, &bplen);
|
gdb/
* breakpoint.c (deprecated_read_memory_nobpt): Update to use
shadow_len.
(insert_bp_location, reattach_breakpoints, remove_breakpoint)
(delete_breakpoint): Update calls to changed methods.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(single_step_breakpoints, insert_single_step_breakpoint)
(remove_single_step_breakpoints): New.
* breakpoint.h (struct bp_target_info): New.
(struct bp_location): Replace shadow_contents with
target_info and overlay_target_info.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(insert_single_step_breakpoint, remove_single_step_breakpoints): New
prototypes.
* gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h.
(memory_insert_breakpoint, memory_remove_breakpoint): Update second
argument.
* mem-break.c (default_memory_insert_breakpoint): Update. Set
placed_address, placed_size, and shadow_len.
(default_memory_remove_breakpoint): Update. Don't use
BREAKPOINT_FROM_PC.
(memory_insert_breakpoint, memory_remove_breakpoint): Update.
* target.c (update_current_target): Update prototypes for changed
functions.
(debug_to_insert_breakpoint, debug_to_remove_breakpoint)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint):
Update.
* target.h: Forward declare struct bp_target_info.
(struct target_ops): Use a bp_target_info argument for
to_insert_breakpoint, to_remove_breakpoint,
to_insert_hw_breakpoint, and to_remove_hw_breakpoint.
(target_insert_breakpoint, target_remove_breakpoint)
(target_insert_hw_breakpoint, target_remove_hw_breakpoint)
(memory_insert_breakpoint, memory_remove_breakpoint)
(default_memory_insert_breakpoint, default_memory_remove_breakpoint):
Update.
* config/i386/nm-i386.h: Forward declare struct bp_target_info.
(i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update.
(target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise.
* gdbarch.c, gdbarch.h: Regenerated.
* alpha-tdep.c (alpha_software_single_step): Use
insert_single_step_breakpoint and remove_single_step_breakpoints.
Remove unused statics.
* arm-tdep.c (arm_software_single_step): Likewise. Add a note.
* cris-tdep.c (cris_software_single_step): Likewise.
* mips-tdep.c (mips_software_single_step): Likewise.
* rs6000-tdep.c (rs6000_software_single_step): Likewise.
* sparc-tdep.c (sparc_software_single_step): Likewise.
* wince.c (struct thread_info_struct): Remove step_prev.
(undoSStep): Use remove_single_step_breakpoints.
(wince_software_single_step): Use insert_single_step_breakpoint.
* corelow.c (ignore): Remove unneeded prototype. Update arguments.
* exec.c (ignore): Likewise.
* sol-thread.c (ignore): Likewise.
* procfs.c (dbx_link_shadow_contents): Delete.
(dbx_link_bpt): New.
(procfs_mourn_inferior): Remove it if necessary.
(remove_dbx_link_breakpoint): Use it.
(insert_dbx_link_bpt_in_file): Set it.
(procfs_init_inferior): Don't update dbx_link_bpt_addr.
* rs6000-nat.c (exec_one_dummy_insn): Use
deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* solib-irix.c (shadow_contents, breakpoint_addr): Delete.
(base_breakpoint): New.
(disable_break): Use it.
(enable_break): Set it.
* i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint):
Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint)
(ia64_memory_remove_breakpoint): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint): Likewise.
* monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint):
Likewise. Remove unnecessary prototypes. Use placed_address
and placed_size. Removed useless read from memory.
* nto-procfs.c (procfs_insert_breakpoint)
(procfs_remove_breakpoint, procfs_insert_hw_breakpoint)
(procfs_remove_hw_breakpoint): Update.
* ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise.
* ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise.
* remote-e7000.c (e7000_insert_breakpoint)
(e7000_remove_breakpoint): Likewise.
* remote-m32r-sdi.c (m32r_insert_breakpoint)
(m32r_remove_breakpoint): Likewise.
* remote-mips.c (mips_insert_breakpoint)
(mips_remove_breakpoint): Likewise.
* remote-rdp.c (remote_rdp_insert_breakpoint)
(remote_rdp_remove_breakpoint): Likewise.
(rdp_step): Use deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint):
Update.
* remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint):
Delete.
(init_gdbsim_ops): Use memory_insert_breakpoint and
memory_remove_breakpoint.
* remote-st.c (st2000_insert_breakpoint)
(st2000_remove_breakpoint): Update. Remove unused
BREAKPOINT_FROM_PC.
* remote.c (remote_insert_breakpoint, remote_remove_breakpoint):
Update. Use placed_address and placed_size.
(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise.
gdb/doc/
* gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert
and remove breakpoint prototypes.
(Watchpoints): Move description of target_insert_hw_breakpoint and
target_remove_hw_breakpoint ...
(Breakpoints): ... to here. Document target_insert_breakpoint and
target_remove_breakpoint.
2006-04-18 19:20:08 +00:00
|
|
|
bp_tgt->placed_address = addr;
|
|
|
|
bp_tgt->placed_size = bplen;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-05-19 19:58:41 +00:00
|
|
|
for (i = 0; i < current_monitor->num_breakpoints; i++)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
if (breakaddr[i] == 0)
|
|
|
|
{
|
|
|
|
breakaddr[i] = addr;
|
|
|
|
monitor_printf (current_monitor->set_break, addr);
|
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("Too many breakpoints (> %d) for monitor."), current_monitor->num_breakpoints);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Tell the monitor to remove a breakpoint. */
|
|
|
|
|
|
|
|
static int
|
gdb/
* breakpoint.c (deprecated_read_memory_nobpt): Update to use
shadow_len.
(insert_bp_location, reattach_breakpoints, remove_breakpoint)
(delete_breakpoint): Update calls to changed methods.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(single_step_breakpoints, insert_single_step_breakpoint)
(remove_single_step_breakpoints): New.
* breakpoint.h (struct bp_target_info): New.
(struct bp_location): Replace shadow_contents with
target_info and overlay_target_info.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(insert_single_step_breakpoint, remove_single_step_breakpoints): New
prototypes.
* gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h.
(memory_insert_breakpoint, memory_remove_breakpoint): Update second
argument.
* mem-break.c (default_memory_insert_breakpoint): Update. Set
placed_address, placed_size, and shadow_len.
(default_memory_remove_breakpoint): Update. Don't use
BREAKPOINT_FROM_PC.
(memory_insert_breakpoint, memory_remove_breakpoint): Update.
* target.c (update_current_target): Update prototypes for changed
functions.
(debug_to_insert_breakpoint, debug_to_remove_breakpoint)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint):
Update.
* target.h: Forward declare struct bp_target_info.
(struct target_ops): Use a bp_target_info argument for
to_insert_breakpoint, to_remove_breakpoint,
to_insert_hw_breakpoint, and to_remove_hw_breakpoint.
(target_insert_breakpoint, target_remove_breakpoint)
(target_insert_hw_breakpoint, target_remove_hw_breakpoint)
(memory_insert_breakpoint, memory_remove_breakpoint)
(default_memory_insert_breakpoint, default_memory_remove_breakpoint):
Update.
* config/i386/nm-i386.h: Forward declare struct bp_target_info.
(i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update.
(target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise.
* gdbarch.c, gdbarch.h: Regenerated.
* alpha-tdep.c (alpha_software_single_step): Use
insert_single_step_breakpoint and remove_single_step_breakpoints.
Remove unused statics.
* arm-tdep.c (arm_software_single_step): Likewise. Add a note.
* cris-tdep.c (cris_software_single_step): Likewise.
* mips-tdep.c (mips_software_single_step): Likewise.
* rs6000-tdep.c (rs6000_software_single_step): Likewise.
* sparc-tdep.c (sparc_software_single_step): Likewise.
* wince.c (struct thread_info_struct): Remove step_prev.
(undoSStep): Use remove_single_step_breakpoints.
(wince_software_single_step): Use insert_single_step_breakpoint.
* corelow.c (ignore): Remove unneeded prototype. Update arguments.
* exec.c (ignore): Likewise.
* sol-thread.c (ignore): Likewise.
* procfs.c (dbx_link_shadow_contents): Delete.
(dbx_link_bpt): New.
(procfs_mourn_inferior): Remove it if necessary.
(remove_dbx_link_breakpoint): Use it.
(insert_dbx_link_bpt_in_file): Set it.
(procfs_init_inferior): Don't update dbx_link_bpt_addr.
* rs6000-nat.c (exec_one_dummy_insn): Use
deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* solib-irix.c (shadow_contents, breakpoint_addr): Delete.
(base_breakpoint): New.
(disable_break): Use it.
(enable_break): Set it.
* i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint):
Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint)
(ia64_memory_remove_breakpoint): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint): Likewise.
* monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint):
Likewise. Remove unnecessary prototypes. Use placed_address
and placed_size. Removed useless read from memory.
* nto-procfs.c (procfs_insert_breakpoint)
(procfs_remove_breakpoint, procfs_insert_hw_breakpoint)
(procfs_remove_hw_breakpoint): Update.
* ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise.
* ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise.
* remote-e7000.c (e7000_insert_breakpoint)
(e7000_remove_breakpoint): Likewise.
* remote-m32r-sdi.c (m32r_insert_breakpoint)
(m32r_remove_breakpoint): Likewise.
* remote-mips.c (mips_insert_breakpoint)
(mips_remove_breakpoint): Likewise.
* remote-rdp.c (remote_rdp_insert_breakpoint)
(remote_rdp_remove_breakpoint): Likewise.
(rdp_step): Use deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint):
Update.
* remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint):
Delete.
(init_gdbsim_ops): Use memory_insert_breakpoint and
memory_remove_breakpoint.
* remote-st.c (st2000_insert_breakpoint)
(st2000_remove_breakpoint): Update. Remove unused
BREAKPOINT_FROM_PC.
* remote.c (remote_insert_breakpoint, remote_remove_breakpoint):
Update. Use placed_address and placed_size.
(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise.
gdb/doc/
* gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert
and remove breakpoint prototypes.
(Watchpoints): Move description of target_insert_hw_breakpoint and
target_remove_hw_breakpoint ...
(Breakpoints): ... to here. Document target_insert_breakpoint and
target_remove_breakpoint.
2006-04-18 19:20:08 +00:00
|
|
|
monitor_remove_breakpoint (struct bp_target_info *bp_tgt)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
gdb/
* breakpoint.c (deprecated_read_memory_nobpt): Update to use
shadow_len.
(insert_bp_location, reattach_breakpoints, remove_breakpoint)
(delete_breakpoint): Update calls to changed methods.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(single_step_breakpoints, insert_single_step_breakpoint)
(remove_single_step_breakpoints): New.
* breakpoint.h (struct bp_target_info): New.
(struct bp_location): Replace shadow_contents with
target_info and overlay_target_info.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(insert_single_step_breakpoint, remove_single_step_breakpoints): New
prototypes.
* gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h.
(memory_insert_breakpoint, memory_remove_breakpoint): Update second
argument.
* mem-break.c (default_memory_insert_breakpoint): Update. Set
placed_address, placed_size, and shadow_len.
(default_memory_remove_breakpoint): Update. Don't use
BREAKPOINT_FROM_PC.
(memory_insert_breakpoint, memory_remove_breakpoint): Update.
* target.c (update_current_target): Update prototypes for changed
functions.
(debug_to_insert_breakpoint, debug_to_remove_breakpoint)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint):
Update.
* target.h: Forward declare struct bp_target_info.
(struct target_ops): Use a bp_target_info argument for
to_insert_breakpoint, to_remove_breakpoint,
to_insert_hw_breakpoint, and to_remove_hw_breakpoint.
(target_insert_breakpoint, target_remove_breakpoint)
(target_insert_hw_breakpoint, target_remove_hw_breakpoint)
(memory_insert_breakpoint, memory_remove_breakpoint)
(default_memory_insert_breakpoint, default_memory_remove_breakpoint):
Update.
* config/i386/nm-i386.h: Forward declare struct bp_target_info.
(i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update.
(target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise.
* gdbarch.c, gdbarch.h: Regenerated.
* alpha-tdep.c (alpha_software_single_step): Use
insert_single_step_breakpoint and remove_single_step_breakpoints.
Remove unused statics.
* arm-tdep.c (arm_software_single_step): Likewise. Add a note.
* cris-tdep.c (cris_software_single_step): Likewise.
* mips-tdep.c (mips_software_single_step): Likewise.
* rs6000-tdep.c (rs6000_software_single_step): Likewise.
* sparc-tdep.c (sparc_software_single_step): Likewise.
* wince.c (struct thread_info_struct): Remove step_prev.
(undoSStep): Use remove_single_step_breakpoints.
(wince_software_single_step): Use insert_single_step_breakpoint.
* corelow.c (ignore): Remove unneeded prototype. Update arguments.
* exec.c (ignore): Likewise.
* sol-thread.c (ignore): Likewise.
* procfs.c (dbx_link_shadow_contents): Delete.
(dbx_link_bpt): New.
(procfs_mourn_inferior): Remove it if necessary.
(remove_dbx_link_breakpoint): Use it.
(insert_dbx_link_bpt_in_file): Set it.
(procfs_init_inferior): Don't update dbx_link_bpt_addr.
* rs6000-nat.c (exec_one_dummy_insn): Use
deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* solib-irix.c (shadow_contents, breakpoint_addr): Delete.
(base_breakpoint): New.
(disable_break): Use it.
(enable_break): Set it.
* i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint):
Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint)
(ia64_memory_remove_breakpoint): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint): Likewise.
* monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint):
Likewise. Remove unnecessary prototypes. Use placed_address
and placed_size. Removed useless read from memory.
* nto-procfs.c (procfs_insert_breakpoint)
(procfs_remove_breakpoint, procfs_insert_hw_breakpoint)
(procfs_remove_hw_breakpoint): Update.
* ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise.
* ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise.
* remote-e7000.c (e7000_insert_breakpoint)
(e7000_remove_breakpoint): Likewise.
* remote-m32r-sdi.c (m32r_insert_breakpoint)
(m32r_remove_breakpoint): Likewise.
* remote-mips.c (mips_insert_breakpoint)
(mips_remove_breakpoint): Likewise.
* remote-rdp.c (remote_rdp_insert_breakpoint)
(remote_rdp_remove_breakpoint): Likewise.
(rdp_step): Use deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint):
Update.
* remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint):
Delete.
(init_gdbsim_ops): Use memory_insert_breakpoint and
memory_remove_breakpoint.
* remote-st.c (st2000_insert_breakpoint)
(st2000_remove_breakpoint): Update. Remove unused
BREAKPOINT_FROM_PC.
* remote.c (remote_insert_breakpoint, remote_remove_breakpoint):
Update. Use placed_address and placed_size.
(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise.
gdb/doc/
* gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert
and remove breakpoint prototypes.
(Watchpoints): Move description of target_insert_hw_breakpoint and
target_remove_hw_breakpoint ...
(Breakpoints): ... to here. Document target_insert_breakpoint and
target_remove_breakpoint.
2006-04-18 19:20:08 +00:00
|
|
|
CORE_ADDR addr = bp_tgt->placed_address;
|
1999-04-16 01:35:26 +00:00
|
|
|
int i;
|
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON rmbkpt %s\n", paddr (addr));
|
|
|
|
if (current_monitor->clr_break == NULL)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("No clr_break defined for this monitor"));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-05-19 19:58:41 +00:00
|
|
|
for (i = 0; i < current_monitor->num_breakpoints; i++)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
if (breakaddr[i] == addr)
|
|
|
|
{
|
|
|
|
breakaddr[i] = 0;
|
|
|
|
/* some monitors remove breakpoints based on the address */
|
|
|
|
if (current_monitor->flags & MO_CLR_BREAK_USES_ADDR)
|
|
|
|
monitor_printf (current_monitor->clr_break, addr);
|
|
|
|
else if (current_monitor->flags & MO_CLR_BREAK_1_BASED)
|
|
|
|
monitor_printf (current_monitor->clr_break, i + 1);
|
|
|
|
else
|
|
|
|
monitor_printf (current_monitor->clr_break, i);
|
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fprintf_unfiltered (gdb_stderr,
|
1999-10-12 04:37:53 +00:00
|
|
|
"Can't find breakpoint associated with 0x%s\n",
|
|
|
|
paddr_nz (addr));
|
1999-04-16 01:35:26 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* monitor_wait_srec_ack -- wait for the target to send an acknowledgement for
|
|
|
|
an S-record. Return non-zero if the ACK is received properly. */
|
|
|
|
|
|
|
|
static int
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_wait_srec_ack (void)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-09-09 00:02:17 +00:00
|
|
|
int ch;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
if (current_monitor->flags & MO_SREC_ACK_PLUS)
|
|
|
|
{
|
|
|
|
return (readchar (timeout) == '+');
|
|
|
|
}
|
|
|
|
else if (current_monitor->flags & MO_SREC_ACK_ROTATE)
|
|
|
|
{
|
|
|
|
/* Eat two backspaces, a "rotating" char (|/-\), and a space. */
|
|
|
|
if ((ch = readchar (1)) < 0)
|
|
|
|
return 0;
|
|
|
|
if ((ch = readchar (1)) < 0)
|
|
|
|
return 0;
|
|
|
|
if ((ch = readchar (1)) < 0)
|
|
|
|
return 0;
|
|
|
|
if ((ch = readchar (1)) < 0)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* monitor_load -- download a file. */
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_load (char *file, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON load\n");
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-10-12 04:37:53 +00:00
|
|
|
if (current_monitor->load_routine)
|
1999-04-16 01:35:26 +00:00
|
|
|
current_monitor->load_routine (monitor_desc, file, hashmark);
|
|
|
|
else
|
|
|
|
{ /* The default is ascii S-records */
|
|
|
|
int n;
|
|
|
|
unsigned long load_offset;
|
|
|
|
char buf[128];
|
|
|
|
|
|
|
|
/* enable user to specify address for downloading as 2nd arg to load */
|
|
|
|
n = sscanf (file, "%s 0x%lx", buf, &load_offset);
|
|
|
|
if (n > 1)
|
|
|
|
file = buf;
|
|
|
|
else
|
|
|
|
load_offset = 0;
|
|
|
|
|
|
|
|
monitor_printf (current_monitor->load);
|
|
|
|
if (current_monitor->loadresp)
|
|
|
|
monitor_expect (current_monitor->loadresp, NULL, 0);
|
|
|
|
|
|
|
|
load_srec (monitor_desc, file, (bfd_vma) load_offset,
|
|
|
|
32, SREC_ALL, hashmark,
|
|
|
|
current_monitor->flags & MO_SREC_ACK ?
|
1999-07-07 20:19:36 +00:00
|
|
|
monitor_wait_srec_ack : NULL);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
monitor_expect_prompt (NULL, 0);
|
|
|
|
}
|
|
|
|
|
2001-09-13 18:53:42 +00:00
|
|
|
/* Finally, make the PC point at the start address */
|
1999-04-16 01:35:26 +00:00
|
|
|
if (exec_bfd)
|
|
|
|
write_pc (bfd_get_start_address (exec_bfd));
|
|
|
|
|
2001-09-13 22:48:19 +00:00
|
|
|
/* There used to be code here which would clear inferior_ptid and
|
|
|
|
call clear_symtab_users. None of that should be necessary:
|
|
|
|
monitor targets should behave like remote protocol targets, and
|
|
|
|
since generic_load does none of those things, this function
|
|
|
|
shouldn't either.
|
|
|
|
|
|
|
|
Furthermore, clearing inferior_ptid is *incorrect*. After doing
|
|
|
|
a load, we still have a valid connection to the monitor, with a
|
|
|
|
live processor state to fiddle with. The user can type
|
|
|
|
`continue' or `jump *start' and make the program run. If they do
|
|
|
|
these things, however, GDB will be talking to a running program
|
|
|
|
while inferior_ptid is null_ptid; this makes things like
|
|
|
|
reinit_frame_cache very confused. */
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_stop (void)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
1999-10-12 04:37:53 +00:00
|
|
|
monitor_debug ("MON stop\n");
|
1999-04-16 01:35:26 +00:00
|
|
|
if ((current_monitor->flags & MO_SEND_BREAK_ON_STOP) != 0)
|
2001-07-15 20:34:14 +00:00
|
|
|
serial_send_break (monitor_desc);
|
1999-04-16 01:35:26 +00:00
|
|
|
if (current_monitor->stop)
|
|
|
|
monitor_printf_noecho (current_monitor->stop);
|
|
|
|
}
|
|
|
|
|
1999-08-09 21:36:23 +00:00
|
|
|
/* Put a COMMAND string out to MONITOR. Output from MONITOR is placed
|
|
|
|
in OUTPUT until the prompt is seen. FIXME: We read the characters
|
|
|
|
ourseleves here cause of a nasty echo. */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
static void
|
1999-08-09 21:36:23 +00:00
|
|
|
monitor_rcmd (char *command,
|
2000-02-02 00:21:19 +00:00
|
|
|
struct ui_file *outbuf)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
char *p;
|
|
|
|
int resp_len;
|
|
|
|
char buf[1000];
|
|
|
|
|
|
|
|
if (monitor_desc == NULL)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("monitor target not open."));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
p = current_monitor->prompt;
|
|
|
|
|
|
|
|
/* Send the command. Note that if no args were supplied, then we're
|
|
|
|
just sending the monitor a newline, which is sometimes useful. */
|
|
|
|
|
1999-08-09 21:36:23 +00:00
|
|
|
monitor_printf ("%s\r", (command ? command : ""));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
resp_len = monitor_expect_prompt (buf, sizeof buf);
|
|
|
|
|
1999-08-09 21:36:23 +00:00
|
|
|
fputs_unfiltered (buf, outbuf); /* Output the response */
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Convert hex digit A to a number. */
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
static int
|
2000-07-30 01:48:28 +00:00
|
|
|
from_hex (int a)
|
1999-07-07 20:19:36 +00:00
|
|
|
{
|
1999-04-16 01:35:26 +00:00
|
|
|
if (a >= '0' && a <= '9')
|
|
|
|
return a - '0';
|
|
|
|
if (a >= 'a' && a <= 'f')
|
|
|
|
return a - 'a' + 10;
|
|
|
|
if (a >= 'A' && a <= 'F')
|
|
|
|
return a - 'A' + 10;
|
|
|
|
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("Reply contains invalid hex digit 0x%x"), a);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
char *
|
2000-07-30 01:48:28 +00:00
|
|
|
monitor_get_dev_name (void)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
return dev_name;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct target_ops monitor_ops;
|
|
|
|
|
|
|
|
static void
|
|
|
|
init_base_monitor_ops (void)
|
|
|
|
{
|
|
|
|
monitor_ops.to_close = monitor_close;
|
|
|
|
monitor_ops.to_detach = monitor_detach;
|
|
|
|
monitor_ops.to_resume = monitor_resume;
|
|
|
|
monitor_ops.to_wait = monitor_wait;
|
|
|
|
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;
|
2004-10-08 20:30:00 +00:00
|
|
|
monitor_ops.deprecated_xfer_memory = monitor_xfer_memory;
|
1999-04-16 01:35:26 +00:00
|
|
|
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_kill = monitor_kill;
|
|
|
|
monitor_ops.to_load = monitor_load;
|
|
|
|
monitor_ops.to_create_inferior = monitor_create_inferior;
|
|
|
|
monitor_ops.to_mourn_inferior = monitor_mourn_inferior;
|
|
|
|
monitor_ops.to_stop = monitor_stop;
|
1999-08-09 21:36:23 +00:00
|
|
|
monitor_ops.to_rcmd = monitor_rcmd;
|
1999-04-16 01:35:26 +00:00
|
|
|
monitor_ops.to_stratum = process_stratum;
|
|
|
|
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_magic = OPS_MAGIC;
|
1999-07-07 20:19:36 +00:00
|
|
|
} /* init_base_monitor_ops */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* Init the target_ops structure pointed at by OPS */
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
init_monitor_ops (struct target_ops *ops)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
if (monitor_ops.to_magic != OPS_MAGIC)
|
|
|
|
init_base_monitor_ops ();
|
|
|
|
|
|
|
|
memcpy (ops, &monitor_ops, sizeof monitor_ops);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Define additional commands that are usually only used by monitors. */
|
|
|
|
|
2003-06-11 13:16:30 +00:00
|
|
|
extern initialize_file_ftype _initialize_remote_monitors; /* -Wmissing-prototypes */
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
_initialize_remote_monitors (void)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
init_base_monitor_ops ();
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_boolean_command through out. Delete #ifdef 0'ed
code adding set/show boolean commands.
* cp-valprint.c, dcache.c, exec.c, gdbtypes.c, infrun.c: Update.
* monitor.c, p-valprint.c, pa64solib.c, printcmd.c: Update.
* proc-api.c, remote-mips.c, remote.c, solib.c: Update.
* somsolib.c, symfile.c, top.c, utils.c, valops.c: Update.
* valprint.c, win32-nat.c, wince.c, xcoffsolib.c: Update.
* cli/cli-cmds.c: Update.
2005-02-18 15:25:32 +00:00
|
|
|
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);
|
1999-10-12 04:37:53 +00:00
|
|
|
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_zinteger_cmd through out. Re-sync gdbarch.sh
and gdbarch.c.
* breakpoint.c, frame.c, gdb-events.sh, gdbarch.sh: Update.
* gdbtypes.c, infrun.c, linux-nat.c, maint.c, monitor.c: Update.
* pa64solib.c, parse.c, remote-mips.c, ser-go32.c: Update.
* serial.c, solib-frv.c, somsolib.c, target.c, top.c: Update.
* varobj.c, cli/cli-cmds.c: Update.
* gdbarch.c, gdb-events.c: Regenerate.
2005-02-18 18:58:56 +00:00
|
|
|
add_setshow_zinteger_cmd ("monitor", no_class, &monitor_debug_p, _("\
|
|
|
|
Set debugging of remote monitor communication."), _("\
|
|
|
|
Show debugging of remote monitor communication."), _("\
|
1999-10-12 04:37:53 +00:00
|
|
|
When enabled, communication between GDB and the remote monitor\n\
|
2005-02-18 Andrew Cagney <cagney@gnu.org>
Use add_setshow_zinteger_cmd through out. Re-sync gdbarch.sh
and gdbarch.c.
* breakpoint.c, frame.c, gdb-events.sh, gdbarch.sh: Update.
* gdbtypes.c, infrun.c, linux-nat.c, maint.c, monitor.c: Update.
* pa64solib.c, parse.c, remote-mips.c, ser-go32.c: Update.
* serial.c, solib-frv.c, somsolib.c, target.c, top.c: Update.
* varobj.c, cli/cli-cmds.c: Update.
* gdbarch.c, gdb-events.c: Regenerate.
2005-02-18 18:58:56 +00:00
|
|
|
is displayed."),
|
|
|
|
NULL,
|
|
|
|
NULL, /* FIXME: i18n: */
|
|
|
|
&setdebuglist, &showdebuglist);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|