OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Memory_reads_inferior() and monitor_fetch_registers() now work good on

Browse Source 
both targets. On to the "set" functions...
This commit is contained in:
Rob Savoye 1994-10-11 04:37:18 +00:00
parent aa400bd250
commit 51d6a95404
4 changed files with 1062 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

988
gdb/monitor.c Normal file
View File

@ -0,0 +1,988 @@
/* Remote debugging interface for boot monitors, for GDB.
Copyright 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
Contributed by Cygnus Support. Written by Rob Savoye for Cygnus.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
/* This file was derived from various remote-* modules. It is a collection
of generic support functions so GDB can talk directly to a ROM based
monitor. This saves use from having to hack an exception based handler
into existance, and makes for quick porting.
This module talks to a debug monitor called 'MONITOR', which
We communicate with MONITOR via either a direct serial line, or a TCP
(or possibly TELNET) stream to a terminal multiplexor,
which in turn talks to the target board.
*/
#include "defs.h"
#include "gdbcore.h"
#include "target.h"
#include "wait.h"
#include <varargs.h>
#include <signal.h>
#include <string.h>
#include <sys/types.h>
#include "command.h"
#include "serial.h"
#include "monitor.h"
#include "remote-utils.h"
#ifdef HAVE_TERMIO
# define TERMINAL struct termios
#else
# define TERMINAL struct sgttyb
#endif
struct monitor_ops *current_monitor;
extern struct cmd_list_element *setlist;
extern struct cmd_list_element *unsetlist;
struct cmd_list_element *showlist;
static int hashmark; /* flag set by "set hash" */
/* FIXME: Replace with sr_get_debug (). */
#define LOG_FILE "monitor.log"
#if defined (LOG_FILE)
FILE *log_file;
#endif
static int timeout = 24;
/* Descriptor for I/O to remote machine. Initialize it to NULL so that
monitor_open knows that we don't have a file open when the program starts.
*/
static serial_t monitor_desc = NULL;
/* sets the download protocol, choices are srec, generic, boot */
char *loadtype;
static char *loadtype_str;
static void set_loadtype_command();
/*
* set_loadtype_command -- set the type for downloading. Check to make
* sure you have a support protocol for this target.
*/
static void
set_loadtype_command (ignore, from_tty, c)
char *ignore;
int from_tty;
struct cmd_list_element *c;
{
#if 0
char *type;
if (strcmp (LOADTYPES, "")) {
error ("No loadtype set");
return;
}
type = strtok(LOADTYPES, ",");
if (STREQ (type, (*(char **) c->var))) {
loadtype_str = savestring (*(char **) c->var, strlen (*(char **) c->var));
return;
}
while (type = strtok (NULL, ",") != (char *)NULL)
if (STREQ (type, (*(char **) c->var)))
loadtype_str = savestring (*(char **) c->var, strlen (*(char **) c->var));
#endif
loadtype_str = savestring (*(char **) c->var, strlen (*(char **) c->var));
}
/*
* printf_monitor -- send data to monitor. Works just like printf.
*/
static void
printf_monitor(va_alist)
va_dcl
{
va_list args;
char *pattern;
char buf[200];
int i;
va_start(args);
pattern = va_arg(args, char *);
vsprintf(buf, pattern, args);
if (sr_get_debug() > 3)
printf ("Sending to monitor,\r\n\t\"%s\".\r\n", buf);
if (SERIAL_WRITE(monitor_desc, buf, strlen(buf)))
fprintf(stderr, "SERIAL_WRITE failed: %s\n", safe_strerror(errno));
}
/* Read a character from the remote system, doing all the fancy
timeout stuff. */
static int
readchar(timeout)
int timeout;
{
int c;
c = SERIAL_READCHAR(monitor_desc, timeout);
if (sr_get_debug())
putchar(c & 0x7f);
#ifdef LOG_FILE
if (isascii (c))
putc(c & 0x7f, log_file);
#endif
if (c >= 0)
return c & 0x7f;
if (c == SERIAL_TIMEOUT)
{
if (timeout == 0)
return c; /* Polls shouldn't generate timeout errors */
error("Timeout reading from remote system.");
}
perror_with_name("remote-monitor");
}
/* Scan input from the remote system, until STRING is found. If DISCARD is
non-zero, then discard non-matching input, else print it out.
Let the user break out immediately. */
static void
expect (string, discard)
char *string;
int discard;
{
char *p = string;
int c;
if (sr_get_debug())
printf ("Expecting \"%s\".\n", string);
immediate_quit = 1;
while (1) {
c = readchar(timeout);
if (!isascii (c))
continue;
if (c == *p++) {
if (*p == '\0') {
immediate_quit = 0;
if (sr_get_debug())
printf ("\nMatched\n");
return;
}
} else {
if (!discard) {
fwrite(string, 1, (p - 1) - string, stdout);
putchar((char)c);
fflush(stdout);
}
p = string;
}
}
}
/* Keep discarding input until we see the MONITOR prompt.
The convention for dealing with the prompt is that you
o give your command
o *then* wait for the prompt.
Thus the last thing that a procedure does with the serial line
will be an expect_prompt(). Exception: monitor_resume does not
wait for the prompt, because the terminal is being handed over
to the inferior. However, the next thing which happens after that
is a monitor_wait which does wait for the prompt.
Note that this includes abnormal exit, e.g. error(). This is
necessary to prevent getting into states from which we can't
recover. */
static void
expect_prompt(discard)
int discard;
{
#if defined (LOG_FILE)
/* This is a convenient place to do this. The idea is to do it often
enough that we never lose much data if we terminate abnormally. */
fflush(log_file);
#endif
expect (PROMPT, discard);
}
/*
* junk -- ignore junk characters. Returns a 1 if junk, 0 otherwise
*/
static int
junk(ch)
char ch;
{
switch (ch) {
case ' ':
case '-':
case '\t':
case '\r':
case '\n':
if (sr_get_debug() > 5)
printf ("Ignoring \'%c\'.\n", ch);
return 1;
default:
if (sr_get_debug() > 5)
printf ("Accepting \'%c\'.\n", ch);
return 0;
}
}
/*
* get_hex_digit -- Get a hex digit from the remote system & return its value.
* If ignore is nonzero, ignore spaces, newline & tabs.
*/
static int
get_hex_digit(ignore)
int ignore;
{
static int ch;
while (1) {
ch = readchar(timeout);
if (junk(ch))
continue;
if (sr_get_debug() > 4)
printf ("get_hex_digit() got a 0x%x(%c)\n", ch, ch);
if (ch >= '0' && ch <= '9')
return ch - '0';
else if (ch >= 'A' && ch <= 'F')
return ch - 'A' + 10;
else if (ch >= 'a' && ch <= 'f')
return ch - 'a' + 10;
else if (ch == ' ' && ignore)
;
else {
expect_prompt(1);
error("Invalid hex digit from remote system.");
}
}
}
/* get_hex_byte -- Get a byte from monitor and put it in *BYT.
* Accept any number leading spaces.
*/
static void
get_hex_byte (byt)
char *byt;
{
int val;
val = get_hex_digit (1) << 4;
if (sr_get_debug() > 3)
printf ("\nget_hex_digit() -- Read first nibble 0x%x\n", val);
val |= get_hex_digit (0);
if (sr_get_debug() > 3)
printf ("\nget_hex_digit() -- Read second nibble 0x%x\n", val);
*byt = val;
if (sr_get_debug() > 3)
printf ("\nget_hex_digit() -- Read a 0x%x\n", val);
}
/*
* get_hex_word -- Get N 32-bit words from remote, each preceded by a space,
* and put them in registers starting at REGNO.
*/
static int
get_hex_word ()
{
long val;
int i;
val = 0;
for (i = 0; i < 8; i++)
val = (val << 4) + get_hex_digit (i == 0);
if (sr_get_debug() > 3)
printf ("\nget_hex_word() got a 0x%x.\n", val);
return val;
}
/* This is called not only when we first attach, but also when the
user types "run" after having attached. */
void
monitor_create_inferior (execfile, args, env)
char *execfile;
char *args;
char **env;
{
int entry_pt;
if (args && *args)
error("Can't pass arguments to remote MONITOR process");
if (execfile == 0 || exec_bfd == 0)
error("No exec file specified");
entry_pt = (int) bfd_get_start_address (exec_bfd);
#ifdef LOG_FILE
fputs ("\nIn Create_inferior()", log_file);
#endif
/* The "process" (board) is already stopped awaiting our commands, and
the program is already downloaded. We just set its PC and go. */
clear_proceed_status ();
/* Tell wait_for_inferior that we've started a new process. */
init_wait_for_inferior ();
/* Set up the "saved terminal modes" of the inferior
based on what modes we are starting it with. */
target_terminal_init ();
/* Install inferior's terminal modes. */
target_terminal_inferior ();
/* insert_step_breakpoint (); FIXME, do we need this? */
/* Let 'er rip... */
proceed ((CORE_ADDR)entry_pt, TARGET_SIGNAL_DEFAULT, 0);
}
/* Open a connection to a remote debugger.
NAME is the filename used for communication. */
static int baudrate = 9600;
static char dev_name[100];
void
monitor_open(args, name, from_tty)
char *args;
char *name;
int from_tty;
{
if (args == NULL)
error ("Use `target %s DEVICE-NAME' to use a serial port, or \n\
`target %s HOST-NAME:PORT-NUMBER' to use a network connection.", name, name);
/* if (is_open) */
monitor_close(0);
strcpy(dev_name, args);
monitor_desc = SERIAL_OPEN(dev_name);
if (monitor_desc == NULL)
perror_with_name(dev_name);
if (baud_rate != -1)
{
if (SERIAL_SETBAUDRATE (monitor_desc, baud_rate))
{
SERIAL_CLOSE (monitor_desc);
perror_with_name (name);
}
}
SERIAL_RAW(monitor_desc);
#if defined (LOG_FILE)
log_file = fopen (LOG_FILE, "w");
if (log_file == NULL)
perror_with_name (LOG_FILE);
#endif
/* wake up the monitor and see if it's alive */
printf_monitor(INIT_CMD);
expect_prompt(1); /* See if we get a prompt */
/* try again to be sure */
printf_monitor(INIT_CMD);
expect_prompt(1); /* See if we get a prompt */
if (from_tty)
printf("Remote target %s connected to %s\n", TARGET_NAME, dev_name);
}
/*
* _close -- Close out all files and local state before this target loses control.
*/
void
monitor_close (quitting)
int quitting;
{
SERIAL_CLOSE(monitor_desc);
monitor_desc = NULL;
#if defined (LOG_FILE)
if (log_file) {
if (ferror(log_file))
fprintf(stderr, "Error writing log file.\n");
if (fclose(log_file) != 0)
fprintf(stderr, "Error closing log file.\n");
}
#endif
}
/* Terminate the open connection to the remote debugger.
Use this when you want to detach and do something else
with your gdb. */
void
monitor_detach (from_tty)
int from_tty;
{
pop_target(); /* calls monitor_close to do the real work */
if (from_tty)
printf ("Ending remote %s debugging\n", target_shortname);
}
/*
* _resume -- Tell the remote machine to resume.
*/
void
monitor_resume (pid, step, sig)
int pid, step;
enum target_signal sig;
{
#ifdef LOG_FILE
fprintf (log_file, "\nIn Resume (step=%d, sig=%d)\n", step, sig);
#endif
if (step)
{
printf_monitor (STEP_CMD);
/* wait for the echo. */
expect (STEP_CMD, 1);
}
else
{
printf_monitor (GO_CMD);
/* swallow the echo. */
expect (GO_CMD, 1);
}
}
/*
* _wait -- Wait until the remote machine stops, then return,
* storing status in status just as `wait' would.
*/
int
monitor_wait (pid, status)
int pid;
struct target_waitstatus *status;
{
int old_timeout = timeout;
#ifdef LOG_FILE
fputs ("\nIn wait ()", log_file);
#endif
status->kind = TARGET_WAITKIND_EXITED;
status->value.integer = 0;
timeout = 0; /* Don't time out -- user program is running. */
expect_prompt(0); /* Wait for prompt, outputting extraneous text */
status->kind = TARGET_WAITKIND_STOPPED;
status->value.sig = TARGET_SIGNAL_TRAP;
timeout = old_timeout;
return 0;
}
/* Return the name of register number regno in the form input and output by
monitor. Currently, register_names just happens to contain exactly what
monitor wants. Lets take advantage of that just as long as possible! */
static char *
get_reg_name (regno)
int regno;
{
static char buf[50];
const char *p;
char *b;
b = buf;
if (regno < 0)
return ("");
for (p = REGNAMES(regno); *p; p++)
*b++ = tolower(*p);
*b = '\000';
if (sr_get_debug() > 5)
printf ("Got name \"%s\" from regno #%d.\n", buf, regno);
return buf;
}
/* read the remote registers into the block regs. */
void
monitor_fetch_registers ()
{
int regno;
/* yeah yeah, i know this is horribly inefficient. but it isn't done
very often... i'll clean it up later. */
for (regno = 0; regno <= PC_REGNUM; regno++)
monitor_fetch_register(regno);
}
/*
* monitor_fetch_register -- fetch register REGNO, or all registers if REGNO is -1.
* Returns errno value.
*/
void
monitor_fetch_register (regno)
int regno;
{
int val, j;
#ifdef LOG_FILE
fprintf (log_file, "\nIn Fetch Register (reg=%s)\n", get_reg_name (regno));
fflush (log_file);
#endif
if (regno < 0) {
monitor_fetch_registers ();
} else {
char *name = get_reg_name (regno);
if (STREQ(name, ""))
return;
printf_monitor (ROMCMD(GET_REG), name); /* send the command */
expect (name, 1); /* then strip the leading garbage */
if (*ROMDELIM(GET_REG) != 0) { /* if there's a delimiter */
expect (ROMDELIM(GET_REG), 1);
}
val = get_hex_word(); /* get the value, ignore junk */
supply_register (regno, (char *) &val);
if (*ROMDELIM(GET_REG) != 0) {
/*** expect (ROMRES(GET_REG)); ***/
printf_monitor (CMD_END);
}
expect_prompt (1);
}
return;
}
/* Store the remote registers from the contents of the block REGS. */
void
monitor_store_registers ()
{
int regno;
#ifdef LOG_FILE
fprintf (log_file, "\nIn Fetch Registers\n");
fflush (log_file);
#endif
for (regno = 0; regno <= PC_REGNUM; regno++)
monitor_store_register(regno);
registers_changed ();
}
/* Store register REGNO, or all if REGNO == 0.
return errno value. */
void
monitor_store_register (regno)
int regno;
{
char *name;
#ifdef LOG_FILE
fprintf (log_file, "\nIn Store_register (regno=%d)\n", regno);
#endif
if (regno < 0)
monitor_store_registers ();
else {
if (sr_get_debug() > 3)
printf ("Setting register %s to 0x%x\n", get_reg_name (regno), read_register (regno));
name = get_reg_name (regno);
if (STREQ(name, ""))
return;
printf_monitor (ROMCMD(SET_REG), name); /* send the command */
expect (name, 1); /* then strip the leading garbage */
if (*ROMDELIM(SET_REG) != 0) { /* if there's a delimiter */
expect (ROMDELIM(SET_REG), 1);
}
if (*ROMDELIM(SET_REG) != 0) {
printf_monitor ("%s%s\n",read_register(regno), CMD_END);
}
expect_prompt (1);
}
return;
#if 0
printf_monitor (SET_REG, get_reg_name (regno),
read_register (regno));
expect_prompt (1);
}
#endif
}
/* Get ready to modify the registers array. On machines which store
individual registers, this doesn't need to do anything. On machines
which store all the registers in one fell swoop, this makes sure
that registers contains all the registers from the program being
debugged. */
void
monitor_prepare_to_store ()
{
/* Do nothing, since we can store individual regs */
}
void
monitor_files_info ()
{
printf ("\tAttached to %s at %d baud.\n",
dev_name, baudrate);
}
/* Copy LEN bytes of data from debugger memory at MYADDR
to inferior's memory at MEMADDR. Returns length moved. */
int
monitor_write_inferior_memory (memaddr, myaddr, len)
CORE_ADDR memaddr;
unsigned char *myaddr;
int len;
{
int i;
char buf[10];
#ifdef LOG_FILE
fprintf (log_file, "\nIn Write_inferior_memory (memaddr=%x, len=%d)\n", memaddr, len);
#endif
#define MEM_PROMPT "" /* FIXME, bogus */
for (i = 0; i < len; i++)
{
printf_monitor (SET_MEM, memaddr + i);
expect (sprintf (buf, MEM_PROMPT, memaddr + i), 1);
expect (CMD_DELIM);
printf_monitor ("%x", myaddr[i]);
if (sr_get_debug())
printf ("\nSet 0x%x to 0x%x\n", memaddr + i, myaddr[i]);
if (CMD_END)
{
/*** expect (sprintf (buf, MEM_PROMPT, memaddr + i +1), 1);
expect (CMD_DELIM); ***/
printf_monitor (CMD_END);
}
expect_prompt (1);
}
return len;
}
/*
* monitor_read_inferior_memory -- read LEN bytes from inferior memory
* at MEMADDR. Put the result at debugger address MYADDR. Returns
* length moved.
*/
int
monitor_read_inferior_memory(memaddr, myaddr, len)
CORE_ADDR memaddr;
char *myaddr;
int len;
{
int i, j;
char buf[20];
/* Number of bytes read so far. */
int count;
/* Starting address of this pass. */
unsigned long startaddr;
/* Number of bytes to read in this pass. */
int len_this_pass;
#ifdef LOG_FILE
fprintf (log_file, "\nIn Read_inferior_memory (memaddr=%x, len=%d)\n", memaddr, len);
#endif
/* Note that this code works correctly if startaddr is just less
than UINT_MAX (well, really CORE_ADDR_MAX if there was such a
thing). That is, something like
monitor_read_bytes (CORE_ADDR_MAX - 4, foo, 4)
works--it never adds len To memaddr and gets 0. */
/* However, something like
monitor_read_bytes (CORE_ADDR_MAX - 3, foo, 4)
doesn't need to work. Detect it and give up if there's an attempt
to do that. */
if (((memaddr - 1) + len) < memaddr) {
errno = EIO;
return 0;
}
startaddr = memaddr;
count = 0;
while (count < len) {
len_this_pass = 16;
if ((startaddr % 16) != 0)
len_this_pass -= startaddr % 16;
if (len_this_pass > (len - count))
len_this_pass = (len - count);
if (sr_get_debug())
printf ("\nDisplay %d bytes at %x\n", len_this_pass, startaddr);
for (i = 0; i < len_this_pass; i++) {
printf_monitor (ROMCMD(GET_MEM), startaddr, startaddr);
sprintf (buf, ROMCMD(GET_MEM), startaddr, startaddr);
#if 0
expect (buf,1); /* get the command echo */
get_hex_word(1); /* strip away the address */
#endif
if (*ROMDELIM(GET_MEM) != 0) { /* if there's a delimiter */
expect (ROMDELIM(GET_MEM), 1);
} else {
sprintf (buf, ROMCMD(GET_MEM), startaddr, startaddr);
expect (buf,1); /* get the command echo */
get_hex_word(1); /* strip away the address */
}
get_hex_byte (&myaddr[count++]); /* get the value at this address */
if (*ROMDELIM(GET_MEM) != 0) {
printf_monitor (CMD_END);
}
expect_prompt (1);
startaddr += 1;
}
}
return len;
}
/* FIXME-someday! merge these two. */
int
monitor_xfer_inferior_memory (memaddr, myaddr, len, write, target)
CORE_ADDR memaddr;
char *myaddr;
int len;
int write;
struct target_ops *target; /* ignored */
{
if (write)
return monitor_write_inferior_memory (memaddr, myaddr, len);
else
return monitor_read_inferior_memory (memaddr, myaddr, len);
}
void
monitor_kill (args, from_tty)
char *args;
int from_tty;
{
return; /* ignore attempts to kill target system */
}
/* Clean up when a program exits.
The program actually lives on in the remote processor's RAM, and may be
run again without a download. Don't leave it full of breakpoint
instructions. */
void
monitor_mourn_inferior ()
{
remove_breakpoints ();
generic_mourn_inferior (); /* Do all the proper things now */
}
#define MAX_MONITOR_BREAKPOINTS 16
extern int memory_breakpoint_size;
static CORE_ADDR breakaddr[MAX_MONITOR_BREAKPOINTS] = {0};
/*
* monitor_insert_breakpoint -- add a breakpoint
*/
int
monitor_insert_breakpoint (addr, shadow)
CORE_ADDR addr;
char *shadow;
{
int i;
#ifdef LOG_FILE
fprintf (log_file, "\nIn Insert_breakpoint (addr=%x)\n", addr);
#endif
for (i = 0; i <= MAX_MONITOR_BREAKPOINTS; i++)
if (breakaddr[i] == 0)
{
breakaddr[i] = addr;
if (sr_get_debug())
printf ("Breakpoint at %x\n", addr);
monitor_read_inferior_memory(addr, shadow, memory_breakpoint_size);
printf_monitor(SET_BREAK_CMD, addr);
expect_prompt(1);
return 0;
}
fprintf(stderr, "Too many breakpoints (> 16) for monitor\n");
return 1;
}
/*
* _remove_breakpoint -- Tell the monitor to remove a breakpoint
*/
int
monitor_remove_breakpoint (addr, shadow)
CORE_ADDR addr;
char *shadow;
{
int i;
#ifdef LOG_FILE
fprintf (log_file, "\nIn Remove_breakpoint (addr=%x)\n", addr);
#endif
for (i = 0; i < MAX_MONITOR_BREAKPOINTS; i++)
if (breakaddr[i] == addr)
{
breakaddr[i] = 0;
/* some monitors remove breakpoints based on the address */
if (strcasecmp (target_shortname, "bug") == 0)
printf_monitor(CLR_BREAK_CMD, addr);
else
printf_monitor(CLR_BREAK_CMD, i);
expect_prompt(1);
return 0;
}
fprintf(stderr, "Can't find breakpoint associated with 0x%x\n", addr);
return 1;
}
/* Load a file. This is usually an srecord, which is ascii. No
protocol, just sent line by line. */
#define DOWNLOAD_LINE_SIZE 100
void
monitor_load (arg)
char *arg;
{
FILE *download;
char buf[DOWNLOAD_LINE_SIZE];
int i, bytes_read;
if (sr_get_debug())
printf ("Loading %s to monitor\n", arg);
download = fopen (arg, "r");
if (download == NULL)
{
error (sprintf (buf, "%s Does not exist", arg));
return;
}
printf_monitor (LOAD_CMD);
/* expect ("Waiting for S-records from host... ", 1); */
while (!feof (download))
{
bytes_read = fread (buf, sizeof (char), DOWNLOAD_LINE_SIZE, download);
if (hashmark)
{
putchar ('.');
fflush (stdout);
}
if (SERIAL_WRITE(monitor_desc, buf, bytes_read)) {
fprintf(stderr, "SERIAL_WRITE failed: (while downloading) %s\n", safe_strerror(errno));
break;
}
i = 0;
while (i++ <=200000) {} ; /* Ugly HACK, probably needs flow control */
if (bytes_read < DOWNLOAD_LINE_SIZE)
{
if (!feof (download))
error ("Only read %d bytes\n", bytes_read);
break;
}
}
if (hashmark)
{
putchar ('\n');
}
if (!feof (download))
error ("Never got EOF while downloading");
fclose (download);
}
/* Put a command string, in args, out to MONITOR. Output from MONITOR is placed
on the users terminal until the prompt is seen. */
void
monitor_command (args, fromtty)
char *args;
int fromtty;
{
#ifdef LOG_FILE
fprintf (log_file, "\nIn command (args=%s)\n", args);
#endif
if (monitor_desc == NULL)
error("monitor target not open.");
if (!args)
error("Missing command.");
printf_monitor("%s\r", args);
expect_prompt(0);
}
/*
* _initialize_remote_monitors -- setup a few addtitional commands that
* are usually only used by monitors.
*/
void
_initialize_remote_monitors ()
{
struct cmd_list_element *c;
/* this sets the type of download protocol */
c = add_set_cmd ("loadtype", no_class, var_string, (char *)&loadtype_str,
"Set the type of the remote load protocol.\n", &setlist);
c->function.sfunc = set_loadtype_command;
add_show_from_set (c, &showlist);
loadtype_str = savestring ("generic", 8);
add_show_from_set (add_set_cmd ("hash", no_class, var_boolean,
(char *)&hashmark,
"Set display of activity while downloading a file.\n\
When enabled, a period \'.\' is displayed.",
&setlist),
&showlist);
/* generic monitor command */
add_com ("monitor", class_obscure, monitor_command,
"Send a command to the debug monitor.");
}

