projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s390 assembler improvements and testsuite
[deliverable/binutils-gdb.git]
/
gdb
/
remote-adapt.c
diff --git
a/gdb/remote-adapt.c
b/gdb/remote-adapt.c
index b41f3c20d47269c3eaee5d73b5eaf686272abae3..9d31d52b8fc4c1cfe97830cefdb17da1199a865e 100644
(file)
--- a/
gdb/remote-adapt.c
+++ b/
gdb/remote-adapt.c
@@
-1,5
+1,6
@@
/* Remote debugging interface for AMD 290*0 Adapt Monitor Version 2.1d18.
/* Remote debugging interface for AMD 290*0 Adapt Monitor Version 2.1d18.
- Copyright 1990, 1991, 1992 Free Software Foundation, Inc.
+ Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
+ 2001 Free Software Foundation, Inc.
Contributed by David Wood at New York University (wood@lab.ultra.nyu.edu).
Adapted from work done at Cygnus Support in remote-eb.c.
Contributed by David Wood at New York University (wood@lab.ultra.nyu.edu).
Adapted from work done at Cygnus Support in remote-eb.c.
@@
-35,7
+36,6
@@
#include "defs.h"
#include "gdb_string.h"
#include "inferior.h"
#include "defs.h"
#include "gdb_string.h"
#include "inferior.h"
-#include "gdb_wait.h"
#include "value.h"
#include <ctype.h>
#include <fcntl.h>
#include "value.h"
#include <ctype.h>
#include <fcntl.h>
@@
-44,6
+44,7
@@
#include "terminal.h"
#include "target.h"
#include "gdbcore.h"
#include "terminal.h"
#include "target.h"
#include "gdbcore.h"
+#include "regcache.h"
/* This processor is getting rusty but I am trying to keep it
up to date at least with data structure changes.
/* This processor is getting rusty but I am trying to keep it
up to date at least with data structure changes.
@@
-118,9
+119,7
@@
FILE *adapt_stream;
#define ON 1
#define OFF 0
static void
#define ON 1
#define OFF 0
static void
-rawmode (desc, turnon)
- int desc;
- int turnon;
+rawmode (int desc, int turnon)
{
TERMINAL sg;
{
TERMINAL sg;
@@
-150,7
+149,7
@@
rawmode (desc, turnon)
}
/* Suck up all the input from the adapt */
}
/* Suck up all the input from the adapt */
-slurp_input ()
+slurp_input (
void
)
{
char buf[8];
{
char buf[8];
@@
-167,7
+166,7
@@
slurp_input ()
/* Read a character from the remote system, doing all the fancy
timeout stuff. */
static int
/* Read a character from the remote system, doing all the fancy
timeout stuff. */
static int
-readchar ()
+readchar (
void
)
{
char buf;
{
char buf;
@@
-198,13
+197,12
@@
readchar ()
/* Keep discarding input from the remote system, until STRING is found.
Let the user break out immediately. */
static void
/* Keep discarding input from the remote system, until STRING is found.
Let the user break out immediately. */
static void
-expect (string)
- char *string;
+expect (char *string)
{
char *p = string;
fflush (adapt_stream);
{
char *p = string;
fflush (adapt_stream);
- immediate_quit
= 1
;
+ immediate_quit
++
;
while (1)
{
if (readchar () == *p)
while (1)
{
if (readchar () == *p)
@@
-212,7
+210,7
@@
expect (string)
p++;
if (*p == '\0')
{
p++;
if (*p == '\0')
{
- immediate_quit
= 0
;
+ immediate_quit
--
;
return;
}
}
return;
}
}
@@
-236,7
+234,7
@@
expect (string)
necessary to prevent getting into states from which we can't
recover. */
static void
necessary to prevent getting into states from which we can't
recover. */
static void
-expect_prompt ()
+expect_prompt (
void
)
{
#if defined (LOG_FILE)
/* This is a convenient place to do this. The idea is to do it often
{
#if defined (LOG_FILE)
/* This is a convenient place to do this. The idea is to do it often
@@
-250,8
+248,7
@@
expect_prompt ()
/* Get a hex digit from the remote system & return its value.
If ignore_space is nonzero, ignore spaces (not newline, tab, etc). */
static int
/* Get a hex digit from the remote system & return its value.
If ignore_space is nonzero, ignore spaces (not newline, tab, etc). */
static int
-get_hex_digit (ignore_space)
- int ignore_space;
+get_hex_digit (int ignore_space)
{
int ch;
while (1)
{
int ch;
while (1)
@@
-276,8
+273,7
@@
get_hex_digit (ignore_space)
/* Get a byte from adapt_desc and put it in *BYT. Accept any number
leading spaces. */
static void
/* Get a byte from adapt_desc and put it in *BYT. Accept any number
leading spaces. */
static void
-get_hex_byte (byt)
- char *byt;
+get_hex_byte (char *byt)
{
int val;
{
int val;
@@
-288,7
+284,7
@@
get_hex_byte (byt)
/* Read a 32-bit hex word from the adapt, preceded by a space */
static long
/* Read a 32-bit hex word from the adapt, preceded by a space */
static long
-get_hex_word ()
+get_hex_word (
void
)
{
long val;
int j;
{
long val;
int j;
@@
-301,9
+297,7
@@
get_hex_word ()
/* Get N 32-bit hex words from remote, each preceded by a space
and put them in registers starting at REGNO. */
static void
/* Get N 32-bit hex words from remote, each preceded by a space
and put them in registers starting at REGNO. */
static void
-get_hex_regs (n, regno)
- int n;
- int regno;
+get_hex_regs (int n, int regno)
{
long val;
while (n--)
{
long val;
while (n--)
@@
-315,16
+309,10
@@
get_hex_regs (n, regno)
/* Called when SIGALRM signal sent due to alarm() timeout. */
#ifndef HAVE_TERMIO
/* Called when SIGALRM signal sent due to alarm() timeout. */
#ifndef HAVE_TERMIO
-#ifndef __STDC__
-#ifndef volatile
-#define volatile
-/**/
-# endif
-#endif
volatile int n_alarms;
void
volatile int n_alarms;
void
-adapt_timer ()
+adapt_timer (
void
)
{
#if 0
if (kiodebug)
{
#if 0
if (kiodebug)
@@
-344,9
+332,7
@@
static char *prog_name = NULL;
static int need_artificial_trap = 0;
void
static int need_artificial_trap = 0;
void
-adapt_kill (arg, from_tty)
- char *arg;
- int from_tty;
+adapt_kill (char *arg, int from_tty)
{
fprintf (adapt_stream, "K");
fprintf (adapt_stream, "\r");
{
fprintf (adapt_stream, "K");
fprintf (adapt_stream, "\r");
@@
-357,9
+343,7
@@
adapt_kill (arg, from_tty)
* FIXME: Assumes the file to download is a binary coff file.
*/
static void
* FIXME: Assumes the file to download is a binary coff file.
*/
static void
-adapt_load (args, fromtty)
- char *args;
- int fromtty;
+adapt_load (char *args, int fromtty)
{
FILE *fp;
int n;
{
FILE *fp;
int n;
@@
-429,10
+413,7
@@
adapt_load (args, fromtty)
/* This is called not only when we first attach, but also when the
user types "run" after having attached. */
void
/* This is called not only when we first attach, but also when the
user types "run" after having attached. */
void
-adapt_create_inferior (execfile, args, env)
- char *execfile;
- char *args;
- char **env;
+adapt_create_inferior (char *execfile, char *args, char **env)
{
int entry_pt;
{
int entry_pt;
@@
-569,8
+550,7
@@
baudtab[] =
};
static int
};
static int
-damn_b (rate)
- int rate;
+damn_b (int rate)
{
int i;
{
int i;
@@
-588,9
+568,7
@@
damn_b (rate)
static int baudrate = 9600;
static void
static int baudrate = 9600;
static void
-adapt_open (name, from_tty)
- char *name;
- int from_tty;
+adapt_open (char *name, int from_tty)
{
TERMINAL sg;
unsigned int prl;
{
TERMINAL sg;
unsigned int prl;
@@
-627,7
+605,7
@@
the baud rate, and the name of the program to run on the remote system.");
/*EMPTY */ ;
if (prog_name != NULL)
/*EMPTY */ ;
if (prog_name != NULL)
- free (prog_name);
+
x
free (prog_name);
prog_name = savestring (p, strlen (p));
adapt_close (0);
prog_name = savestring (p, strlen (p));
adapt_close (0);
@@
-701,8
+679,7
@@
the baud rate, and the name of the program to run on the remote system.");
/* Close out all files and local state before this target loses control. */
static void
/* Close out all files and local state before this target loses control. */
static void
-adapt_close (quitting)
- int quitting;
+adapt_close (int quitting)
{
/* Clear any break points */
{
/* Clear any break points */
@@
-742,9
+719,7
@@
adapt_close (quitting)
/* Attach to the target that is already loaded and possibly running */
static void
/* Attach to the target that is already loaded and possibly running */
static void
-adapt_attach (args, from_tty)
- char *args;
- int from_tty;
+adapt_attach (char *args, int from_tty)
{
if (from_tty)
{
if (from_tty)
@@
-761,9
+736,7
@@
adapt_attach (args, from_tty)
Use this when you want to detach and do something else
with your gdb. */
void
Use this when you want to detach and do something else
with your gdb. */
void
-adapt_detach (args, from_tty)
- char *args;
- int from_tty;
+adapt_detach (char *args, int from_tty)
{
if (adapt_stream)
{
if (adapt_stream)
@@
-780,9
+753,7
@@
adapt_detach (args, from_tty)
/* Tell the remote machine to resume. */
void
/* Tell the remote machine to resume. */
void
-adapt_resume (pid, step, sig)
- int pid, step;
- enum target_signal sig;
+adapt_resume (ptid_t ptid, int step, enum target_signal sig)
{
if (step)
{
{
if (step)
{
@@
-810,9
+781,8
@@
adapt_resume (pid, step, sig)
/* Wait until the remote machine stops, then return,
storing status in STATUS just as `wait' would. */
/* Wait until the remote machine stops, then return,
storing status in STATUS just as `wait' would. */
-int
-adapt_wait (status)
- struct target_waitstatus *status;
+ptid_t
+adapt_wait (ptid_t ptid, struct target_waitstatus *status)
{
/* Strings to look for. '?' means match any single character.
Note that with the algorithm we use, the initial character
{
/* Strings to look for. '?' means match any single character.
Note that with the algorithm we use, the initial character
@@
-845,7
+815,7
@@
adapt_wait (status)
status->kind = TARGET_WAITKIND_STOPPED;
status->value.sig = TARGET_SIGNAL_TRAP;
need_artificial_trap--;
status->kind = TARGET_WAITKIND_STOPPED;
status->value.sig = TARGET_SIGNAL_TRAP;
need_artificial_trap--;
- return
0
;
+ return
inferior_ptid
;
}
timeout = 0; /* Don't time out -- user program is running. */
}
timeout = 0; /* Don't time out -- user program is running. */
@@
-901,7
+871,7
@@
adapt_wait (status)
}
timeout = old_timeout;
immediate_quit = old_immediate_quit;
}
timeout = old_timeout;
immediate_quit = old_immediate_quit;
- return
0
;
+ return
inferior_ptid
;
}
/* Return the name of register number REGNO
}
/* Return the name of register number REGNO
@@
-909,8
+879,7
@@
adapt_wait (status)
Returns a pointer to a static buffer containing the answer. */
static char *
Returns a pointer to a static buffer containing the answer. */
static char *
-get_reg_name (regno)
- int regno;
+get_reg_name (int regno)
{
static char buf[80];
if (regno >= GR96_REGNUM && regno < GR96_REGNUM + 32)
{
static char buf[80];
if (regno >= GR96_REGNUM && regno < GR96_REGNUM + 32)
@@
-945,7
+914,7
@@
get_reg_name (regno)
/* Read the remote registers. */
static void
/* Read the remote registers. */
static void
-adapt_fetch_registers ()
+adapt_fetch_registers (
void
)
{
int reg_index;
int regnum_index;
{
int reg_index;
int regnum_index;
@@
-1062,8
+1031,7
@@
adapt_fetch_registers ()
/* Fetch register REGNO, or all registers if REGNO is -1.
*/
static void
/* Fetch register REGNO, or all registers if REGNO is -1.
*/
static void
-adapt_fetch_register (regno)
- int regno;
+adapt_fetch_register (int regno)
{
if (regno == -1)
adapt_fetch_registers ();
{
if (regno == -1)
adapt_fetch_registers ();
@@
-1081,7
+1049,7
@@
adapt_fetch_register (regno)
/* Store the remote registers from the contents of the block REGS. */
static void
/* Store the remote registers from the contents of the block REGS. */
static void
-adapt_store_registers ()
+adapt_store_registers (
void
)
{
int i, j;
{
int i, j;
@@
-1137,8
+1105,7
@@
adapt_store_registers ()
/* Store register REGNO, or all if REGNO == -1.
Return errno value. */
void
/* Store register REGNO, or all if REGNO == -1.
Return errno value. */
void
-adapt_store_register (regno)
- int regno;
+adapt_store_register (int regno)
{
/* printf("adapt_store_register() called.\n"); fflush(stdout); /* */
if (regno == -1)
{
/* printf("adapt_store_register() called.\n"); fflush(stdout); /* */
if (regno == -1)
@@
-1166,14
+1133,13
@@
adapt_store_register (regno)
debugged. */
void
debugged. */
void
-adapt_prepare_to_store ()
+adapt_prepare_to_store (
void
)
{
/* Do nothing, since we can store individual regs */
}
static CORE_ADDR
{
/* Do nothing, since we can store individual regs */
}
static CORE_ADDR
-translate_addr (addr)
- CORE_ADDR addr;
+translate_addr (CORE_ADDR addr)
{
#if defined(KERNEL_DEBUGGING)
/* Check for a virtual address in the kernel */
{
#if defined(KERNEL_DEBUGGING)
/* Check for a virtual address in the kernel */
@@
-1196,11
+1162,9
@@
translate_addr (addr)
/* FIXME! Merge these two. */
int
/* FIXME! Merge these two. */
int
-adapt_xfer_inferior_memory (memaddr, myaddr, len, write)
- CORE_ADDR memaddr;
- char *myaddr;
- int len;
- int write;
+adapt_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+ struct mem_attrib *attrib ATTRIBUTE_UNUSED,
+ struct target_ops *target ATTRIBUTE_UNUSED)
{
memaddr = translate_addr (memaddr);
{
memaddr = translate_addr (memaddr);
@@
-1212,7
+1176,7
@@
adapt_xfer_inferior_memory (memaddr, myaddr, len, write)
}
void
}
void
-adapt_files_info ()
+adapt_files_info (
void
)
{
printf_filtered ("\tAttached to %s at %d baud and running program %s\n",
dev_name, baudrate, prog_name);
{
printf_filtered ("\tAttached to %s at %d baud and running program %s\n",
dev_name, baudrate, prog_name);
@@
-1224,10
+1188,7
@@
adapt_files_info ()
* sb/sh instructions don't work on unaligned addresses, when TU=1.
*/
int
* sb/sh instructions don't work on unaligned addresses, when TU=1.
*/
int
-adapt_write_inferior_memory (memaddr, myaddr, len)
- CORE_ADDR memaddr;
- char *myaddr;
- int len;
+adapt_write_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len)
{
int i;
unsigned int cps;
{
int i;
unsigned int cps;
@@
-1258,10
+1219,7
@@
adapt_write_inferior_memory (memaddr, myaddr, len)
/* Read LEN bytes from inferior memory at MEMADDR. Put the result
at debugger address MYADDR. Returns errno value. */
int
/* Read LEN bytes from inferior memory at MEMADDR. Put the result
at debugger address MYADDR. Returns errno value. */
int
-adapt_read_inferior_memory (memaddr, myaddr, len)
- CORE_ADDR memaddr;
- char *myaddr;
- int len;
+adapt_read_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len)
{
int i;
{
int i;
@@
-1332,10
+1290,14
@@
adapt_read_inferior_memory (memaddr, myaddr, len)
#define MAX_BREAKS 8
static int num_brkpts = 0;
#define MAX_BREAKS 8
static int num_brkpts = 0;
+
+/* Insert a breakpoint at ADDR. SAVE is normally the address of the
+ pattern buffer where the instruction that the breakpoint overwrites
+ is saved. It is unused here since the Adapt Monitor is responsible
+ for saving/restoring the original instruction. */
+
static int
static int
-adapt_insert_breakpoint (addr, save)
- CORE_ADDR addr;
- char *save; /* Throw away, let adapt save instructions */
+adapt_insert_breakpoint (CORE_ADDR addr, char *save)
{
if (num_brkpts < MAX_BREAKS)
{
{
if (num_brkpts < MAX_BREAKS)
{
@@
-1353,10
+1315,13
@@
adapt_insert_breakpoint (addr, save)
}
}
}
}
+
+/* Remove a breakpoint at ADDR. SAVE is normally the previously
+ saved pattern, but is unused here as the Adapt Monitor is
+ responsible for saving/restoring instructions. */
+
static int
static int
-adapt_remove_breakpoint (addr, save)
- CORE_ADDR addr;
- char *save; /* Throw away, let adapt save instructions */
+adapt_remove_breakpoint (CORE_ADDR addr, char *save)
{
if (num_brkpts > 0)
{
{
if (num_brkpts > 0)
{
@@
-1371,7
+1336,7
@@
adapt_remove_breakpoint (addr, save)
/* Clear the adapts notion of what the break points are */
static int
/* Clear the adapts notion of what the break points are */
static int
-adapt_clear_breakpoints ()
+adapt_clear_breakpoints (
void
)
{
if (adapt_stream)
{
{
if (adapt_stream)
{
@@
-1383,7
+1348,7
@@
adapt_clear_breakpoints ()
num_brkpts = 0;
}
static void
num_brkpts = 0;
}
static void
-adapt_mourn ()
+adapt_mourn (
void
)
{
adapt_clear_breakpoints ();
pop_target (); /* Pop back to no-child state */
{
adapt_clear_breakpoints ();
pop_target (); /* Pop back to no-child state */
@@
-1394,8
+1359,7
@@
adapt_mourn ()
* specified string
*/
static int
* specified string
*/
static int
-display_until (str)
- char *str;
+display_until (char *str)
{
int i = 0, j, c;
{
int i = 0, j, c;
@@
-1429,9
+1393,7
@@
display_until (str)
FIXME: Can't handle commands that take input. */
void
FIXME: Can't handle commands that take input. */
void
-adapt_com (args, fromtty)
- char *args;
- int fromtty;
+adapt_com (char *args, int fromtty)
{
if (!adapt_stream)
{
{
if (!adapt_stream)
{
@@
-1540,7
+1502,6
@@
init_adapt_ops (void)
adapt_ops.to_thread_alive = 0;
adapt_ops.to_stop = 0; /* process_stratum; */
adapt_ops.to_pid_to_exec_file = NULL;
adapt_ops.to_thread_alive = 0;
adapt_ops.to_stop = 0; /* process_stratum; */
adapt_ops.to_pid_to_exec_file = NULL;
- adapt_ops.to_core_file_to_sym_file = NULL;
adapt_ops.to_stratum = 0;
adapt_ops.DONT_USE = 0;
adapt_ops.to_has_all_memory = 1;
adapt_ops.to_stratum = 0;
adapt_ops.DONT_USE = 0;
adapt_ops.to_has_all_memory = 1;
@@
-1554,7
+1515,7
@@
init_adapt_ops (void)
} /* init_adapt_ops */
void
} /* init_adapt_ops */
void
-_initialize_remote_adapt ()
+_initialize_remote_adapt (
void
)
{
init_adapt_ops ();
add_target (&adapt_ops);
{
init_adapt_ops ();
add_target (&adapt_ops);
This page took
0.029155 seconds
and
4
git commands to generate.