#include "gdbcore.h"
#include "target.h"
#include "wait.h"
+#ifdef ANSI_PROTOTYPES
+#include <stdarg.h>
+#else
#include <varargs.h>
+#endif
#include <signal.h>
#include <string.h>
#include <sys/types.h>
#include "gdbcmd.h"
#include "inferior.h"
#include "regex.h"
+#include "dcache.h"
-static void monitor_command PARAMS ((char *args, int fromtty));
-static void monitor_load_srec PARAMS ((char *args, int protocol));
-static int getacknak PARAMS ((int byte));
+static int readchar PARAMS ((int timeout));
-static void make_xmodem_packet PARAMS ((unsigned char *packet,
- unsigned char *data,
- int len));
-static void print_xmodem_packet PARAMS ((char *packet));
+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,
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_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));
static struct monitor_ops *current_monitor;
-static char *loadtype_str = "srec";
-static char *loadproto_str = "none";
-
-static int hashmark; /* flag set by "set hash" */
+static int hashmark; /* flag set by "set hash" */
static int timeout = 30;
-static int expect PARAMS ((char *string, char *buf, int buflen));
-static int expect_prompt PARAMS ((char *buf, int buflen));
-
-/* Having this larger than 400 causes us to be incompatible with m68k-stub.c
- and i386-stub.c. Normally, no one would notice because it only matters
- for writing large chunks of memory (e.g. in downloads). Also, this needs
- to be more than 400 if required to hold the registers (see below, where
- we round it up based on REGISTER_BYTES). */
+static int in_monitor_wait = 0; /* Non-zero means we are in monitor_wait() */
-#define PBUFSIZ 400
+static void (*ofunc)(); /* Old SIGINT signal handler */
/* 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
static int dump_reg_flag; /* Non-zero means do a dump_registers cmd when
monitor_wait wakes up. */
-/* These definitions are for xmodem protocol. */
-
-#define SOH 0x01
-#define ACK 0x06
-#define NAK 0x15
-#define EOT 0x04
-#define CANCEL 0x18
-#define GETACK getacknak(ACK)
-#define GETNAK getacknak(NAK)
-#define XMODEM_DATASIZE 128 /* the data size is ALWAYS 128 */
-#define XMODEM_PACKETSIZE 131 /* the packet size is ALWAYS 132 (zero based) */
-#define XMODEM 1
+static DCACHE *remote_dcache;
-/* printf_monitor -- send data to monitor. Works just like printf. */
+/* monitor_printf_noecho -- Send data to monitor, but don't expect an echo.
+ Works just like printf. */
-static void
-printf_monitor (va_alist)
+void
+#ifdef ANSI_PROTOTYPES
+monitor_printf_noecho (char *pattern, ...)
+#else
+monitor_printf_noecho (va_alist)
va_dcl
+#endif
{
va_list args;
- char *pattern;
- char buf[PBUFSIZ];
+ 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 (buf, pattern, args);
+ vsprintf (sndbuf, pattern, args);
if (remote_debug > 0)
- fputs_unfiltered (buf, gdb_stderr);
+ fputs_unfiltered (sndbuf, gdb_stderr);
- if (strlen (buf) > PBUFSIZ)
- error ("printf_monitor(): string too long");
- if (SERIAL_WRITE(monitor_desc, buf, strlen (buf)))
+ len = strlen (sndbuf);
+
+ if (len + 1 > sizeof sndbuf)
+ abort ();
+
+ if (SERIAL_WRITE(monitor_desc, sndbuf, len))
fprintf_unfiltered (stderr, "SERIAL_WRITE failed: %s\n", safe_strerror (errno));
}
-/* Send raw data to monitor. */
+/* monitor_printf -- Send data to monitor and check the echo. Works just like
+ printf. */
-static void
-write_monitor (data, len)
- char *data;
- int len;
+void
+#ifdef ANSI_PROTOTYPES
+monitor_printf (char *pattern, ...)
+#else
+monitor_printf (va_alist)
+ va_dcl
+#endif
{
- if (SERIAL_WRITE (monitor_desc, data, len))
- fprintf_unfiltered (stderr, "SERIAL_WRITE failed: %s\n", safe_strerror(errno));
-
- *(data + len + 1) = '\0';
+ 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);
+
+ len = strlen (sndbuf);
+
+ if (len + 1 > sizeof sndbuf)
+ abort ();
+
+ if (SERIAL_WRITE(monitor_desc, sndbuf, len))
+ fprintf_unfiltered (stderr, "SERIAL_WRITE failed: %s\n", safe_strerror (errno));
+
+ for (i = 0; i < len; i++)
+ {
+ trycr:
+ c = readchar (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);
+ }
+ }
}
/* Read a character from the remote system, doing all the fancy
return c & 0x7f;
if (c == SERIAL_TIMEOUT)
- error ("Timeout reading from remote system.");
+#ifdef MAINTENANCE_CMDS
+ if (in_monitor_wait) /* Watchdog went off */
+ {
+ target_mourn_inferior ();
+ error ("Watchdog has expired. Target detached.\n");
+ }
+ else
+#endif
+ error ("Timeout reading from remote system.");
perror_with_name ("remote-monitor");
}
(minus the terminating NUL). Note that in the non-overflow case, STRING
will be at the end of BUF. */
-static int
-expect (string, buf, buflen)
+int
+monitor_expect (string, buf, buflen)
char *string;
char *buf;
int buflen;
o *then* wait for the prompt.
Thus the last thing that a procedure does with the serial line
- will be an expect_prompt(). Exception: monitor_resume does not
+ 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.
necessary to prevent getting into states from which we can't
recover. */
-static int
-expect_prompt (buf, buflen)
+int
+monitor_expect_prompt (buf, buflen)
char *buf;
int buflen;
{
- return expect (PROMPT, buf, buflen);
+ return monitor_expect (PROMPT, buf, buflen);
}
/* Get N 32-bit words from remote, each preceded by a space, and put
/* See if we can wake up the monitor. First, try sending a stop sequence,
then send the init strings. Last, remove all breakpoints. */
- monitor_stop ();
+ if (current_monitor->stop)
+ {
+ monitor_stop ();
+ monitor_expect_prompt (NULL, 0);
+ }
/* wake up the monitor and see if it's alive */
for (p = mon_ops->init; *p != NULL; p++)
{
- printf_monitor (*p);
- expect_prompt (NULL, 0);
+ monitor_printf (*p);
+ monitor_expect_prompt (NULL, 0);
}
+ SERIAL_FLUSH_INPUT (monitor_desc);
+
/* Remove all breakpoints */
if (mon_ops->clr_all_break)
{
- printf_monitor (mon_ops->clr_all_break);
- expect_prompt (NULL, 0);
+ monitor_printf (mon_ops->clr_all_break);
+ monitor_expect_prompt (NULL, 0);
}
- /* Setup the suffixes for the `set remoteloadtype' command */
-
- add_show_from_set (add_set_enum_cmd ("remoteloadtype", no_class,
- mon_ops->loadtypes,
- (char *)&loadtype_str,
- "Set the remote load type.",
- &setlist),
- &showlist);
-
- /* Setup the suffixes for the `set remoteloadprotocol' command */
-
- add_show_from_set (add_set_enum_cmd ("remoteloadprotocol", no_class,
- mon_ops->loadprotos,
- (char *)&loadproto_str,
- "Set the remote load protocol.",
- &setlist),
- &showlist);
-
if (from_tty)
printf_unfiltered ("Remote target %s connected to %s\n", name, dev_name);
inferior_pid = 42000; /* Make run command think we are busy... */
- printf_monitor ("\r"); /* Give monitor_wait something to read */
+ /* Give monitor_wait something to read */
+
+ monitor_printf (current_monitor->line_term);
+
+ remote_dcache = dcache_init (monitor_read_memory, monitor_write_memory);
start_remote ();
}
int pid, step;
enum target_signal sig;
{
+ dcache_flush (remote_dcache);
if (step)
- printf_monitor (STEP_CMD);
+ monitor_printf (STEP_CMD);
else
{
- printf_monitor (CONT_CMD);
+ monitor_printf (CONT_CMD);
if (current_monitor->flags & MO_NEED_REGDUMP_AFTER_CONT)
dump_reg_flag = 1;
}
}
}
+/* Send ^C to target to halt it. Target will respond, and send us a
+ packet. */
+
+static void
+monitor_interrupt (signo)
+ 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");
+
+ target_stop ();
+}
+
+/* The user typed ^C twice. */
+
+static void
+monitor_interrupt_twice (signo)
+ int signo;
+{
+ signal (signo, ofunc);
+
+ monitor_interrupt_query ();
+
+ signal (signo, monitor_interrupt);
+}
+
+/* Ask the user what to do when an interrupt is received. */
+
+static void
+monitor_interrupt_query ()
+{
+ target_terminal_ours ();
+
+ if (query ("Interrupted while waiting for the program.\n\
+Give up (and stop debugging it)? "))
+ {
+ target_mourn_inferior ();
+ return_to_top_level (RETURN_QUIT);
+ }
+
+ target_terminal_inferior ();
+}
+
+static void
+monitor_wait_cleanup (old_timeout)
+ int old_timeout;
+{
+ timeout = old_timeout;
+ signal (SIGINT, ofunc);
+ in_monitor_wait = 0;
+}
+
/* Wait until the remote machine stops, then return, storing status in
status just as `wait' would. */
struct target_waitstatus *status;
{
int old_timeout = timeout;
- char buf[512];
+ char buf[1024];
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);
+
+#ifdef MAINTENANCE_CMDS
+ in_monitor_wait = 1;
+ timeout = watchdog > 0 ? watchdog : -1;
+#else
timeout = -1; /* Don't time out -- user program is running. */
+#endif
+
+ ofunc = (void (*)()) signal (SIGINT, monitor_interrupt);
do
{
- resp_len = expect_prompt (buf, sizeof (buf));
+ 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);
+ signal (SIGINT, ofunc);
+
timeout = old_timeout;
if (dump_reg_flag && current_monitor->dump_registers)
{
dump_reg_flag = 0;
- printf_monitor (current_monitor->dump_registers);
- resp_len = expect_prompt (buf, sizeof (buf));
+ monitor_printf (current_monitor->dump_registers);
+ resp_len = monitor_expect_prompt (buf, sizeof (buf));
}
if (current_monitor->register_pattern)
status->kind = TARGET_WAITKIND_STOPPED;
status->value.sig = TARGET_SIGNAL_TRAP;
+ discard_cleanups (old_chain);
+
+ in_monitor_wait = 0;
+
return inferior_pid;
}
monitor_fetch_register (regno)
int regno;
{
- char buf[200];
- char *p;
char *name;
- int resp_len;
+ static char zerobuf[MAX_REGISTER_RAW_SIZE] = {0};
+ char regbuf[MAX_REGISTER_RAW_SIZE * 2 + 1];
+ int i;
name = REGNAMES (regno);
if (!name)
- return;
+ {
+ supply_register (regno, zerobuf);
+ return;
+ }
/* send the register examine command */
- printf_monitor (current_monitor->getreg.cmd, name);
+ 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)
+ monitor_expect (current_monitor->getreg.resp_delim, NULL, 0);
+
+/* Now, read the appropriate number of hex digits for this register, skipping
+ spaces. */
+
+ for (i = 0; i < REGISTER_RAW_SIZE (regno) * 2; i++)
+ {
+ int c;
+
+ while (1)
+ {
+ c = readchar (timeout);
+ if (isxdigit (c))
+ break;
+ if (c == ' ')
+ continue;
+
+ error ("monitor_fetch_register (%d): bad response from monitor: %.*s%c.",
+ regno, i, regbuf, c);
+ }
+
+ regbuf[i] = c;
+ }
+
+ regbuf[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
if (current_monitor->getreg.term)
{
- resp_len = expect (current_monitor->getreg.term, buf, sizeof buf); /* get response */
-
- if (resp_len <= 0)
- error ("monitor_fetch_register (%d): excessive response from monitor: %.*s.",
- regno, resp_len, buf);
+ monitor_expect (current_monitor->getreg.term, NULL, 0); /* get response */
if (current_monitor->getreg.term_cmd)
{
- SERIAL_WRITE (monitor_desc, current_monitor->getreg.term_cmd,
- strlen (current_monitor->getreg.term_cmd));
- expect_prompt (NULL, 0);
+ monitor_printf (current_monitor->getreg.term_cmd);
+ monitor_expect_prompt (NULL, 0);
}
}
else
- resp_len = expect_prompt (buf, sizeof buf); /* get response */
+ monitor_expect_prompt (NULL, 0); /* get response */
+ monitor_supply_register (regno, regbuf);
+}
- /* 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. */
+/* Read the remote registers into the block regs. */
- if (current_monitor->getreg.resp_delim)
+static void monitor_dump_regs ()
+{
+ if (current_monitor->dump_registers)
{
- p = strstr (buf, current_monitor->getreg.resp_delim);
- if (!p)
- error ("monitor_fetch_register (%d): bad response from monitor: %.*s.",
- regno, resp_len, buf);
- p += strlen (current_monitor->getreg.resp_delim);
+ 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
- p = buf;
-
- monitor_supply_register (regno, p);
+ abort(); /* Need some way to read registers */
}
-/* Read the remote registers into the block regs. */
-
static void
monitor_fetch_registers (regno)
int regno;
{
- if (regno >= 0)
+ if (current_monitor->getreg.cmd)
{
- monitor_fetch_register (regno);
- return;
- }
+ if (regno >= 0)
+ {
+ monitor_fetch_register (regno);
+ return;
+ }
- for (regno = 0; regno < NUM_REGS; regno++)
- monitor_fetch_register (regno);
+ for (regno = 0; regno < NUM_REGS; regno++)
+ monitor_fetch_register (regno);
+ }
+ else {
+ monitor_dump_regs ();
+ }
}
/* Store register REGNO, or all if REGNO == 0. Return errno value. */
/* send the register deposit command */
- printf_monitor (current_monitor->setreg.cmd, name, val);
+ 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...) */
- expect_prompt (NULL, 0);
+ monitor_expect_prompt (NULL, 0);
}
/* Store the remote registers. */
if (i > 4) /* More than 4 zeros is worth doing */
{
if (current_monitor->flags & MO_FILL_USES_ADDR)
- printf_monitor (current_monitor->fill, memaddr, memaddr + i, 0);
+ monitor_printf (current_monitor->fill, memaddr, memaddr + i, 0);
else
- printf_monitor (current_monitor->fill, memaddr, i, 0);
+ monitor_printf (current_monitor->fill, memaddr, i, 0);
- expect_prompt (NULL, 0);
+ monitor_expect_prompt (NULL, 0);
return i;
}
val = extract_unsigned_integer (myaddr, len);
- printf_monitor (cmd, memaddr, val);
+ monitor_printf (cmd, memaddr, val);
+
+ monitor_expect_prompt (NULL, 0);
+
+ return len;
+}
+
+/* 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;
+{
+ unsigned LONGEST val;
+ char membuf[sizeof(LONGEST) * 2 + 1];
+ char *p;
+ char *cmd;
+ int i;
+
+ 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)
+ {
+ 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 register 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);
+
+/* Now, read the appropriate number of hex digits for this loc, skipping
+ spaces. */
- expect_prompt (NULL, 0);
+ for (i = 0; i < len * 2; i++)
+ {
+ 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);
+ }
+
+ membuf[i] = c;
+ }
+
+ 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
+ all of the output into buf, and then wait for the normal prompt. */
+
+ if (current_monitor->getmem.term)
+ {
+ monitor_expect (current_monitor->getmem.term, NULL, 0); /* get response */
+
+ if (current_monitor->getmem.term_cmd)
+ {
+ monitor_printf (current_monitor->getmem.term_cmd);
+ monitor_expect_prompt (NULL, 0);
+ }
+ }
+ else
+ 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);
+
+ /* supply register stores in target byte order, so swap here */
+
+ store_unsigned_integer (myaddr, len, val);
return len;
}
{
unsigned LONGEST val;
unsigned char regbuf[MAX_REGISTER_RAW_SIZE];
- char buf[200];
+ char buf[512];
char *p, *p1;
char *name;
int resp_len;
int i;
+ 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. */
+ if (((memaddr ^ (memaddr + len - 1)) & ~0xf) != 0)
+ len = ((memaddr + len) & ~0xf) - memaddr;
+
/* send the memory examine command */
- printf_monitor (current_monitor->getmem.cmdb, memaddr, len);
+ if (current_monitor->flags & MO_GETMEM_NEEDS_RANGE)
+ monitor_printf (current_monitor->getmem.cmdb, memaddr, memaddr + len - 1);
+ 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
if (current_monitor->getmem.term)
{
- resp_len = 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.",
{
SERIAL_WRITE (monitor_desc, current_monitor->getmem.term_cmd,
strlen (current_monitor->getmem.term_cmd));
- expect_prompt (NULL, 0);
+ monitor_expect_prompt (NULL, 0);
}
}
else
- resp_len = 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 (current_monitor->getmem.resp_delim)
{
- p = strstr (buf, current_monitor->getmem.resp_delim);
+ 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);
p += strlen (current_monitor->getmem.resp_delim);
}
- else
- p = buf;
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')
+ error ("monitor_read_memory (0x%x): badly terminated response from monitor: %.*s", memaddr, resp_len, buf);
+ 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);
- p = p1;
*myaddr++ = val;
+
+ if (i == 1)
+ break;
+
+ p = p1;
}
return len;
}
-/* FIXME-someday! merge these two. */
-
static int
monitor_xfer_memory (memaddr, myaddr, len, write, target)
CORE_ADDR memaddr;
int write;
struct target_ops *target; /* ignored */
{
- if (write)
- return monitor_write_memory (memaddr, myaddr, len);
- else
- return monitor_read_memory (memaddr, myaddr, len);
+ return dcache_xfer_memory (remote_dcache, memaddr, myaddr, len, write);
}
static void
{
breakaddr[i] = addr;
monitor_read_memory (addr, shadow, sizeof (break_insn));
- printf_monitor (SET_BREAK_CMD, addr);
- expect_prompt (NULL, 0);
+ monitor_printf (SET_BREAK_CMD, addr);
+ monitor_expect_prompt (NULL, 0);
return 0;
}
}
breakaddr[i] = 0;
/* some monitors remove breakpoints based on the address */
if (current_monitor->flags & MO_CLR_BREAK_USES_ADDR)
- printf_monitor (CLR_BREAK_CMD, addr);
+ monitor_printf (CLR_BREAK_CMD, addr);
else
- printf_monitor (CLR_BREAK_CMD, i);
- expect_prompt (NULL, 0);
+ monitor_printf (CLR_BREAK_CMD, i);
+ monitor_expect_prompt (NULL, 0);
return 0;
}
}
return 1;
}
-/* monitor_load -- load a file. This file determines which of the
- * supported formats to use. The current types are:
- * FIXME: not all types supported yet.
- * default - reads any file using bfd and writes it to memory. This
- * is really slow.
- * srec - reads binary file using bfd and writes it as an
- * ascii srecord.
- * xmodem-bin - reads a binary file using bfd, and downloads it
- * using xmodem protocol.
- * xmodem-srec - reads a binary file using bfd, and after converting
- * it downloads it as an srecord using xmodem protocol.
- * ascii-srec - reads a ascii srecord file and downloads it
- * without a change.
- * ascii-xmodem - reads a ascii file and downloads using xmodem
- * protocol.
- */
+/* monitor_load -- download a file. */
static void
monitor_load (file, from_tty)
char *file;
int from_tty;
{
- /* default, load a binary */
- if (STREQ (loadtype_str, "default"))
- error ("default load type not supported.");
-
- /* load an srecord by converting */
- else if ((STREQ (loadtype_str, "srec")) && STREQ (loadproto_str, "xmodem"))
- monitor_load_srec (file, XMODEM);
+ dcache_flush (remote_dcache);
- /* load an srecord by converting */
- else if (STREQ (loadtype_str, "srec"))
- monitor_load_srec (file, 0); /* if from a binary */
-
- /* load an srecord by converting */
- else if (STREQ (loadtype_str, "none"))
- error ("Unimplemented");
-
- /* load an srecord file */
- else if (STREQ (loadproto_str, "none"))
- monitor_load_srec (file, 0);
-
- else if (STREQ (loadproto_str, "xmodem"))
- monitor_load_srec (file, XMODEM);
+ if (current_monitor->load_routine)
+ current_monitor->load_routine (monitor_desc, file, hashmark);
+ else
+ monitor_load_srec (file);
/* Finally, make the PC point at the start address */
- write_pc (bfd_get_start_address (exec_bfd));
+ if (exec_bfd)
+ write_pc (bfd_get_start_address (exec_bfd));
inferior_pid = 0; /* No process now */
static void
monitor_stop ()
{
- if (!current_monitor->stop)
- return;
-
- printf_monitor(current_monitor->stop);
- expect_prompt (NULL, 0);
+ if (current_monitor->stop)
+ monitor_printf_noecho (current_monitor->stop);
}
/* Put a command string, in args, out to MONITOR. Output from MONITOR
int resp_len;
char buf[1000];
- p = PROMPT;
-
if (monitor_desc == NULL)
error ("monitor target not open.");
+ p = PROMPT;
+
/* Send the command. Note that if no args were supplied, then we're
just sending the monitor a newline, which is sometimes useful. */
- printf_monitor ("%s\r", (args ? args : ""));
+ monitor_printf ("%s\r", (args ? args : ""));
- resp_len = expect_prompt (buf, sizeof buf);
+ resp_len = monitor_expect_prompt (buf, sizeof buf);
fputs_unfiltered (buf, gdb_stdout); /* Output the response */
}
-/* Download a binary file by converting it to srecords. This
- will also use xmodem to download the resulting file.
-
- A download goes like this when using xmodem:
- Receiver: Sender
- NAK ---------->
- <-------- (packet) [SOH|1|1|data|SUM]
- ACK ---------->
- <-------- (packet) [SOH|2|2|data|SUM]
- ACK ---------->
- <-------- EOT
- ACK ---------->
-
- ACK = 0x06
- NAK = 0x15
- EOT = 0x04
- */
+/* Download a binary file by converting it to S records. */
static void
-monitor_load_srec (args, protocol)
+monitor_load_srec (args)
char *args;
- int protocol;
{
bfd *abfd;
asection *s;
char *buffer, srec[1024];
- char packet[XMODEM_PACKETSIZE];
int i;
- int retries;
- int srec_frame = 57; /* FIXME: this must be 57 There is 12 bytes
- of header, and 2 bytes of checksum at the end.
- The problem is an xmodem packet holds exactly
- 128 bytes. */
+ int srec_frame = 32;
+ int reclen;
buffer = alloca (srec_frame * 2 + 256);
return;
}
- printf_monitor (LOAD_CMD); /* tell the monitor to load */
+ monitor_printf (LOAD_CMD); /* tell the monitor to load */
if (current_monitor->loadresp)
- expect (current_monitor->loadresp, NULL, 0);
+ monitor_expect (current_monitor->loadresp, NULL, 0);
- /* get the NAK from the target */
- if (protocol == XMODEM && !GETNAK)
+ for (s = abfd->sections; s; s = s->next)
{
- printf_monitor ("%c", EOT);
- error ("Never got the NAK to start loading");
+ 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 */
}
-
- for (s = abfd->sections; s; s = s->next)
- if (s->flags & SEC_LOAD)
- {
- 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 += srec_frame)
- {
- int numbytes;
-
- numbytes = min (srec_frame, s->_raw_size - i);
-
- bfd_get_section_contents (abfd, s, buffer, i, numbytes);
- monitor_make_srec (srec, 3, s->vma + i, buffer, numbytes);
-
- /* send a packet using xmodem */
- if (protocol == XMODEM)
- {
- make_xmodem_packet (packet, srec, XMODEM_DATASIZE);
- write_monitor (packet, XMODEM_PACKETSIZE+1);
-
- for (retries = 3; retries >= 0; retries++)
- {
- if (GETACK) /* ACKnowledged, get next data chunk */
- break;
-
- /* Resend packet */
-
- sleep (1);
- /* send it again */
- write_monitor (packet, XMODEM_PACKETSIZE+1);
-
- if (hashmark)
- {
- putchar_unfiltered ('-');
- gdb_flush (gdb_stdout);
- }
- }
- if (retries < 0)
- { /* too many tries, must be hosed */
- printf_monitor ("%c", EOT);
- error ("Never got a ACK after sending an xmodem packet");
- }
- }
- else
- printf_monitor ("%s\n", srec); /* no protocols at all */
-
- 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. */
- if (protocol == XMODEM)
- {
- /* send a packet using xmodem */
- monitor_make_srec (srec, 7, abfd->start_address, "", 0);
- make_xmodem_packet (packet, srec, XMODEM_DATASIZE);
- write_monitor (packet, XMODEM_PACKETSIZE+1);
- printf_monitor ("%c", EOT);
- if (!GETACK)
- error ("Never got ACK after sending EOT");
- }
- else
- {
- monitor_make_srec (srec, 7, abfd->start_address, "", 0);
- printf_monitor ("%s\n", srec);
- }
+ reclen = monitor_make_srec (srec, 't', abfd->start_address, NULL, 0);
- expect_prompt (NULL, 0);
-}
+ monitor_printf_noecho ("%.*s\r", reclen, srec);
-/* Get an ACK or a NAK from the target. returns 1 (true) or 0 (false)
- This is for xmodem. ANy string starting with "***" is an error
- message from the target. Here's a few from the WinBond w89k
- "Cougar" PA board:
- *** Too many errors found.
- *** Bad command
- *** Command syntax error
- */
+ monitor_printf_noecho ("\r\r"); /* Some monitors need these to wake up */
-static int
-getacknak (byte)
- int byte;
-{
- char character;
- int i;
-
- i = 0;
- while (i++ < 60)
- {
- character = (char) readchar (0);
- if ((character == 0xfffffffe) || (character == 0x7f))
- { /* empty uart */
- sleep (1);
- continue;
- }
- if (character == CANCEL)
- { /* target aborted load */
- expect_prompt (NULL, 0);
- error ("Got a CANCEL from the target.");
- }
- if (character == '*')
- { /* look for missed error message */
- expect_prompt (NULL, 0);
- error ("Got an error message from the target");
- }
- if (character == byte) /* got what we wanted */
- return 1;
- if (character == ((byte == ACK) ? NAK : ACK))
- return 0;
- sleep (1);
- }
+ monitor_expect_prompt (NULL, 0);
- return 0;
+ SERIAL_FLUSH_INPUT (monitor_desc);
}
/*
* - 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
unsigned char *myaddr;
int len;
{
- int checksum;
+ 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;
- /* Create the header for the srec. 4 is the number of bytes in the address,
+ 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. */
- sprintf (buf, "S%d%02X%08X", type, len + 4 + 1, memaddr);
- buf += 12;
-
- checksum += (len + 4 + 1 /* calculate the checksum */
- + (memaddr & 0xff)
+ 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++)
{
- sprintf (buf, "%02X", myaddr[i]);
+ *buf++ = hextab [myaddr[i] >> 4];
+ *buf++ = hextab [myaddr[i] & 0xf];
checksum += myaddr[i];
- buf += 2;
- }
-
- sprintf(buf, "%02X", ~checksum & 0xff); /* add the checksum */
-
- return 0;
-}
-
-/* Take 128 bytes of data and make a packet out of it.
- *
- * Each packet looks like this:
- * +-----+-------+-------+------+-----+
- * | SOH | Seq1. | Seq2. | data | SUM |
- * +-----+-------+-------+------+-----+
- * SOH = 0x01
- * Seq1 = The sequence number.
- * Seq2 = The complement of the sequence number.
- * Data = A 128 bytes of data.
- * SUM = Add the contents of the 128 bytes and use the low-order
- * 8 bits of the result.
- */
-
-static void
-make_xmodem_packet (packet, data, len)
- unsigned char *packet;
- unsigned char *data;
- int len;
-{
- static int sequence = 1;
- int i, sum;
- unsigned char *buf;
-
- buf = data;
- /* build the packet header */
- packet[0] = SOH;
- packet[1] = sequence;
- packet[2] = 255 - sequence;
- sequence++;
-#if 0
- packet[2] = ~sequence++; /* the complement is the sequence checksum */
-#endif
-
- sum = 0; /* calculate the data checksum */
- for (i = 3; i <= len + 2; i++) {
- packet[i] = *buf;
- sum += *buf;
- buf++;
- }
-
- /* add padding for the rest of the packet */
- for (i = len+1 ; i <= XMODEM_DATASIZE ; i++)
- packet[i] = '0';
-
- packet[XMODEM_PACKETSIZE] = sum & 0xff; /* add the checksum */
-}
-
-/* Print the packet as a debug check. */
-
-static void
-print_xmodem_packet (packet)
- char *packet;
-{
- int i;
- static int lastseq;
- int sum;
-
- /* take apart the packet header the packet header */
- if (packet[0] == SOH)
- printf_unfiltered ("SOH");
- else
- error ("xmodem: SOH is wrong");
-
- /* check the sequence */
- if (packet[1] != 0)
- {
- lastseq = packet[1];
- if (packet[2] != ~lastseq)
- error ("xmodem: Sequence checksum is wrong");
- else
- printf_filtered (" %d %d", lastseq, ~lastseq);
}
-
- /* check the data checksum */
- sum = 0;
- for (i = 3; i <= XMODEM_DATASIZE; i++)
- sum += packet[i];
- /* ignore the data */
-#if 0
- printf_unfiltered (" [128 bytes of data] %d\n", sum & 0xff);
-#endif
- printf_filtered (" [%s] %d\n", packet, sum & 0xff);
+ checksum = ~checksum;
- if ((packet[XMODEM_PACKETSIZE] & 0xff) != (sum & 0xff))
- printf_unfiltered ("xmodem: data checksum wrong, got a %d",
- packet[XMODEM_PACKETSIZE] & 0xff);
+ *buf++ = hextab[checksum >> 4];
+ *buf++ = hextab[checksum & 0xf];
- putchar_unfiltered ('\n');
+ return buf - buffer;
}
/* Convert hex digit A to a number. */
error ("Reply contains invalid hex digit 0x%x", a);
}
-static struct target_ops monitor_ops = {
+static struct target_ops monitor_ops =
+{
NULL, /* to_shortname */
NULL, /* to_longname */
NULL, /* to_doc */
projects / deliverable / binutils-gdb.git / blobdiff