62
gdb/monitor.h
View File

@ -1,4 +1,4 @@
/* Remote debugging interface for ROM68K boot monitor, for GDB.
/* Remote debugging interface ROM monitors.
* Copyright 1990, 1991, 1992 Free Software Foundation, Inc.
* Contributed by Cygnus Support. Written by Rob Savoye for Cygnus.
*
@ -22,41 +22,73 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
struct rom_cmd_data {
char *cmd; /* command to send */
char *delim; /* the delimiter */
char *result; /* the result */
};
struct monitor_ops {
int type; /* 1 is ascii, 0 is binary */
char *init; /* initialize to the monitor */
char *execute; /* execute or usually GO command */
char *resume; /* continue command */
char *step; /* single step */
char *set_break; /* set a breakpoint */
char *clr_break; /* clear a breakpoint */
char *set_mem; /* set memory to a value */
char *dis_mem; /* display memory */
char *mem_prompt; /* prompt memory commands use */
char *set_reg; /* set a register */
char *reg_delim; /* delimiter between registers */
char *get_reg; /* read a register */
char *load; /* download command */
struct rom_cmd_data setmem; /* set memory to a value */
struct rom_cmd_data getmem; /* display memory */
struct rom_cmd_data regset; /* set a register */
struct rom_cmd_data regget; /* read a register */
char *load; /* load command */
char *prompt; /* monitor command prompt */
char *cmd_delim; /* end-of-command delimitor */
char *cmd_end; /* optional command terminator */
struct target_ops *target; /* target operations */
char *loadtypes; /* the load types that are supported */
char **regnames; /* array of register names in ascii */
};
extern struct monitor_ops *current_monitor;
#define PROTO_TYPE (current_monitor->type)
#define LOADTYPES (current_monitor->loadtypes)
#define INIT_CMD (current_monitor->init)
#define GO_CMD (current_monitor->execute)
#define CONT_CMD (current_monitor->resume)
#define STEP_CMD (current_monitor->step)
#define SET_BREAK_CMD (current_monitor->set_break)
#define CLR_BREAK_CMD (current_monitor->clr_break)
#define MEM_SET_CMD (current_monitor->set_mem)
#define MEM_DIS_CMD (current_monitor->dis_mem)
#define SET_MEM (current_monitor->setmem)
#define GET_MEM (current_monitor->getmem)
#define LOAD_CMD (current_monitor->load)
#define GET_REG (current_monitor->get_reg)
#define REG_DELIM (current_monitor->reg_delim)
#define SET_REG (current_monitor->set_reg)
#define GET_REG (current_monitor->regget)
#define SET_REG (current_monitor->regset)
#define CMD_END (current_monitor->cmd_end)
#define CMD_DELIM (current_monitor->cmd_delim)
#define PROMPT (current_monitor->prompt)
#define MEM_PROMPT (current_monitor->mem_prompt)
#define TARGET_OPS (current_monitor->target)
#define TARGET_NAME (current_monitor->target->to_shortname)
#define REGNAMES(x) (current_monitor->regnames[x])
#define ROMCMD(x) (x.cmd)
#define ROMDELIM(x) (x.delim)
#define ROMRES(x) (x.result)
#define push_monitor(x) current_monitor = x;
extern void monitor_open();
extern void monitor_close();
extern void monitor_detach();
extern void monitor_resume();
extern int monitor_wait();
extern void monitor_fetch_register();
extern void monitor_store_register();
extern void monitor_prepare_to_store();
extern int monitor_xfer_inferior_memory();
extern void monitor_files_info();
extern int monitor_insert_breakpoint();
extern int monitor_remove_breakpoint();
extern void monitor_kill();
extern void monitor_load();
extern void monitor_create_inferior();
extern void monitor_mourn_inferior();

