collect some remote things into remote-utils
This commit is contained in:
parent
604633aeca
commit
c6f494e8be
@ -1,3 +1,50 @@
|
||||
Mon Sep 13 14:14:35 1993 K. Richard Pixley (rich@sendai.cygnus.com)
|
||||
|
||||
Collect some remote things into remote-utils.
|
||||
* remote-utils.[ch]: new files of functions collected from several
|
||||
different remote targets.
|
||||
* Makefile.in (REMOTE_O): add remote-utils.o.
|
||||
(dcache_h, remote_utils_h): new macros.
|
||||
(HFILES): add $(remote_utils_h).
|
||||
(ALLDEPFILES): add $(remote_utils_h).
|
||||
(dcache.o): new rule.
|
||||
(main.o, remote-bug.o): also depend on $(remote_utils_h).
|
||||
* target.h (remote_debug): extern moved to remote-utils.h.
|
||||
* target.c (find_default_run_target, find_core_target): initialize
|
||||
runable.
|
||||
(remote_debug): moved to remote-utils.c.
|
||||
(_initialize_targets): move declaration of user variable
|
||||
remotedebug to remote-utils.c.
|
||||
* remote-bug.c: include remote-utils.h rather than dcache.h.
|
||||
(bug_close, bug_write, bug_write_cr, desc, bug_dcache, timeout,
|
||||
dev_name, check_open, is_open, readchar, readchar_nofail,
|
||||
pollchar, expect, expect_prompt, get_hex_digit, get_hex_byte,
|
||||
get_hex_word, bug_kill, bug_detach, bug_create_inferior,
|
||||
multi-scan, bug_prepare_to_store, bug_fetch_word,
|
||||
bug_store_word, bug_files_info, bug_mourn, bug_com, bug_device,
|
||||
bug_speed): removed and replaced with facilities from
|
||||
remote-utils.[ch].
|
||||
(bug_read_inferior_memory): renamed to bug_read_memory.
|
||||
(bug_write_inferior_memory): renamed to bug_write_memory.
|
||||
(bug_xfer_inferior_memory): renamed to bug_xfer_memory.
|
||||
(get_word): comment out this unused function for now.
|
||||
(bug_settings, cpu_check_strings): new statics.
|
||||
(bug_open): rewritten to use gr_open.
|
||||
(_initialize_remote_bug): remove declarations of commands bug,
|
||||
device, speed.
|
||||
* main.c: include remote-utils.h.
|
||||
(baud_rate): removed to remote-utils.c.
|
||||
(main): handle baud rate settings using new facilities from
|
||||
remote-utils.
|
||||
* defs.h (baud_rate): removed extern.
|
||||
|
||||
m88110 support via bug-197 monitor.
|
||||
* remote-bug.c (get_reg_name, bug_fetch_register,
|
||||
bug_store_register): added m88110 extended register support.
|
||||
(wait_strings): added bug-197 prompt.
|
||||
(bug_wait): cope with bug-197 prompt.
|
||||
(start_load): cope with either bug-197 or bug-187 prompt.
|
||||
|
||||
Mon Sep 13 12:53:09 1993 Jim Kingdon (kingdon@cirdan.cygnus.com)
|
||||
|
||||
* inferior.h, infrun.c, thread.c, infcmd.c: Remove all uses of
|
||||
|
@ -189,7 +189,7 @@ SER_HARDWIRE=ser-unix.o
|
||||
|
||||
# The `remote' debugging target is supported for most architectures,
|
||||
# but not all (e.g. 960)
|
||||
REMOTE_O = remote.o dcache.o
|
||||
REMOTE_O = remote.o dcache.o remote-utils.o
|
||||
|
||||
# Host and target-dependent makefile fragments come in here.
|
||||
####
|
||||
@ -322,6 +322,9 @@ SFILES_KGDB = $(SFILES) stuff.c kdb-start.c
|
||||
#wait_h = $(INCLUDE_DIR)/wait.h
|
||||
#dis-asm_h = $(INCLUDE_DIR)/dis-asm.h
|
||||
|
||||
dcache_h = dcache.h
|
||||
remote_utils_h = $(dcache_h) remote-utils.h
|
||||
|
||||
readline_headers = \
|
||||
$(READLINE_SRC)/chardefs.h \
|
||||
$(READLINE_SRC)/history.h \
|
||||
@ -372,7 +375,8 @@ HFILES = buildsym.h call-cmds.h defs.h environ.h $(gdbcmd_h) \
|
||||
nindy-share/env.h nindy-share/stop.h \
|
||||
vx-share/dbgRpcLib.h vx-share/ptrace.h vx-share/vxTypes.h \
|
||||
vx-share/vxWorks.h vx-share/wait.h vx-share/xdr_ld.h \
|
||||
vx-share/xdr_ptrace.h vx-share/xdr_rdb.h thread.h $(dcache_h)
|
||||
vx-share/xdr_ptrace.h vx-share/xdr_rdb.h thread.h \
|
||||
$(remote_utils_h)
|
||||
|
||||
# GDB "info" files, which should be included in their entirety
|
||||
INFOFILES = gdb.info*
|
||||
@ -813,7 +817,8 @@ ALLDEPFILES = 29k-share/udi/udip2soc.c 29k-share/udi/udr.c \
|
||||
nindy-share/ttyflush.c nindy-tdep.c \
|
||||
ns32k-pinsn.c paread.c procfs.c pyr-pinsn.c pyr-tdep.c pyr-xdep.c \
|
||||
remote-adapt.c remote-bug.c remote-eb.c remote-es.c remote-hms.c remote-mips.c \
|
||||
remote-mm.c remote-mon.c remote-nindy.c remote-sim.c remote-st.c \
|
||||
remote-mm.c remote-mon.c remote-nindy.c remote-sim.c \
|
||||
remote-st.c remote-utils.c dcache.c \
|
||||
remote-udi.c remote-vx.c remote-z8k.c rs6000-nat.c rs6000-pinsn.c \
|
||||
rs6000-tdep.c ser-go32.c ser-tcp.c sh-tdep.c solib.c sparc-nat.c \
|
||||
sparc-pinsn.c sparc-tdep.c sun3-nat.c sun386-nat.c symm-tdep.c \
|
||||
@ -854,8 +859,8 @@ ALLPARAM = config/a29k/nm-ultra3.h config/a29k/tm-a29k.h \
|
||||
config/m68k/tm-amix.h config/m68k/tm-delta68.h \
|
||||
config/m68k/tm-dpx2.h config/m68k/tm-es1800.h \
|
||||
config/m68k/tm-hp300bsd.h config/m68k/tm-hp300hpux.h \
|
||||
config/m68k/tm-isi.h config/m68k/tm-m68k-fp.h \
|
||||
config/m68k/tm-m68k-nofp.h config/m68k/tm-monitor.h \
|
||||
config/m68k/tm-isi.h config/m68k/tm-m68k-em.h \
|
||||
config/m68k/tm-monitor.h \
|
||||
config/m68k/tm-news.h config/m68k/tm-os68k.h config/m68k/tm-st2000.h \
|
||||
config/m68k/tm-sun2.h config/m68k/tm-sun2os4.h config/m68k/tm-sun3.h \
|
||||
config/m68k/tm-sun3os4.h config/m68k/tm-vx68.h config/m68k/xm-3b1.h \
|
||||
@ -915,7 +920,7 @@ ALLCONFIG = config/a29k/a29k-kern.mt config/a29k/a29k-udi.mt \
|
||||
config/m68k/es1800.mt config/m68k/hp300bsd.mh \
|
||||
config/m68k/hp300bsd.mt config/m68k/hp300hpux.mh \
|
||||
config/m68k/hp300hpux.mt config/m68k/isi.mh config/m68k/isi.mt \
|
||||
config/m68k/m68k-fp.mt config/m68k/m68k-nofp.mt \
|
||||
config/m68k/m68k-em.mt \
|
||||
config/m68k/monitor.mt \
|
||||
config/m68k/news.mh config/m68k/news.mt config/m68k/news1000.mh \
|
||||
config/m68k/os68k.mt config/m68k/st2000.mt config/m68k/sun2os3.mh \
|
||||
@ -1021,6 +1026,8 @@ dbxread.o: dbxread.c $(breakpoint_h) buildsym.h $(command_h) \
|
||||
$(gdbtypes_h) language.h objfiles.h partial-stab.h stabsread.h \
|
||||
symfile.h $(symtab_h) target.h
|
||||
|
||||
dcache.o: dcache.c $(dcache_h)
|
||||
|
||||
delta68-nat.o: delta68-nat.c $(defs_h)
|
||||
|
||||
demangle.o: demangle.c $(defs_h) $(gdbcmd_h)
|
||||
@ -1128,7 +1135,8 @@ m88k-pinsn.o: m88k-pinsn.c $(defs_h) $(symtab_h)
|
||||
m88k-tdep.o: m88k-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h)
|
||||
|
||||
main.o: main.c $(bfd_h) $(getopt_h) $(readline_headers) call-cmds.h \
|
||||
$(defs_h) $(gdbcmd_h) $(inferior_h) language.h signals.h target.h
|
||||
$(defs_h) $(gdbcmd_h) $(inferior_h) language.h signals.h \
|
||||
target.h $(remote_utils_h)
|
||||
$(CC) -c $(INTERNAL_CFLAGS) $(READLINE_CFLAGS) $(srcdir)/main.c
|
||||
|
||||
maint.o: maint.c $(defs_h) $(gdbcmd_h) $(gdbtypes_h) $(symtab_h)
|
||||
@ -1198,7 +1206,7 @@ remote-adapt.o: remote-adapt.c $(wait_h) $(defs_h) $(gdbcore_h) \
|
||||
$(inferior_h) target.h terminal.h
|
||||
|
||||
remote-bug.o: remote-bug.c $(wait_h) $(defs_h) $(gdbcore_h) \
|
||||
$(inferior_h) target.h terminal.h $(dcache_h)
|
||||
$(inferior_h) target.h terminal.h $(remote_utils_h)
|
||||
|
||||
remote-eb.o: remote-eb.c $(wait_h) $(srcdir)/config/a29k/tm-a29k.h \
|
||||
$(defs_h) $(gdbcore_h) $(inferior_h) symfile.h target.h terminal.h
|
||||
|
@ -353,9 +353,6 @@ extern char *current_directory;
|
||||
extern unsigned input_radix;
|
||||
extern unsigned output_radix;
|
||||
|
||||
/* Baud rate specified for communication with serial target systems. */
|
||||
extern char *baud_rate;
|
||||
|
||||
/* Possibilities for prettyprint parameters to routines which print
|
||||
things. Like enum language, this should be in value.h, but needs
|
||||
to be here for the same reason. FIXME: If we can eliminate this
|
||||
|
812
gdb/remote-bug.c
812
gdb/remote-bug.c
File diff suppressed because it is too large
Load Diff
648
gdb/remote-utils.c
Normal file
648
gdb/remote-utils.c
Normal file
@ -0,0 +1,648 @@
|
||||
/* Generic support for remote debugging interfaces.
|
||||
|
||||
Copyright 1993 Free Software Foundation, Inc.
|
||||
|
||||
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 actually contains two distinct logical "packages". They
|
||||
are packaged together in this one file because they are typically
|
||||
used together.
|
||||
|
||||
The first package is an addition to the serial package. The
|
||||
addition provides reading and writing with debugging output and
|
||||
timeouts based on user settable variables. These routines are
|
||||
intended to support serial port based remote backends. These
|
||||
functions are prefixed with sr_.
|
||||
|
||||
The second package is a collection of more or less generic
|
||||
functions for use by remote backends. They support user settable
|
||||
variables for debugging, retries, and the like.
|
||||
|
||||
Todo:
|
||||
|
||||
* a pass through mode a la kermit or telnet.
|
||||
* autobaud.
|
||||
* ask remote to change his baud rate.
|
||||
* put generic load here.
|
||||
|
||||
*/
|
||||
|
||||
#include <ctype.h>
|
||||
|
||||
#include "defs.h"
|
||||
#include "gdbcmd.h"
|
||||
#include "target.h"
|
||||
#include "serial.h"
|
||||
#include "gdbcore.h" /* for exec_bfd */
|
||||
#include "inferior.h" /* for generic_mourn_inferior */
|
||||
#include "remote-utils.h"
|
||||
|
||||
struct _sr_settings sr_settings = {
|
||||
0, /* debug */
|
||||
9600, /* baud */
|
||||
4, /* timeout:
|
||||
remote-hms.c had 2
|
||||
remote-bug.c had "with a timeout of 2, we time out waiting for
|
||||
the prompt after an s-record dump."
|
||||
|
||||
remote.c had (2): This was 5 seconds, which is a long time to
|
||||
sit and wait. Unless this is going though some terminal server
|
||||
or multiplexer or other form of hairy serial connection, I
|
||||
would think 2 seconds would be plenty.
|
||||
*/
|
||||
|
||||
10, /* retries */
|
||||
NULL, /* device */
|
||||
NULL, /* descriptor */
|
||||
};
|
||||
|
||||
struct gr_settings *gr_settings = NULL;
|
||||
|
||||
static void
|
||||
usage(proto, junk)
|
||||
char *proto;
|
||||
char *junk;
|
||||
{
|
||||
if (junk != NULL)
|
||||
fprintf(stderr, "Unrecognized arguments: `%s'.\n", junk);
|
||||
|
||||
/* FIXME-now: service@host? */
|
||||
|
||||
error("Usage: target %s <device <speed <debug>>>\n\
|
||||
or target %s <host> <port>\n", proto, proto);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
#define CHECKDONE(p, q) \
|
||||
{ \
|
||||
if (q == p) \
|
||||
{ \
|
||||
if (*p == '\0') \
|
||||
return; \
|
||||
else \
|
||||
usage(proto, p); \
|
||||
} \
|
||||
}
|
||||
|
||||
void
|
||||
sr_scan_args(proto, args)
|
||||
char *proto;
|
||||
char *args;
|
||||
{
|
||||
int n;
|
||||
char *p, *q;
|
||||
|
||||
extern int strtol();
|
||||
|
||||
/* if no args, then nothing to do. */
|
||||
if (args == NULL || *args == '\0')
|
||||
return;
|
||||
|
||||
/* scan off white space. */
|
||||
for (p = args; isspace(*p); ++p) ;;
|
||||
|
||||
/* find end of device name. */
|
||||
for (q = p; *q != '\0' && !isspace(*q); ++q) ;;
|
||||
|
||||
/* check for missing or empty device name. */
|
||||
CHECKDONE(p, q);
|
||||
sr_set_device(savestring(p, q - p));
|
||||
|
||||
/* look for baud rate. */
|
||||
n = strtol(q, &p, 10);
|
||||
|
||||
/* check for missing or empty baud rate. */
|
||||
CHECKDONE(p, q);
|
||||
sr_set_baud_rate(n);
|
||||
|
||||
/* look for debug value. */
|
||||
n = strtol(p, &q, 10);
|
||||
|
||||
/* check for missing or empty debug value. */
|
||||
CHECKDONE(p, q);
|
||||
sr_set_debug(n);
|
||||
|
||||
/* scan off remaining white space. */
|
||||
for (p = q; isspace(*p); ++p) ;;
|
||||
|
||||
/* if not end of string, then there's unrecognized junk. */
|
||||
if (*p != '\0')
|
||||
usage(proto, p);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
gr_generic_checkin()
|
||||
{
|
||||
sr_write_cr("");
|
||||
gr_expect_prompt();
|
||||
}
|
||||
|
||||
void
|
||||
gr_open(args, from_tty, gr)
|
||||
char *args;
|
||||
int from_tty;
|
||||
struct gr_settings *gr;
|
||||
{
|
||||
target_preopen(from_tty);
|
||||
sr_scan_args(gr->ops->to_shortname, args);
|
||||
unpush_target(gr->ops);
|
||||
|
||||
gr_settings = gr;
|
||||
|
||||
gr_set_dcache(dcache_init(gr->readfunc, gr->writefunc));
|
||||
|
||||
if (sr_get_desc() != NULL)
|
||||
gr_close (0);
|
||||
|
||||
sr_set_desc(SERIAL_OPEN (sr_get_device()));
|
||||
if (!sr_get_desc())
|
||||
perror_with_name((char *) sr_get_device());
|
||||
|
||||
if (SERIAL_SETBAUDRATE(sr_get_desc(), sr_get_baud_rate()) != 0)
|
||||
{
|
||||
SERIAL_CLOSE(sr_get_desc());
|
||||
perror_with_name(sr_get_device());
|
||||
}
|
||||
|
||||
SERIAL_RAW (sr_get_desc());
|
||||
|
||||
/* default retries */
|
||||
if (sr_get_retries() == 0)
|
||||
sr_set_retries(1);
|
||||
|
||||
/* default clear breakpoint function */
|
||||
if (gr_settings->clear_all_breakpoints == NULL)
|
||||
gr_settings->clear_all_breakpoints = remove_breakpoints;
|
||||
|
||||
if (from_tty)
|
||||
printf_filtered ("Remote debugging using `%s' at baud rate of %d\n",
|
||||
sr_get_device(), sr_get_baud_rate());
|
||||
|
||||
push_target(gr->ops);
|
||||
gr_checkin();
|
||||
gr_clear_all_breakpoints ();
|
||||
return;
|
||||
}
|
||||
|
||||
/* Read a character from the remote system masking it down to 7 bits
|
||||
and doing all the fancy timeout stuff. */
|
||||
|
||||
int
|
||||
sr_readchar ()
|
||||
{
|
||||
int buf;
|
||||
|
||||
buf = SERIAL_READCHAR (sr_get_desc(), sr_get_timeout());
|
||||
|
||||
if (buf == SERIAL_TIMEOUT)
|
||||
error ("Timeout reading from remote system.");
|
||||
|
||||
if (sr_get_debug() > 0)
|
||||
printf ("%c", buf);
|
||||
|
||||
return buf & 0x7f;
|
||||
}
|
||||
|
||||
int
|
||||
sr_pollchar()
|
||||
{
|
||||
int buf;
|
||||
|
||||
buf = SERIAL_READCHAR (sr_get_desc(), 0);
|
||||
if (buf == SERIAL_TIMEOUT)
|
||||
buf = 0;
|
||||
if (sr_get_debug() > 0)
|
||||
if (buf)
|
||||
printf ("%c", buf);
|
||||
else
|
||||
printf ("<empty character poll>");
|
||||
|
||||
return buf & 0x7f;
|
||||
}
|
||||
|
||||
/* Keep discarding input from the remote system, until STRING is found.
|
||||
Let the user break out immediately. */
|
||||
void
|
||||
sr_expect (string)
|
||||
char *string;
|
||||
{
|
||||
char *p = string;
|
||||
|
||||
immediate_quit = 1;
|
||||
while (1)
|
||||
{
|
||||
if (sr_readchar () == *p)
|
||||
{
|
||||
p++;
|
||||
if (*p == '\0')
|
||||
{
|
||||
immediate_quit = 0;
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
p = string;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
sr_write (a, l)
|
||||
char *a;
|
||||
int l;
|
||||
{
|
||||
int i;
|
||||
|
||||
if (SERIAL_WRITE (sr_get_desc(), a, l) != 0)
|
||||
perror_with_name ("sr_write: Error writing to remote");
|
||||
|
||||
if (sr_get_debug() > 0)
|
||||
for (i = 0; i < l; i++)
|
||||
printf ("%c", a[i]);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
sr_write_cr (s)
|
||||
char *s;
|
||||
{
|
||||
sr_write (s, strlen (s));
|
||||
sr_write ("\r", 1);
|
||||
return;
|
||||
}
|
||||
|
||||
int
|
||||
sr_timed_read (buf, n)
|
||||
char *buf;
|
||||
int n;
|
||||
{
|
||||
int i;
|
||||
char c;
|
||||
|
||||
i = 0;
|
||||
while (i < n)
|
||||
{
|
||||
c = sr_readchar ();
|
||||
|
||||
if (c == 0)
|
||||
return i;
|
||||
buf[i] = c;
|
||||
i++;
|
||||
|
||||
}
|
||||
return i;
|
||||
}
|
||||
|
||||
/* Get a hex digit from the remote system & return its value. If
|
||||
ignore_space is nonzero, ignore spaces (not newline, tab, etc). */
|
||||
|
||||
int
|
||||
sr_get_hex_digit (ignore_space)
|
||||
int ignore_space;
|
||||
{
|
||||
int ch;
|
||||
|
||||
while (1)
|
||||
{
|
||||
ch = sr_readchar ();
|
||||
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_space)
|
||||
{
|
||||
gr_expect_prompt ();
|
||||
error ("Invalid hex digit from remote system.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Get a byte from the remote and put it in *BYT. Accept any number
|
||||
leading spaces. */
|
||||
void
|
||||
sr_get_hex_byte (byt)
|
||||
char *byt;
|
||||
{
|
||||
int val;
|
||||
|
||||
val = sr_get_hex_digit (1) << 4;
|
||||
val |= sr_get_hex_digit (0);
|
||||
*byt = val;
|
||||
}
|
||||
|
||||
/* Read a 32-bit hex word from the remote, preceded by a space */
|
||||
long
|
||||
sr_get_hex_word ()
|
||||
{
|
||||
long val;
|
||||
int j;
|
||||
|
||||
val = 0;
|
||||
for (j = 0; j < 8; j++)
|
||||
val = (val << 4) + sr_get_hex_digit (j == 0);
|
||||
return val;
|
||||
}
|
||||
|
||||
/* Put a command string, in args, out to the remote. The remote is assumed to
|
||||
be in raw mode, all writing/reading done through desc.
|
||||
Ouput from the remote is placed on the users terminal until the
|
||||
prompt from the remote is seen.
|
||||
FIXME: Can't handle commands that take input. */
|
||||
|
||||
void
|
||||
sr_com (args, fromtty)
|
||||
char *args;
|
||||
int fromtty;
|
||||
{
|
||||
sr_check_open ();
|
||||
|
||||
if (!args)
|
||||
return;
|
||||
|
||||
/* Clear all input so only command relative output is displayed */
|
||||
|
||||
sr_write_cr (args);
|
||||
sr_write ("\030", 1);
|
||||
gr_expect_prompt ();
|
||||
}
|
||||
|
||||
void
|
||||
gr_close(quitting)
|
||||
int quitting;
|
||||
{
|
||||
gr_clear_all_breakpoints();
|
||||
|
||||
if (sr_is_open())
|
||||
{
|
||||
SERIAL_CLOSE (sr_get_desc());
|
||||
sr_set_desc(NULL);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/* gr_detach()
|
||||
takes a program previously attached to and detaches it.
|
||||
We better not have left any breakpoints
|
||||
in the program or it'll die when it hits one.
|
||||
Close the open connection to the remote debugger.
|
||||
Use this when you want to detach and do something else
|
||||
with your gdb. */
|
||||
|
||||
void
|
||||
gr_detach(args, from_tty)
|
||||
char *args;
|
||||
int from_tty;
|
||||
{
|
||||
if (args)
|
||||
error ("Argument given to \"detach\" when remotely debugging.");
|
||||
|
||||
if (sr_is_open())
|
||||
gr_clear_all_breakpoints ();
|
||||
|
||||
pop_target ();
|
||||
if (from_tty)
|
||||
puts_filtered ("Ending remote debugging.\n");
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
gr_files_info (ops)
|
||||
struct target_ops *ops;
|
||||
{
|
||||
char *file = "nothing";
|
||||
|
||||
if (exec_bfd)
|
||||
file = bfd_get_filename (exec_bfd);
|
||||
|
||||
if (exec_bfd)
|
||||
{
|
||||
#ifdef __GO32__
|
||||
printf_filtered ("\tAttached to DOS asynctsr\n");
|
||||
#else
|
||||
printf_filtered ("\tAttached to %s at %d baud\n",
|
||||
sr_get_device(), sr_get_baud_rate());
|
||||
#endif
|
||||
}
|
||||
|
||||
printf_filtered ("\tand running program %s\n", file);
|
||||
printf_filtered ("\tusing the %s protocol.\n", ops->to_shortname);
|
||||
}
|
||||
|
||||
void
|
||||
gr_mourn ()
|
||||
{
|
||||
gr_clear_all_breakpoints ();
|
||||
unpush_target (gr_get_ops());
|
||||
generic_mourn_inferior ();
|
||||
}
|
||||
|
||||
void
|
||||
gr_kill ()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
/* This is called not only when we first attach, but also when the
|
||||
user types "run" after having attached. */
|
||||
void
|
||||
gr_create_inferior (execfile, args, env)
|
||||
char *execfile;
|
||||
char *args;
|
||||
char **env;
|
||||
{
|
||||
int entry_pt;
|
||||
|
||||
if (args && *args)
|
||||
error ("Can't pass arguments to remote process.");
|
||||
|
||||
if (execfile == 0 || exec_bfd == 0)
|
||||
error ("No exec file specified");
|
||||
|
||||
entry_pt = (int) bfd_get_start_address (exec_bfd);
|
||||
sr_check_open ();
|
||||
|
||||
gr_kill ();
|
||||
gr_clear_all_breakpoints ();
|
||||
|
||||
init_wait_for_inferior ();
|
||||
gr_checkin();
|
||||
|
||||
insert_breakpoints (); /* Needed to get correct instruction in cache */
|
||||
proceed (entry_pt, -1, 0);
|
||||
}
|
||||
|
||||
/* Given a null terminated list of strings LIST, read the input until we find one of
|
||||
them. Return the index of the string found or -1 on error. '?' means match
|
||||
any single character. Note that with the algorithm we use, the initial
|
||||
character of the string cannot recur in the string, or we will not find some
|
||||
cases of the string in the input. If PASSTHROUGH is non-zero, then
|
||||
pass non-matching data on. */
|
||||
|
||||
int
|
||||
gr_multi_scan (list, passthrough)
|
||||
char *list[];
|
||||
int passthrough;
|
||||
{
|
||||
char *swallowed = NULL; /* holding area */
|
||||
char *swallowed_p = swallowed; /* Current position in swallowed. */
|
||||
int ch;
|
||||
int ch_handled;
|
||||
int i;
|
||||
int string_count;
|
||||
int max_length;
|
||||
char **plist;
|
||||
|
||||
/* Look through the strings. Count them. Find the largest one so we can
|
||||
allocate a holding area. */
|
||||
|
||||
for (max_length = string_count = i = 0;
|
||||
list[i] != NULL;
|
||||
++i, ++string_count)
|
||||
{
|
||||
int length = strlen(list[i]);
|
||||
|
||||
if (length > max_length)
|
||||
max_length = length;
|
||||
}
|
||||
|
||||
/* if we have no strings, then something is wrong. */
|
||||
if (string_count == 0)
|
||||
return(-1);
|
||||
|
||||
/* otherwise, we will need a holding area big enough to hold almost two
|
||||
copies of our largest string. */
|
||||
swallowed_p = swallowed = alloca(max_length << 1);
|
||||
|
||||
/* and a list of pointers to current scan points. */
|
||||
plist = alloca(string_count * sizeof(*plist));
|
||||
|
||||
/* and initialize */
|
||||
for (i = 0; i < string_count; ++i)
|
||||
plist[i] = list[i];
|
||||
|
||||
for (ch = sr_readchar(); /* loop forever */ ; ch = sr_readchar())
|
||||
{
|
||||
QUIT; /* Let user quit and leave process running */
|
||||
ch_handled = 0;
|
||||
|
||||
for (i = 0; i < string_count; ++i)
|
||||
{
|
||||
if (ch == *plist[i] || *plist[i] == '?')
|
||||
{
|
||||
++plist[i];
|
||||
if (*plist[i] == '\0')
|
||||
return(i);
|
||||
|
||||
if (!ch_handled)
|
||||
*swallowed_p++ = ch;
|
||||
|
||||
ch_handled = 1;
|
||||
}
|
||||
else
|
||||
plist[i] = list[i];
|
||||
}
|
||||
|
||||
if (!ch_handled)
|
||||
{
|
||||
char *p;
|
||||
|
||||
/* Print out any characters which have been swallowed. */
|
||||
if (passthrough)
|
||||
{
|
||||
for (p = swallowed; p < swallowed_p; ++p)
|
||||
putc (*p, stdout);
|
||||
|
||||
putc (ch, stdout);
|
||||
}
|
||||
|
||||
swallowed_p = swallowed;
|
||||
}
|
||||
}
|
||||
|
||||
return(-1);
|
||||
}
|
||||
|
||||
/* 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
|
||||
gr_prepare_to_store ()
|
||||
{
|
||||
/* Do nothing, since we assume we can store individual regs */
|
||||
}
|
||||
|
||||
/* Read a word from remote address ADDR and return it.
|
||||
* This goes through the data cache.
|
||||
*/
|
||||
int
|
||||
gr_fetch_word (addr)
|
||||
CORE_ADDR addr;
|
||||
{
|
||||
return dcache_fetch (gr_get_dcache(), addr);
|
||||
}
|
||||
|
||||
/* Write a word WORD into remote address ADDR.
|
||||
This goes through the data cache. */
|
||||
|
||||
void
|
||||
gr_store_word (addr, word)
|
||||
CORE_ADDR addr;
|
||||
int word;
|
||||
{
|
||||
dcache_poke (gr_get_dcache(), addr, word);
|
||||
}
|
||||
|
||||
void
|
||||
_initialize_sr_support ()
|
||||
{
|
||||
add_show_from_set (add_set_cmd ("remotedebug", no_class,
|
||||
var_zinteger, (char *)&sr_settings.debug,
|
||||
"Set debugging of remote serial I/O.\n\
|
||||
When non-zero, each packet sent or received with the remote target\n\
|
||||
is displayed. Higher numbers produce more debugging.", &setlist),
|
||||
&showlist);
|
||||
|
||||
/* FIXME-now: if target is open when baud changes... */
|
||||
add_show_from_set (add_set_cmd ("remotebaud", no_class,
|
||||
var_zinteger, (char *)&sr_settings.baud_rate,
|
||||
"Set baud rate for remote serial I/O.\n\
|
||||
This value is used to set the speed of the serial port when debugging\n\
|
||||
using remote targets.", &setlist),
|
||||
&showlist);
|
||||
|
||||
/* FIXME-now: if target is open... */
|
||||
add_show_from_set (add_set_cmd ("remotedevice", no_class,
|
||||
var_filename, (char *)&sr_settings.device,
|
||||
"Set device for remote serial I/O.\n\
|
||||
This device is used as the serial port when debugging using remote\n\
|
||||
targets.", &setlist),
|
||||
&showlist);
|
||||
|
||||
add_com ("remote <command>", class_obscure, sr_com,
|
||||
"Send a command to the remote monitor.");
|
||||
|
||||
}
|
154
gdb/remote-utils.h
Normal file
154
gdb/remote-utils.h
Normal file
@ -0,0 +1,154 @@
|
||||
/* Generic support for remote debugging interfaces.
|
||||
|
||||
Copyright 1993 Free Software Foundation, Inc.
|
||||
|
||||
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. */
|
||||
|
||||
#ifndef REMOTE_UTILS_H
|
||||
#define REMOTE_UTILS_H
|
||||
|
||||
#include "target.h"
|
||||
#include "dcache.h"
|
||||
|
||||
/* Stuff that should be shared (and handled consistently) among the various
|
||||
remote targets. */
|
||||
|
||||
struct _sr_settings {
|
||||
/* Debugging level. 0 is off, and non-zero values mean to print
|
||||
some debug information (higher values, more information). */
|
||||
unsigned int debug;
|
||||
|
||||
/* Baud rate specified for talking to remote target systems via a
|
||||
serial port. */
|
||||
unsigned int baud_rate;
|
||||
|
||||
unsigned int timeout;
|
||||
|
||||
int retries;
|
||||
|
||||
char *device;
|
||||
serial_t desc;
|
||||
|
||||
};
|
||||
|
||||
extern struct _sr_settings sr_settings;
|
||||
|
||||
/* get and set debug value. */
|
||||
#define sr_get_debug() (sr_settings.debug)
|
||||
#define sr_set_debug(newval) (sr_settings.debug = (newval))
|
||||
|
||||
/* get and set baud rate. */
|
||||
#define sr_get_baud_rate() (sr_settings.baud_rate)
|
||||
#define sr_set_baud_rate(newval) (sr_settings.baud_rate = (newval))
|
||||
|
||||
/* get and set timeout. */
|
||||
#define sr_get_timeout() (sr_settings.timeout)
|
||||
#define sr_set_timeout(newval) (sr_settings.timeout = (newval))
|
||||
|
||||
/* get and set device. */
|
||||
#define sr_get_device() (sr_settings.device)
|
||||
#define sr_set_device(newval) \
|
||||
{ \
|
||||
if (sr_settings.device) free(sr_settings.device); \
|
||||
sr_settings.device = (newval); \
|
||||
}
|
||||
|
||||
/* get and set descriptor value. */
|
||||
#define sr_get_desc() (sr_settings.desc)
|
||||
#define sr_set_desc(newval) (sr_settings.desc = (newval))
|
||||
|
||||
/* get and set retries. */
|
||||
#define sr_get_retries() (sr_settings.retries)
|
||||
#define sr_set_retries(newval) (sr_settings.retries = (newval))
|
||||
|
||||
#define sr_is_open() (sr_settings.desc != NULL)
|
||||
|
||||
#define sr_check_open() { if (!sr_is_open()) \
|
||||
error ("Remote device not open"); }
|
||||
|
||||
struct gr_settings {
|
||||
/* This is our data cache. */
|
||||
DCACHE *dcache;
|
||||
char *prompt;
|
||||
struct target_ops *ops;
|
||||
int (*clear_all_breakpoints)PARAMS((void));
|
||||
memxferfunc readfunc;
|
||||
memxferfunc writefunc;
|
||||
void (*checkin)PARAMS((void));
|
||||
};
|
||||
|
||||
extern struct gr_settings *gr_settings;
|
||||
|
||||
/* get and set dcache. */
|
||||
#define gr_get_dcache() (gr_settings->dcache)
|
||||
#define gr_set_dcache(newval) (gr_settings->dcache = (newval))
|
||||
|
||||
/* get and set prompt. */
|
||||
#define gr_get_prompt() (gr_settings->prompt)
|
||||
#define gr_set_prompt(newval) (gr_settings->prompt = (newval))
|
||||
|
||||
/* get and set ops. */
|
||||
#define gr_get_ops() (gr_settings->ops)
|
||||
#define gr_set_ops(newval) (gr_settings->ops = (newval))
|
||||
|
||||
#define gr_clear_all_breakpoints() ((gr_settings->clear_all_breakpoints)())
|
||||
#define gr_checkin() ((gr_settings->checkin)())
|
||||
|
||||
/* Keep discarding input until we see the 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 gr_expect_prompt(). Exception: 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 bug_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. */
|
||||
|
||||
#define gr_expect_prompt() sr_expect(gr_get_prompt())
|
||||
|
||||
int gr_fetch_word PARAMS((CORE_ADDR addr));
|
||||
int gr_multi_scan PARAMS((char *list[], int passthrough));
|
||||
int sr_get_hex_digit PARAMS((int ignore_space));
|
||||
int sr_pollchar PARAMS((void));
|
||||
int sr_readchar PARAMS((void));
|
||||
int sr_timed_read PARAMS((char *buf, int n));
|
||||
long sr_get_hex_word PARAMS((void));
|
||||
void gr_close PARAMS((int quitting));
|
||||
void gr_create_inferior PARAMS((char *execfile, char *args, char **env));
|
||||
void gr_detach PARAMS((char *args, int from_tty));
|
||||
void gr_files_info PARAMS((struct target_ops *ops));
|
||||
void gr_generic_checkin PARAMS((void));
|
||||
void gr_kill PARAMS((void));
|
||||
void gr_mourn PARAMS((void));
|
||||
void gr_prepare_to_store PARAMS((void));
|
||||
void gr_store_word PARAMS((CORE_ADDR addr, int word));
|
||||
void sr_expect PARAMS((char *string));
|
||||
void sr_get_hex_byte PARAMS((char *byt));
|
||||
void sr_scan_args PARAMS((char *proto, char *args));
|
||||
void sr_write PARAMS((char *a, int l));
|
||||
void sr_write_cr PARAMS((char *s));
|
||||
|
||||
void gr_open PARAMS((char *args, int from_tty,
|
||||
struct gr_settings *gr_settings));
|
||||
|
||||
|
||||
#endif /* REMOTE_UTILS_H */
|
Loading…
Reference in New Issue
Block a user