X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmonitor.c;h=198155f443f4f9826c2c7e2888f305836b2b12a6;hb=2ca62865245d3e3da0acde89222d1a091512880a;hp=1eb07b9291cea3debe838684b509bb765ab2267b;hpb=45993f6118fb8065ed70d448f4e741763cb8fe4d;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/monitor.c b/gdb/monitor.c index 1eb07b9291..198155f443 100644 --- a/gdb/monitor.c +++ b/gdb/monitor.c @@ -1,91 +1,109 @@ /* Remote debugging interface for boot monitors, for GDB. - Copyright 1990, 1991, 1992, 1993, 1995 Free Software Foundation, Inc. - Contributed by Cygnus Support. Written by Rob Savoye for Cygnus. -This file is part of GDB. + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + 1999, 2000, 2001, 2002 Free Software Foundation, Inc. -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. + Contributed by Cygnus Support. Written by Rob Savoye for Cygnus. + Resurrected from the ashes by Stu Grossman. -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. + This file is part of GDB. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + 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. + + 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. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* 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 - into existance, and makes for quick porting. + into existence, and makes for quick porting. 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" -#include "wait.h" -#ifdef ANSI_PROTOTYPES -#include -#else -#include -#endif #include -#include +#include +#include "gdb_string.h" #include #include "command.h" #include "serial.h" #include "monitor.h" #include "gdbcmd.h" #include "inferior.h" -#include "regex.h" -#include "dcache.h" - -static int readchar PARAMS ((int timeout)); - -static void monitor_command PARAMS ((char *args, int fromtty)); -static void monitor_load_srec PARAMS ((char *args)); - -static int monitor_make_srec PARAMS ((char *buffer, int type, - CORE_ADDR memaddr, - unsigned char *myaddr, int len)); - -static void monitor_fetch_register PARAMS ((int regno)); -static void monitor_store_register PARAMS ((int regno)); - -static void monitor_close PARAMS ((int quitting)); -static void monitor_detach PARAMS ((char *args, int from_tty)); -static void monitor_resume PARAMS ((int pid, int step, enum target_signal sig)); -static void monitor_interrupt PARAMS ((int signo)); -static void monitor_interrupt_twice PARAMS ((int signo)); -static void monitor_interrupt_query PARAMS ((void)); -static void monitor_wait_cleanup PARAMS ((int old_timeout)); - -static int monitor_wait PARAMS ((int pid, struct target_waitstatus *status)); -static void monitor_fetch_registers PARAMS ((int regno)); -static void monitor_store_registers PARAMS ((int regno)); -static void monitor_prepare_to_store PARAMS ((void)); -static int monitor_xfer_memory PARAMS ((CORE_ADDR memaddr, char *myaddr, int len, int write, struct target_ops *target)); -static void monitor_files_info PARAMS ((struct target_ops *ops)); -static int monitor_insert_breakpoint PARAMS ((CORE_ADDR addr, char *shadow)); -static int monitor_remove_breakpoint PARAMS ((CORE_ADDR addr, char *shadow)); -static void monitor_kill PARAMS ((void)); -static void monitor_load PARAMS ((char *file, int from_tty)); -static void monitor_mourn_inferior PARAMS ((void)); -static void monitor_stop PARAMS ((void)); - -static int monitor_read_memory PARAMS ((CORE_ADDR addr, char *myaddr,int len)); -static int monitor_write_memory PARAMS ((CORE_ADDR addr, char *myaddr,int len)); - -static int from_hex PARAMS ((int a)); -static unsigned long get_hex_word PARAMS ((void)); +#include "gdb_regex.h" +#include "srec.h" +#include "regcache.h" + +static char *dev_name; +static struct target_ops *targ_ops; + +static void monitor_vsprintf (char *sndbuf, char *pattern, va_list args); + +static int readchar (int timeout); + +static void monitor_fetch_register (int regno); +static void monitor_store_register (int regno); + +static void monitor_printable_string (char *newstr, char *oldstr, int len); +static void monitor_error (char *function, char *message, CORE_ADDR memaddr, int len, char *string, int final_char); +static void monitor_detach (char *args, int from_tty); +static void monitor_resume (ptid_t ptid, int step, enum target_signal sig); +static void monitor_interrupt (int signo); +static void monitor_interrupt_twice (int signo); +static void monitor_interrupt_query (void); +static void monitor_wait_cleanup (void *old_timeout); + +static ptid_t monitor_wait (ptid_t ptid, struct target_waitstatus *status); +static void monitor_fetch_registers (int regno); +static void monitor_store_registers (int regno); +static void monitor_prepare_to_store (void); +static int monitor_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, + int write, + struct mem_attrib *attrib, + struct target_ops *target); +static void monitor_files_info (struct target_ops *ops); +static int monitor_insert_breakpoint (CORE_ADDR addr, char *shadow); +static int monitor_remove_breakpoint (CORE_ADDR addr, char *shadow); +static void monitor_kill (void); +static void monitor_load (char *file, int from_tty); +static void monitor_mourn_inferior (void); +static void monitor_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); +#if 0 +static int from_hex (int a); +static unsigned long get_hex_word (void); +#endif +static void parse_register_dump (char *, int); static struct monitor_ops *current_monitor; @@ -95,148 +113,393 @@ static int timeout = 30; static int in_monitor_wait = 0; /* Non-zero means we are in monitor_wait() */ -static void (*ofunc)(); /* Old SIGINT signal handler */ +static void (*ofunc) (); /* Old SIGINT signal handler */ + +static CORE_ADDR *breakaddr; /* 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. */ -static serial_t monitor_desc = NULL; +static struct serial *monitor_desc = NULL; /* Pointer to regexp pattern matching data */ static struct re_pattern_buffer register_pattern; +static char register_fastmap[256]; -/* Element 0 points to start of register name, and element 1 points to the - start of the register value. */ +static struct re_pattern_buffer getmem_resp_delim_pattern; +static char getmem_resp_delim_fastmap[256]; -static struct re_registers register_strings; +static struct re_pattern_buffer setmem_resp_delim_pattern; +static char setmem_resp_delim_fastmap[256]; -static char fastmap[256]; +static struct re_pattern_buffer setreg_resp_delim_pattern; +static char setreg_resp_delim_fastmap[256]; static int dump_reg_flag; /* Non-zero means do a dump_registers cmd when monitor_wait wakes up. */ -static DCACHE *remote_dcache; +static int first_time = 0; /* is this the first time we're executing after + gaving created the child proccess? */ + +#define TARGET_BUF_SIZE 2048 + +/* Monitor specific debugging information. Typically only useful to + the developer of a new monitor interface. */ + +static void monitor_debug (const char *fmt, ...) ATTR_FORMAT(printf, 1, 2); + +static int monitor_debug_p = 0; + +/* NOTE: This file alternates between monitor_debug_p and remote_debug + when determining if debug information is printed. Perhaphs this + 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) +{ + int ch; + int i; + + if (len <= 0) + len = strlen (oldstr); + + for (i = 0; i < len; i++) + { + ch = oldstr[i]; + switch (ch) + { + default: + if (isprint (ch)) + *newstr++ = ch; + + else + { + sprintf (newstr, "\\x%02x", ch & 0xff); + newstr += 4; + } + break; + + 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; + } + } + + *newstr++ = '\0'; +} + +/* Print monitor errors with a string, converting the string to printable + representation. */ + +static void +monitor_error (char *function, char *message, + CORE_ADDR memaddr, int len, char *string, int final_char) +{ + int real_len = (len == 0 && string != (char *) 0) ? strlen (string) : len; + char *safe_string = alloca ((real_len * 4) + 1); + monitor_printable_string (safe_string, string, real_len); + + if (final_char) + error ("%s (0x%s): %s: %s%c", function, paddr_nz (memaddr), message, safe_string, final_char); + else + error ("%s (0x%s): %s: %s", function, paddr_nz (memaddr), message, safe_string); +} + +/* Convert hex digit A to a number. */ + +static int +fromhex (int a) +{ + if (a >= '0' && a <= '9') + return a - '0'; + else if (a >= 'a' && a <= 'f') + return a - 'a' + 10; + else if (a >= 'A' && a <= 'F') + return a - 'A' + 10; + else + error ("Invalid hex digit %d", a); +} + +/* 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 %. + */ + +static void +monitor_vsprintf (char *sndbuf, char *pattern, va_list args) +{ + 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; + format[i + 1] = '\0'; + + /* 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 -#ifdef ANSI_PROTOTYPES -monitor_printf_noecho (char *pattern, ...) -#else -monitor_printf_noecho (va_alist) - va_dcl -#endif +monitor_printf_noecho (char *pattern,...) { va_list args; char sndbuf[2000]; int len; -#if ANSI_PROTOTYPES va_start (args, pattern); -#else - char *pattern; - va_start (args); - pattern = va_arg (args, char *); -#endif - vsprintf (sndbuf, pattern, args); - - if (remote_debug > 0) - fputs_unfiltered (sndbuf, gdb_stderr); + monitor_vsprintf (sndbuf, pattern, args); len = strlen (sndbuf); - if (len + 1 > sizeof sndbuf) - abort (); + internal_error (__FILE__, __LINE__, "failed internal consistency check"); - if (SERIAL_WRITE(monitor_desc, sndbuf, len)) - fprintf_unfiltered (stderr, "SERIAL_WRITE failed: %s\n", safe_strerror (errno)); + if (monitor_debug_p) + { + char *safe_string = (char *) alloca ((strlen (sndbuf) * 4) + 1); + monitor_printable_string (safe_string, sndbuf, 0); + fprintf_unfiltered (gdb_stdlog, "sent[%s]\n", safe_string); + } + + monitor_write (sndbuf, len); } /* monitor_printf -- Send data to monitor and check the echo. Works just like printf. */ void -#ifdef ANSI_PROTOTYPES -monitor_printf (char *pattern, ...) -#else -monitor_printf (va_alist) - va_dcl -#endif +monitor_printf (char *pattern,...) { va_list args; char sndbuf[2000]; int len; - int i, c; -#ifdef ANSI_PROTOTYPES va_start (args, pattern); -#else - char *pattern; - va_start (args); - pattern = va_arg (args, char *); -#endif - - vsprintf (sndbuf, pattern, args); - if (remote_debug > 0) - fputs_unfiltered (sndbuf, gdb_stderr); + monitor_vsprintf (sndbuf, pattern, args); len = strlen (sndbuf); - if (len + 1 > sizeof sndbuf) - abort (); + internal_error (__FILE__, __LINE__, "failed internal consistency check"); - if (SERIAL_WRITE(monitor_desc, sndbuf, len)) - fprintf_unfiltered (stderr, "SERIAL_WRITE failed: %s\n", safe_strerror (errno)); + if (monitor_debug_p) + { + char *safe_string = (char *) alloca ((len * 4) + 1); + monitor_printable_string (safe_string, sndbuf, 0); + fprintf_unfiltered (gdb_stdlog, "sent[%s]\n", safe_string); + } - for (i = 0; i < len; i++) + 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. */ + monitor_debug ("ExpectEcho\n"); + monitor_expect (sndbuf, (char *) 0, 0); +} + + +/* Write characters to the remote system. */ + +void +monitor_write (char *buf, int buflen) +{ + if (serial_write (monitor_desc, buf, buflen)) + fprintf_unfiltered (gdb_stderr, "serial_write failed: %s\n", + 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 +monitor_readchar (void) +{ + int c; + int looping; + + do { - trycr: - c = readchar (timeout); + looping = 0; + c = serial_readchar (monitor_desc, timeout); - if (c != sndbuf[i]) - { - /* Don't fail if we sent a ^C, they're never echoed */ - if (sndbuf[i] == '\003') - continue; -#if 0 - if (sndbuf[i] == '\r' - && c == '\n') - goto trycr; -#endif - warning ("monitor_printf: Bad echo. Sent: \"%s\", Got: \"%.*s%c\".", - sndbuf, i, sndbuf, c); - } + if (c >= 0) + c &= 0xff; /* don't lose bit 7 */ } + while (looping); + + if (c >= 0) + return c; + + if (c == SERIAL_TIMEOUT) + error ("Timeout reading from remote system."); + + perror_with_name ("remote-monitor"); } + /* Read a character from the remote system, doing all the fancy timeout stuff. */ static int -readchar (timeout) - int timeout; +readchar (int timeout) { int c; + static enum + { + last_random, last_nl, last_cr, last_crnl + } + state = last_random; + int looping; + + do + { + looping = 0; + c = serial_readchar (monitor_desc, timeout); + + if (c >= 0) + { + c &= 0x7f; + /* This seems to interfere with proper function of the + input stream */ + if (monitor_debug_p || remote_debug) + { + char buf[2]; + buf[0] = c; + buf[1] = '\0'; + puts_debug ("read -->", buf, "<--"); + } - c = SERIAL_READCHAR (monitor_desc, timeout); + } - if (remote_debug > 0) - fputc_unfiltered (c, gdb_stderr); + /* 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 & 0x7f; + return c; if (c == SERIAL_TIMEOUT) -#ifdef MAINTENANCE_CMDS +#if 0 + /* I fail to see how detaching here can be useful */ if (in_monitor_wait) /* Watchdog went off */ { target_mourn_inferior (); - error ("Watchdog has expired. Target detached.\n"); + error ("GDB serial timeout has expired. Target detached.\n"); } else #endif @@ -253,16 +516,20 @@ readchar (timeout) will be at the end of BUF. */ int -monitor_expect (string, buf, buflen) - char *string; - char *buf; - int buflen; +monitor_expect (char *string, char *buf, int buflen) { char *p = string; int obuflen = buflen; int c; - immediate_quit = 1; + if (monitor_debug_p) + { + char *safe_string = (char *) alloca ((strlen (string) * 4) + 1); + monitor_printable_string (safe_string, string, 0); + fprintf_unfiltered (gdb_stdlog, "MON Expecting '%s'\n", safe_string); + } + + immediate_quit++; while (1) { if (buf) @@ -270,22 +537,27 @@ monitor_expect (string, buf, buflen) if (buflen < 2) { *buf = '\000'; - immediate_quit = 0; + immediate_quit--; return -1; } c = readchar (timeout); + if (c == '\000') + continue; *buf++ = c; buflen--; } else c = readchar (timeout); - if (c == *p++) + /* Don't expect any ^C sent to be echoed */ + + if (*p == '\003' || c == *p) { + p++; if (*p == '\0') { - immediate_quit = 0; + immediate_quit--; if (buf) { @@ -298,10 +570,83 @@ monitor_expect (string, buf, buflen) } else { - p = string; - if (c == *p) - p++; + /* 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; + } + } +} + +/* Search for a regexp. */ + +static int +monitor_expect_regexp (struct re_pattern_buffer *pat, char *buf, int buflen) +{ + char *mybuf; + char *p; + monitor_debug ("MON Expecting regexp\n"); + if (buf) + mybuf = buf; + else + { + mybuf = alloca (TARGET_BUF_SIZE); + buflen = TARGET_BUF_SIZE; + } + + 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; } } @@ -311,28 +656,27 @@ monitor_expect (string, buf, buflen) 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. */ + 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 -monitor_expect_prompt (buf, buflen) - char *buf; - int buflen; +monitor_expect_prompt (char *buf, int buflen) { - return monitor_expect (PROMPT, buf, buflen); + monitor_debug ("MON Expecting prompt\n"); + return monitor_expect (current_monitor->prompt, buf, buflen); } /* 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 -get_hex_word () +get_hex_word (void) { unsigned long val; int i; @@ -340,7 +684,7 @@ get_hex_word () do ch = readchar (timeout); - while (isspace(ch)); + while (isspace (ch)); val = from_hex (ch); @@ -354,21 +698,37 @@ get_hex_word () return val; } +#endif + +static void +compile_pattern (char *pattern, struct re_pattern_buffer *compiled_pattern, + char *fastmap) +{ + 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) + error ("compile_pattern: Can't compile pattern string `%s': %s!", pattern, val); + + if (fastmap) + re_compile_fastmap (compiled_pattern); +} /* Open a connection to a remote debugger. NAME is the filename used for communication. */ -static char *dev_name; -static struct target_ops *targ_ops; - void -monitor_open (args, mon_ops, from_tty) - char *args; - struct monitor_ops *mon_ops; - int from_tty; +monitor_open (char *args, struct monitor_ops *mon_ops, int from_tty) { char *name; - int i; char **p; if (mon_ops->magic != MONITOR_OPS_MAGIC) @@ -386,48 +746,48 @@ monitor_open (args, mon_ops, from_tty) /* Setup pattern for register dump */ if (mon_ops->register_pattern) - { - int tmp; - char *val; + compile_pattern (mon_ops->register_pattern, ®ister_pattern, + register_fastmap); - register_pattern.fastmap = fastmap; - tmp = re_set_syntax (RE_SYNTAX_EMACS); - val = re_compile_pattern (mon_ops->register_pattern, - strlen (mon_ops->register_pattern), - ®ister_pattern); - re_set_syntax (tmp); - if (val) - error ("Can't compiler register pattern string: %s!", val); - re_compile_fastmap (®ister_pattern); - } + if (mon_ops->getmem.resp_delim) + compile_pattern (mon_ops->getmem.resp_delim, &getmem_resp_delim_pattern, + getmem_resp_delim_fastmap); + + 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); + unpush_target (targ_ops); if (dev_name) - free (dev_name); - dev_name = strsave (args); + xfree (dev_name); + dev_name = xstrdup (args); - monitor_desc = SERIAL_OPEN (dev_name); + monitor_desc = serial_open (dev_name); if (!monitor_desc) perror_with_name (dev_name); if (baud_rate != -1) { - if (SERIAL_SETBAUDRATE (monitor_desc, baud_rate)) + if (serial_setbaudrate (monitor_desc, baud_rate)) { - SERIAL_CLOSE (monitor_desc); + serial_close (monitor_desc); perror_with_name (dev_name); } } - - SERIAL_RAW (monitor_desc); - SERIAL_FLUSH_INPUT (monitor_desc); + serial_raw (monitor_desc); + + serial_flush_input (monitor_desc); /* some systems only work with 2 stop bits */ - SERIAL_SETSTOPBITS (monitor_desc, mon_ops->stopbits); + serial_setstopbits (monitor_desc, mon_ops->stopbits); current_monitor = mon_ops; @@ -437,17 +797,37 @@ monitor_open (args, mon_ops, from_tty) if (current_monitor->stop) { monitor_stop (); - monitor_expect_prompt (NULL, 0); + if ((current_monitor->flags & MO_NO_ECHO_ON_OPEN) == 0) + { + monitor_debug ("EXP Open echo\n"); + monitor_expect_prompt (NULL, 0); + } } /* wake up the monitor and see if it's alive */ for (p = mon_ops->init; *p != NULL; p++) { - monitor_printf (*p); + /* Some of the characters we send may not be echoed, + but we hope to get a prompt at the end of it all. */ + + if ((current_monitor->flags & MO_NO_ECHO_ON_OPEN) == 0) + monitor_printf (*p); + else + monitor_printf_noecho (*p); monitor_expect_prompt (NULL, 0); } - SERIAL_FLUSH_INPUT (monitor_desc); + serial_flush_input (monitor_desc); + + /* 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)); + } /* Remove all breakpoints */ @@ -462,26 +842,31 @@ monitor_open (args, mon_ops, from_tty) push_target (targ_ops); - inferior_pid = 42000; /* Make run command think we are busy... */ + inferior_ptid = pid_to_ptid (42000); /* Make run command think we are busy... */ /* Give monitor_wait something to read */ monitor_printf (current_monitor->line_term); - remote_dcache = dcache_init (monitor_read_memory, monitor_write_memory); - start_remote (); } /* Close out all files and local state before this target loses control. */ -static void -monitor_close (quitting) - int quitting; +void +monitor_close (int quitting) { if (monitor_desc) - SERIAL_CLOSE (monitor_desc); + serial_close (monitor_desc); + + /* Free breakpoint memory */ + if (breakaddr != NULL) + { + xfree (breakaddr); + breakaddr = NULL; + } + monitor_desc = NULL; } @@ -489,9 +874,7 @@ monitor_close (quitting) when you want to detach and do something else with your gdb. */ static void -monitor_detach (args, from_tty) - char *args; - int from_tty; +monitor_detach (char *args, int from_tty) { pop_target (); /* calls monitor_close to do the real work */ if (from_tty) @@ -501,15 +884,36 @@ monitor_detach (args, from_tty) /* Convert VALSTR into the target byte-ordered value of REGNO and store it. */ char * -monitor_supply_register (regno, valstr) - int regno; - char *valstr; +monitor_supply_register (int regno, char *valstr) { - unsigned LONGEST val; - unsigned char regbuf[MAX_REGISTER_RAW_SIZE]; + ULONGEST val; + unsigned char regbuf[MAX_REGISTER_SIZE]; char *p; - val = strtoul (valstr, &p, 16); + val = 0; + 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++); + } + monitor_debug ("Supplying Register %d %s\n", regno, valstr); if (val == 0 && valstr == p) error ("monitor_supply_register (%d): bad value from monitor: %s.", @@ -517,7 +921,7 @@ monitor_supply_register (regno, valstr) /* supply register stores in target byte order, so swap here */ - store_unsigned_integer (regbuf, REGISTER_RAW_SIZE (regno), val); + store_unsigned_integer (regbuf, DEPRECATED_REGISTER_RAW_SIZE (regno), val); supply_register (regno, regbuf); @@ -527,35 +931,49 @@ monitor_supply_register (regno, valstr) /* Tell the remote machine to resume. */ static void -monitor_resume (pid, step, sig) - int pid, step; - enum target_signal sig; +monitor_resume (ptid_t ptid, int step, enum target_signal sig) { - dcache_flush (remote_dcache); + /* Some monitors require a different command when starting a program */ + monitor_debug ("MON resume\n"); + 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) + dump_reg_flag = 1; + return; + } if (step) - monitor_printf (STEP_CMD); + monitor_printf (current_monitor->step); else { - monitor_printf (CONT_CMD); + if (current_monitor->continue_hook) + (*current_monitor->continue_hook) (); + else + monitor_printf (current_monitor->cont); 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. */ +/* 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 char * -parse_register_dump (buf, len) - char *buf; - int len; +static void +parse_register_dump (char *buf, int len) { + monitor_debug ("MON Parsing register dump\n"); while (1) { int regnamelen, vallen; char *regname, *val; + /* Element 0 points to start of register name, and element 1 + points to the start of the register value. */ + 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) @@ -577,14 +995,13 @@ parse_register_dump (buf, len) packet. */ static void -monitor_interrupt (signo) - int signo; +monitor_interrupt (int signo) { /* If this doesn't work, try more severe steps. */ signal (signo, monitor_interrupt_twice); - - if (remote_debug) - printf_unfiltered ("monitor_interrupt called\n"); + + if (monitor_debug_p || remote_debug) + fprintf_unfiltered (gdb_stdlog, "monitor_interrupt called\n"); target_stop (); } @@ -592,11 +1009,10 @@ monitor_interrupt (signo) /* The user typed ^C twice. */ static void -monitor_interrupt_twice (signo) - int signo; +monitor_interrupt_twice (int signo) { signal (signo, ofunc); - + monitor_interrupt_query (); signal (signo, monitor_interrupt); @@ -605,7 +1021,7 @@ monitor_interrupt_twice (signo) /* Ask the user what to do when an interrupt is received. */ static void -monitor_interrupt_query () +monitor_interrupt_query (void) { target_terminal_ours (); @@ -613,41 +1029,74 @@ monitor_interrupt_query () Give up (and stop debugging it)? ")) { target_mourn_inferior (); - return_to_top_level (RETURN_QUIT); + throw_exception (RETURN_QUIT); } target_terminal_inferior (); } static void -monitor_wait_cleanup (old_timeout) - int old_timeout; +monitor_wait_cleanup (void *old_timeout) { - timeout = old_timeout; + timeout = *(int *) old_timeout; signal (SIGINT, ofunc); in_monitor_wait = 0; } + + +static void +monitor_wait_filter (char *buf, + int bufmax, + int *ext_resp_len, + struct target_waitstatus *status) +{ + int resp_len; + do + { + resp_len = monitor_expect_prompt (buf, bufmax); + *ext_resp_len = resp_len; + + 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 */ + if (monitor_debug_p || remote_debug + || current_monitor->flags & MO_PRINT_PROGRAM_OUTPUT) + { + 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. */ -static int -monitor_wait (pid, status) - int pid; - struct target_waitstatus *status; +static ptid_t +monitor_wait (ptid_t ptid, struct target_waitstatus *status) { int old_timeout = timeout; - char buf[1024]; + char buf[TARGET_BUF_SIZE]; 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); + old_chain = make_cleanup (monitor_wait_cleanup, &old_timeout); + monitor_debug ("MON wait\n"); -#ifdef MAINTENANCE_CMDS - in_monitor_wait = 1; +#if 0 + /* This is somthing other than a maintenance command */ + in_monitor_wait = 1; timeout = watchdog > 0 ? watchdog : -1; #else timeout = -1; /* Don't time out -- user program is running. */ @@ -655,6 +1104,12 @@ monitor_wait (pid, status) ofunc = (void (*)()) signal (SIGINT, monitor_interrupt); + if (current_monitor->wait_filter) + (*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 */ do { resp_len = monitor_expect_prompt (buf, sizeof (buf)); @@ -664,20 +1119,36 @@ monitor_wait (pid, status) } while (resp_len < 0); + /* Print any output characters that were preceded by ^O. */ + /* FIXME - This would be great as a user settabgle flag */ + if (monitor_debug_p || remote_debug + || current_monitor->flags & MO_PRINT_PROGRAM_OUTPUT) + { + int i; + + for (i = 0; i < resp_len - 1; i++) + if (buf[i] == 0x0f) + putchar_unfiltered (buf[++i]); + } +#endif + 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 + monitor_debug ("Wait fetching registers after stop\n"); + monitor_dump_regs (); +#endif status->kind = TARGET_WAITKIND_STOPPED; status->value.sig = TARGET_SIGNAL_TRAP; @@ -686,105 +1157,156 @@ monitor_wait (pid, status) in_monitor_wait = 0; - return inferior_pid; + return inferior_ptid; } /* Fetch register REGNO, or all registers if REGNO is -1. Returns errno value. */ static void -monitor_fetch_register (regno) - int regno; +monitor_fetch_register (int regno) { - char *name; - static char zerobuf[MAX_REGISTER_RAW_SIZE] = {0}; - char regbuf[MAX_REGISTER_RAW_SIZE * 2 + 1]; + const char *name; + char *zerobuf; + char *regbuf; int i; - name = REGNAMES (regno); + regbuf = alloca (MAX_REGISTER_SIZE * 2 + 1); + zerobuf = alloca (MAX_REGISTER_SIZE); + memset (zerobuf, 0, MAX_REGISTER_SIZE); + + if (current_monitor->regname != NULL) + name = current_monitor->regname (regno); + else + name = current_monitor->regnames[regno]; + monitor_debug ("MON fetchreg %d '%s'\n", regno, name ? name : "(null name)"); - if (!name) + if (!name || (*name == '\0')) { + monitor_debug ("No register known for %d\n", regno); supply_register (regno, zerobuf); return; } - /* send the register examine command */ + /* 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 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) - monitor_expect (current_monitor->getreg.resp_delim, NULL, 0); - -/* Now, read the appropriate number of hex digits for this register, skipping - spaces. */ + { + monitor_debug ("EXP getreg.resp_delim\n"); + monitor_expect (current_monitor->getreg.resp_delim, NULL, 0); + /* Handle case of first 32 registers listed in pairs. */ + if (current_monitor->flags & MO_32_REGS_PAIRED + && (regno & 1) != 0 && regno < 32) + { + monitor_debug ("EXP getreg.resp_delim\n"); + monitor_expect (current_monitor->getreg.resp_delim, NULL, 0); + } + } - for (i = 0; i < REGISTER_RAW_SIZE (regno) * 2; i++) + /* Skip leading spaces and "0x" if MO_HEX_PREFIX flag is set */ + if (current_monitor->flags & MO_HEX_PREFIX) { int c; + c = readchar (timeout); + while (c == ' ') + c = readchar (timeout); + if ((c == '0') && ((c = readchar (timeout)) == 'x')) + ; + else + error ("Bad value returned from monitor while fetching register %x.", + regno); + } - while (1) - { - c = readchar (timeout); - if (isxdigit (c)) - break; - if (c == ' ') - continue; + /* 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. */ - error ("monitor_fetch_register (%d): bad response from monitor: %.*s%c.", - regno, i, regbuf, c); - } + for (i = 0; i < DEPRECATED_REGISTER_RAW_SIZE (regno) * 2; i++) + { + int c; + c = readchar (timeout); + while (c == ' ') + c = readchar (timeout); + + if (!isxdigit (c)) + break; regbuf[i] = c; } regbuf[i] = '\000'; /* terminate the number */ + monitor_debug ("REGVAL '%s'\n", regbuf); -/* 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 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) { - monitor_expect (current_monitor->getreg.term, NULL, 0); /* get response */ + monitor_debug ("EXP getreg.term\n"); + monitor_expect (current_monitor->getreg.term, NULL, 0); /* get response */ + } - if (current_monitor->getreg.term_cmd) - { - monitor_printf (current_monitor->getreg.term_cmd); - monitor_expect_prompt (NULL, 0); - } + if (current_monitor->getreg.term_cmd) + { + monitor_debug ("EMIT getreg.term.cmd\n"); + monitor_printf (current_monitor->getreg.term_cmd); } - else - monitor_expect_prompt (NULL, 0); /* get response */ + if (!current_monitor->getreg.term || /* Already expected or */ + current_monitor->getreg.term_cmd) /* ack expected */ + monitor_expect_prompt (NULL, 0); /* get response */ 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. + */ +int +monitor_dump_reg_block (char *block_cmd) +{ + char buf[TARGET_BUF_SIZE]; + int resp_len; + monitor_printf (block_cmd); + resp_len = monitor_expect_prompt (buf, sizeof (buf)); + parse_register_dump (buf, resp_len); + return 1; +} + + /* Read the remote registers into the block regs. */ +/* Call the specific function if it has been provided */ -static void monitor_dump_regs () +static void +monitor_dump_regs (void) { - if (current_monitor->dump_registers) + char buf[TARGET_BUF_SIZE]; + int resp_len; + if (current_monitor->dumpregs) + (*(current_monitor->dumpregs)) (); /* call supplied function */ + else if (current_monitor->dump_registers) /* default version */ { - char buf[200]; - int resp_len; monitor_printf (current_monitor->dump_registers); resp_len = monitor_expect_prompt (buf, sizeof (buf)); parse_register_dump (buf, resp_len); } else - abort(); /* Need some way to read registers */ + internal_error (__FILE__, __LINE__, "failed internal consistency check"); /* Need some way to read registers */ } static void -monitor_fetch_registers (regno) - int regno; +monitor_fetch_registers (int regno) { - if (current_monitor->getreg.cmd) + monitor_debug ("MON fetchregs\n"); + if (current_monitor->getreg.cmd) { if (regno >= 0) { @@ -795,43 +1317,73 @@ monitor_fetch_registers (regno) for (regno = 0; regno < NUM_REGS; regno++) monitor_fetch_register (regno); } - else { - monitor_dump_regs (); - } + else + { + monitor_dump_regs (); + } } /* Store register REGNO, or all if REGNO == 0. Return errno value. */ static void -monitor_store_register (regno) - int regno; +monitor_store_register (int regno) { - char *name; - unsigned LONGEST val; - - name = REGNAMES (regno); - if (!name) - return; + const char *name; + ULONGEST val; + + if (current_monitor->regname != NULL) + name = current_monitor->regname (regno); + else + name = current_monitor->regnames[regno]; + + if (!name || (*name == '\0')) + { + monitor_debug ("MON Cannot store unknown register\n"); + return; + } val = read_register (regno); + monitor_debug ("MON storeg %d %s\n", regno, + phex (val, DEPRECATED_REGISTER_RAW_SIZE (regno))); - /* send the register deposit command */ + /* send the register deposit command */ - monitor_printf (current_monitor->setreg.cmd, name, val); - -/* It's possible that there are actually some monitors out there that will - prompt you when you set a register. In that case, you may need to add some - code here to deal with TERM and TERM_CMD (see monitor_fetch_register to get - an idea of what's needed...) */ + if (current_monitor->flags & MO_REGISTER_VALUE_FIRST) + 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); - monitor_expect_prompt (NULL, 0); -} + 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)); + } + if (current_monitor->setreg.term) + { + monitor_debug ("EXP setreg.term\n"); + monitor_expect (current_monitor->setreg.term, NULL, 0); + if (current_monitor->flags & MO_SETREG_INTERACTIVE) + monitor_printf ("%s\r", paddr_nz (val)); + monitor_expect_prompt (NULL, 0); + } + else + monitor_expect_prompt (NULL, 0); + if (current_monitor->setreg.term_cmd) /* Mode exit required */ + { + monitor_debug ("EXP setreg_termcmd\n"); + monitor_printf ("%s", current_monitor->setreg.term_cmd); + monitor_expect_prompt (NULL, 0); + } +} /* monitor_store_register */ /* Store the remote registers. */ static void -monitor_store_registers (regno) - int regno; +monitor_store_registers (int regno) { if (regno >= 0) { @@ -850,28 +1402,29 @@ monitor_store_registers (regno) debugged. */ static void -monitor_prepare_to_store () +monitor_prepare_to_store (void) { /* Do nothing, since we can store individual regs */ } static void -monitor_files_info (ops) - struct target_ops *ops; +monitor_files_info (struct target_ops *ops) { printf_unfiltered ("\tAttached to %s at %d baud.\n", dev_name, baud_rate); } static int -monitor_write_memory (memaddr, myaddr, len) - CORE_ADDR memaddr; - unsigned char *myaddr; - int len; +monitor_write_memory (CORE_ADDR memaddr, char *myaddr, int len) { - unsigned LONGEST val; + unsigned int val, hostval; char *cmd; int i; + monitor_debug ("MON write %d %s\n", len, paddr (memaddr)); + + if (current_monitor->flags & MO_ADDR_BITS_REMOVE) + memaddr = ADDR_BITS_REMOVE (memaddr); + /* Use memory fill command for leading 0 bytes. */ if (current_monitor->fill) @@ -882,8 +1435,9 @@ monitor_write_memory (memaddr, myaddr, len) if (i > 4) /* More than 4 zeros is worth doing */ { + monitor_debug ("MON FILL %d\n", i); if (current_monitor->flags & MO_FILL_USES_ADDR) - monitor_printf (current_monitor->fill, memaddr, memaddr + i, 0); + monitor_printf (current_monitor->fill, memaddr, (memaddr + i) - 1, 0); else monitor_printf (current_monitor->fill, memaddr, i, 0); @@ -893,12 +1447,16 @@ monitor_write_memory (memaddr, myaddr, len) } } +#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 if ((memaddr & 0x3) == 0 && len >= 4 && current_monitor->setmem.cmdl) + else +#endif + if ((memaddr & 0x3) == 0 && len >= 4 && current_monitor->setmem.cmdl) { len = 4; cmd = current_monitor->setmem.cmdl; @@ -916,34 +1474,265 @@ monitor_write_memory (memaddr, myaddr, len) val = extract_unsigned_integer (myaddr, len); - monitor_printf (cmd, memaddr, val); + if (len == 4) + { + hostval = *(unsigned int *) myaddr; + monitor_debug ("Hostval(%08x) val(%08x)\n", hostval, val); + } + + + 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); + + 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); + } + if (current_monitor->setmem.term) + { + monitor_debug ("EXP setmem.term"); + monitor_expect (current_monitor->setmem.term, NULL, 0); + monitor_printf ("%x\r", val); + } + if (current_monitor->setmem.term_cmd) + { /* Emit this to get out of the memory editing state */ + monitor_printf ("%s", current_monitor->setmem.term_cmd); + /* Drop through to expecting a prompt */ + } + } + else + monitor_printf (cmd, memaddr, val); monitor_expect_prompt (NULL, 0); return len; } + +static int +monitor_write_even_block (CORE_ADDR memaddr, char *myaddr, int len) +{ + unsigned int val; + int written = 0;; + /* Enter the sub mode */ + monitor_printf (current_monitor->setmem.cmdl, memaddr); + monitor_expect_prompt (NULL, 0); + + while (len) + { + val = extract_unsigned_integer (myaddr, 4); /* REALLY */ + monitor_printf ("%x\r", val); + myaddr += 4; + memaddr += 4; + written += 4; + monitor_debug (" @ %s\n", paddr (memaddr)); + /* If we wanted to, here we could validate the address */ + monitor_expect_prompt (NULL, 0); + } + /* Now exit the sub mode */ + monitor_printf (current_monitor->getreg.term_cmd); + monitor_expect_prompt (NULL, 0); + return written; +} + + +static int +monitor_write_memory_bytes (CORE_ADDR memaddr, char *myaddr, int len) +{ + unsigned char val; + int written = 0; + if (len == 0) + return 0; + /* Enter the sub mode */ + monitor_printf (current_monitor->setmem.cmdb, memaddr); + monitor_expect_prompt (NULL, 0); + while (len) + { + val = *myaddr; + monitor_printf ("%x\r", val); + myaddr++; + memaddr++; + written++; + /* If we wanted to, here we could validate the address */ + monitor_expect_prompt (NULL, 0); + len--; + } + /* Now exit the sub mode */ + monitor_printf (current_monitor->getreg.term_cmd); + monitor_expect_prompt (NULL, 0); + return written; +} + + +static void +longlongendswap (unsigned char *a) +{ + int i, j; + unsigned char x; + i = 0; + j = 7; + while (i < 4) + { + x = *(a + i); + *(a + i) = *(a + j); + *(a + j) = x; + i++, j--; + } +} +/* Format 32 chars of long long value, advance the pointer */ +static char *hexlate = "0123456789abcdef"; +static char * +longlong_hexchars (unsigned long long value, + char *outbuff) +{ + if (value == 0) + { + *outbuff++ = '0'; + return outbuff; + } + else + { + 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; + } + longlongendswap (disbuf); /* FIXME: ONly on big endian hosts */ + while (scan < limit) + { + c = *scan++; /* a byte of our long long value */ + if (leadzero) + { + if (c == 0) + continue; + else + leadzero = 0; /* henceforth we print even zeroes */ + } + nib = c >> 4; /* high nibble bits */ + *outbuff++ = hexlate[nib]; + nib = c & 0x0f; /* low nibble bits */ + *outbuff++ = hexlate[nib]; + } + return outbuff; + } +} /* longlong_hexchars */ + + + +/* I am only going to call this when writing virtual byte streams. + Which possably entails endian conversions + */ +static int +monitor_write_memory_longlongs (CORE_ADDR memaddr, char *myaddr, int len) +{ + 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; + /* If we wanted to, here we could validate the address */ + monitor_expect_prompt (NULL, 0); + len -= 8; + } + /* Now exit the sub mode */ + monitor_printf (current_monitor->getreg.term_cmd); + monitor_expect_prompt (NULL, 0); + return written; +} /* */ + + + +/* ----- 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... + 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. + */ + +static int +monitor_write_memory_block (CORE_ADDR memaddr, char *myaddr, int len) +{ + int written; + written = 0; + /* FIXME: This would be a good place to put the zero test */ +#if 1 + if ((len > 8) && (((len & 0x07)) == 0) && current_monitor->setmem.cmdll) + { + return monitor_write_memory_longlongs (memaddr, myaddr, len); + } +#endif +#if 0 + if (len > 4) + { + int sublen; + written = monitor_write_even_block (memaddr, myaddr, len); + /* Adjust calling parameters by written amount */ + memaddr += written; + myaddr += written; + len -= written; + } +#endif + written = monitor_write_memory_bytes (memaddr, myaddr, len); + return written; +} + /* 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 -monitor_read_memory_single (memaddr, myaddr, len) - CORE_ADDR memaddr; - unsigned char *myaddr; - int len; +monitor_read_memory_single (CORE_ADDR memaddr, char *myaddr, int len) { - unsigned LONGEST val; - char membuf[sizeof(LONGEST) * 2 + 1]; + unsigned int val; + char membuf[sizeof (int) * 2 + 1]; char *p; char *cmd; - int i; + monitor_debug ("MON read single\n"); +#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 if ((memaddr & 0x3) == 0 && len >= 4 && current_monitor->getmem.cmdl) + else +#endif + if ((memaddr & 0x3) == 0 && len >= 4 && current_monitor->getmem.cmdl) { len = 4; cmd = current_monitor->getmem.cmdl; @@ -959,40 +1748,61 @@ monitor_read_memory_single (memaddr, myaddr, len) cmd = current_monitor->getmem.cmdb; } -/* Send the examine command. */ + /* Send the examine command. */ monitor_printf (cmd, memaddr); -/* 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 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) - monitor_expect (current_monitor->getmem.resp_delim, NULL, 0); + { + monitor_debug ("EXP getmem.resp_delim\n"); + monitor_expect_regexp (&getmem_resp_delim_pattern, NULL, 0); + } -/* Now, read the appropriate number of hex digits for this loc, skipping - spaces. */ + /* Now, read the appropriate number of hex digits for this loc, + skipping spaces. */ - for (i = 0; i < len * 2; i++) + /* Skip leading spaces and "0x" if MO_HEX_PREFIX flag is set. */ + if (current_monitor->flags & MO_HEX_PREFIX) { int c; - while (1) - { - c = readchar (timeout); - if (isxdigit (c)) - break; - if (c == ' ') - continue; - - error ("monitor_read_memory_single (0x%x): bad response from monitor: %.*s%c.", - memaddr, i, membuf, c); - } + c = readchar (timeout); + while (c == ' ') + c = readchar (timeout); + if ((c == '0') && ((c = readchar (timeout)) == 'x')) + ; + else + monitor_error ("monitor_read_memory_single", + "bad response from monitor", + memaddr, 0, NULL, 0); + } + { + int i; + for (i = 0; i < len * 2; i++) + { + int c; + + 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); + } membuf[i] = c; } - - membuf[i] = '\000'; /* terminate the number */ + membuf[i] = '\000'; /* terminate the number */ + } /* 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 @@ -1000,7 +1810,7 @@ monitor_read_memory_single (memaddr, myaddr, len) if (current_monitor->getmem.term) { - monitor_expect (current_monitor->getmem.term, NULL, 0); /* get response */ + monitor_expect (current_monitor->getmem.term, NULL, 0); /* get response */ if (current_monitor->getmem.term_cmd) { @@ -1009,14 +1819,15 @@ monitor_read_memory_single (memaddr, myaddr, len) } } else - monitor_expect_prompt (NULL, 0); /* get response */ + monitor_expect_prompt (NULL, 0); /* get response */ p = membuf; val = strtoul (membuf, &p, 16); if (val == 0 && membuf == p) - error ("monitor_read_memory_single (0x%x): bad value from monitor: %s.", - memaddr, membuf); + monitor_error ("monitor_read_memory_single", + "bad value from monitor", + memaddr, 0, membuf, 0); /* supply register stores in target byte order, so swap here */ @@ -1025,76 +1836,149 @@ monitor_read_memory_single (memaddr, myaddr, len) return len; } -/* Copy LEN bytes of data from debugger memory at MYADDR to inferior's memory - at MEMADDR. Returns length moved. Currently, we only do one byte at a - time. */ +/* 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 -monitor_read_memory (memaddr, myaddr, len) - CORE_ADDR memaddr; - char *myaddr; - int len; +monitor_read_memory (CORE_ADDR memaddr, char *myaddr, int len) { - unsigned LONGEST val; - unsigned char regbuf[MAX_REGISTER_RAW_SIZE]; + unsigned int val; char buf[512]; char *p, *p1; - char *name; int resp_len; int i; + CORE_ADDR dumpaddr; + + if (len <= 0) + { + monitor_debug ("Zero length call to monitor_read_memory\n"); + return 0; + } + + monitor_debug ("MON read block ta(%s) ha(%lx) %d\n", + paddr_nz (memaddr), (long) myaddr, len); + + 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); -/* See if xfer would cross a 16 byte boundary. If so, clip it. */ + /* Some dumpers align the first data with the preceeding 16 + byte boundary. Some print blanks and start at the + requested boundary. EXACT_DUMPADDR + */ + + dumpaddr = (current_monitor->flags & MO_EXACT_DUMPADDR) + ? memaddr : memaddr & ~0x0f; + + /* 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 */ + /* send the memory examine command */ if (current_monitor->flags & MO_GETMEM_NEEDS_RANGE) - monitor_printf (current_monitor->getmem.cmdb, memaddr, memaddr + len - 1); + monitor_printf (current_monitor->getmem.cmdb, memaddr, memaddr + len); + 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 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) { - resp_len = monitor_expect (current_monitor->getmem.term, buf, sizeof buf); /* get response */ + resp_len = monitor_expect (current_monitor->getmem.term, buf, sizeof buf); /* get response */ if (resp_len <= 0) - error ("monitor_read_memory (0x%x): excessive response from monitor: %.*s.", - memaddr, resp_len, buf); + monitor_error ("monitor_read_memory", + "excessive response from monitor", + memaddr, resp_len, buf, 0); if (current_monitor->getmem.term_cmd) { - SERIAL_WRITE (monitor_desc, current_monitor->getmem.term_cmd, + serial_write (monitor_desc, current_monitor->getmem.term_cmd, strlen (current_monitor->getmem.term_cmd)); monitor_expect_prompt (NULL, 0); } } else - resp_len = monitor_expect_prompt (buf, sizeof buf); /* get response */ + resp_len = monitor_expect_prompt (buf, sizeof buf); /* get response */ 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 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; + monitor_debug ("MON getmem.resp_delim %s\n", current_monitor->getmem.resp_delim); + + 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) + monitor_error ("monitor_read_memory", + "bad response from monitor", + memaddr, resp_len, buf, 0); + + p += resp_strings.end[0]; +#if 0 p = strstr (p, current_monitor->getmem.resp_delim); if (!p) - error ("monitor_read_memory (0x%x): bad response from monitor: %.*s.", - memaddr, resp_len, buf); + monitor_error ("monitor_read_memory", + "bad response from monitor", + memaddr, resp_len, buf, 0); p += strlen (current_monitor->getmem.resp_delim); +#endif + } + monitor_debug ("MON scanning %d ,%lx '%s'\n", len, (long) p, p); + if (current_monitor->flags & MO_GETMEM_16_BOUNDARY) + { + char c; + int fetched = 0; + i = len; + c = *p; + + + while (!(c == '\000' || c == '\n' || c == '\r') && i > 0) + { + if (isxdigit (c)) + { + if ((dumpaddr >= memaddr) && (i > 0)) + { + val = fromhex (c) * 16 + fromhex (*(p + 1)); + *myaddr++ = val; + if (monitor_debug_p || remote_debug) + fprintf_unfiltered (gdb_stdlog, "[%02x]", val); + --i; + fetched++; + } + ++dumpaddr; + ++p; + } + ++p; /* skip a blank or other non hex char */ + c = *p; + } + if (fetched == 0) + error ("Failed to read via monitor"); + if (monitor_debug_p || remote_debug) + fprintf_unfiltered (gdb_stdlog, "\n"); + return fetched; /* Return the number of bytes actually read */ } + monitor_debug ("MON scanning bytes\n"); for (i = len; i > 0; i--) { @@ -1104,16 +1988,20 @@ monitor_read_memory (memaddr, myaddr, len) { if (isxdigit (*p)) break; + if (*p == '\000' || *p == '\n' || *p == '\r') - error ("monitor_read_memory (0x%x): badly terminated response from monitor: %.*s", memaddr, resp_len, buf); + monitor_error ("monitor_read_memory", + "badly terminated response from monitor", + memaddr, resp_len, buf, 0); p++; } val = strtoul (p, &p1, 16); if (val == 0 && p == p1) - error ("monitor_read_memory (0x%x): bad value from monitor: %.*s.", memaddr, - resp_len, buf); + monitor_error ("monitor_read_memory", + "bad value from monitor", + memaddr, resp_len, buf, 0); *myaddr++ = val; @@ -1126,35 +2014,47 @@ monitor_read_memory (memaddr, myaddr, len) return len; } +/* Transfer LEN bytes between target address MEMADDR and GDB address + MYADDR. Returns 0 for success, errno code for failure. TARGET is + unused. */ + static int -monitor_xfer_memory (memaddr, myaddr, len, write, target) - CORE_ADDR memaddr; - char *myaddr; - int len; - int write; - struct target_ops *target; /* ignored */ +monitor_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, + struct mem_attrib *attrib, struct target_ops *target) { - return dcache_xfer_memory (remote_dcache, memaddr, myaddr, len, write); + 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; } static void -monitor_kill () +monitor_kill (void) { - return; /* ignore attempts to kill target system */ + return; /* ignore attempts to kill target system */ } /* All we actually do is set the PC to the start address of exec_bfd, and start the program at that point. */ static void -monitor_create_inferior (exec_file, args, env) - char *exec_file; - char *args; - char **env; +monitor_create_inferior (char *exec_file, char *args, char **env) { if (args && (*args != '\000')) error ("Args are not supported by the monitor."); + first_time = 1; clear_proceed_status (); proceed (bfd_get_start_address (exec_bfd), TARGET_SIGNAL_0, 0); } @@ -1165,113 +2065,179 @@ monitor_create_inferior (exec_file, args, env) instructions. */ static void -monitor_mourn_inferior () +monitor_mourn_inferior (void) { unpush_target (targ_ops); generic_mourn_inferior (); /* Do all the proper things now */ } -#define NUM_MONITOR_BREAKPOINTS 8 - -static CORE_ADDR breakaddr[NUM_MONITOR_BREAKPOINTS] = {0}; - /* Tell the monitor to add a breakpoint. */ static int -monitor_insert_breakpoint (addr, shadow) - CORE_ADDR addr; - char *shadow; +monitor_insert_breakpoint (CORE_ADDR addr, char *shadow) { int i; - static unsigned char break_insn[] = BREAKPOINT; + const unsigned char *bp; + int bplen; + + monitor_debug ("MON inst bkpt %s\n", paddr (addr)); + if (current_monitor->set_break == NULL) + error ("No set_break defined for this monitor"); + + if (current_monitor->flags & MO_ADDR_BITS_REMOVE) + addr = ADDR_BITS_REMOVE (addr); + + /* Determine appropriate breakpoint size for this address. */ + bp = gdbarch_breakpoint_from_pc (current_gdbarch, &addr, &bplen); - for (i = 0; i < NUM_MONITOR_BREAKPOINTS; i++) + for (i = 0; i < current_monitor->num_breakpoints; i++) { if (breakaddr[i] == 0) { breakaddr[i] = addr; - monitor_read_memory (addr, shadow, sizeof (break_insn)); - monitor_printf (SET_BREAK_CMD, addr); + monitor_read_memory (addr, shadow, bplen); + monitor_printf (current_monitor->set_break, addr); monitor_expect_prompt (NULL, 0); return 0; } } - error ("Too many breakpoints (> %d) for monitor.", NUM_MONITOR_BREAKPOINTS); + error ("Too many breakpoints (> %d) for monitor.", current_monitor->num_breakpoints); } /* Tell the monitor to remove a breakpoint. */ static int -monitor_remove_breakpoint (addr, shadow) - CORE_ADDR addr; - char *shadow; +monitor_remove_breakpoint (CORE_ADDR addr, char *shadow) { int i; - for (i = 0; i < NUM_MONITOR_BREAKPOINTS; i++) + monitor_debug ("MON rmbkpt %s\n", paddr (addr)); + if (current_monitor->clr_break == NULL) + error ("No clr_break defined for this monitor"); + + if (current_monitor->flags & MO_ADDR_BITS_REMOVE) + addr = ADDR_BITS_REMOVE (addr); + + for (i = 0; i < current_monitor->num_breakpoints; i++) { 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 (CLR_BREAK_CMD, addr); + 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 (CLR_BREAK_CMD, i); + monitor_printf (current_monitor->clr_break, i); monitor_expect_prompt (NULL, 0); return 0; } } - fprintf_unfiltered (stderr, "Can't find breakpoint associated with 0x%x\n", addr); + fprintf_unfiltered (gdb_stderr, + "Can't find breakpoint associated with 0x%s\n", + paddr_nz (addr)); + 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 +monitor_wait_srec_ack (void) +{ + int ch; + + 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 -monitor_load (file, from_tty) - char *file; - int from_tty; +monitor_load (char *file, int from_tty) { - dcache_flush (remote_dcache); + monitor_debug ("MON load\n"); if (current_monitor->load_routine) current_monitor->load_routine (monitor_desc, file, hashmark); else - monitor_load_srec (file); + { /* 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; -/* Finally, make the PC point at the start address */ + monitor_printf (current_monitor->load); + if (current_monitor->loadresp) + monitor_expect (current_monitor->loadresp, NULL, 0); - if (exec_bfd) - write_pc (bfd_get_start_address (exec_bfd)); + load_srec (monitor_desc, file, (bfd_vma) load_offset, + 32, SREC_ALL, hashmark, + current_monitor->flags & MO_SREC_ACK ? + monitor_wait_srec_ack : NULL); - inferior_pid = 0; /* No process now */ + monitor_expect_prompt (NULL, 0); + } -/* This is necessary because many things were based on the PC at the time that - we attached to the monitor, which is no longer valid now that we have loaded - new code (and just changed the PC). Another way to do this might be to call - normal_stop, except that the stack may not be valid, and things would get - horribly confused... */ + /* Finally, make the PC point at the start address */ + if (exec_bfd) + write_pc (bfd_get_start_address (exec_bfd)); - clear_symtab_users (); + /* 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. */ } static void -monitor_stop () +monitor_stop (void) { + monitor_debug ("MON stop\n"); + if ((current_monitor->flags & MO_SEND_BREAK_ON_STOP) != 0) + serial_send_break (monitor_desc); if (current_monitor->stop) monitor_printf_noecho (current_monitor->stop); } -/* Put a command string, in args, out to MONITOR. Output from MONITOR - is placed on the users terminal until the prompt is seen. FIXME: We - read the characters ourseleves here cause of a nasty echo. */ +/* 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. */ static void -monitor_command (args, from_tty) - char *args; - int from_tty; +monitor_rcmd (char *command, + struct ui_file *outbuf) { char *p; int resp_len; @@ -1280,231 +2246,24 @@ monitor_command (args, from_tty) if (monitor_desc == NULL) error ("monitor target not open."); - p = PROMPT; + 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. */ - monitor_printf ("%s\r", (args ? args : "")); + monitor_printf ("%s\r", (command ? command : "")); resp_len = monitor_expect_prompt (buf, sizeof buf); - fputs_unfiltered (buf, gdb_stdout); /* Output the response */ -} - -/* Download a binary file by converting it to S records. */ - -static void -monitor_load_srec (args) - char *args; -{ - bfd *abfd; - asection *s; - char *buffer, srec[1024]; - int i; - int srec_frame = 32; - int reclen; - - buffer = alloca (srec_frame * 2 + 256); - - abfd = bfd_openr (args, 0); - if (!abfd) - { - printf_filtered ("Unable to open file %s\n", args); - return; - } - - if (bfd_check_format (abfd, bfd_object) == 0) - { - printf_filtered ("File is not an object file\n"); - return; - } - - monitor_printf (LOAD_CMD); /* tell the monitor to load */ - if (current_monitor->loadresp) - monitor_expect (current_monitor->loadresp, NULL, 0); - - for (s = abfd->sections; s; s = s->next) - { - if (s->flags & SEC_LOAD) - { - int numbytes; - - printf_filtered ("%s\t: 0x%4x .. 0x%4x ", s->name, s->vma, - s->vma + s->_raw_size); - gdb_flush (gdb_stdout); - - for (i = 0; i < s->_raw_size; i += numbytes) - { - numbytes = min (srec_frame, s->_raw_size - i); - - bfd_get_section_contents (abfd, s, buffer, i, numbytes); - - reclen = monitor_make_srec (srec, 'd', s->vma + i, buffer, numbytes); - - monitor_printf_noecho ("%.*s\r", reclen, srec); - - if (hashmark) - { - putchar_unfiltered ('#'); - gdb_flush (gdb_stdout); - } - } /* Per-packet (or S-record) loop */ - - putchar_unfiltered ('\n'); - } /* Loadable sections */ - } - if (hashmark) - putchar_unfiltered ('\n'); - - /* Write a type 7 terminator record. no data for a type 7, and there - is no data, so len is 0. */ - - reclen = monitor_make_srec (srec, 't', abfd->start_address, NULL, 0); - - monitor_printf_noecho ("%.*s\r", reclen, srec); - - monitor_printf_noecho ("\r\r"); /* Some monitors need these to wake up */ - - monitor_expect_prompt (NULL, 0); - - SERIAL_FLUSH_INPUT (monitor_desc); -} - -/* - * monitor_make_srec -- make an srecord. This writes each line, one at a - * time, each with it's own header and trailer line. - * An srecord looks like this: - * - * byte count-+ address - * start ---+ | | data +- checksum - * | | | | - * S01000006F6B692D746573742E73726563E4 - * S315000448600000000000000000FC00005900000000E9 - * S31A0004000023C1400037DE00F023604000377B009020825000348D - * S30B0004485A0000000000004E - * S70500040000F6 - * - * S
- * - * Where - * - length - * is the number of bytes following upto the checksum. Note that - * this is not the number of chars following, since it takes two - * chars to represent a byte. - * - type - * is one of: - * 0) header record - * 1) two byte address data record - * 2) three byte address data record - * 3) four byte address data record - * 7) four byte address termination record - * 8) three byte address termination record - * 9) two byte address termination record - * - * - address - * is the start address of the data following, or in the case of - * a termination record, the start address of the image - * - data - * is the data. - * - checksum - * is the sum of all the raw byte data in the record, from the length - * upwards, modulo 256 and subtracted from 255. - * - * This routine returns the length of the S-record. - * - */ - -static int -monitor_make_srec (buffer, type, memaddr, myaddr, len) - char *buffer; - int type; - CORE_ADDR memaddr; - unsigned char *myaddr; - int len; -{ - unsigned char checksum; - int i; - char *buf; - static char hextab[16] = "0123456789ABCDEF"; - static char data_code_table[] = { 0,0,1,2,3}; - static char term_code_table[] = { 0,0,9,8,7}; - int addr_size; /* Number of bytes in the record */ - int type_code; - buf = buffer; - - checksum = 0; - - addr_size = 2; - if (memaddr >= 0xffffff) - addr_size = 4; - else if (memaddr >= 0xffffff) - addr_size = 3; - else - addr_size = 2; - - switch (type) - { - case 't': - type_code = term_code_table[addr_size]; - break; - case 'd': - type_code = data_code_table[addr_size]; - break; - default: - abort(); - } - /* Create the header for the srec. addr_size is the number of bytes in the address, - and 1 is the number of bytes in the count. */ - - switch (addr_size) - { - case 4: - sprintf (buf, "S%d%02X%08X", type_code, len + addr_size + 1, memaddr); - buf += 12; - break; - case 3: - sprintf (buf, "S%d%02X%06X", type_code, len + addr_size + 1, memaddr); - buf += 10; - break; - case 2: - sprintf (buf, "S%d%02X%04X", type_code, len + addr_size + 1, memaddr); - buf += 8; - break; - } - -/* Note that the checksum is calculated on the raw data, not the hexified - data. It includes the length, address and the data portions of the - packet. */ - - checksum += (len + addr_size + 1 /* Packet length */ - + (memaddr & 0xff) /* Address... */ - + ((memaddr >> 8) & 0xff) - + ((memaddr >> 16) & 0xff) - + ((memaddr >> 24) & 0xff)); - - /* build the srecord */ - for (i = 0; i < len; i++) - { - *buf++ = hextab [myaddr[i] >> 4]; - *buf++ = hextab [myaddr[i] & 0xf]; - checksum += myaddr[i]; - } - - checksum = ~checksum; - - *buf++ = hextab[checksum >> 4]; - *buf++ = hextab[checksum & 0xf]; - - return buf - buffer; + fputs_unfiltered (buf, outbuf); /* Output the response */ } /* Convert hex digit A to a number. */ +#if 0 static int -from_hex (a) - int a; -{ +from_hex (int a) +{ if (a >= '0' && a <= '9') return a - '0'; if (a >= 'a' && a <= 'f') @@ -1514,71 +2273,76 @@ from_hex (a) error ("Reply contains invalid hex digit 0x%x", a); } +#endif -static struct target_ops monitor_ops = +char * +monitor_get_dev_name (void) { - NULL, /* to_shortname */ - NULL, /* to_longname */ - NULL, /* to_doc */ - NULL, /* to_open */ - monitor_close, /* to_close */ - NULL, /* to_attach */ - monitor_detach, /* to_detach */ - monitor_resume, /* to_resume */ - monitor_wait, /* to_wait */ - monitor_fetch_registers, /* to_fetch_registers */ - monitor_store_registers, /* to_store_registers */ - monitor_prepare_to_store, /* to_prepare_to_store */ - monitor_xfer_memory, /* to_xfer_memory */ - monitor_files_info, /* to_files_info */ - monitor_insert_breakpoint, /* to_insert_breakpoint */ - monitor_remove_breakpoint, /* to_remove_breakpoint */ - 0, /* to_terminal_init */ - 0, /* to_terminal_inferior */ - 0, /* to_terminal_ours_for_output */ - 0, /* to_terminal_ours */ - 0, /* to_terminal_info */ - monitor_kill, /* to_kill */ - monitor_load, /* to_load */ - 0, /* to_lookup_symbol */ - monitor_create_inferior, /* to_create_inferior */ - monitor_mourn_inferior, /* to_mourn_inferior */ - 0, /* to_can_run */ - 0, /* to_notice_signals */ - monitor_stop, /* to_stop */ - process_stratum, /* to_stratum */ - 0, /* to_next */ - 1, /* to_has_all_memory */ - 1, /* to_has_memory */ - 1, /* to_has_stack */ - 1, /* to_has_registers */ - 1, /* to_has_execution */ - 0, /* sections */ - 0, /* sections_end */ - OPS_MAGIC /* to_magic */ -}; + 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; + monitor_ops.to_xfer_memory = monitor_xfer_memory; + monitor_ops.to_files_info = monitor_files_info; + monitor_ops.to_insert_breakpoint = monitor_insert_breakpoint; + monitor_ops.to_remove_breakpoint = monitor_remove_breakpoint; + monitor_ops.to_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; + monitor_ops.to_rcmd = monitor_rcmd; + 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; +} /* init_base_monitor_ops */ /* Init the target_ops structure pointed at by OPS */ void -init_monitor_ops (ops) - struct target_ops *ops; +init_monitor_ops (struct target_ops *ops) { + 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. */ +extern initialize_file_ftype _initialize_remote_monitors; /* -Wmissing-prototypes */ + void -_initialize_remote_monitors () +_initialize_remote_monitors (void) { + init_base_monitor_ops (); add_show_from_set (add_set_cmd ("hash", no_class, var_boolean, - (char *)&hashmark, + (char *) &hashmark, "Set display of activity while downloading a file.\n\ When enabled, a hashmark \'#\' is displayed.", - &setlist), + &setlist), &showlist); - add_com ("monitor", class_obscure, monitor_command, - "Send a command to the debug monitor."); + add_show_from_set + (add_set_cmd ("monitor", no_class, var_zinteger, + (char *) &monitor_debug_p, + "Set debugging of remote monitor communication.\n\ +When enabled, communication between GDB and the remote monitor\n\ +is displayed.", &setdebuglist), + &showdebuglist); }