23
gdb/op50-rom.c
View File

@ -44,9 +44,11 @@ static char *op50n_regnames[] = {
struct target_ops op50n_ops = {
"op50n",
"Oki's debug monitor for the Op50n Eval board",
"Debug on a Oki OP50N eval board.\n\
Specify the serial device it is connected to (e.g. /dev/ttya).",
op50n_open,
monitor_close,
0,
monitor_detach,
@ -85,18 +87,25 @@ Specify the serial device it is connected to (e.g. /dev/ttya).",
struct monitor_ops op50n_cmds = {
1, /* 1 for ASCII, 0 for binary */
"\n", /* monitor init string */
".\n", /* monitor init string */
"", /* execute or usually GO command */
"", /* continue command */
"", /* single step */
"", /* set a breakpoint */
"", /* clear a breakpoint */
"", /* set memory to a value */
"", /* display memory */
"", /* prompt memory commands use */
{ /* set a register */
{
"sx %x %x;.\n", /* set memory */
"", /* delimiter */
"", /* the result */
},
{
"sx %x\n", /* get memory */
": ", /* delimiter */
" ", /* the result */
},
{
"x %s %x\n", /* set a register */
"", /* delimiter between registers */
"=", /* delimiter between registers */
"", /* the result */
},
{
@ -104,7 +113,7 @@ struct monitor_ops op50n_cmds = {
"=", /* delimiter between registers */
" ", /* the result */
},
"r 0\r", /* download command */
"r 0\n", /* download command */
"#", /* monitor command prompt */
" ", /* end-of-command delimitor */
".\n", /* optional command terminator */

15
gdb/w89k-rom.c
View File

@ -88,11 +88,18 @@ struct monitor_ops w89k_cmds = {
"T\r", /* single step */
"BP %x\r", /* set a breakpoint */
"BC %x\r", /* clear a breakpoint */
"E %x %x\r", /* set memory to a value */
"D %x\r", /* display memory */
"", /* prompt memory commands use */
{
"e %x %x\n", /* set memory */
"", /* delimiter */
"", /* the result */
},
{
"db %x %x\n", /* get memory */
"", /* delimiter */
"", /* the result */
},
{ /* set a register */
"r %s %x\r", /* set a register */
"r %s %x\n", /* set a register */
"", /* delimiter between registers */
"", /* the result */
},