/* Remote debugging interface for MIPS remote debugging protocol.
- Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1993-2014 Free Software Foundation, Inc.
Contributed by Cygnus Support. Written by Ian Lance Taylor
<ian@cygnus.com>.
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
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "inferior.h"
+#include "infrun.h"
#include "bfd.h"
#include "symfile.h"
#include "gdbcmd.h"
#include "serial.h"
#include "target.h"
#include "exceptions.h"
-#include "gdb_string.h"
-#include "gdb_stat.h"
+#include <string.h>
+#include <sys/stat.h>
+#include "gdb_usleep.h"
#include "regcache.h"
#include <ctype.h>
#include "mips-tdep.h"
+#include "gdbthread.h"
+#include "gdb_bfd.h"
\f
/* Breakpoint types. Values 0, 1, and 2 must agree with the watch
int *pch, int timeout);
static int mips_cksum (const unsigned char *hdr,
- const unsigned char *data, int len);
+ const char *data, int len);
static void mips_send_packet (const char *s, int get_ack);
static void lsi_open (char *name, int from_tty);
-static void mips_close (int quitting);
+static void mips_close (struct target_ops *self);
-static void mips_detach (char *args, int from_tty);
+static int mips_map_regno (struct gdbarch *, int);
-static void mips_resume (ptid_t ptid, int step,
- enum target_signal siggnal);
+static void mips_set_register (int regno, ULONGEST value);
-static ptid_t mips_wait (ptid_t ptid,
- struct target_waitstatus *status);
+static void mips_prepare_to_store (struct target_ops *self,
+ struct regcache *regcache);
-static int mips_map_regno (int regno);
-
-static void mips_fetch_registers (struct regcache *regcache, int regno);
-
-static void mips_prepare_to_store (struct regcache *regcache);
-
-static void mips_store_registers (struct regcache *regcache, int regno);
-
-static unsigned int mips_fetch_word (CORE_ADDR addr);
+static int mips_fetch_word (CORE_ADDR addr, unsigned int *valp);
static int mips_store_word (CORE_ADDR addr, unsigned int value,
- char *old_contents);
+ int *old_contents);
-static int mips_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len,
- int write,
- struct mem_attrib *attrib,
- struct target_ops *target);
+static enum target_xfer_status mips_xfer_memory (gdb_byte *readbuf,
+ const gdb_byte *writebuf,
+ ULONGEST memaddr,
+ ULONGEST len,
+ ULONGEST *xfered_len);
static void mips_files_info (struct target_ops *ignore);
-static void mips_mourn_inferior (void);
+static void mips_mourn_inferior (struct target_ops *ops);
-static int pmon_makeb64 (unsigned long v, char *p, int n, int *chksum);
+static int pmon_makeb64 (unsigned long v, char *p, int n, unsigned int *chksum);
-static int pmon_zeroset (int recsize, char **buff, int *amount,
+static int pmon_zeroset (int recsize, char **buff, unsigned int *amount,
unsigned int *chksum);
-static int pmon_checkset (int recsize, char **buff, int *value);
+static int pmon_checkset (int recsize, char **buff, unsigned int *value);
static void pmon_make_fastrec (char **outbuf, unsigned char *inbuf,
int *inptr, int inamount, int *recsize,
static void pmon_load_fast (char *file);
-static void mips_load (char *file, int from_tty);
+static void mips_load (struct target_ops *self, char *file, int from_tty);
static int mips_make_srec (char *buffer, int type, CORE_ADDR memaddr,
unsigned char *myaddr, int len);
-static int set_breakpoint (CORE_ADDR addr, int len, enum break_type type);
+static int mips_set_breakpoint (CORE_ADDR addr, int len, enum break_type type);
-static int clear_breakpoint (CORE_ADDR addr, int len, enum break_type type);
+static int mips_clear_breakpoint (CORE_ADDR addr, int len,
+ enum break_type type);
-static int common_breakpoint (int set, CORE_ADDR addr, int len,
- enum break_type type);
+static int mips_common_breakpoint (int set, CORE_ADDR addr, int len,
+ enum break_type type);
/* Forward declarations. */
extern struct target_ops mips_ops;
extern struct target_ops pmon_ops;
extern struct target_ops ddb_ops;
+extern struct target_ops rockhopper_ops;
\f/* *INDENT-OFF* */
/* The MIPS remote debugging interface is built on top of a simple
packet protocol. Each packet is organized as follows:
These are initialized with code in _initialize_remote_mips instead
of static initializers, to make it easier to extend the target_ops
vector later. */
-struct target_ops mips_ops, pmon_ops, ddb_ops, lsi_ops;
+struct target_ops mips_ops, pmon_ops, ddb_ops, rockhopper_ops, lsi_ops;
enum mips_monitor_type
{
/* IDT/SIM monitor being used: */
MON_IDT,
/* PMON monitor being used: */
- MON_PMON, /* 3.0.83 [COGENT,EB,FP,NET] Algorithmics Ltd. Nov 9 1995 17:19:50 */
- MON_DDB, /* 2.7.473 [DDBVR4300,EL,FP,NET] Risq Modular Systems, Thu Jun 6 09:28:40 PDT 1996 */
- MON_LSI, /* 4.3.12 [EB,FP], LSI LOGIC Corp. Tue Feb 25 13:22:14 1997 */
- /* Last and unused value, for sizing vectors, etc. */
+ MON_PMON, /* 3.0.83 [COGENT,EB,FP,NET]
+ Algorithmics Ltd. Nov 9 1995 17:19:50 */
+ MON_DDB, /* 2.7.473 [DDBVR4300,EL,FP,NET]
+ Risq Modular Systems,
+ Thu Jun 6 09:28:40 PDT 1996 */
+ MON_LSI, /* 4.3.12 [EB,FP],
+ LSI LOGIC Corp. Tue Feb 25 13:22:14 1997 */
+ MON_ROCKHOPPER,
+ /* Last and unused value, for sizing vectors, etc. */
MON_LAST
};
static enum mips_monitor_type mips_monitor = MON_LAST;
/* Set to 1 if the target is open. */
static int mips_is_open;
-/* Currently active target description (if mips_is_open == 1) */
+/* Currently active target description (if mips_is_open == 1). */
static struct target_ops *current_ops;
/* Set to 1 while the connection is being initialized. */
via ^C. */
static int interrupt_count;
-/* If non-zero, means that the target is running. */
+/* If non-zero, means that the target is running. */
static int mips_wait_flag = 0;
-/* If non-zero, monitor supports breakpoint commands. */
+/* If non-zero, monitor supports breakpoint commands. */
static int monitor_supports_breakpoints = 0;
/* Data cache header. */
-#if 0 /* not used (yet?) */
+#if 0 /* not used (yet?) */
static DCACHE *mips_dcache;
#endif
-/* Non-zero means that we've just hit a read or write watchpoint */
+/* Non-zero means that we've just hit a read or write watchpoint. */
static int hit_watchpoint;
/* Table of breakpoints/watchpoints (used only on LSI PMON target).
The table is indexed by a breakpoint number, which is an integer
- from 0 to 255 returned by the LSI PMON when a breakpoint is set.
- */
+ from 0 to 255 returned by the LSI PMON when a breakpoint is set. */
+
#define MAX_LSI_BREAKPOINTS 256
struct lsi_breakpoint_info
{
/* Error/warning codes returned by LSI PMON for breakpoint commands.
Warning values may be ORed together; error values may not. */
-#define W_WARN 0x100 /* This bit is set if the error code is a warning */
-#define W_MSK 0x101 /* warning: Range feature is supported via mask */
-#define W_VAL 0x102 /* warning: Value check is not supported in hardware */
-#define W_QAL 0x104 /* warning: Requested qualifiers are not supported in hardware */
-
-#define E_ERR 0x200 /* This bit is set if the error code is an error */
+#define W_WARN 0x100 /* This bit is set if the error code
+ is a warning */
+#define W_MSK 0x101 /* warning: Range feature is supported
+ via mask */
+#define W_VAL 0x102 /* warning: Value check is not
+ supported in hardware */
+#define W_QAL 0x104 /* warning: Requested qualifiers are
+ not supported in hardware */
+
+#define E_ERR 0x200 /* This bit is set if the error code
+ is an error */
#define E_BPT 0x200 /* error: No such breakpoint number */
#define E_RGE 0x201 /* error: Range is not supported */
-#define E_QAL 0x202 /* error: The requested qualifiers can not be used */
+#define E_QAL 0x202 /* error: The requested qualifiers can
+ not be used */
#define E_OUT 0x203 /* error: Out of hardware resources */
#define E_NON 0x204 /* error: Hardware breakpoint not supported */
of warnings returned by PMON when hardware breakpoints are used. */
static int monitor_warnings;
+/* This is the ptid we use while we're connected to the remote. Its
+ value is arbitrary, as the remote-mips target doesn't have a notion of
+ processes or threads, but we need something non-null to place in
+ inferior_ptid. */
+static ptid_t remote_mips_ptid;
+
+/* Close any ports which might be open. Reset certain globals indicating
+ the state of those ports. */
static void
close_ports (void)
all hell to break loose--the rest of GDB will tend to get left in an
inconsistent state. */
-static NORETURN void
+static void ATTRIBUTE_NORETURN
mips_error (char *string,...)
{
va_list args;
-
- va_start (args, string);
+ char *fmt;
target_terminal_ours ();
- wrap_here (""); /* Force out any buffered output */
+ wrap_here (""); /* Force out any buffered output. */
gdb_flush (gdb_stdout);
- if (error_pre_print)
- fputs_filtered (error_pre_print, gdb_stderr);
- vfprintf_filtered (gdb_stderr, string, args);
- fprintf_filtered (gdb_stderr, "\n");
- va_end (args);
gdb_flush (gdb_stderr);
/* Clean up in such a way that mips_close won't try to talk to the
it). */
close_ports ();
- printf_unfiltered ("Ending remote MIPS debugging.\n");
- target_mourn_inferior ();
+ if (!ptid_equal (inferior_ptid, null_ptid))
+ target_mourn_inferior ();
+
+ fmt = concat (_("Ending remote MIPS debugging: "),
+ string, (char *) NULL);
+ make_cleanup (xfree, fmt);
- deprecated_throw_reason (RETURN_ERROR);
+ va_start (args, string);
+ throw_verror (TARGET_CLOSE_ERROR, fmt, args);
+ va_end (args);
}
/* putc_readable - print a character, displaying non-printable chars in
}
+/* Read P as a hex value. Return true if every character made sense,
+ storing the result in *RESULT. Leave *RESULT unchanged otherwise. */
+
+static int
+read_hex_value (const char *p, ULONGEST *result)
+{
+ ULONGEST retval;
+
+ retval = 0;
+ while (*p != 0)
+ {
+ retval <<= 4;
+ if (*p >= '0' && *p <= '9')
+ retval |= *p - '0';
+ else if (*p >= 'A' && *p <= 'F')
+ retval |= *p - 'A' + 10;
+ else if (*p >= 'a' && *p <= 'f')
+ retval |= *p - 'a' + 10;
+ else
+ return 0;
+ p++;
+ }
+ *result = retval;
+ return 1;
+}
+
+
/* Wait until STRING shows up in mips_desc. Returns 1 if successful, else 0 if
- timed out. TIMEOUT specifies timeout value in seconds.
- */
+ timed out. TIMEOUT specifies timeout value in seconds. */
static int
mips_expect_timeout (const char *string, int timeout)
}
immediate_quit++;
+ QUIT;
while (1)
{
int c;
/* Must use serial_readchar() here cuz mips_readchar would get
- confused if we were waiting for the mips_monitor_prompt... */
+ confused if we were waiting for the mips_monitor_prompt... */
c = serial_readchar (mips_desc, timeout);
/* Wait until STRING shows up in mips_desc. Returns 1 if successful, else 0 if
timed out. The timeout value is hard-coded to 2 seconds. Use
- mips_expect_timeout if a different timeout value is needed.
- */
+ mips_expect_timeout if a different timeout value is needed. */
static int
mips_expect (const char *string)
static int state = 0;
int mips_monitor_prompt_len = strlen (mips_monitor_prompt);
- {
+ { /* FIXME this whole block is dead code! */
int i;
i = timeout;
timeout = 1;
ch = serial_readchar (mips_desc, timeout);
- if (ch == SERIAL_TIMEOUT && timeout == -1) /* Watchdog went off */
+ if (ch == SERIAL_TIMEOUT && timeout == -1) /* Watchdog went off. */
{
target_mourn_inferior ();
- error ("Watchdog has expired. Target detached.\n");
+ error (_("Watchdog has expired. Target detached."));
}
if (ch == SERIAL_EOF)
- mips_error ("End of file from remote");
+ mips_error (_("End of file from remote"));
if (ch == SERIAL_ERROR)
- mips_error ("Error reading from remote: %s", safe_strerror (errno));
+ mips_error (_("Error reading from remote: %s"), safe_strerror (errno));
if (remote_debug > 1)
{
/* Don't use _filtered; we can't deal with a QUIT out of
if (remote_debug > 0)
/* Don't use _filtered; we can't deal with a QUIT out of
target_wait, and I think this might be called from there. */
- fprintf_unfiltered (gdb_stdlog, "Reinitializing MIPS debugging mode\n");
+ fprintf_unfiltered (gdb_stdlog,
+ "Reinitializing MIPS debugging mode\n");
mips_need_reply = 0;
mips_initialize ();
state = 0;
/* At this point, about the only thing we can do is abort the command
- in progress and get back to command level as quickly as possible. */
+ in progress and get back to command level as quickly as possible. */
- error ("Remote board reset, debug protocol re-initialized.");
+ error (_("Remote board reset, debug protocol re-initialized."));
}
if (ch == mips_monitor_prompt[state])
what the program is outputting, if the debugging is
being done on the console port. Don't use _filtered:
we can't deal with a QUIT out of target_wait and
- buffered target output confuses the user. */
+ buffered target output confuses the user. */
if (!mips_initializing || remote_debug > 0)
{
if (isprint (ch) || isspace (ch))
gdb_flush (gdb_stdtarg);
}
- /* Only count unprintable characters. */
+ /* Only count unprintable characters. */
if (! (isprint (ch) || isspace (ch)))
(*pgarbage) += 1;
if (mips_syn_garbage > 0
&& *pgarbage > mips_syn_garbage)
- mips_error ("Debug protocol failure: more than %d characters before a sync.",
+ mips_error (_("Debug protocol failure: more "
+ "than %d characters before a sync."),
mips_syn_garbage);
}
}
for success, -1 for timeout, -2 for error. */
static int
-mips_receive_trailer (unsigned char *trlr, int *pgarbage, int *pch, int timeout)
+mips_receive_trailer (unsigned char *trlr, int *pgarbage,
+ int *pch, int timeout)
{
int i;
int ch;
}
/* Get the checksum of a packet. HDR points to the packet header.
- DATA points to the packet data. LEN is the length of DATA. */
+ DATASTR points to the packet data. LEN is the length of DATASTR. */
static int
-mips_cksum (const unsigned char *hdr, const unsigned char *data, int len)
+mips_cksum (const unsigned char *hdr, const char *datastr, int len)
{
const unsigned char *p;
+ const unsigned char *data = (const unsigned char *) datastr;
int c;
int cksum;
len = strlen (s);
if (len > DATA_MAXLEN)
- mips_error ("MIPS protocol data packet too long: %s", s);
+ mips_error (_("MIPS protocol data packet too long: %s"), s);
packet = (unsigned char *) alloca (HDR_LENGTH + len + TRLR_LENGTH + 1);
memcpy (packet + HDR_LENGTH, s, len);
- cksum = mips_cksum (packet, packet + HDR_LENGTH, len);
+ cksum = mips_cksum (packet, (char *) packet + HDR_LENGTH, len);
packet[HDR_LENGTH + len + TRLR_INDX_CSUM1] = TRLR_SET_CSUM1 (cksum);
packet[HDR_LENGTH + len + TRLR_INDX_CSUM2] = TRLR_SET_CSUM2 (cksum);
packet[HDR_LENGTH + len + TRLR_INDX_CSUM3] = TRLR_SET_CSUM3 (cksum);
if (serial_write (mips_desc, packet,
HDR_LENGTH + len + TRLR_LENGTH) != 0)
- mips_error ("write to target failed: %s", safe_strerror (errno));
+ mips_error (_("write to target failed: %s"), safe_strerror (errno));
if (!get_ack)
return;
int i;
/* Ignore any errors raised whilst attempting to ignore
- packet. */
+ packet. */
len = HDR_GET_LEN (hdr);
}
if (rch == SERIAL_TIMEOUT)
break;
- /* ignore the character */
+ /* Ignore the character. */
}
if (i == len)
remote_timeout);
/* We don't bother checking the checksum, or providing an
- ACK to the packet. */
+ ACK to the packet. */
continue;
}
/* If the checksum does not match the trailer checksum, this
is a bad packet; ignore it. */
- if (mips_cksum (hdr, (unsigned char *) NULL, 0)
- != TRLR_GET_CKSUM (trlr))
+ if (mips_cksum (hdr, NULL, 0) != TRLR_GET_CKSUM (trlr))
continue;
if (remote_debug > 0)
}
}
- mips_error ("Remote did not acknowledge packet");
+ mips_error (_("Remote did not acknowledge packet"));
}
/* Receive and acknowledge a packet, returning the data in BUFF (which
if (mips_receive_header (hdr, &garbage, ch, timeout) != 0)
{
if (throw_error)
- mips_error ("Timed out waiting for remote packet");
+ mips_error (_("Timed out waiting for remote packet"));
else
return -1;
}
if (len == 0)
{
/* Ignore the error condition, since we are going to
- ignore the packet anyway. */
+ ignore the packet anyway. */
(void) mips_receive_trailer (trlr, &garbage, &ch, timeout);
}
/* Don't use _filtered; we can't deal with a QUIT out of
if (rch == SERIAL_TIMEOUT)
{
if (throw_error)
- mips_error ("Timed out waiting for remote packet");
+ mips_error (_("Timed out waiting for remote packet"));
else
return -1;
}
if (err == -1)
{
if (throw_error)
- mips_error ("Timed out waiting for packet");
+ mips_error (_("Timed out waiting for packet"));
else
return -1;
}
ack[HDR_INDX_LEN1] = HDR_SET_LEN1 (0, 0, mips_receive_seq);
ack[HDR_INDX_SEQ] = HDR_SET_SEQ (0, 0, mips_receive_seq);
- cksum = mips_cksum (ack, (unsigned char *) NULL, 0);
+ cksum = mips_cksum (ack, NULL, 0);
ack[HDR_LENGTH + TRLR_INDX_CSUM1] = TRLR_SET_CSUM1 (cksum);
ack[HDR_LENGTH + TRLR_INDX_CSUM2] = TRLR_SET_CSUM2 (cksum);
if (serial_write (mips_desc, ack, HDR_LENGTH + TRLR_LENGTH) != 0)
{
if (throw_error)
- mips_error ("write to target failed: %s", safe_strerror (errno));
+ mips_error (_("write to target failed: %s"),
+ safe_strerror (errno));
else
return -1;
}
ack[HDR_INDX_LEN1] = HDR_SET_LEN1 (0, 0, mips_receive_seq);
ack[HDR_INDX_SEQ] = HDR_SET_SEQ (0, 0, mips_receive_seq);
- cksum = mips_cksum (ack, (unsigned char *) NULL, 0);
+ cksum = mips_cksum (ack, NULL, 0);
ack[HDR_LENGTH + TRLR_INDX_CSUM1] = TRLR_SET_CSUM1 (cksum);
ack[HDR_LENGTH + TRLR_INDX_CSUM2] = TRLR_SET_CSUM2 (cksum);
if (serial_write (mips_desc, ack, HDR_LENGTH + TRLR_LENGTH) != 0)
{
if (throw_error)
- mips_error ("write to target failed: %s", safe_strerror (errno));
+ mips_error (_("write to target failed: %s"), safe_strerror (errno));
else
return -1;
}
int timeout,
char *buff)
{
+ int addr_size = gdbarch_addr_bit (target_gdbarch ()) / 8;
char myBuff[DATA_MAXLEN + 1];
+ char response_string[17];
int len;
int rpid;
char rcmd;
int rerrflg;
- unsigned long rresponse;
+ ULONGEST rresponse;
if (buff == (char *) NULL)
buff = myBuff;
{
if (mips_need_reply)
internal_error (__FILE__, __LINE__,
- _("mips_request: Trying to send command before reply"));
- sprintf (buff, "0x0 %c 0x%s 0x%s", cmd, paddr_nz (addr), paddr_nz (data));
+ _("mips_request: Trying to send "
+ "command before reply"));
+ /* 'T' sets a register to a 64-bit value, so make sure we use
+ the right conversion function. */
+ if (cmd == 'T')
+ sprintf (buff, "0x0 %c 0x%s 0x%s", cmd,
+ phex_nz (addr, addr_size), phex_nz (data, 8));
+ else
+ sprintf (buff, "0x0 %c 0x%s 0x%s", cmd,
+ phex_nz (addr, addr_size), phex_nz (data, addr_size));
+
mips_send_packet (buff, 1);
mips_need_reply = 1;
}
len = mips_receive_packet (buff, 1, timeout);
buff[len] = '\0';
- if (sscanf (buff, "0x%x %c 0x%x 0x%lx",
- &rpid, &rcmd, &rerrflg, &rresponse) != 4
+ if (sscanf (buff, "0x%x %c 0x%x 0x%16s",
+ &rpid, &rcmd, &rerrflg, response_string) != 4
+ || !read_hex_value (response_string, &rresponse)
|| (cmd != '\0' && rcmd != cmd))
- mips_error ("Bad response from remote board");
+ mips_error (_("Bad response from remote board"));
if (rerrflg != 0)
{
return rresponse;
}
+/* Cleanup associated with mips_initialize(). */
+
static void
mips_initialize_cleanups (void *arg)
{
mips_initializing = 0;
}
+/* Cleanup associated with mips_exit_debug(). */
+
static void
mips_exit_cleanups (void *arg)
{
mips_exiting = 0;
}
+/* Send a command and wait for that command to be echoed back. Wait,
+ too, for the following prompt. */
+
static void
mips_send_command (const char *cmd, int prompt)
{
}
/* Enter remote (dbx) debug mode: */
+
static void
mips_enter_debug (void)
{
if (mips_monitor != MON_IDT)
mips_send_command ("debug\r", 0);
- else /* assume IDT monitor by default */
+ else /* Assume IDT monitor by default. */
mips_send_command ("db tty0\r", 0);
- sleep (1);
+ gdb_usleep (1000000);
serial_write (mips_desc, "\r", sizeof "\r" - 1);
/* We don't need to absorb any spurious characters here, since the
mips_receive_header will eat up a reasonable number of characters
whilst looking for the SYN, however this avoids the "garbage"
- being displayed to the user. */
+ being displayed to the user. */
if (mips_monitor != MON_IDT)
mips_expect ("\r");
{
char buff[DATA_MAXLEN + 1];
+
if (mips_receive_packet (buff, 1, 3) < 0)
- mips_error ("Failed to initialize (didn't receive packet).");
+ mips_error (_("Failed to initialize (didn't receive packet)."));
}
}
/* Exit remote (dbx) debug mode, returning to the monitor prompt: */
+
static int
mips_exit_debug (void)
{
mips_exiting = 1;
- if (mips_monitor != MON_IDT)
+ if (mips_monitor != MON_IDT && mips_monitor != MON_ROCKHOPPER)
{
/* The DDB (NEC) and MiniRISC (LSI) versions of PMON exit immediately,
so we do not get a reply to this command: */
mips_request ('x', 0, 0, NULL, mips_receive_wait, NULL);
mips_need_reply = 0;
if (!mips_expect (" break!"))
- return -1;
+ {
+ do_cleanups (old_cleanups);
+ return -1;
+ }
}
else
mips_request ('x', 0, 0, &err, mips_receive_wait, NULL);
if (!mips_expect (mips_monitor_prompt))
- return -1;
+ {
+ do_cleanups (old_cleanups);
+ return -1;
+ }
do_cleanups (old_cleanups);
mips_initialize (void)
{
int err;
- struct cleanup *old_cleanups = make_cleanup (mips_initialize_cleanups, NULL);
+ struct cleanup *old_cleanups;
int j;
/* What is this code doing here? I don't see any way it can happen, and
if (mips_initializing)
{
- warning ("internal error: mips_initialize called twice");
+ warning (_("internal error: mips_initialize called twice"));
return;
}
+ old_cleanups = make_cleanup (mips_initialize_cleanups, NULL);
+
mips_wait_flag = 0;
mips_initializing = 1;
/* Force the system into the monitor. After this we *should* be at
the mips_monitor_prompt. */
if (mips_monitor != MON_IDT)
- j = 0; /* start by checking if we are already at the prompt */
+ j = 0; /* Start by checking if we are already
+ at the prompt. */
else
- j = 1; /* start by sending a break */
+ j = 1; /* Start by sending a break. */
for (; j <= 4; j++)
{
switch (j)
{
- case 0: /* First, try sending a CR */
+ case 0: /* First, try sending a CR. */
serial_flush_input (mips_desc);
serial_write (mips_desc, "\r", 1);
break;
- case 1: /* First, try sending a break */
+ case 1: /* First, try sending a break. */
serial_send_break (mips_desc);
break;
- case 2: /* Then, try a ^C */
+ case 2: /* Then, try a ^C. */
serial_write (mips_desc, "\003", 1);
break;
- case 3: /* Then, try escaping from download */
+ case 3: /* Then, try escaping from download. */
{
if (mips_monitor != MON_IDT)
{
/* We shouldn't need to send multiple termination
sequences, since the target performs line (or
block) reads, and then processes those
- packets. In-case we were downloading a large packet
+ packets. In-case we were downloading a large packet
we flush the output buffer before inserting a
- termination sequence. */
+ termination sequence. */
serial_flush_output (mips_desc);
sprintf (tbuff, "\r/E/E\r");
serial_write (mips_desc, tbuff, 6);
out is to send enough termination packets (8 bytes)
to fill up and then overflow the largest size
S-record (255 bytes in this case). This amounts to
- 256/8 + 1 packets.
- */
+ 256/8 + 1 packets. */
mips_make_srec (srec, '7', 0, NULL, 0);
if (serial_readchar (mips_desc, 0) >= 0)
break; /* Break immediatly if we get something from
- the board. */
+ the board. */
}
}
}
break;
case 4:
- mips_error ("Failed to initialize.");
+ mips_error (_("Failed to initialize."));
}
if (mips_expect (mips_monitor_prompt))
/* Delete all the current breakpoints: */
mips_send_command ("db *\r", -1);
/* NOTE: PMON does not have breakpoint support through the
- "debug" mode, only at the monitor command-line. */
+ "debug" mode, only at the monitor command-line. */
}
mips_enter_debug ();
/* Clear all breakpoints: */
if ((mips_monitor == MON_IDT
- && clear_breakpoint (-1, 0, BREAK_UNUSED) == 0)
+ && mips_clear_breakpoint (-1, 0, BREAK_UNUSED) == 0)
|| mips_monitor == MON_LSI)
monitor_supports_breakpoints = 1;
else
}
/* Open a connection to the remote board. */
+
static void
common_open (struct target_ops *ops, char *name, int from_tty,
enum mips_monitor_type new_monitor,
const char *new_monitor_prompt)
{
- char *ptype;
char *serial_port_name;
char *remote_name = 0;
char *local_name = 0;
char **argv;
+ struct cleanup *cleanup;
if (name == 0)
- error (
- "To open a MIPS remote debugging connection, you need to specify what serial\n\
-device is attached to the target board (e.g., /dev/ttya).\n"
- "If you want to use TFTP to download to the board, specify the name of a\n"
- "temporary file to be used by GDB for downloads as the second argument.\n"
- "This filename must be in the form host:filename, where host is the name\n"
- "of the host running the TFTP server, and the file must be readable by the\n"
- "world. If the local name of the temporary file differs from the name as\n"
- "seen from the board via TFTP, specify that name as the third parameter.\n");
+ error (_("\
+To open a MIPS remote debugging connection, you need to specify what\n\
+serial device is attached to the target board (e.g., /dev/ttya).\n\
+If you want to use TFTP to download to the board, specify the name of a\n\
+temporary file to be used by GDB for downloads as the second argument.\n\
+This filename must be in the form host:filename, where host is the name\n\
+of the host running the TFTP server, and the file must be readable by the\n\
+world. If the local name of the temporary file differs from the name as\n\
+seen from the board via TFTP, specify that name as the third parameter.\n"));
/* Parse the serial port name, the optional TFTP name, and the
optional local TFTP name. */
- if ((argv = buildargv (name)) == NULL)
- nomem (0);
- make_cleanup_freeargv (argv);
+ argv = gdb_buildargv (name);
+ cleanup = make_cleanup_freeargv (argv);
serial_port_name = xstrdup (argv[0]);
- if (argv[1]) /* remote TFTP name specified? */
+ if (argv[1]) /* Remote TFTP name specified? */
{
remote_name = argv[1];
- if (argv[2]) /* local TFTP filename specified? */
+ if (argv[2]) /* Local TFTP filename specified? */
local_name = argv[2];
}
{
udp_desc = serial_open (remote_name);
if (!udp_desc)
- perror_with_name ("Unable to open UDP port");
+ perror_with_name (_("Unable to open UDP port"));
udp_in_use = 1;
}
else
xfree (tftp_localname);
if (local_name == NULL)
if ((local_name = strchr (remote_name, ':')) != NULL)
- local_name++; /* skip over the colon */
+ local_name++; /* Skip over the colon. */
if (local_name == NULL)
- local_name = remote_name; /* local name same as remote name */
+ local_name = remote_name; /* Local name same as remote name. */
tftp_name = xstrdup (remote_name);
tftp_localname = xstrdup (local_name);
tftp_in_use = 1;
/* Switch to using remote target now. */
push_target (ops);
- /* FIXME: Should we call start_remote here? */
+ inferior_ptid = remote_mips_ptid;
+ inferior_appeared (current_inferior (), ptid_get_pid (inferior_ptid));
+ add_thread_silent (inferior_ptid);
/* Try to figure out the processor model if possible. */
deprecated_mips_set_processor_regs_hack ();
reinit_frame_cache ();
registers_changed ();
- stop_pc = read_pc ();
- print_stack_frame (get_selected_frame (NULL), 0, SRC_AND_LOC);
+ stop_pc = regcache_read_pc (get_current_regcache ());
+ print_stack_frame (get_selected_frame (NULL), 0, SRC_AND_LOC, 1);
xfree (serial_port_name);
+
+ do_cleanups (cleanup);
}
+/* Open a connection to an IDT board. */
+
static void
mips_open (char *name, int from_tty)
{
const char *monitor_prompt = NULL;
- if (TARGET_ARCHITECTURE != NULL
- && TARGET_ARCHITECTURE->arch == bfd_arch_mips)
+ if (gdbarch_bfd_arch_info (target_gdbarch ()) != NULL
+ && gdbarch_bfd_arch_info (target_gdbarch ())->arch == bfd_arch_mips)
{
- switch (TARGET_ARCHITECTURE->mach)
+ switch (gdbarch_bfd_arch_info (target_gdbarch ())->mach)
{
case bfd_mach_mips4100:
case bfd_mach_mips4300:
common_open (&mips_ops, name, from_tty, MON_IDT, monitor_prompt);
}
+/* Open a connection to a PMON board. */
+
static void
pmon_open (char *name, int from_tty)
{
common_open (&pmon_ops, name, from_tty, MON_PMON, "PMON> ");
}
+/* Open a connection to a DDB board. */
+
static void
ddb_open (char *name, int from_tty)
{
common_open (&ddb_ops, name, from_tty, MON_DDB, "NEC010>");
}
+/* Open a connection to a rockhopper board. */
+
+static void
+rockhopper_open (char *name, int from_tty)
+{
+ common_open (&rockhopper_ops, name, from_tty, MON_ROCKHOPPER, "NEC01>");
+}
+
+/* Open a connection to an LSI board. */
+
static void
lsi_open (char *name, int from_tty)
{
/* Close a connection to the remote board. */
static void
-mips_close (int quitting)
+mips_close (struct target_ops *self)
{
if (mips_is_open)
{
close_ports ();
}
+
+ generic_mourn_inferior ();
}
/* Detach from the remote board. */
static void
-mips_detach (char *args, int from_tty)
+mips_detach (struct target_ops *ops, const char *args, int from_tty)
{
if (args)
- error ("Argument given to \"detach\" when remotely debugging.");
+ error (_("Argument given to \"detach\" when remotely debugging."));
- pop_target ();
-
- mips_close (1);
+ unpush_target (ops);
if (from_tty)
printf_unfiltered ("Ending remote MIPS debugging.\n");
where PMON does return a reply. */
static void
-mips_resume (ptid_t ptid, int step, enum target_signal siggnal)
+mips_resume (struct target_ops *ops,
+ ptid_t ptid, int step, enum gdb_signal siggnal)
{
int err;
/* Return the signal corresponding to SIG, where SIG is the number which
the MIPS protocol uses for the signal. */
-static enum target_signal
+
+static enum gdb_signal
mips_signal_from_protocol (int sig)
{
/* We allow a few more signals than the IDT board actually returns, on
for these signals is widely agreed upon. */
if (sig <= 0
|| sig > 31)
- return TARGET_SIGNAL_UNKNOWN;
+ return GDB_SIGNAL_UNKNOWN;
- /* Don't want to use target_signal_from_host because we are converting
+ /* Don't want to use gdb_signal_from_host because we are converting
from MIPS signal numbers, not host ones. Our internal numbers
match the MIPS numbers for the signals the board can return, which
are: SIGINT, SIGSEGV, SIGBUS, SIGILL, SIGFPE, SIGTRAP. */
- return (enum target_signal) sig;
+ return (enum gdb_signal) sig;
+}
+
+/* Set the register designated by REGNO to the value designated by VALUE. */
+
+static void
+mips_set_register (int regno, ULONGEST value)
+{
+ gdb_byte buf[MAX_REGISTER_SIZE];
+ struct regcache *regcache = get_current_regcache ();
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+
+ /* We got the number the register holds, but gdb expects to see a
+ value in the target byte ordering. */
+
+ if (mips_monitor != MON_ROCKHOPPER
+ && (regno == mips_regnum (gdbarch)->pc || regno < 32))
+ /* Some 64-bit boards have monitors that only send the bottom 32 bits.
+ In such cases we can only really debug 32-bit code properly so,
+ when reading a GPR or the PC, assume that the full 64-bit
+ value is the sign extension of the lower 32 bits. */
+ store_signed_integer (buf, register_size (gdbarch, regno), byte_order,
+ value);
+ else
+ store_unsigned_integer (buf, register_size (gdbarch, regno), byte_order,
+ value);
+
+ regcache_raw_supply (regcache, regno, buf);
}
/* Wait until the remote stops, and return a wait status. */
static ptid_t
-mips_wait (ptid_t ptid, struct target_waitstatus *status)
+mips_wait (struct target_ops *ops,
+ ptid_t ptid, struct target_waitstatus *status, int options)
{
int rstatus;
int err;
char buff[DATA_MAXLEN];
- int rpc, rfp, rsp;
- char flags[20];
+ ULONGEST rpc, rfp, rsp;
+ char pc_string[17], fp_string[17], sp_string[17], flags[20];
int nfields;
- int i;
interrupt_count = 0;
hit_watchpoint = 0;
if (!mips_need_reply)
{
status->kind = TARGET_WAITKIND_STOPPED;
- status->value.sig = TARGET_SIGNAL_TRAP;
+ status->value.sig = GDB_SIGNAL_TRAP;
return inferior_ptid;
}
rstatus = mips_request ('\000', 0, 0, &err, -1, buff);
mips_wait_flag = 0;
if (err)
- mips_error ("Remote failure: %s", safe_strerror (errno));
+ mips_error (_("Remote failure: %s"), safe_strerror (errno));
/* On returning from a continue, the PMON monitor seems to start
echoing back the messages we send prior to sending back the
- ACK. The code can cope with this, but to try and avoid the
+ ACK. The code can cope with this, but to try and avoid the
unnecessary serial traffic, and "spurious" characters displayed
- to the user, we cheat and reset the debug protocol. The problems
+ to the user, we cheat and reset the debug protocol. The problems
seems to be caused by a check on the number of arguments, and the
command length, within the monitor causing it to echo the command
- as a bad packet. */
+ as a bad packet. */
if (mips_monitor == MON_PMON)
{
mips_exit_debug ();
mips_enter_debug ();
}
- /* See if we got back extended status. If so, pick out the pc, fp, sp, etc... */
+ /* See if we got back extended status. If so, pick out the pc, fp,
+ sp, etc... */
- nfields = sscanf (buff, "0x%*x %*c 0x%*x 0x%*x 0x%x 0x%x 0x%x 0x%*x %s",
- &rpc, &rfp, &rsp, flags);
- if (nfields >= 3)
+ nfields = sscanf (buff,
+ "0x%*x %*c 0x%*x 0x%*x 0x%16s 0x%16s 0x%16s 0x%*x %s",
+ pc_string, fp_string, sp_string, flags);
+ if (nfields >= 3
+ && read_hex_value (pc_string, &rpc)
+ && read_hex_value (fp_string, &rfp)
+ && read_hex_value (sp_string, &rsp))
{
- char buf[MAX_REGISTER_SIZE];
-
- store_unsigned_integer (buf, register_size (current_gdbarch, PC_REGNUM), rpc);
- regcache_raw_supply (current_regcache, PC_REGNUM, buf);
-
- store_unsigned_integer (buf, register_size (current_gdbarch, PC_REGNUM), rfp);
- regcache_raw_supply (current_regcache, 30, buf); /* This register they are avoiding and so it is unnamed */
-
- store_unsigned_integer (buf, register_size (current_gdbarch, SP_REGNUM), rsp);
- regcache_raw_supply (current_regcache, SP_REGNUM, buf);
+ struct regcache *regcache = get_current_regcache ();
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
- store_unsigned_integer (buf, register_size (current_gdbarch, DEPRECATED_FP_REGNUM), 0);
- regcache_raw_supply (current_regcache, DEPRECATED_FP_REGNUM, buf);
+ mips_set_register (gdbarch_pc_regnum (gdbarch), rpc);
+ mips_set_register (30, rfp);
+ mips_set_register (gdbarch_sp_regnum (gdbarch), rsp);
if (nfields == 9)
{
if (strcmp (target_shortname, "lsi") == 0)
{
#if 0
- /* If this is an LSI PMON target, see if we just hit a hardrdware watchpoint.
- Right now, PMON doesn't give us enough information to determine which
- breakpoint we hit. So we have to look up the PC in our own table
- of breakpoints, and if found, assume it's just a normal instruction
- fetch breakpoint, not a data watchpoint. FIXME when PMON
- provides some way to tell us what type of breakpoint it is. */
+ /* If this is an LSI PMON target, see if we just hit a
+ hardrdware watchpoint. Right now, PMON doesn't give us
+ enough information to determine which breakpoint we hit. So
+ we have to look up the PC in our own table of breakpoints,
+ and if found, assume it's just a normal instruction fetch
+ breakpoint, not a data watchpoint. FIXME when PMON provides
+ some way to tell us what type of breakpoint it is. */
int i;
- CORE_ADDR pc = read_pc ();
+ CORE_ADDR pc = regcache_read_pc (get_current_regcache ());
hit_watchpoint = 1;
for (i = 0; i < MAX_LSI_BREAKPOINTS; i++)
is not a normal breakpoint. */
if (strcmp (target_shortname, "lsi") == 0)
{
- char *func_name;
+ const char *func_name;
CORE_ADDR func_start;
- CORE_ADDR pc = read_pc ();
+ CORE_ADDR pc = regcache_read_pc (get_current_regcache ());
find_pc_partial_function (pc, &func_name, &func_start, NULL);
if (func_name != NULL && strcmp (func_name, "_exit") == 0
#define REGNO_OFFSET 96
static int
-mips_map_regno (int regno)
+mips_map_regno (struct gdbarch *gdbarch, int regno)
{
if (regno < 32)
return regno;
- if (regno >= mips_regnum (current_gdbarch)->fp0
- && regno < mips_regnum (current_gdbarch)->fp0 + 32)
- return regno - mips_regnum (current_gdbarch)->fp0 + 32;
- else if (regno == mips_regnum (current_gdbarch)->pc)
+ if (regno >= mips_regnum (gdbarch)->fp0
+ && regno < mips_regnum (gdbarch)->fp0 + 32)
+ return regno - mips_regnum (gdbarch)->fp0 + 32;
+ else if (regno == mips_regnum (gdbarch)->pc)
return REGNO_OFFSET + 0;
- else if (regno == mips_regnum (current_gdbarch)->cause)
+ else if (regno == mips_regnum (gdbarch)->cause)
return REGNO_OFFSET + 1;
- else if (regno == mips_regnum (current_gdbarch)->hi)
+ else if (regno == mips_regnum (gdbarch)->hi)
return REGNO_OFFSET + 2;
- else if (regno == mips_regnum (current_gdbarch)->lo)
+ else if (regno == mips_regnum (gdbarch)->lo)
return REGNO_OFFSET + 3;
- else if (regno == mips_regnum (current_gdbarch)->fp_control_status)
+ else if (regno == mips_regnum (gdbarch)->fp_control_status)
return REGNO_OFFSET + 4;
- else if (regno == mips_regnum (current_gdbarch)->fp_implementation_revision)
+ else if (regno == mips_regnum (gdbarch)->fp_implementation_revision)
return REGNO_OFFSET + 5;
else
/* FIXME: Is there a way to get the status register? */
/* Fetch the remote registers. */
static void
-mips_fetch_registers (struct regcache *regcache, int regno)
+mips_fetch_registers (struct target_ops *ops,
+ struct regcache *regcache, int regno)
{
- unsigned LONGEST val;
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+ ULONGEST val;
int err;
if (regno == -1)
{
- for (regno = 0; regno < NUM_REGS; regno++)
- mips_fetch_registers (regcache, regno);
+ for (regno = 0; regno < gdbarch_num_regs (gdbarch); regno++)
+ mips_fetch_registers (ops, regcache, regno);
return;
}
- if (regno == DEPRECATED_FP_REGNUM || regno == MIPS_ZERO_REGNUM)
- /* DEPRECATED_FP_REGNUM on the mips is a hack which is just
+ if (regno == gdbarch_deprecated_fp_regnum (gdbarch)
+ || regno == MIPS_ZERO_REGNUM)
+ /* gdbarch_deprecated_fp_regnum on the mips is a hack which is just
supposed to read zero (see also mips-nat.c). */
val = 0;
else
{
/* If PMON doesn't support this register, don't waste serial
bandwidth trying to read it. */
- int pmon_reg = mips_map_regno (regno);
+ int pmon_reg = mips_map_regno (gdbarch, regno);
+
if (regno != 0 && pmon_reg == 0)
val = 0;
else
{
/* Unfortunately the PMON version in the Vr4300 board has been
- compiled without the 64bit register access commands. This
- means we cannot get hold of the full register width. */
- if (mips_monitor == MON_DDB)
- val = (unsigned) mips_request ('t', pmon_reg, 0,
- &err, mips_receive_wait, NULL);
+ compiled without the 64bit register access commands. This
+ means we cannot get hold of the full register width. */
+ if (mips_monitor == MON_DDB || mips_monitor == MON_ROCKHOPPER)
+ val = mips_request ('t', pmon_reg, 0,
+ &err, mips_receive_wait, NULL);
else
val = mips_request ('r', pmon_reg, 0,
&err, mips_receive_wait, NULL);
if (err)
- mips_error ("Can't read register %d: %s", regno,
+ mips_error (_("Can't read register %d: %s"), regno,
safe_strerror (errno));
}
}
- {
- char buf[MAX_REGISTER_SIZE];
-
- /* We got the number the register holds, but gdb expects to see a
- value in the target byte ordering. */
- store_unsigned_integer (buf, register_size (current_gdbarch, regno), val);
- regcache_raw_supply (regcache, regno, buf);
- }
+ mips_set_register (regno, val);
}
/* Prepare to store registers. The MIPS protocol can store individual
registers, so this function doesn't have to do anything. */
static void
-mips_prepare_to_store (struct regcache *regcache)
+mips_prepare_to_store (struct target_ops *self, struct regcache *regcache)
{
}
/* Store remote register(s). */
static void
-mips_store_registers (struct regcache *regcache, int regno)
+mips_store_registers (struct target_ops *ops,
+ struct regcache *regcache, int regno)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
ULONGEST val;
int err;
if (regno == -1)
{
- for (regno = 0; regno < NUM_REGS; regno++)
- mips_store_registers (regcache, regno);
+ for (regno = 0; regno < gdbarch_num_regs (gdbarch); regno++)
+ mips_store_registers (ops, regcache, regno);
return;
}
regcache_cooked_read_unsigned (regcache, regno, &val);
- mips_request ('R', mips_map_regno (regno), val,
+ mips_request (mips_monitor == MON_ROCKHOPPER ? 'T' : 'R',
+ mips_map_regno (gdbarch, regno),
+ val,
&err, mips_receive_wait, NULL);
if (err)
- mips_error ("Can't write register %d: %s", regno, safe_strerror (errno));
+ mips_error (_("Can't write register %d: %s"), regno,
+ safe_strerror (errno));
}
-/* Fetch a word from the target board. */
+/* Fetch a word from the target board. Return word fetched in location
+ addressed by VALP. Return 0 when successful; return positive error
+ code when not. */
-static unsigned int
-mips_fetch_word (CORE_ADDR addr)
+static int
+mips_fetch_word (CORE_ADDR addr, unsigned int *valp)
{
- unsigned int val;
int err;
- val = mips_request ('d', addr, 0, &err, mips_receive_wait, NULL);
+ *valp = mips_request ('d', addr, 0, &err, mips_receive_wait, NULL);
if (err)
{
/* Data space failed; try instruction space. */
- val = mips_request ('i', addr, 0, &err,
- mips_receive_wait, NULL);
- if (err)
- mips_error ("Can't read address 0x%s: %s",
- paddr_nz (addr), safe_strerror (errno));
+ *valp = mips_request ('i', addr, 0, &err,
+ mips_receive_wait, NULL);
}
- return val;
+ return err;
}
/* Store a word to the target board. Returns errno code or zero for
success. If OLD_CONTENTS is non-NULL, put the old contents of that
memory location there. */
-/* FIXME! make sure only 32-bit quantities get stored! */
+/* FIXME! make sure only 32-bit quantities get stored! */
static int
-mips_store_word (CORE_ADDR addr, unsigned int val, char *old_contents)
+mips_store_word (CORE_ADDR addr, unsigned int val, int *old_contents)
{
int err;
unsigned int oldcontents;
return errno;
}
if (old_contents != NULL)
- store_unsigned_integer (old_contents, 4, oldcontents);
+ *old_contents = oldcontents;
return 0;
}
-/* Read or write LEN bytes from inferior memory at MEMADDR,
- transferring to or from debugger address MYADDR. Write to inferior
- if SHOULD_WRITE is nonzero. Returns length of data written or
- read; 0 for error. Note that protocol gives us the correct value
- for a longword, since it transfers values in ASCII. We want the
- byte values, so we have to swap the longword values. */
+/* Helper for mips_xfer_partial that handles memory transfers.
+ Arguments are like target_xfer_partial. Note that the protocol
+ gives us the correct value for a longword, since it transfers
+ values in ASCII. We want the byte values, so we have to swap the
+ longword values. */
static int mask_address_p = 1;
-static int
-mips_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write,
- struct mem_attrib *attrib, struct target_ops *target)
+static enum target_xfer_status
+mips_xfer_memory (gdb_byte *readbuf, const gdb_byte *writebuf,
+ ULONGEST memaddr, ULONGEST len, ULONGEST *xfered_len)
{
+ enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
int i;
CORE_ADDR addr;
int count;
- char *buffer;
+ gdb_byte *buffer;
int status;
/* PMON targets do not cope well with 64 bit addresses. Mask the
- value down to 32 bits. */
+ value down to 32 bits. */
if (mask_address_p)
memaddr &= (CORE_ADDR) 0xffffffff;
/* Allocate buffer of that many longwords. */
buffer = alloca (count * 4);
- if (write)
+ if (writebuf != NULL)
{
/* Fill start and end extra bytes of buffer with existing data. */
if (addr != memaddr || len < 4)
{
+ unsigned int val;
+
+ if (mips_fetch_word (addr, &val))
+ return TARGET_XFER_E_IO;
+
/* Need part of initial word -- fetch it. */
- store_unsigned_integer (&buffer[0], 4, mips_fetch_word (addr));
+ store_unsigned_integer (&buffer[0], 4, byte_order, val);
}
if (count > 1)
{
+ unsigned int val;
+
/* Need part of last word -- fetch it. FIXME: we do this even
if we don't need it. */
- store_unsigned_integer (&buffer[(count - 1) * 4], 4,
- mips_fetch_word (addr + (count - 1) * 4));
+ if (mips_fetch_word (addr + (count - 1) * 4, &val))
+ return TARGET_XFER_E_IO;
+
+ store_unsigned_integer (&buffer[(count - 1) * 4],
+ 4, byte_order, val);
}
- /* Copy data to be written over corresponding part of buffer */
+ /* Copy data to be written over corresponding part of buffer. */
- memcpy ((char *) buffer + (memaddr & 3), myaddr, len);
+ memcpy ((char *) buffer + (memaddr & 3), writebuf, len);
/* Write the entire buffer. */
for (i = 0; i < count; i++, addr += 4)
{
- status = mips_store_word (addr,
- extract_unsigned_integer (&buffer[i * 4], 4),
- NULL);
- /* Report each kilobyte (we download 32-bit words at a time) */
+ int word;
+
+ word = extract_unsigned_integer (&buffer[i * 4], 4, byte_order);
+ status = mips_store_word (addr, word, NULL);
+ /* Report each kilobyte (we download 32-bit words at a time). */
if (i % 256 == 255)
{
printf_unfiltered ("*");
gdb_flush (gdb_stdout);
}
if (status)
- {
- errno = status;
- return 0;
- }
+ return TARGET_XFER_E_IO;
/* FIXME: Do we want a QUIT here? */
}
if (count >= 256)
}
else
{
- /* Read all the longwords */
+ /* Read all the longwords. */
for (i = 0; i < count; i++, addr += 4)
{
- store_unsigned_integer (&buffer[i * 4], 4, mips_fetch_word (addr));
+ unsigned int val;
+
+ if (mips_fetch_word (addr, &val))
+ return TARGET_XFER_E_IO;
+
+ store_unsigned_integer (&buffer[i * 4], 4, byte_order, val);
QUIT;
}
/* Copy appropriate bytes out of the buffer. */
- memcpy (myaddr, buffer + (memaddr & 3), len);
+ memcpy (readbuf, buffer + (memaddr & 3), len);
}
return len;
}
+/* Target to_xfer_partial implementation. */
+
+static enum target_xfer_status
+mips_xfer_partial (struct target_ops *ops, enum target_object object,
+ const char *annex, gdb_byte *readbuf,
+ const gdb_byte *writebuf, ULONGEST offset, ULONGEST len,
+ ULONGEST *xfered_len)
+{
+ switch (object)
+ {
+ case TARGET_OBJECT_MEMORY:
+ return mips_xfer_memory (readbuf, writebuf, offset, len, xfered_len);
+
+ default:
+ return ops->beneath->to_xfer_partial (ops->beneath, object, annex,
+ readbuf, writebuf, offset, len,
+ xfered_len);
+ }
+}
+
/* Print info on this target. */
static void
right port, we could interrupt the process with a break signal. */
static void
-mips_kill (void)
+mips_kill (struct target_ops *ops)
{
if (!mips_wait_flag)
- return;
+ {
+ target_mourn_inferior ();
+ return;
+ }
interrupt_count++;
target_terminal_ours ();
- if (query ("Interrupted while waiting for the program.\n\
-Give up (and stop debugging it)? "))
+ if (query (_("Interrupted while waiting for the program.\n\
+Give up (and stop debugging it)? ")))
{
- /* Clean up in such a way that mips_close won't try to talk to the
- board (it almost surely won't work since we weren't able to talk to
- it). */
+ /* Clean up in such a way that mips_close won't try to talk
+ to the board (it almost surely won't work since we
+ weren't able to talk to it). */
mips_wait_flag = 0;
close_ports ();
printf_unfiltered ("Ending remote MIPS debugging.\n");
target_mourn_inferior ();
-
- deprecated_throw_reason (RETURN_QUIT);
+ quit ();
}
target_terminal_inferior ();
serial_send_break (mips_desc);
+ target_mourn_inferior ();
+
#if 0
if (mips_is_open)
{
/* Start running on the target board. */
static void
-mips_create_inferior (char *execfile, char *args, char **env, int from_tty)
+mips_create_inferior (struct target_ops *ops, char *execfile,
+ char *args, char **env, int from_tty)
{
CORE_ADDR entry_pt;
if (args && *args)
{
- warning ("\
-Can't pass arguments to remote MIPS board; arguments ignored.");
+ warning (_("\
+Can't pass arguments to remote MIPS board; arguments ignored."));
/* And don't try to use them on the next "run" command. */
execute_command ("set args", 0);
}
if (execfile == 0 || exec_bfd == 0)
- error ("No executable file specified");
+ error (_("No executable file specified"));
entry_pt = (CORE_ADDR) bfd_get_start_address (exec_bfd);
init_wait_for_inferior ();
- /* FIXME: Should we set inferior_ptid here? */
-
- write_pc (entry_pt);
+ regcache_write_pc (get_current_regcache (), entry_pt);
}
-/* Clean up after a process. Actually nothing to do. */
+/* Clean up after a process. The bulk of the work is done in mips_close(),
+ which is called when unpushing the target. */
static void
-mips_mourn_inferior (void)
+mips_mourn_inferior (struct target_ops *ops)
{
if (current_ops != NULL)
unpush_target (current_ops);
- generic_mourn_inferior ();
}
\f
/* We can write a breakpoint and read the shadow contents in one
target contents. */
static int
-mips_insert_breakpoint (struct bp_target_info *bp_tgt)
+mips_insert_breakpoint (struct target_ops *ops, struct gdbarch *gdbarch,
+ struct bp_target_info *bp_tgt)
{
if (monitor_supports_breakpoints)
- return set_breakpoint (bp_tgt->placed_address, MIPS_INSN32_SIZE,
- BREAK_FETCH);
+ return mips_set_breakpoint (bp_tgt->placed_address, MIPS_INSN32_SIZE,
+ BREAK_FETCH);
else
- return memory_insert_breakpoint (bp_tgt);
+ return memory_insert_breakpoint (ops, gdbarch, bp_tgt);
}
+/* Remove a breakpoint. */
+
static int
-mips_remove_breakpoint (struct bp_target_info *bp_tgt)
+mips_remove_breakpoint (struct target_ops *ops, struct gdbarch *gdbarch,
+ struct bp_target_info *bp_tgt)
{
if (monitor_supports_breakpoints)
- return clear_breakpoint (bp_tgt->placed_address, MIPS_INSN32_SIZE,
- BREAK_FETCH);
+ return mips_clear_breakpoint (bp_tgt->placed_address, MIPS_INSN32_SIZE,
+ BREAK_FETCH);
else
- return memory_remove_breakpoint (bp_tgt);
+ return memory_remove_breakpoint (ops, gdbarch, bp_tgt);
}
/* Tell whether this target can support a hardware breakpoint. CNT
is the number of hardware breakpoints already installed. This
- implements the TARGET_CAN_USE_HARDWARE_WATCHPOINT macro. */
+ implements the target_can_use_hardware_watchpoint macro. */
-int
-mips_can_use_watchpoint (int type, int cnt, int othertype)
+static int
+mips_can_use_watchpoint (struct target_ops *self,
+ int type, int cnt, int othertype)
{
return cnt < MAX_LSI_BREAKPOINTS && strcmp (target_shortname, "lsi") == 0;
}
/* Set a data watchpoint. ADDR and LEN should be obvious. TYPE is 0
for a write watchpoint, 1 for a read watchpoint, or 2 for a read/write
- watchpoint. */
+ watchpoint. */
-int
-mips_insert_watchpoint (CORE_ADDR addr, int len, int type)
+static int
+mips_insert_watchpoint (struct target_ops *self,
+ CORE_ADDR addr, int len, int type,
+ struct expression *cond)
{
- if (set_breakpoint (addr, len, type))
+ if (mips_set_breakpoint (addr, len, type))
return -1;
return 0;
}
-int
-mips_remove_watchpoint (CORE_ADDR addr, int len, int type)
+/* Remove a watchpoint. */
+
+static int
+mips_remove_watchpoint (struct target_ops *self,
+ CORE_ADDR addr, int len, int type,
+ struct expression *cond)
{
- if (clear_breakpoint (addr, len, type))
+ if (mips_clear_breakpoint (addr, len, type))
return -1;
return 0;
}
-int
-mips_stopped_by_watchpoint (void)
+/* Test to see if a watchpoint has been hit. Return 1 if so; return 0,
+ if not. */
+
+static int
+mips_stopped_by_watchpoint (struct target_ops *ops)
{
return hit_watchpoint;
}
/* Insert a breakpoint. */
static int
-set_breakpoint (CORE_ADDR addr, int len, enum break_type type)
+mips_set_breakpoint (CORE_ADDR addr, int len, enum break_type type)
{
- return common_breakpoint (1, addr, len, type);
+ return mips_common_breakpoint (1, addr, len, type);
}
/* Clear a breakpoint. */
static int
-clear_breakpoint (CORE_ADDR addr, int len, enum break_type type)
+mips_clear_breakpoint (CORE_ADDR addr, int len, enum break_type type)
{
- return common_breakpoint (0, addr, len, type);
+ return mips_common_breakpoint (0, addr, len, type);
}
command. If there's no error, just return 0. If it's a warning,
print the warning text and return 0. If it's an error, print
the error text and return 1. <ADDR> is the address of the breakpoint
- that was being set. <RERRFLG> is the error code returned by PMON.
- This is a helper function for common_breakpoint. */
+ that was being set. <RERRFLG> is the error code returned by PMON.
+ This is a helper function for mips_common_breakpoint. */
static int
-check_lsi_error (CORE_ADDR addr, int rerrflg)
+mips_check_lsi_error (CORE_ADDR addr, int rerrflg)
{
struct lsi_error *err;
- char *saddr = paddr_nz (addr); /* printable address string */
+ const char *saddr = paddress (target_gdbarch (), addr);
if (rerrflg == 0) /* no error */
return 0;
if (monitor_warnings)
{
int found = 0;
+
for (err = lsi_warning_table; err->code != 0; err++)
{
if ((err->code & rerrflg) == err->code)
{
found = 1;
- fprintf_unfiltered (gdb_stderr,
- "common_breakpoint (0x%s): Warning: %s\n",
+ fprintf_unfiltered (gdb_stderr, "\
+mips_common_breakpoint (%s): Warning: %s\n",
saddr,
err->string);
}
}
if (!found)
- fprintf_unfiltered (gdb_stderr,
- "common_breakpoint (0x%s): Unknown warning: 0x%x\n",
+ fprintf_unfiltered (gdb_stderr, "\
+mips_common_breakpoint (%s): Unknown warning: 0x%x\n",
saddr,
rerrflg);
}
{
if ((err->code & rerrflg) == err->code)
{
- fprintf_unfiltered (gdb_stderr,
- "common_breakpoint (0x%s): Error: %s\n",
+ fprintf_unfiltered (gdb_stderr, "\
+mips_common_breakpoint (%s): Error: %s\n",
saddr,
err->string);
return 1;
}
}
- fprintf_unfiltered (gdb_stderr,
- "common_breakpoint (0x%s): Unknown error: 0x%x\n",
+ fprintf_unfiltered (gdb_stderr, "\
+mips_common_breakpoint (%s): Unknown error: 0x%x\n",
saddr,
rerrflg);
return 1;
Return 0 if successful; otherwise 1. */
static int
-common_breakpoint (int set, CORE_ADDR addr, int len, enum break_type type)
+mips_common_breakpoint (int set, CORE_ADDR addr, int len, enum break_type type)
{
+ int addr_size = gdbarch_addr_bit (target_gdbarch ()) / 8;
char buf[DATA_MAXLEN + 1];
char cmd, rcmd;
int rpid, rerrflg, rresponse, rlen;
int nfields;
- addr = ADDR_BITS_REMOVE (addr);
+ addr = gdbarch_addr_bits_remove (target_gdbarch (), addr);
if (mips_monitor == MON_LSI)
{
/* Clear the table entry and tell PMON to clear the breakpoint. */
if (i == MAX_LSI_BREAKPOINTS)
{
- warning ("common_breakpoint: Attempt to clear bogus breakpoint at %s\n",
- paddr_nz (addr));
+ warning (_("\
+mips_common_breakpoint: Attempt to clear bogus breakpoint at %s"),
+ paddress (target_gdbarch (), addr));
return 1;
}
nfields = sscanf (buf, "0x%x b 0x0 0x%x", &rpid, &rerrflg);
if (nfields != 2)
- mips_error ("common_breakpoint: Bad response from remote board: %s", buf);
+ mips_error (_("mips_common_breakpoint: "
+ "Bad response from remote board: %s"),
+ buf);
- return (check_lsi_error (addr, rerrflg));
+ return (mips_check_lsi_error (addr, rerrflg));
}
else
/* set a breakpoint */
succesful completion, other values indicate various
errors and warnings.
- Possible return codes: OK, W_QAL, E_QAL, E_OUT, E_NON.
-
- */
+ Possible return codes: OK, W_QAL, E_QAL, E_OUT, E_NON. */
if (type == BREAK_FETCH) /* instruction breakpoint */
{
cmd = 'B';
- sprintf (buf, "0x0 B 0x%s 0x0", paddr_nz (addr));
+ sprintf (buf, "0x0 B 0x%s 0x0", phex_nz (addr, addr_size));
}
else
/* watchpoint */
{
cmd = 'A';
- sprintf (buf, "0x0 A 0x%s 0x%x 0x%s", paddr_nz (addr),
- type == BREAK_READ ? 1 : (type == BREAK_WRITE ? 2 : 3),
- paddr_nz (addr + len - 1));
+ sprintf (buf, "0x0 A 0x%s 0x%x 0x%s",
+ phex_nz (addr, addr_size),
+ type == BREAK_READ ? 1 : (type == BREAK_WRITE ? 2 : 3),
+ phex_nz (addr + len - 1, addr_size));
}
mips_send_packet (buf, 1);
nfields = sscanf (buf, "0x%x %c 0x%x 0x%x",
&rpid, &rcmd, &rresponse, &rerrflg);
if (nfields != 4 || rcmd != cmd || rresponse > 255)
- mips_error ("common_breakpoint: Bad response from remote board: %s", buf);
+ mips_error (_("mips_common_breakpoint: "
+ "Bad response from remote board: %s"),
+ buf);
if (rerrflg != 0)
- if (check_lsi_error (addr, rerrflg))
+ if (mips_check_lsi_error (addr, rerrflg))
return 1;
/* rresponse contains PMON's breakpoint number. Record the
/* On non-LSI targets, the breakpoint command has this form:
0x0 <CMD> <ADDR> <MASK> <FLAGS>
<MASK> is a don't care mask for addresses.
- <FLAGS> is any combination of `r', `w', or `f' for read/write/fetch.
- */
+ <FLAGS> is any combination of `r', `w', or `f' for
+ read/write/fetch. */
+
unsigned long mask;
mask = calculate_mask (addr, len);
if (set) /* set a breakpoint */
{
char *flags;
+
switch (type)
{
case BREAK_WRITE: /* write */
flags = "f";
break;
default:
- internal_error (__FILE__, __LINE__, _("failed internal consistency check"));
+ internal_error (__FILE__, __LINE__,
+ _("failed internal consistency check"));
}
cmd = 'B';
- sprintf (buf, "0x0 B 0x%s 0x%s %s", paddr_nz (addr),
- paddr_nz (mask), flags);
+ sprintf (buf, "0x0 B 0x%s 0x%s %s", phex_nz (addr, addr_size),
+ phex_nz (mask, addr_size), flags);
}
else
{
cmd = 'b';
- sprintf (buf, "0x0 b 0x%s", paddr_nz (addr));
+ sprintf (buf, "0x0 b 0x%s", phex_nz (addr, addr_size));
}
mips_send_packet (buf, 1);
&rpid, &rcmd, &rerrflg, &rresponse);
if (nfields != 4 || rcmd != cmd)
- mips_error ("common_breakpoint: Bad response from remote board: %s",
+ mips_error (_("mips_common_breakpoint: "
+ "Bad response from remote board: %s"),
buf);
if (rerrflg != 0)
if (mips_monitor == MON_DDB)
rresponse = rerrflg;
if (rresponse != 22) /* invalid argument */
- fprintf_unfiltered (gdb_stderr,
- "common_breakpoint (0x%s): Got error: 0x%x\n",
- paddr_nz (addr), rresponse);
+ fprintf_unfiltered (gdb_stderr, "\
+mips_common_breakpoint (%s): Got error: 0x%x\n",
+ paddress (target_gdbarch (), addr), rresponse);
return 1;
}
}
return 0;
}
\f
+/* Send one S record as specified by SREC of length LEN, starting
+ at ADDR. Note, however, that ADDR is not used except to provide
+ a useful message to the user in the event that a NACK is received
+ from the board. */
+
static void
send_srec (char *srec, int len, CORE_ADDR addr)
{
switch (ch)
{
case SERIAL_TIMEOUT:
- error ("Timeout during download.");
+ error (_("Timeout during download."));
break;
case 0x6: /* ACK */
return;
case 0x15: /* NACK */
- fprintf_unfiltered (gdb_stderr, "Download got a NACK at byte %s! Retrying.\n", paddr_u (addr));
+ fprintf_unfiltered (gdb_stderr,
+ "Download got a NACK at byte %s! Retrying.\n",
+ paddress (target_gdbarch (), addr));
continue;
default:
- error ("Download got unexpected ack char: 0x%x, retrying.\n", ch);
+ error (_("Download got unexpected ack char: 0x%x, retrying."),
+ ch);
}
}
}
-/* Download a binary file by converting it to S records. */
+/* Download a binary file by converting it to S records. */
static void
mips_load_srec (char *args)
{
bfd *abfd;
asection *s;
- char *buffer, srec[1024];
+ char srec[1024];
+ bfd_byte *buffer;
unsigned int i;
unsigned int srec_frame = 200;
int reclen;
+ struct cleanup *cleanup;
static int hashmark = 1;
buffer = alloca (srec_frame * 2 + 256);
- abfd = bfd_openr (args, 0);
+ abfd = gdb_bfd_open (args, NULL, -1);
if (!abfd)
{
printf_filtered ("Unable to open file %s\n", args);
return;
}
+ cleanup = make_cleanup_bfd_unref (abfd);
if (bfd_check_format (abfd, bfd_object) == 0)
{
printf_filtered ("File is not an object file\n");
+ do_cleanups (cleanup);
return;
}
{
unsigned int numbytes;
- /* FIXME! vma too small????? */
+ /* FIXME! vma too small????? */
printf_filtered ("%s\t: 0x%4lx .. 0x%4lx ", s->name,
(long) s->vma,
(long) (s->vma + bfd_get_section_size (s)));
send_srec (srec, reclen, abfd->start_address);
serial_flush_input (mips_desc);
+ do_cleanups (cleanup);
}
/*
- * mips_make_srec -- make an srecord. This writes each line, one at a
+ * mips_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:
*
*
* Where
* - length
- * is the number of bytes following upto the checksum. Note that
+ * 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
unsigned char checksum;
int i;
- /* 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. */
+ /* 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. */
- /* FIXME!! bigger buf required for 64-bit! */
+ /* FIXME!! bigger buf required for 64-bit! */
buf[0] = 'S';
buf[1] = type;
buf[2] = len + 4 + 1; /* len + 4 byte address + 1 byte checksum */
- /* This assumes S3 style downloads (4byte addresses). There should
+ /* This assumes S3 style downloads (4byte addresses). There should
probably be a check, or the code changed to make it more
- explicit. */
+ explicit. */
buf[3] = memaddr >> 24;
buf[4] = memaddr >> 16;
buf[5] = memaddr >> 8;
hexified data. It includes the length, address and the data
portions of the packet. */
checksum = 0;
- buf += 2; /* Point at length byte */
+ buf += 2; /* Point at length byte. */
for (i = 0; i < len + 4 + 1; i++)
checksum += *buf++;
}
/* The following manifest controls whether we enable the simple flow
- control support provided by the monitor. If enabled the code will
- wait for an affirmative ACK between transmitting packets. */
+ control support provided by the monitor. If enabled the code will
+ wait for an affirmative ACK between transmitting packets. */
#define DOETXACK (1)
/* The PMON fast-download uses an encoded packet format constructed of
'K' clear checksum
'C' compare checksum (12bit value, not included in checksum calculation)
- 'S' define symbol name (for addr) terminated with "," and padded to 4char boundary
+ 'S' define symbol name (for addr) terminated with ","
+ and padded to 4char boundary
'Z' zero fill multiple of 3bytes
'B' byte (12bit encoded value, of 8bit data)
'A' address (36bit encoded value)
The encoding of numbers is done in 6bit fields. The 6bit value is
used to index into this string to get the specific character
encoding for the value: */
-static char encoding[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789,.";
+static char encoding[] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789,.";
/* Convert the number of bits required into an encoded number, 6bits
at a time (range 0..63). Keep a checksum if required (passed
- pointer non-NULL). The function returns the number of encoded
- characters written into the buffer. */
+ pointer non-NULL). The function returns the number of encoded
+ characters written into the buffer. */
+
static int
-pmon_makeb64 (unsigned long v, char *p, int n, int *chksum)
+pmon_makeb64 (unsigned long v, char *p, int n, unsigned int *chksum)
{
int count = (n / 6);
if ((n % 12) != 0)
{
fprintf_unfiltered (gdb_stderr,
- "Fast encoding bitcount must be a multiple of 12bits: %dbit%s\n", n, (n == 1) ? "" : "s");
+ "Fast encoding bitcount must be a "
+ "multiple of 12bits: %dbit%s\n",
+ n, (n == 1) ? "" : "s");
return (0);
}
if (n > 36)
{
fprintf_unfiltered (gdb_stderr,
- "Fast encoding cannot process more than 36bits at the moment: %dbits\n", n);
+ "Fast encoding cannot process more "
+ "than 36bits at the moment: %dbits\n", n);
return (0);
}
}
/* Shorthand function (that could be in-lined) to output the zero-fill
- escape sequence into the data stream. */
+ escape sequence into the data stream. */
+
static int
-pmon_zeroset (int recsize, char **buff, int *amount, unsigned int *chksum)
+pmon_zeroset (int recsize, char **buff,
+ unsigned int *amount, unsigned int *chksum)
{
int count;
return (recsize + count + 2);
}
+/* Add the checksum specified by *VALUE to end of the record under
+ construction. *BUF specifies the location at which to begin
+ writing characters comprising the checksum information. RECSIZE
+ specifies the size of the record constructed thus far. (A trailing
+ NUL character may be present in the buffer holding the record, but
+ the record size does not include this character.)
+
+ Return the total size of the record after adding the checksum escape,
+ the checksum itself, and the trailing newline.
+
+ The checksum specified by *VALUE is zeroed out prior to returning.
+ Additionally, *BUF is updated to refer to the location just beyond
+ the record elements added by this call. */
+
static int
-pmon_checkset (int recsize, char **buff, int *value)
+pmon_checkset (int recsize, char **buff, unsigned int *value)
{
int count;
count = pmon_makeb64 (*value, (*buff + 2), 12, NULL);
*buff += (count + 2);
sprintf (*buff, "\n");
- *buff += 2; /* include zero terminator */
+ *buff += 2; /* Include zero terminator. */
/* Forcing a checksum validation clears the sum: */
*value = 0;
return (recsize + count + 3);
/* Amount of padding we leave after at the end of the output buffer,
for the checksum and line termination characters: */
#define CHECKSIZE (4 + 4 + 4 + 2)
-/* zero-fill, checksum, transfer end and line termination space. */
+/* zero-fill, checksum, transfer end and line termination space. */
/* The amount of binary data loaded from the object file in a single
operation: */
/* Maximum line of data accepted by the monitor: */
#define MAXRECSIZE (550)
-/* NOTE: This constant depends on the monitor being used. This value
- is for PMON 5.x on the Cogent Vr4300 board. */
+/* NOTE: This constant depends on the monitor being used. This value
+ is for PMON 5.x on the Cogent Vr4300 board. */
+
+/* Create a FastLoad format record.
+
+ *OUTBUF is the buffer into which a FastLoad formatted record is
+ written. On return, the pointer position represented by *OUTBUF
+ is updated to point at the end of the data, i.e. the next position
+ in the buffer that may be written. No attempt is made to NUL-
+ terminate this portion of the record written to the buffer.
+
+ INBUF contains the binary input data from which the FastLoad
+ formatted record will be built. *INPTR is an index into this
+ buffer. *INPTR is updated as the input is consumed. Thus, on
+ return, the caller has access to the position of the next input
+ byte yet to be processed. INAMOUNT is the size, in bytes, of the
+ input data.
+
+ *RECSIZE will be written with the size of the record written to the
+ output buffer prior to returning. This size does not include a
+ NUL-termination byte as none is written to the output buffer.
+
+ *CSUM is the output buffer checksum. It is updated as data is
+ written to the output buffer.
+
+ *ZEROFILL is the current number of 3-byte zero sequences that have
+ been encountered. It is both an input and an output to this
+ function. */
static void
pmon_make_fastrec (char **outbuf, unsigned char *inbuf, int *inptr,
char *p = *outbuf;
/* This is a simple check to ensure that our data will fit within
- the maximum allowable record size. Each record output is 4bytes
- in length. We must allow space for a pending zero fill command,
- the record, and a checksum record. */
+ the maximum allowable record size. Each record output is 4bytes
+ in length. We must allow space for a pending zero fill command,
+ the record, and a checksum record. */
while ((*recsize < (MAXRECSIZE - CHECKSIZE)) && ((inamount - *inptr) > 0))
{
/* Process the binary data: */
}
else
{
- unsigned int value = ((inbuf[*inptr + 0] << 16) | (inbuf[*inptr + 1] << 8) | inbuf[*inptr + 2]);
- /* Simple check for zero data. TODO: A better check would be
+ unsigned int value = ((inbuf[*inptr + 0] << 16)
+ | (inbuf[*inptr + 1] << 8)
+ | (inbuf[*inptr + 2]));
+
+ /* Simple check for zero data. TODO: A better check would be
to check the last, and then the middle byte for being zero
- (if the first byte is not). We could then check for
+ (if the first byte is not). We could then check for
following runs of zeros, and if above a certain size it is
worth the 4 or 8 character hit of the byte insertions used
- to pad to the start of the zeroes. NOTE: This also depends
- on the alignment at the end of the zero run. */
+ to pad to the start of the zeroes. NOTE: This also depends
+ on the alignment at the end of the zero run. */
if (value == 0x00000000)
{
(*zerofill)++;
return;
}
+/* Attempt to read an ACK. If an ACK is not read in a timely manner,
+ output the message specified by MESG. Return -1 for failure, 0
+ for success. */
+
static int
pmon_check_ack (char *mesg)
{
{
fprintf_unfiltered (gdb_stderr,
"Failed to receive valid ACK for %s\n", mesg);
- return (-1); /* terminate the download */
+ return (-1); /* Terminate the download. */
}
}
#endif /* DOETXACK */
}
}
+/* Look for the string specified by STRING sent from the target board
+ during a download operation. If the string in question is not
+ seen, output an error message, remove the temporary file, if
+ appropriate, and return 0. Otherwise, return 1 to indicate
+ success. */
+
static int
mips_expect_download (char *string)
{
{
fprintf_unfiltered (gdb_stderr, "Load did not complete successfully.\n");
if (tftp_in_use)
- remove (tftp_localname); /* Remove temporary file */
+ remove (tftp_localname); /* Remove temporary file. */
return 0;
}
else
return 1;
}
+/* Look for messages from the target board associated with the entry
+ address.
+
+ NOTE: This function doesn't indicate success or failure, so we
+ have no way to determine whether or not the output from the board
+ was correctly seen. However, given that other items are checked
+ after this, it seems unlikely that those checks will pass if this
+ check doesn't first (silently) pass. */
+
static void
pmon_check_entry_address (char *entry_address, int final)
{
- char hexnumber[9]; /* includes '\0' space */
+ char hexnumber[9]; /* Includes '\0' space. */
+
mips_expect_timeout (entry_address, tftp_in_use ? 15 : remote_timeout);
sprintf (hexnumber, "%x", final);
mips_expect (hexnumber);
mips_expect ("\r\n");
}
+/* Look for messages from the target board showing the total number of
+ bytes downloaded to the board. Output 1 for success if the tail
+ end of the message was read correctly, 0 otherwise. */
+
static int
pmon_check_total (int bintotal)
{
- char hexnumber[9]; /* includes '\0' space */
+ char hexnumber[9]; /* Includes '\0' space. */
+
mips_expect ("\r\ntotal = 0x");
sprintf (hexnumber, "%x", bintotal);
mips_expect (hexnumber);
return mips_expect_download (" bytes\r\n");
}
+/* Look for the termination messages associated with the end of
+ a download to the board.
+
+ Also, when `tftp_in_use' is set, issue the load command to the
+ board causing the file to be transferred. (This is done prior
+ to looking for the above mentioned termination messages.) */
+
static void
pmon_end_download (int final, int bintotal)
{
- char hexnumber[9]; /* includes '\0' space */
+ char hexnumber[9]; /* Includes '\0' space. */
if (tftp_in_use)
{
chmod (tftp_localname, stbuf.st_mode | S_IROTH);
/* Must reinitialize the board to prevent PMON from crashing. */
- mips_send_command ("initEther\r", -1);
+ if (mips_monitor != MON_ROCKHOPPER)
+ mips_send_command ("initEther\r", -1);
/* Send the load command. */
cmd = xmalloc (strlen (load_cmd_prefix) + strlen (tftp_name) + 2);
/* Wait for the stuff that PMON prints after the load has completed.
The timeout value for use in the tftp case (15 seconds) was picked
- arbitrarily but might be too small for really large downloads. FIXME. */
+ arbitrarily but might be too small for really large downloads. FIXME. */
switch (mips_monitor)
{
case MON_LSI:
if (!pmon_check_total (bintotal))
return;
break;
+ case MON_ROCKHOPPER:
+ if (!pmon_check_total (bintotal))
+ return;
+ pmon_check_entry_address ("Entry Address = ", final);
+ break;
default:
pmon_check_entry_address ("Entry Address = ", final);
pmon_check_ack ("termination");
}
if (tftp_in_use)
- remove (tftp_localname); /* Remove temporary file */
+ remove (tftp_localname); /* Remove temporary file. */
}
+/* Write the buffer specified by BUFFER of length LENGTH to either
+ the board or the temporary file that'll eventually be transferred
+ to the board. */
+
static void
pmon_download (char *buffer, int length)
{
if (tftp_in_use)
- fwrite (buffer, 1, length, tftp_file);
+ {
+ size_t written;
+
+ written = fwrite (buffer, 1, length, tftp_file);
+ if (written < length)
+ perror_with_name (tftp_localname);
+ }
else
serial_write (udp_in_use ? udp_desc : mips_desc, buffer, length);
}
+/* Open object or executable file, FILE, and send it to the board
+ using the FastLoad format. */
+
static void
pmon_load_fast (char *file)
{
int bintotal = 0;
int final = 0;
int finished = 0;
+ struct cleanup *cleanup;
buffer = (char *) xmalloc (MAXRECSIZE + 1);
binbuf = (unsigned char *) xmalloc (BINCHUNK);
- abfd = bfd_openr (file, 0);
+ abfd = gdb_bfd_open (file, NULL, -1);
if (!abfd)
{
printf_filtered ("Unable to open file %s\n", file);
return;
}
+ cleanup = make_cleanup_bfd_unref (abfd);
if (bfd_check_format (abfd, bfd_object) == 0)
{
printf_filtered ("File is not an object file\n");
+ do_cleanups (cleanup);
return;
}
mips_send_command ("set dlproto etxack\r", -1);
mips_send_command ("set dlecho off\r", -1);
/* NOTE: We get a "cannot set variable" message if the variable is
- already defined to have the argument we give. The code doesn't
- care, since it just scans to the next prompt anyway. */
+ already defined to have the argument we give. The code doesn't
+ care, since it just scans to the next prompt anyway. */
/* Start the download: */
pmon_start_download ();
- /* Zero the checksum */
+ /* Zero the checksum. */
sprintf (buffer, "/Kxx\n");
reclen = strlen (buffer);
pmon_download (buffer, reclen);
finished = pmon_check_ack ("/Kxx");
for (s = abfd->sections; s && !finished; s = s->next)
- if (s->flags & SEC_LOAD) /* only deal with loadable sections */
+ if (s->flags & SEC_LOAD) /* Only deal with loadable sections. */
{
bintotal += bfd_get_section_size (s);
final = (s->vma + bfd_get_section_size (s));
- printf_filtered ("%s\t: 0x%4x .. 0x%4x ", s->name, (unsigned int) s->vma,
+ printf_filtered ("%s\t: 0x%4x .. 0x%4x ", s->name,
+ (unsigned int) s->vma,
(unsigned int) (s->vma + bfd_get_section_size (s)));
gdb_flush (gdb_stdout);
- /* Output the starting address */
+ /* Output the starting address. */
sprintf (buffer, "/A");
reclen = pmon_makeb64 (s->vma, &buffer[2], 36, &csum);
buffer[2 + reclen] = '\n';
buffer[3 + reclen] = '\0';
- reclen += 3; /* for the initial escape code and carriage return */
+ reclen += 3; /* For the initial escape code and carriage return. */
pmon_download (buffer, reclen);
finished = pmon_check_ack ("/A");
finished = pmon_check_ack ("data record");
if (finished)
{
- zerofill = 0; /* do not transmit pending zerofills */
+ zerofill = 0; /* Do not transmit pending
+ zerofills. */
break;
}
putchar_unfiltered ('\n');
}
- /* Terminate the transfer. We know that we have an empty output
- buffer at this point. */
- sprintf (buffer, "/E/E\n"); /* include dummy padding characters */
+ /* Terminate the transfer. We know that we have an empty output
+ buffer at this point. */
+ sprintf (buffer, "/E/E\n"); /* Include dummy padding characters. */
reclen = strlen (buffer);
pmon_download (buffer, reclen);
pmon_end_download (final, bintotal);
}
+ do_cleanups (cleanup);
return;
}
-/* mips_load -- download a file. */
+/* mips_load -- download a file. */
static void
-mips_load (char *file, int from_tty)
+mips_load (struct target_ops *self, char *file, int from_tty)
{
+ struct regcache *regcache;
+
/* Get the board out of remote debugging mode. */
if (mips_exit_debug ())
- error ("mips_load: Couldn't get into monitor mode.");
+ error (_("mips_load: Couldn't get into monitor mode."));
if (mips_monitor != MON_IDT)
pmon_load_fast (file);
mips_initialize ();
- /* Finally, make the PC point at the start address */
+ /* Finally, make the PC point at the start address. */
+ regcache = get_current_regcache ();
if (mips_monitor != MON_IDT)
{
/* Work around problem where PMON monitor updates the PC after a load
- to a different value than GDB thinks it has. The following ensures
- that the write_pc() WILL update the PC value: */
- deprecated_register_valid[PC_REGNUM] = 0;
+ to a different value than GDB thinks it has. The following ensures
+ that the regcache_write_pc() WILL update the PC value: */
+ regcache_invalidate (regcache,
+ mips_regnum (get_regcache_arch (regcache))->pc);
}
if (exec_bfd)
- write_pc (bfd_get_start_address (exec_bfd));
-
- inferior_ptid = null_ptid; /* No process now */
+ regcache_write_pc (regcache, bfd_get_start_address (exec_bfd));
+}
-/* 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... */
+/* Check to see if a thread is still alive. */
+
+static int
+mips_thread_alive (struct target_ops *ops, ptid_t ptid)
+{
+ if (ptid_equal (ptid, remote_mips_ptid))
+ /* The monitor's task is always alive. */
+ return 1;
- clear_symtab_users ();
+ return 0;
}
+/* Convert a thread ID to a string. Returns the string in a static
+ buffer. */
+
+static char *
+mips_pid_to_str (struct target_ops *ops, ptid_t ptid)
+{
+ static char buf[64];
+
+ if (ptid_equal (ptid, remote_mips_ptid))
+ {
+ xsnprintf (buf, sizeof buf, "Thread <main>");
+ return buf;
+ }
+
+ return normal_pid_to_str (ptid);
+}
/* Pass the command argument as a packet to PMON verbatim. */
printf_filtered ("Received packet: %s\n", buf);
}
\f
-extern initialize_file_ftype _initialize_remote_mips; /* -Wmissing-prototypes */
+/* -Wmissing-prototypes */
+extern initialize_file_ftype _initialize_remote_mips;
+
+/* Initialize mips_ops, lsi_ops, ddb_ops, pmon_ops, and rockhopper_ops.
+ Create target specific commands and perform other initializations
+ specific to this file. */
void
_initialize_remote_mips (void)
mips_ops.to_fetch_registers = mips_fetch_registers;
mips_ops.to_store_registers = mips_store_registers;
mips_ops.to_prepare_to_store = mips_prepare_to_store;
- mips_ops.deprecated_xfer_memory = mips_xfer_memory;
+ mips_ops.to_xfer_partial = mips_xfer_partial;
mips_ops.to_files_info = mips_files_info;
mips_ops.to_insert_breakpoint = mips_insert_breakpoint;
mips_ops.to_remove_breakpoint = mips_remove_breakpoint;
mips_ops.to_load = mips_load;
mips_ops.to_create_inferior = mips_create_inferior;
mips_ops.to_mourn_inferior = mips_mourn_inferior;
+ mips_ops.to_thread_alive = mips_thread_alive;
+ mips_ops.to_pid_to_str = mips_pid_to_str;
+ mips_ops.to_log_command = serial_log_command;
mips_ops.to_stratum = process_stratum;
- mips_ops.to_has_all_memory = 1;
- mips_ops.to_has_memory = 1;
- mips_ops.to_has_stack = 1;
- mips_ops.to_has_registers = 1;
- mips_ops.to_has_execution = 1;
+ mips_ops.to_has_all_memory = default_child_has_all_memory;
+ mips_ops.to_has_memory = default_child_has_memory;
+ mips_ops.to_has_stack = default_child_has_stack;
+ mips_ops.to_has_registers = default_child_has_registers;
+ mips_ops.to_has_execution = default_child_has_execution;
mips_ops.to_magic = OPS_MAGIC;
/* Copy the common fields to all four target vectors. */
- pmon_ops = ddb_ops = lsi_ops = mips_ops;
+ rockhopper_ops = pmon_ops = ddb_ops = lsi_ops = mips_ops;
/* Initialize target-specific fields in the target vectors. */
mips_ops.to_shortname = "mips";
ddb_ops.to_open = ddb_open;
ddb_ops.to_wait = mips_wait;
+ rockhopper_ops.to_shortname = "rockhopper";
+ rockhopper_ops.to_doc = ddb_ops.to_doc;
+ rockhopper_ops.to_open = rockhopper_open;
+ rockhopper_ops.to_wait = mips_wait;
+
lsi_ops.to_shortname = "lsi";
lsi_ops.to_doc = pmon_ops.to_doc;
lsi_ops.to_open = lsi_open;
add_target (&pmon_ops);
add_target (&ddb_ops);
add_target (&lsi_ops);
+ add_target (&rockhopper_ops);
add_setshow_zinteger_cmd ("timeout", no_class, &mips_receive_wait, _("\
Set timeout in seconds for remote MIPS serial I/O."), _("\
NULL,
NULL, /* FIXME: i18n: */
&setlist, &showlist);
+ remote_mips_ptid = ptid_build (42000, 0, 42000);
}
projects / thirdparty / binutils-gdb.git / blobdiff