projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2002-11-11 Andrew Cagney <ac131313@redhat.com>
[deliverable/binutils-gdb.git]
/
gdb
/
remote-rdp.c
diff --git
a/gdb/remote-rdp.c
b/gdb/remote-rdp.c
index 470a82b0276276ae9d109773c1d8d3adaf35da27..07b340bf9e4bc858fded8e3ab4456d5dc6aea66a 100644
(file)
--- a/
gdb/remote-rdp.c
+++ b/
gdb/remote-rdp.c
@@
-1,5
+1,7
@@
/* Remote debugging for the ARM RDP interface.
/* Remote debugging for the ARM RDP interface.
- Copyright 1994, 1995, 2001 Free Software Foundation, Inc.
+
+ Copyright 1994, 1995, 1998, 1999, 2000, 2001, 2002 Free Software
+ Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-39,7
+41,7
@@
#include "defs.h"
#include "inferior.h"
#include "value.h"
#include "defs.h"
#include "inferior.h"
#include "value.h"
-#include "callback.h"
+#include "
gdb/
callback.h"
#include "command.h"
#include <ctype.h>
#include <fcntl.h>
#include "command.h"
#include <ctype.h>
#include <fcntl.h>
@@
-47,13
+49,17
@@
#include "remote-utils.h"
#include "gdb_string.h"
#include "gdbcore.h"
#include "remote-utils.h"
#include "gdb_string.h"
#include "gdbcore.h"
+#include "regcache.h"
+#include "serial.h"
+
+#include "arm-tdep.h"
#ifdef HAVE_TIME_H
#include <time.h>
#endif
extern struct target_ops remote_rdp_ops;
#ifdef HAVE_TIME_H
#include <time.h>
#endif
extern struct target_ops remote_rdp_ops;
-static s
erial_t
io;
+static s
truct serial *
io;
static host_callback *callback = &default_callback;
struct
static host_callback *callback = &default_callback;
struct
@@
-177,7
+183,7
@@
remote_rdp_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
static unsigned char
get_byte (void)
{
static unsigned char
get_byte (void)
{
- int c =
SERIAL_READCHAR
(io, timeout);
+ int c =
serial_readchar
(io, timeout);
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "[%02x]\n", c);
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "[%02x]\n", c);
@@
-214,7
+220,7
@@
put_byte (char val)
{
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "(%02x)\n", val);
{
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "(%02x)\n", val);
-
SERIAL_WRITE
(io, &val, 1);
+
serial_write
(io, &val, 1);
}
static void
}
static void
@@
-230,7
+236,7
@@
put_word (int val)
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "(%04x)", val);
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "(%04x)", val);
-
SERIAL_WRITE
(io, b, 4);
+
serial_write
(io, b, 4);
}
}
@@
-261,8
+267,8
@@
rdp_init (int cold, int tty)
int restype;
QUIT;
int restype;
QUIT;
-
SERIAL_FLUSH_INPUT
(io);
-
SERIAL_FLUSH_OUTPUT
(io);
+
serial_flush_input
(io);
+
serial_flush_output
(io);
if (tty)
printf_unfiltered ("Trying to connect at %d baud.\n", baudtry);
if (tty)
printf_unfiltered ("Trying to connect at %d baud.\n", baudtry);
@@
-274,7
+280,7
@@
rdp_init (int cold, int tty)
if (cold)
{
put_byte (RDP_RESET);
if (cold)
{
put_byte (RDP_RESET);
- while ((restype =
SERIAL_READCHAR
(io, 1)) > 0)
+ while ((restype =
serial_readchar
(io, 1)) > 0)
{
switch (restype)
{
{
switch (restype)
{
@@
-301,7
+307,7
@@
rdp_init (int cold, int tty)
put_byte (type | RDP_OPEN_TYPE_RETURN_SEX);
put_word (0);
put_byte (type | RDP_OPEN_TYPE_RETURN_SEX);
put_word (0);
- while (!sync && (restype =
SERIAL_READCHAR
(io, 1)) > 0)
+ while (!sync && (restype =
serial_readchar
(io, 1)) > 0)
{
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "[%02x]\n", restype);
{
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "[%02x]\n", restype);
@@
-312,13
+318,13
@@
rdp_init (int cold, int tty)
break;
case RDP_RESET:
break;
case RDP_RESET:
- while ((restype =
SERIAL_READCHAR
(io, 1)) == RDP_RESET)
+ while ((restype =
serial_readchar
(io, 1)) == RDP_RESET)
;
do
{
printf_unfiltered ("%c", isgraph (restype) ? restype : ' ');
}
;
do
{
printf_unfiltered ("%c", isgraph (restype) ? restype : ' ');
}
- while ((restype =
SERIAL_READCHAR
(io, 1)) > 0);
+ while ((restype =
serial_readchar
(io, 1)) > 0);
if (tty)
{
if (tty)
{
@@
-336,7
+342,7
@@
rdp_init (int cold, int tty)
case RDP_RES_VALUE:
{
case RDP_RES_VALUE:
{
- int resval =
SERIAL_READCHAR
(io, 1);
+ int resval =
serial_readchar
(io, 1);
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "[%02x]\n", resval);
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "[%02x]\n", resval);
@@
-346,11
+352,11
@@
rdp_init (int cold, int tty)
case SERIAL_TIMEOUT:
break;
case RDP_RES_VALUE_LITTLE_ENDIAN:
case SERIAL_TIMEOUT:
break;
case RDP_RES_VALUE_LITTLE_ENDIAN:
- target_byte_order =
LITTLE_ENDIAN
;
+ target_byte_order =
BFD_ENDIAN_LITTLE
;
sync = 1;
break;
case RDP_RES_VALUE_BIG_ENDIAN:
sync = 1;
break;
case RDP_RES_VALUE_BIG_ENDIAN:
- target_byte_order = B
IG_ENDIAN
;
+ target_byte_order = B
FD_ENDIAN_BIG
;
sync = 1;
break;
default:
sync = 1;
break;
default:
@@
-456,13
+462,13
@@
send_rdp (char *template,...)
pc = va_arg (alist, char *);
val = va_arg (alist, int);
dst = buf;
pc = va_arg (alist, char *);
val = va_arg (alist, int);
dst = buf;
-
SERIAL_WRITE
(io, pc, val);
+
serial_write
(io, pc, val);
break;
case '-':
/* Send whats in the queue */
if (dst != buf)
{
break;
case '-':
/* Send whats in the queue */
if (dst != buf)
{
-
SERIAL_WRITE
(io, buf, dst - buf);
+
serial_write
(io, buf, dst - buf);
dst = buf;
}
break;
dst = buf;
}
break;
@@
-606,17
+612,17
@@
remote_rdp_fetch_register (int regno)
}
else
{
}
else
{
- char buf[MAX_REGISTER_RAW_SIZE];
+ char buf[
ARM_
MAX_REGISTER_RAW_SIZE];
if (regno < 15)
rdp_fetch_one_register (1 << regno, buf);
if (regno < 15)
rdp_fetch_one_register (1 << regno, buf);
- else if (regno == PC_REGNUM)
+ else if (regno ==
ARM_
PC_REGNUM)
rdp_fetch_one_register (RDP_CPU_READWRITE_MASK_PC, buf);
rdp_fetch_one_register (RDP_CPU_READWRITE_MASK_PC, buf);
- else if (regno == PS_REGNUM)
+ else if (regno ==
ARM_
PS_REGNUM)
rdp_fetch_one_register (RDP_CPU_READWRITE_MASK_CPSR, buf);
rdp_fetch_one_register (RDP_CPU_READWRITE_MASK_CPSR, buf);
- else if (regno == FPS_REGNUM)
+ else if (regno ==
ARM_
FPS_REGNUM)
rdp_fetch_one_fpu_register (RDP_FPU_READWRITE_MASK_FPS, buf);
rdp_fetch_one_fpu_register (RDP_FPU_READWRITE_MASK_FPS, buf);
- else if (regno >=
F0_REGNUM && regno <=
F7_REGNUM)
- rdp_fetch_one_fpu_register (1 << (regno - F0_REGNUM), buf);
+ else if (regno >=
ARM_F0_REGNUM && regno <= ARM_
F7_REGNUM)
+ rdp_fetch_one_fpu_register (1 << (regno -
ARM_
F0_REGNUM), buf);
else
{
printf ("Help me with fetch reg %d\n", regno);
else
{
printf ("Help me with fetch reg %d\n", regno);
@@
-636,16
+642,16
@@
remote_rdp_store_register (int regno)
}
else
{
}
else
{
- char tmp[MAX_REGISTER_RAW_SIZE];
- read_register_gen (regno, tmp);
+ char tmp[
ARM_
MAX_REGISTER_RAW_SIZE];
+
deprecated_
read_register_gen (regno, tmp);
if (regno < 15)
rdp_store_one_register (1 << regno, tmp);
if (regno < 15)
rdp_store_one_register (1 << regno, tmp);
- else if (regno == PC_REGNUM)
+ else if (regno ==
ARM_
PC_REGNUM)
rdp_store_one_register (RDP_CPU_READWRITE_MASK_PC, tmp);
rdp_store_one_register (RDP_CPU_READWRITE_MASK_PC, tmp);
- else if (regno == PS_REGNUM)
+ else if (regno ==
ARM_
PS_REGNUM)
rdp_store_one_register (RDP_CPU_READWRITE_MASK_CPSR, tmp);
rdp_store_one_register (RDP_CPU_READWRITE_MASK_CPSR, tmp);
- else if (regno >=
F0_REGNUM && regno <=
F7_REGNUM)
- rdp_store_one_fpu_register (1 << (regno - F0_REGNUM), tmp);
+ else if (regno >=
ARM_F0_REGNUM && regno <= ARM_
F7_REGNUM)
+ rdp_store_one_fpu_register (1 << (regno -
ARM_
F0_REGNUM), tmp);
else
{
printf ("Help me with reg %d\n", regno);
else
{
printf ("Help me with reg %d\n", regno);
@@
-697,13
+703,7
@@
rdp_set_command_line (char *command, char *args)
if (commandline != NULL)
xfree (commandline);
if (commandline != NULL)
xfree (commandline);
- commandline = malloc (strlen (command) + strlen (args) + 2);
- if (commandline != NULL)
- {
- strcpy (commandline, command);
- strcat (commandline, " ");
- strcat (commandline, args);
- }
+ xasprintf (&commandline, "%s %s", command, args);
}
static void
}
static void
@@
-998,12
+998,12
@@
rdp_execute_finish (void)
while (running)
{
int res;
while (running)
{
int res;
- res =
SERIAL_READCHAR
(io, 1);
+ res =
serial_readchar
(io, 1);
while (res == SERIAL_TIMEOUT)
{
QUIT;
printf_filtered ("Waiting for target..\n");
while (res == SERIAL_TIMEOUT)
{
QUIT;
printf_filtered ("Waiting for target..\n");
- res =
SERIAL_READCHAR
(io, 1);
+ res =
serial_readchar
(io, 1);
}
switch (res)
}
switch (res)
@@
-1094,7
+1094,7
@@
rdp_step (void)
else
{
char handle[4];
else
{
char handle[4];
- CORE_ADDR pc = read_register (PC_REGNUM);
+ CORE_ADDR pc = read_register (
ARM_
PC_REGNUM);
pc = arm_get_next_pc (pc);
remote_rdp_insert_breakpoint (pc, handle);
rdp_execute ();
pc = arm_get_next_pc (pc);
remote_rdp_insert_breakpoint (pc, handle);
rdp_execute ();
@@
-1114,12
+1114,12
@@
remote_rdp_open (char *args, int from_tty)
target_preopen (from_tty);
target_preopen (from_tty);
- io =
SERIAL_OPEN
(args);
+ io =
serial_open
(args);
if (!io)
perror_with_name (args);
if (!io)
perror_with_name (args);
-
SERIAL_RAW
(io);
+
serial_raw
(io);
rdp_init (1, from_tty);
rdp_init (1, from_tty);
@@
-1164,7
+1164,7
@@
remote_rdp_open (char *args, int from_tty)
registers_changed ();
stop_pc = read_pc ();
set_current_frame (create_new_frame (read_fp (), stop_pc));
registers_changed ();
stop_pc = read_pc ();
set_current_frame (create_new_frame (read_fp (), stop_pc));
- select_frame (get_current_frame ()
, 0
);
+ select_frame (get_current_frame ());
print_stack_frame (selected_frame, -1, 1);
}
print_stack_frame (selected_frame, -1, 1);
}
@@
-1177,7
+1177,7
@@
remote_rdp_close (int quitting)
{
callback->shutdown (callback);
if (io)
{
callback->shutdown (callback);
if (io)
-
SERIAL_CLOSE
(io);
+
serial_close
(io);
io = 0;
}
io = 0;
}
@@
-1187,7
+1187,7
@@
remote_rdp_close (int quitting)
to the target, or zero for no signal. */
static void
to the target, or zero for no signal. */
static void
-remote_rdp_resume (
int p
id, int step, enum target_signal siggnal)
+remote_rdp_resume (
ptid_t pt
id, int step, enum target_signal siggnal)
{
if (step)
rdp_step ();
{
if (step)
rdp_step ();
@@
-1199,8
+1199,8
@@
remote_rdp_resume (int pid, int step, enum target_signal siggnal)
or -1 in case of error; store status through argument pointer STATUS,
just as `wait' would. */
or -1 in case of error; store status through argument pointer STATUS,
just as `wait' would. */
-static
in
t
-remote_rdp_wait (
int p
id, struct target_waitstatus *status)
+static
ptid_
t
+remote_rdp_wait (
ptid_t pt
id, struct target_waitstatus *status)
{
switch (ds.rdi_stopped_status)
{
{
switch (ds.rdi_stopped_status)
{
@@
-1226,7
+1226,7
@@
remote_rdp_wait (int pid, struct target_waitstatus *status)
#endif
}
#endif
}
- return inferior_pid;
+ return inferior_p
t
id;
}
/* Get ready to modify the registers array. On machines which store
}
/* Get ready to modify the registers array. On machines which store
@@
-1249,9
+1249,8
@@
remote_rdp_prepare_to_store (void)
static int
remote_rdp_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
static int
remote_rdp_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
- int write,
- struct mem_attrib *attrib ATTRIBUTE_UNUSED,
- struct target_ops *target ATTRIBUTE_UNUSED)
+ int write, struct mem_attrib *attrib,
+ struct target_ops *target)
{
/* I infer from D Taylor's code that there's a limit on the amount
we can transfer in one chunk.. */
{
/* I infer from D Taylor's code that there's a limit on the amount
we can transfer in one chunk.. */
@@
-1352,7
+1351,7
@@
remote_rdp_create_inferior (char *exec_file, char *allargs, char **env)
/* This gives us a chance to set up the command line */
rdp_set_command_line (exec_file, allargs);
/* This gives us a chance to set up the command line */
rdp_set_command_line (exec_file, allargs);
- inferior_p
id = 42
;
+ inferior_p
tid = pid_to_ptid (42)
;
insert_breakpoints (); /* Needed to get correct instruction in cache */
/*
insert_breakpoints (); /* Needed to get correct instruction in cache */
/*
@@
-1364,13
+1363,6
@@
remote_rdp_create_inferior (char *exec_file, char *allargs, char **env)
proceed (entry_point, TARGET_SIGNAL_DEFAULT, 0);
}
proceed (entry_point, TARGET_SIGNAL_DEFAULT, 0);
}
-/* Accept any stray run/attach commands */
-static int
-remote_rdp_can_run (void)
-{
- return 1;
-}
-
/* Attach doesn't need to do anything */
static void
remote_rdp_attach (char *args, int from_tty)
/* Attach doesn't need to do anything */
static void
remote_rdp_attach (char *args, int from_tty)
@@
-1432,12
+1424,11
@@
init_remote_rdp_ops (void)
remote_rdp_ops.to_reported_exec_events_per_exec_call = NULL;
remote_rdp_ops.to_has_exited = NULL;
remote_rdp_ops.to_mourn_inferior = generic_mourn_inferior;
remote_rdp_ops.to_reported_exec_events_per_exec_call = NULL;
remote_rdp_ops.to_has_exited = NULL;
remote_rdp_ops.to_mourn_inferior = generic_mourn_inferior;
- remote_rdp_ops.to_can_run =
remote_rdp_can_run
;
+ remote_rdp_ops.to_can_run =
NULL
;
remote_rdp_ops.to_notice_signals = 0;
remote_rdp_ops.to_thread_alive = 0;
remote_rdp_ops.to_stop = 0;
remote_rdp_ops.to_pid_to_exec_file = NULL;
remote_rdp_ops.to_notice_signals = 0;
remote_rdp_ops.to_thread_alive = 0;
remote_rdp_ops.to_stop = 0;
remote_rdp_ops.to_pid_to_exec_file = NULL;
- remote_rdp_ops.to_core_file_to_sym_file = NULL;
remote_rdp_ops.to_stratum = process_stratum;
remote_rdp_ops.DONT_USE = NULL;
remote_rdp_ops.to_has_all_memory = 1;
remote_rdp_ops.to_stratum = process_stratum;
remote_rdp_ops.DONT_USE = NULL;
remote_rdp_ops.to_has_all_memory = 1;
This page took
0.036759 seconds
and
4
git commands to generate.