projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revised test (that is not O(n2)) for checking for orphaned cloned symbols
[deliverable/binutils-gdb.git]
/
gdb
/
remote-sim.c
diff --git
a/gdb/remote-sim.c
b/gdb/remote-sim.c
index 538f8a4dbc16275583fa32cf088d4f5e5cfc1bf7..4e36f54af9a538a8b0f66395dc68adcfee79e77a 100644
(file)
--- a/
gdb/remote-sim.c
+++ b/
gdb/remote-sim.c
@@
-1,7
+1,7
@@
/* Generic remote debugging interface for simulators.
/* Generic remote debugging interface for simulators.
- Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002 Free Software Foundation, Inc.
+ Copyright
(C)
1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+ 2002
, 2004, 2005, 2006
Free Software Foundation, Inc.
Contributed by Cygnus Support.
Steve Chamberlain (sac@cygnus.com).
Contributed by Cygnus Support.
Steve Chamberlain (sac@cygnus.com).
@@
-20,8
+20,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA. */
#include "defs.h"
#include "inferior.h"
#include "defs.h"
#include "inferior.h"
@@
-42,13
+42,13
@@
#include "regcache.h"
#include "gdb_assert.h"
#include "sim-regno.h"
#include "regcache.h"
#include "gdb_assert.h"
#include "sim-regno.h"
+#include "arch-utils.h"
+#include "readline/readline.h"
/* Prototypes */
extern void _initialize_remote_sim (void);
/* Prototypes */
extern void _initialize_remote_sim (void);
-extern int (*ui_loop_hook) (int signo);
-
static void dump_mem (char *buf, int len);
static void init_callbacks (void);
static void dump_mem (char *buf, int len);
static void init_callbacks (void);
@@
-82,8
+82,6
@@
static void gdbsim_kill (void);
static void gdbsim_load (char *prog, int fromtty);
static void gdbsim_load (char *prog, int fromtty);
-static void gdbsim_create_inferior (char *exec_file, char *args, char **env);
-
static void gdbsim_open (char *args, int from_tty);
static void gdbsim_close (int quitting);
static void gdbsim_open (char *args, int from_tty);
static void gdbsim_close (int quitting);
@@
-96,11
+94,6
@@
static ptid_t gdbsim_wait (ptid_t ptid, struct target_waitstatus *status);
static void gdbsim_prepare_to_store (void);
static void gdbsim_prepare_to_store (void);
-static int gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr,
- int len, int write,
- struct mem_attrib *attrib,
- struct target_ops *target);
-
static void gdbsim_files_info (struct target_ops *target);
static void gdbsim_mourn_inferior (void);
static void gdbsim_files_info (struct target_ops *target);
static void gdbsim_mourn_inferior (void);
@@
-220,7
+213,7
@@
gdb_os_write_stderr (host_callback *p, const char *buf, int len)
{
b[0] = buf[i];
b[1] = 0;
{
b[0] = buf[i];
b[1] = 0;
- fputs_unfiltered (b, gdb_stdtarg);
+ fputs_unfiltered (b, gdb_stdtarg
err
);
}
return len;
}
}
return len;
}
@@
-230,7
+223,7
@@
gdb_os_write_stderr (host_callback *p, const char *buf, int len)
static void
gdb_os_flush_stderr (host_callback *p)
{
static void
gdb_os_flush_stderr (host_callback *p)
{
- gdb_flush (gdb_stderr);
+ gdb_flush (gdb_std
targ
err);
}
/* GDB version of printf_filtered callback. */
}
/* GDB version of printf_filtered callback. */
@@
-267,8
+260,8
@@
gdb_os_evprintf_filtered (host_callback * p, const char *format, va_list ap)
static void
gdb_os_error (host_callback * p, const char *format,...)
{
static void
gdb_os_error (host_callback * p, const char *format,...)
{
- if (error_hook)
- (*error_hook) ();
+ if (
deprecated_
error_hook)
+ (*
deprecated_
error_hook) ();
else
{
va_list args;
else
{
va_list args;
@@
-307,7
+300,7
@@
gdbsim_fetch_register (int regno)
char buf[MAX_REGISTER_SIZE];
int nr_bytes;
memset (buf, 0, MAX_REGISTER_SIZE);
char buf[MAX_REGISTER_SIZE];
int nr_bytes;
memset (buf, 0, MAX_REGISTER_SIZE);
-
supply_register (
regno, buf);
+
regcache_raw_supply (current_regcache,
regno, buf);
set_register_cached (regno, -1);
break;
}
set_register_cached (regno, -1);
break;
}
@@
-320,14
+313,14
@@
gdbsim_fetch_register (int regno)
memset (buf, 0, MAX_REGISTER_SIZE);
nr_bytes = sim_fetch_register (gdbsim_desc,
REGISTER_SIM_REGNO (regno),
memset (buf, 0, MAX_REGISTER_SIZE);
nr_bytes = sim_fetch_register (gdbsim_desc,
REGISTER_SIM_REGNO (regno),
- buf,
DEPRECATED_REGISTER_RAW_SIZE (
regno));
- if (nr_bytes > 0 && nr_bytes !=
DEPRECATED_REGISTER_RAW_SIZE (
regno) && warn_user)
+ buf,
register_size (current_gdbarch,
regno));
+ if (nr_bytes > 0 && nr_bytes !=
register_size (current_gdbarch,
regno) && warn_user)
{
fprintf_unfiltered (gdb_stderr,
"Size of register %s (%d/%d) incorrect (%d instead of %d))",
REGISTER_NAME (regno),
regno, REGISTER_SIM_REGNO (regno),
{
fprintf_unfiltered (gdb_stderr,
"Size of register %s (%d/%d) incorrect (%d instead of %d))",
REGISTER_NAME (regno),
regno, REGISTER_SIM_REGNO (regno),
- nr_bytes,
DEPRECATED_REGISTER_RAW_SIZE (
regno));
+ nr_bytes,
register_size (current_gdbarch,
regno));
warn_user = 0;
}
/* FIXME: cagney/2002-05-27: Should check `nr_bytes == 0'
warn_user = 0;
}
/* FIXME: cagney/2002-05-27: Should check `nr_bytes == 0'
@@
-335,12
+328,12
@@
gdbsim_fetch_register (int regno)
which registers are fetchable. */
/* Else if (nr_bytes < 0): an old simulator, that doesn't
think to return the register size. Just assume all is ok. */
which registers are fetchable. */
/* Else if (nr_bytes < 0): an old simulator, that doesn't
think to return the register size. Just assume all is ok. */
-
supply_register (
regno, buf);
+
regcache_raw_supply (current_regcache,
regno, buf);
if (sr_get_debug ())
{
printf_filtered ("gdbsim_fetch_register: %d", regno);
/* FIXME: We could print something more intelligible. */
if (sr_get_debug ())
{
printf_filtered ("gdbsim_fetch_register: %d", regno);
/* FIXME: We could print something more intelligible. */
- dump_mem (buf,
DEPRECATED_REGISTER_RAW_SIZE (
regno));
+ dump_mem (buf,
register_size (current_gdbarch,
regno));
}
break;
}
}
break;
}
@@
-364,10
+357,10
@@
gdbsim_store_register (int regno)
deprecated_read_register_gen (regno, tmp);
nr_bytes = sim_store_register (gdbsim_desc,
REGISTER_SIM_REGNO (regno),
deprecated_read_register_gen (regno, tmp);
nr_bytes = sim_store_register (gdbsim_desc,
REGISTER_SIM_REGNO (regno),
- tmp,
DEPRECATED_REGISTER_RAW_SIZE (
regno));
- if (nr_bytes > 0 && nr_bytes !=
DEPRECATED_REGISTER_RAW_SIZE (
regno))
+ tmp,
register_size (current_gdbarch,
regno));
+ if (nr_bytes > 0 && nr_bytes !=
register_size (current_gdbarch,
regno))
internal_error (__FILE__, __LINE__,
internal_error (__FILE__, __LINE__,
-
"Register size different to expected"
);
+
_("Register size different to expected")
);
/* FIXME: cagney/2002-05-27: Should check `nr_bytes == 0'
indicating that GDB and the SIM have different ideas about
which registers are fetchable. */
/* FIXME: cagney/2002-05-27: Should check `nr_bytes == 0'
indicating that GDB and the SIM have different ideas about
which registers are fetchable. */
@@
-375,7
+368,7
@@
gdbsim_store_register (int regno)
{
printf_filtered ("gdbsim_store_register: %d", regno);
/* FIXME: We could print something more intelligible. */
{
printf_filtered ("gdbsim_store_register: %d", regno);
/* FIXME: We could print something more intelligible. */
- dump_mem (tmp,
DEPRECATED_REGISTER_RAW_SIZE (
regno));
+ dump_mem (tmp,
register_size (current_gdbarch,
regno));
}
}
}
}
}
}
@@
-399,8
+392,21
@@
gdbsim_kill (void)
GDB's symbol tables to match. */
static void
GDB's symbol tables to match. */
static void
-gdbsim_load (char *
prog
, int fromtty)
+gdbsim_load (char *
args
, int fromtty)
{
{
+ char **argv = buildargv (args);
+ char *prog;
+
+ if (argv == NULL)
+ nomem (0);
+
+ make_cleanup_freeargv (argv);
+
+ prog = tilde_expand (argv[0]);
+
+ if (argv[1] != NULL)
+ error (_("GDB sim does not yet support a load offset."));
+
if (sr_get_debug ())
printf_filtered ("gdbsim_load: prog \"%s\"\n", prog);
if (sr_get_debug ())
printf_filtered ("gdbsim_load: prog \"%s\"\n", prog);
@@
-410,7
+416,7
@@
gdbsim_load (char *prog, int fromtty)
Need error to either not print anything if passed NULL or need
another routine that doesn't take any arguments. */
if (sim_load (gdbsim_desc, prog, NULL, fromtty) == SIM_RC_FAIL)
Need error to either not print anything if passed NULL or need
another routine that doesn't take any arguments. */
if (sim_load (gdbsim_desc, prog, NULL, fromtty) == SIM_RC_FAIL)
- error (
"unable to load program"
);
+ error (
_("unable to load program")
);
/* FIXME: If a load command should reset the targets registers then
a call to sim_create_inferior() should go here. */
/* FIXME: If a load command should reset the targets registers then
a call to sim_create_inferior() should go here. */
@@
-428,15
+434,15
@@
gdbsim_load (char *prog, int fromtty)
user types "run" after having attached. */
static void
user types "run" after having attached. */
static void
-gdbsim_create_inferior (char *exec_file, char *args, char **env)
+gdbsim_create_inferior (char *exec_file, char *args, char **env
, int from_tty
)
{
int len;
char *arg_buf, **argv;
if (exec_file == 0 || exec_bfd == 0)
{
int len;
char *arg_buf, **argv;
if (exec_file == 0 || exec_bfd == 0)
- warning (
"No executable file specified."
);
+ warning (
_("No executable file specified.")
);
if (!program_loaded)
if (!program_loaded)
- warning (
"No program loaded."
);
+ warning (
_("No program loaded.")
);
if (sr_get_debug ())
printf_filtered ("gdbsim_create_inferior: exec_file \"%s\", args \"%s\"\n",
if (sr_get_debug ())
printf_filtered ("gdbsim_create_inferior: exec_file \"%s\", args \"%s\"\n",
@@
-466,9
+472,6
@@
gdbsim_create_inferior (char *exec_file, char *args, char **env)
insert_breakpoints (); /* Needed to get correct instruction in cache */
clear_proceed_status ();
insert_breakpoints (); /* Needed to get correct instruction in cache */
clear_proceed_status ();
-
- /* NB: Entry point already set by sim_create_inferior. */
- proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 0);
}
/* The open routine takes the rest of the parameters from the command,
}
/* The open routine takes the rest of the parameters from the command,
@@
-504,27
+507,23
@@
gdbsim_open (char *args, int from_tty)
strcpy (arg_buf, "gdbsim"); /* 7 */
/* Specify the byte order for the target when it is both selectable
and explicitly specified by the user (not auto detected). */
strcpy (arg_buf, "gdbsim"); /* 7 */
/* Specify the byte order for the target when it is both selectable
and explicitly specified by the user (not auto detected). */
-
if (!TARGET_BYTE_ORDER_AUTO
)
+
switch (selected_byte_order ()
)
{
{
- switch (TARGET_BYTE_ORDER)
- {
- case BFD_ENDIAN_BIG:
- strcat (arg_buf, " -E big");
- break;
- case BFD_ENDIAN_LITTLE:
- strcat (arg_buf, " -E little");
- break;
- default:
- internal_error (__FILE__, __LINE__,
- "Value of TARGET_BYTE_ORDER unknown");
- }
+ case BFD_ENDIAN_BIG:
+ strcat (arg_buf, " -E big");
+ break;
+ case BFD_ENDIAN_LITTLE:
+ strcat (arg_buf, " -E little");
+ break;
+ case BFD_ENDIAN_UNKNOWN:
+ break;
}
/* Specify the architecture of the target when it has been
explicitly specified */
}
/* Specify the architecture of the target when it has been
explicitly specified */
- if (
!TARGET_ARCHITECTURE_AUTO
)
+ if (
selected_architecture_name () != NULL
)
{
strcat (arg_buf, " --architecture=");
{
strcat (arg_buf, " --architecture=");
- strcat (arg_buf,
TARGET_ARCHITECTURE->printable_name
);
+ strcat (arg_buf,
selected_architecture_name ()
);
}
/* finally, any explicit args */
if (args)
}
/* finally, any explicit args */
if (args)
@@
-534,14
+533,14
@@
gdbsim_open (char *args, int from_tty)
}
argv = buildargv (arg_buf);
if (argv == NULL)
}
argv = buildargv (arg_buf);
if (argv == NULL)
- error (
"Insufficient memory available to allocate simulator arg list."
);
+ error (
_("Insufficient memory available to allocate simulator arg list.")
);
make_cleanup_freeargv (argv);
init_callbacks ();
gdbsim_desc = sim_open (SIM_OPEN_DEBUG, &gdb_callback, exec_bfd, argv);
if (gdbsim_desc == 0)
make_cleanup_freeargv (argv);
init_callbacks ();
gdbsim_desc = sim_open (SIM_OPEN_DEBUG, &gdb_callback, exec_bfd, argv);
if (gdbsim_desc == 0)
- error (
"unable to create simulator instance"
);
+ error (
_("unable to create simulator instance")
);
push_target (&gdbsim_ops);
target_fetch_registers (-1);
push_target (&gdbsim_ops);
target_fetch_registers (-1);
@@
-606,7
+605,7
@@
static void
gdbsim_resume (ptid_t ptid, int step, enum target_signal siggnal)
{
if (PIDGET (inferior_ptid) != 42)
gdbsim_resume (ptid_t ptid, int step, enum target_signal siggnal)
{
if (PIDGET (inferior_ptid) != 42)
- error (
"The program is not being run."
);
+ error (
_("The program is not being run.")
);
if (sr_get_debug ())
printf_filtered ("gdbsim_resume: step %d, signal %d\n", step, siggnal);
if (sr_get_debug ())
printf_filtered ("gdbsim_resume: step %d, signal %d\n", step, siggnal);
@@
-634,13
+633,13
@@
gdbsim_stop (void)
}
/* GDB version of os_poll_quit callback.
}
/* GDB version of os_poll_quit callback.
- Taken from gdb/util.c - should be in a library */
+ Taken from gdb/util.c - should be in a library
.
*/
static int
gdb_os_poll_quit (host_callback *p)
{
static int
gdb_os_poll_quit (host_callback *p)
{
- if (ui_loop_hook != NULL)
- ui_loop_hook (0);
+ if (
deprecated_
ui_loop_hook != NULL)
+
deprecated_
ui_loop_hook (0);
if (quit_flag) /* gdb's idea of quit */
{
if (quit_flag) /* gdb's idea of quit */
{
@@
-686,8
+685,7
@@
gdbsim_wait (ptid_t ptid, struct target_waitstatus *status)
#else
prev_sigint = signal (SIGINT, gdbsim_cntrl_c);
#endif
#else
prev_sigint = signal (SIGINT, gdbsim_cntrl_c);
#endif
- sim_resume (gdbsim_desc, resume_step,
- target_signal_to_host (resume_siggnal));
+ sim_resume (gdbsim_desc, resume_step, resume_siggnal);
signal (SIGINT, prev_sigint);
resume_step = 0;
signal (SIGINT, prev_sigint);
resume_step = 0;
@@
-702,24
+700,20
@@
gdbsim_wait (ptid_t ptid, struct target_waitstatus *status)
case sim_stopped:
switch (sigrc)
{
case sim_stopped:
switch (sigrc)
{
- case
SIG
ABRT:
+ case
TARGET_SIGNAL_
ABRT:
quit ();
break;
quit ();
break;
- case
SIG
INT:
- case
SIG
TRAP:
+ case
TARGET_SIGNAL_
INT:
+ case
TARGET_SIGNAL_
TRAP:
default:
status->kind = TARGET_WAITKIND_STOPPED;
default:
status->kind = TARGET_WAITKIND_STOPPED;
- /* The signal in sigrc is a host signal. That probably
- should be fixed. */
- status->value.sig = target_signal_from_host (sigrc);
+ status->value.sig = sigrc;
break;
}
break;
case sim_signalled:
status->kind = TARGET_WAITKIND_SIGNALLED;
break;
}
break;
case sim_signalled:
status->kind = TARGET_WAITKIND_SIGNALLED;
- /* The signal in sigrc is a host signal. That probably
- should be fixed. */
- status->value.sig = target_signal_from_host (sigrc);
+ status->value.sig = sigrc;
break;
case sim_running:
case sim_polling:
break;
case sim_running:
case sim_polling:
@@
-749,12
+743,12
@@
gdbsim_prepare_to_store (void)
Returns the number of bytes transferred. */
static int
Returns the number of bytes transferred. */
static int
-gdbsim_xfer_inferior_memory (CORE_ADDR memaddr,
char
*myaddr, int len,
+gdbsim_xfer_inferior_memory (CORE_ADDR memaddr,
gdb_byte
*myaddr, int len,
int write, struct mem_attrib *attrib,
struct target_ops *target)
{
if (!program_loaded)
int write, struct mem_attrib *attrib,
struct target_ops *target)
{
if (!program_loaded)
- error (
"No program loaded."
);
+ error (
_("No program loaded.")
);
if (sr_get_debug ())
{
if (sr_get_debug ())
{
@@
-811,18
+805,6
@@
gdbsim_mourn_inferior (void)
generic_mourn_inferior ();
}
generic_mourn_inferior ();
}
-static int
-gdbsim_insert_breakpoint (CORE_ADDR addr, char *contents_cache)
-{
- return memory_insert_breakpoint (addr, contents_cache);
-}
-
-static int
-gdbsim_remove_breakpoint (CORE_ADDR addr, char *contents_cache)
-{
- return memory_remove_breakpoint (addr, contents_cache);
-}
-
/* Pass the command argument through to the simulator verbatim. The
simulator must do any command interpretation work. */
/* Pass the command argument through to the simulator verbatim. The
simulator must do any command interpretation work. */
@@
-842,7
+824,7
@@
simulator_command (char *args, int from_tty)
commands, is restricted to the period when the channel to the
simulator is open. */
commands, is restricted to the period when the channel to the
simulator is open. */
- error (
"Not connected to the simulator target"
);
+ error (
_("Not connected to the simulator target")
);
}
sim_do_command (gdbsim_desc, args);
}
sim_do_command (gdbsim_desc, args);
@@
-870,10
+852,10
@@
init_gdbsim_ops (void)
gdbsim_ops.to_fetch_registers = gdbsim_fetch_register;
gdbsim_ops.to_store_registers = gdbsim_store_register;
gdbsim_ops.to_prepare_to_store = gdbsim_prepare_to_store;
gdbsim_ops.to_fetch_registers = gdbsim_fetch_register;
gdbsim_ops.to_store_registers = gdbsim_store_register;
gdbsim_ops.to_prepare_to_store = gdbsim_prepare_to_store;
- gdbsim_ops.
to
_xfer_memory = gdbsim_xfer_inferior_memory;
+ gdbsim_ops.
deprecated
_xfer_memory = gdbsim_xfer_inferior_memory;
gdbsim_ops.to_files_info = gdbsim_files_info;
gdbsim_ops.to_files_info = gdbsim_files_info;
- gdbsim_ops.to_insert_breakpoint =
gdbsim
_insert_breakpoint;
- gdbsim_ops.to_remove_breakpoint =
gdbsim
_remove_breakpoint;
+ gdbsim_ops.to_insert_breakpoint =
memory
_insert_breakpoint;
+ gdbsim_ops.to_remove_breakpoint =
memory
_remove_breakpoint;
gdbsim_ops.to_kill = gdbsim_kill;
gdbsim_ops.to_load = gdbsim_load;
gdbsim_ops.to_create_inferior = gdbsim_create_inferior;
gdbsim_ops.to_kill = gdbsim_kill;
gdbsim_ops.to_load = gdbsim_load;
gdbsim_ops.to_create_inferior = gdbsim_create_inferior;
@@
-898,6
+880,6
@@
_initialize_remote_sim (void)
init_gdbsim_ops ();
add_target (&gdbsim_ops);
init_gdbsim_ops ();
add_target (&gdbsim_ops);
- add_com ("sim
<command>
", class_obscure, simulator_command,
-
"Send a command to the simulator."
);
+ add_com ("sim", class_obscure, simulator_command,
+
_("Send a command to the simulator.")
);
}
}
This page took
0.030619 seconds
and
4
git commands to generate.