X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=gdb%2Fremote-sim.c;h=5fd24cbdb1ab3ea4d62fe5e9658901ca9567c32c;hb=d9f719f1adb653ab40a55e4c1b8c300215b400ff;hp=dda004565591c99e987a7f8ae4049bd480fcf306;hpb=146ec4dbcf11fdac62a9f7174f214e6abb5d36dc;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index dda0045655..5fd24cbdb1 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -1,6 +1,6 @@
/* Generic remote debugging interface for simulators.
- Copyright (C) 1993-2013 Free Software Foundation, Inc.
+ Copyright (C) 1993-2018 Free Software Foundation, Inc.
Contributed by Cygnus Support.
Steve Chamberlain (sac@cygnus.com).
@@ -21,14 +21,14 @@
along with this program. If not, see . */
#include "defs.h"
+#include "gdb_bfd.h"
#include "inferior.h"
+#include "infrun.h"
#include "value.h"
-#include "gdb_string.h"
#include
#include
#include
#include
-#include
#include "terminal.h"
#include "target.h"
#include "gdbcore.h"
@@ -36,16 +36,14 @@
#include "gdb/remote-sim.h"
#include "command.h"
#include "regcache.h"
-#include "gdb_assert.h"
#include "sim-regno.h"
#include "arch-utils.h"
#include "readline/readline.h"
#include "gdbthread.h"
+#include "common/byte-vector.h"
/* Prototypes */
-extern void _initialize_remote_sim (void);
-
static void init_callbacks (void);
static void end_callbacks (void);
@@ -70,33 +68,78 @@ static void gdb_os_evprintf_filtered (host_callback *, const char *, va_list);
static void gdb_os_error (host_callback *, const char *, ...)
ATTRIBUTE_NORETURN;
-static void gdbsim_kill (struct target_ops *);
+void simulator_command (char *args, int from_tty);
+
+/* Naming convention:
+
+ sim_* are the interface to the simulator (see remote-sim.h).
+ gdbsim_* are stuff which is internal to gdb. */
+
+static const target_info gdbsim_target_info = {
+ "sim",
+ N_("simulator"),
+ N_("Use the compiled-in simulator.")
+};
-static void gdbsim_load (char *prog, int fromtty);
+struct gdbsim_target final
+ : public memory_breakpoint_target
+{
+ gdbsim_target ()
+ { to_stratum = process_stratum; }
-static void gdbsim_open (char *args, int from_tty);
+ const target_info &info () const override
+ { return gdbsim_target_info; }
-static void gdbsim_close (void);
+ void close () override;
-static void gdbsim_detach (struct target_ops *ops, char *args, int from_tty);
+ void detach (inferior *inf, int) override;
-static void gdbsim_prepare_to_store (struct regcache *regcache);
+ void resume (ptid_t, int, enum gdb_signal) override;
+ ptid_t wait (ptid_t, struct target_waitstatus *, int) override;
-static void gdbsim_files_info (struct target_ops *target);
+ void fetch_registers (struct regcache *, int) override;
+ void store_registers (struct regcache *, int) override;
+ void prepare_to_store (struct regcache *) override;
-static void gdbsim_mourn_inferior (struct target_ops *target);
+ enum target_xfer_status xfer_partial (enum target_object object,
+ const char *annex,
+ gdb_byte *readbuf,
+ const gdb_byte *writebuf,
+ ULONGEST offset, ULONGEST len,
+ ULONGEST *xfered_len) override;
-static void gdbsim_stop (ptid_t ptid);
+ void files_info () override;
-void simulator_command (char *args, int from_tty);
+ void kill () override;
-/* Naming convention:
+ void load (const char *, int) override;
- sim_* are the interface to the simulator (see remote-sim.h).
- gdbsim_* are stuff which is internal to gdb. */
+ bool can_create_inferior () override { return true; }
+ void create_inferior (const char *, const std::string &,
+ char **, int) override;
-/* Forward data declarations */
-extern struct target_ops gdbsim_ops;
+ void mourn_inferior () override;
+
+ void interrupt () override;
+
+ bool thread_alive (ptid_t ptid) override;
+
+ const char *pid_to_str (ptid_t) override;
+
+ bool has_all_memory () override;
+ bool has_memory () override;
+
+ bool has_stack () override
+ { return default_child_has_stack (); }
+
+ bool has_registers () override
+ { return default_child_has_registers (); }
+
+ bool has_execution (ptid_t ptid) override
+ { return default_child_has_execution (ptid); }
+};
+
+static struct gdbsim_target gdbsim_ops;
static const struct inferior_data *sim_inferior_data_key;
@@ -150,9 +193,10 @@ static int
check_for_duplicate_sim_descriptor (struct inferior *inf, void *arg)
{
struct sim_inferior_data *sim_data;
- SIM_DESC new_sim_desc = arg;
+ SIM_DESC new_sim_desc = (SIM_DESC) arg;
- sim_data = inferior_data (inf, sim_inferior_data_key);
+ sim_data = ((struct sim_inferior_data *)
+ inferior_data (inf, sim_inferior_data_key));
return (sim_data != NULL && sim_data->gdbsim_desc == new_sim_desc);
}
@@ -170,13 +214,13 @@ get_sim_inferior_data (struct inferior *inf, int sim_instance_needed)
{
SIM_DESC sim_desc = NULL;
struct sim_inferior_data *sim_data
- = inferior_data (inf, sim_inferior_data_key);
+ = (struct sim_inferior_data *) inferior_data (inf, sim_inferior_data_key);
/* Try to allocate a new sim instance, if needed. We do this ahead of
a potential allocation of a sim_inferior_data struct in order to
avoid needlessly allocating that struct in the event that the sim
instance allocation fails. */
- if (sim_instance_needed == SIM_INSTANCE_NEEDED
+ if (sim_instance_needed == SIM_INSTANCE_NEEDED
&& (sim_data == NULL || sim_data->gdbsim_desc == NULL))
{
struct inferior *idup;
@@ -186,7 +230,7 @@ get_sim_inferior_data (struct inferior *inf, int sim_instance_needed)
inf->num);
idup = iterate_over_inferiors (check_for_duplicate_sim_descriptor,
- sim_desc);
+ sim_desc);
if (idup != NULL)
{
/* We don't close the descriptor due to the fact that it's
@@ -199,13 +243,13 @@ get_sim_inferior_data (struct inferior *inf, int sim_instance_needed)
error (
_("Inferior %d and inferior %d would have identical simulator state.\n"
"(This simulator does not support the running of more than one inferior.)"),
- inf->num, idup->num);
- }
+ inf->num, idup->num);
+ }
}
if (sim_data == NULL)
{
- sim_data = XZALLOC(struct sim_inferior_data);
+ sim_data = XCNEW(struct sim_inferior_data);
set_inferior_data (inf, sim_inferior_data_key, sim_data);
/* Allocate a ptid for this inferior. */
@@ -221,7 +265,7 @@ get_sim_inferior_data (struct inferior *inf, int sim_instance_needed)
else if (sim_desc)
{
/* This handles the case where sim_data was allocated prior to
- needing a sim instance. */
+ needing a sim instance. */
sim_data->gdbsim_desc = sim_desc;
}
@@ -241,7 +285,7 @@ get_sim_inferior_data_by_ptid (ptid_t ptid, int sim_instance_needed)
if (pid <= 0)
return NULL;
-
+
inf = find_inferior_pid (pid);
if (inf)
@@ -255,7 +299,7 @@ get_sim_inferior_data_by_ptid (ptid_t ptid, int sim_instance_needed)
static void
sim_inferior_data_cleanup (struct inferior *inf, void *data)
{
- struct sim_inferior_data *sim_data = data;
+ struct sim_inferior_data *sim_data = (struct sim_inferior_data *) data;
if (sim_data != NULL)
{
@@ -271,26 +315,26 @@ sim_inferior_data_cleanup (struct inferior *inf, void *data)
static void
dump_mem (const gdb_byte *buf, int len)
{
- printf_filtered ("\t");
+ fputs_unfiltered ("\t", gdb_stdlog);
if (len == 8 || len == 4)
{
uint32_t l[2];
memcpy (l, buf, len);
- printf_filtered ("0x%08x", l[0]);
+ fprintf_unfiltered (gdb_stdlog, "0x%08x", l[0]);
if (len == 8)
- printf_filtered (" 0x%08x", l[1]);
+ fprintf_unfiltered (gdb_stdlog, " 0x%08x", l[1]);
}
else
{
int i;
for (i = 0; i < len; i++)
- printf_filtered ("0x%02x ", buf[i]);
+ fprintf_unfiltered (gdb_stdlog, "0x%02x ", buf[i]);
}
- printf_filtered ("\n");
+ fputs_unfiltered ("\n", gdb_stdlog);
}
/* Initialize gdb_callback. */
@@ -375,8 +419,8 @@ gdb_os_flush_stderr (host_callback *p)
/* GDB version of printf_filtered callback. */
-static void
-gdb_os_printf_filtered (host_callback * p, const char *format,...)
+static void ATTRIBUTE_PRINTF (2, 3)
+gdb_os_printf_filtered (host_callback * p, const char *format, ...)
{
va_list args;
@@ -387,7 +431,7 @@ gdb_os_printf_filtered (host_callback * p, const char *format,...)
/* GDB version of error vprintf_filtered. */
-static void
+static void ATTRIBUTE_PRINTF (2, 0)
gdb_os_vprintf_filtered (host_callback * p, const char *format, va_list ap)
{
vfprintf_filtered (gdb_stdout, format, ap);
@@ -395,7 +439,7 @@ gdb_os_vprintf_filtered (host_callback * p, const char *format, va_list ap)
/* GDB version of error evprintf_filtered. */
-static void
+static void ATTRIBUTE_PRINTF (2, 0)
gdb_os_evprintf_filtered (host_callback * p, const char *format, va_list ap)
{
vfprintf_filtered (gdb_stderr, format, ap);
@@ -403,7 +447,7 @@ gdb_os_evprintf_filtered (host_callback * p, const char *format, va_list ap)
/* GDB version of error callback. */
-static void
+static void ATTRIBUTE_PRINTF (2, 3)
gdb_os_error (host_callback * p, const char *format, ...)
{
va_list args;
@@ -421,18 +465,18 @@ one2one_register_sim_regno (struct gdbarch *gdbarch, int regnum)
return regnum;
}
-static void
-gdbsim_fetch_register (struct target_ops *ops,
- struct regcache *regcache, int regno)
+void
+gdbsim_target::fetch_registers (struct regcache *regcache, int regno)
{
- struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct gdbarch *gdbarch = regcache->arch ();
+ struct inferior *inf = find_inferior_ptid (regcache_get_ptid (regcache));
struct sim_inferior_data *sim_data
- = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED);
+ = get_sim_inferior_data (inf, SIM_INSTANCE_NEEDED);
if (regno == -1)
{
for (regno = 0; regno < gdbarch_num_regs (gdbarch); regno++)
- gdbsim_fetch_register (ops, regcache, regno);
+ fetch_registers (regcache, regno);
return;
}
@@ -443,39 +487,32 @@ gdbsim_fetch_register (struct target_ops *ops,
case SIM_REGNO_DOES_NOT_EXIST:
{
/* For moment treat a `does not exist' register the same way
- as an ``unavailable'' register. */
- gdb_byte buf[MAX_REGISTER_SIZE];
- int nr_bytes;
-
- memset (buf, 0, MAX_REGISTER_SIZE);
- regcache_raw_supply (regcache, regno, buf);
+ as an ``unavailable'' register. */
+ regcache->raw_supply_zeroed (regno);
break;
}
-
+
default:
{
static int warn_user = 1;
- gdb_byte buf[MAX_REGISTER_SIZE];
+ int regsize = register_size (gdbarch, regno);
+ gdb::byte_vector buf (regsize, 0);
int nr_bytes;
gdb_assert (regno >= 0 && regno < gdbarch_num_regs (gdbarch));
- memset (buf, 0, MAX_REGISTER_SIZE);
nr_bytes = sim_fetch_register (sim_data->gdbsim_desc,
gdbarch_register_sim_regno
(gdbarch, regno),
- buf,
- register_size (gdbarch, regno));
- if (nr_bytes > 0
- && nr_bytes != register_size (gdbarch, regno) && warn_user)
+ buf.data (), regsize);
+ if (nr_bytes > 0 && nr_bytes != regsize && warn_user)
{
fprintf_unfiltered (gdb_stderr,
"Size of register %s (%d/%d) "
"incorrect (%d instead of %d))",
gdbarch_register_name (gdbarch, regno),
regno,
- gdbarch_register_sim_regno
- (gdbarch, regno),
- nr_bytes, register_size (gdbarch, regno));
+ gdbarch_register_sim_regno (gdbarch, regno),
+ nr_bytes, regsize);
warn_user = 0;
}
/* FIXME: cagney/2002-05-27: Should check `nr_bytes == 0'
@@ -483,12 +520,13 @@ gdbsim_fetch_register (struct target_ops *ops,
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. */
- regcache_raw_supply (regcache, regno, buf);
+ regcache->raw_supply (regno, buf.data ());
if (remote_debug)
{
- printf_filtered ("gdbsim_fetch_register: %d", regno);
+ fprintf_unfiltered (gdb_stdlog,
+ "gdbsim_fetch_register: %d", regno);
/* FIXME: We could print something more intelligible. */
- dump_mem (buf, register_size (gdbarch, regno));
+ dump_mem (buf.data (), regsize);
}
break;
}
@@ -496,45 +534,47 @@ gdbsim_fetch_register (struct target_ops *ops,
}
-static void
-gdbsim_store_register (struct target_ops *ops,
- struct regcache *regcache, int regno)
+void
+gdbsim_target::store_registers (struct regcache *regcache, int regno)
{
- struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct gdbarch *gdbarch = regcache->arch ();
+ struct inferior *inf = find_inferior_ptid (regcache_get_ptid (regcache));
struct sim_inferior_data *sim_data
- = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED);
+ = get_sim_inferior_data (inf, SIM_INSTANCE_NEEDED);
if (regno == -1)
{
for (regno = 0; regno < gdbarch_num_regs (gdbarch); regno++)
- gdbsim_store_register (ops, regcache, regno);
+ store_registers (regcache, regno);
return;
}
else if (gdbarch_register_sim_regno (gdbarch, regno) >= 0)
{
- gdb_byte tmp[MAX_REGISTER_SIZE];
+ int regsize = register_size (gdbarch, regno);
+ gdb::byte_vector tmp (regsize);
int nr_bytes;
- regcache_cooked_read (regcache, regno, tmp);
+ regcache->cooked_read (regno, tmp.data ());
nr_bytes = sim_store_register (sim_data->gdbsim_desc,
gdbarch_register_sim_regno
(gdbarch, regno),
- tmp, register_size (gdbarch, regno));
- if (nr_bytes > 0 && nr_bytes != register_size (gdbarch, regno))
+ tmp.data (), regsize);
+
+ if (nr_bytes > 0 && nr_bytes != regsize)
internal_error (__FILE__, __LINE__,
_("Register size different to expected"));
if (nr_bytes < 0)
- internal_error (__FILE__, __LINE__,
- _("Register %d not updated"), regno);
+ internal_error (__FILE__, __LINE__,
+ _("Register %d not updated"), regno);
if (nr_bytes == 0)
- warning (_("Register %s not updated"),
- gdbarch_register_name (gdbarch, regno));
+ warning (_("Register %s not updated"),
+ gdbarch_register_name (gdbarch, regno));
if (remote_debug)
{
- printf_filtered ("gdbsim_store_register: %d", regno);
+ fprintf_unfiltered (gdb_stdlog, "gdbsim_store_register: %d", regno);
/* FIXME: We could print something more intelligible. */
- dump_mem (tmp, register_size (gdbarch, regno));
+ dump_mem (tmp.data (), regsize);
}
}
}
@@ -542,34 +582,32 @@ gdbsim_store_register (struct target_ops *ops,
/* Kill the running program. This may involve closing any open files
and releasing other resources acquired by the simulated program. */
-static void
-gdbsim_kill (struct target_ops *ops)
+void
+gdbsim_target::kill ()
{
if (remote_debug)
- printf_filtered ("gdbsim_kill\n");
+ fprintf_unfiltered (gdb_stdlog, "gdbsim_kill\n");
/* There is no need to `kill' running simulator - the simulator is
not running. Mourning it is enough. */
- target_mourn_inferior ();
+ target_mourn_inferior (inferior_ptid);
}
/* Load an executable file into the target process. This is expected to
not only bring new code into the target process, but also to update
GDB's symbol tables to match. */
-static void
-gdbsim_load (char *args, int fromtty)
+void
+gdbsim_target::load (const char *args, int fromtty)
{
- char **argv;
- char *prog;
+ const char *prog;
struct sim_inferior_data *sim_data
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED);
if (args == NULL)
error_no_arg (_("program to load"));
- argv = gdb_buildargv (args);
- make_cleanup_freeargv (argv);
+ gdb_argv argv (args);
prog = tilde_expand (argv[0]);
@@ -577,7 +615,7 @@ gdbsim_load (char *args, int fromtty)
error (_("GDB sim does not yet support a load offset."));
if (remote_debug)
- printf_filtered ("gdbsim_load: prog \"%s\"\n", prog);
+ fprintf_unfiltered (gdb_stdlog, "gdbsim_load: prog \"%s\"\n", prog);
/* FIXME: We will print two messages on error.
Need error to either not print anything if passed NULL or need
@@ -600,14 +638,16 @@ gdbsim_load (char *args, int fromtty)
/* This is called not only when we first attach, but also when the
user types "run" after having attached. */
-static void
-gdbsim_create_inferior (struct target_ops *target, char *exec_file, char *args,
- char **env, int from_tty)
+void
+gdbsim_target::create_inferior (const char *exec_file,
+ const std::string &allargs,
+ char **env, int from_tty)
{
struct sim_inferior_data *sim_data
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED);
int len;
- char *arg_buf, **argv;
+ char *arg_buf;
+ const char *args = allargs.c_str ();
if (exec_file == 0 || exec_bfd == 0)
warning (_("No executable file specified."));
@@ -615,33 +655,33 @@ gdbsim_create_inferior (struct target_ops *target, char *exec_file, char *args,
warning (_("No program loaded."));
if (remote_debug)
- printf_filtered ("gdbsim_create_inferior: exec_file \"%s\", args \"%s\"\n",
- (exec_file ? exec_file : "(NULL)"),
- args);
+ fprintf_unfiltered (gdb_stdlog,
+ "gdbsim_create_inferior: exec_file \"%s\", args \"%s\"\n",
+ (exec_file ? exec_file : "(NULL)"),
+ args);
if (ptid_equal (inferior_ptid, sim_data->remote_sim_ptid))
- gdbsim_kill (target);
+ kill ();
remove_breakpoints ();
init_wait_for_inferior ();
+ gdb_argv built_argv;
if (exec_file != NULL)
{
- len = strlen (exec_file) + 1 + strlen (args) + 1 + /*slop */ 10;
+ len = strlen (exec_file) + 1 + allargs.size () + 1 + /*slop */ 10;
arg_buf = (char *) alloca (len);
arg_buf[0] = '\0';
strcat (arg_buf, exec_file);
strcat (arg_buf, " ");
strcat (arg_buf, args);
- argv = gdb_buildargv (arg_buf);
- make_cleanup_freeargv (argv);
+ built_argv.reset (arg_buf);
}
- else
- argv = NULL;
if (!have_inferiors ())
init_thread_list ();
- if (sim_create_inferior (sim_data->gdbsim_desc, exec_bfd, argv, env)
+ if (sim_create_inferior (sim_data->gdbsim_desc, exec_bfd,
+ built_argv.get (), env)
!= SIM_RC_OK)
error (_("Unable to create sim inferior."));
@@ -652,7 +692,7 @@ gdbsim_create_inferior (struct target_ops *target, char *exec_file, char *args,
insert_breakpoints (); /* Needed to get correct instruction
in cache. */
- clear_proceed_status ();
+ clear_proceed_status (0);
}
/* The open routine takes the rest of the parameters from the command,
@@ -661,15 +701,21 @@ gdbsim_create_inferior (struct target_ops *target, char *exec_file, char *args,
/* Called when selecting the simulator. E.g. (gdb) target sim name. */
static void
-gdbsim_open (char *args, int from_tty)
+gdbsim_target_open (const char *args, int from_tty)
{
int len;
char *arg_buf;
struct sim_inferior_data *sim_data;
+ const char *sysroot;
SIM_DESC gdbsim_desc;
+ sysroot = gdb_sysroot;
+ if (is_target_filename (sysroot))
+ sysroot += strlen (TARGET_SYSROOT_PREFIX);
+
if (remote_debug)
- printf_filtered ("gdbsim_open: args \"%s\"\n", args ? args : "(null)");
+ fprintf_unfiltered (gdb_stdlog,
+ "gdbsim_open: args \"%s\"\n", args ? args : "(null)");
/* Ensure that the sim target is not on the target stack. This is
necessary, because if it is on the target stack, the call to
@@ -684,7 +730,7 @@ gdbsim_open (char *args, int from_tty)
len = (7 + 1 /* gdbsim */
+ strlen (" -E little")
+ strlen (" --architecture=xxxxxxxxxx")
- + strlen (" --sysroot=") + strlen (gdb_sysroot) +
+ + strlen (" --sysroot=") + strlen (sysroot) +
+ (args ? strlen (args) : 0)
+ 50) /* slack */ ;
arg_buf = (char *) alloca (len);
@@ -711,25 +757,28 @@ gdbsim_open (char *args, int from_tty)
}
/* Pass along gdb's concept of the sysroot. */
strcat (arg_buf, " --sysroot=");
- strcat (arg_buf, gdb_sysroot);
+ strcat (arg_buf, sysroot);
/* finally, any explicit args */
if (args)
{
strcat (arg_buf, " "); /* 1 */
strcat (arg_buf, args);
}
- sim_argv = gdb_buildargv (arg_buf);
+
+ gdb_argv argv (arg_buf);
+ sim_argv = argv.get ();
init_callbacks ();
gdbsim_desc = sim_open (SIM_OPEN_DEBUG, &gdb_callback, exec_bfd, sim_argv);
if (gdbsim_desc == 0)
{
- freeargv (sim_argv);
sim_argv = NULL;
error (_("unable to create simulator instance"));
}
+ argv.release ();
+
/* Reset the pid numberings for this batch of sim instances. */
next_pid = INITIAL_PID;
@@ -756,8 +805,8 @@ gdbsim_open (char *args, int from_tty)
static int
gdbsim_close_inferior (struct inferior *inf, void *arg)
{
- struct sim_inferior_data *sim_data = inferior_data (inf,
- sim_inferior_data_key);
+ struct sim_inferior_data *sim_data
+ = (struct sim_inferior_data *) inferior_data (inf, sim_inferior_data_key);
if (sim_data != NULL)
{
ptid_t ptid = sim_data->remote_sim_ptid;
@@ -770,7 +819,7 @@ gdbsim_close_inferior (struct inferior *inf, void *arg)
Thus we need to verify the existence of an inferior using the
pid in question before setting inferior_ptid via
switch_to_thread() or mourning the inferior. */
- if (find_inferior_pid (ptid_get_pid (ptid)) != NULL)
+ if (find_inferior_ptid (ptid) != NULL)
{
switch_to_thread (ptid);
generic_mourn_inferior ();
@@ -782,14 +831,14 @@ gdbsim_close_inferior (struct inferior *inf, void *arg)
/* Close out all files and local state before this target loses control. */
-static void
-gdbsim_close (void)
+void
+gdbsim_target::close ()
{
struct sim_inferior_data *sim_data
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
if (remote_debug)
- printf_filtered ("gdbsim_close\n");
+ fprintf_unfiltered (gdb_stdlog, "gdbsim_close\n");
iterate_over_inferiors (gdbsim_close_inferior, NULL);
@@ -807,19 +856,18 @@ gdbsim_close (void)
/* Takes a program previously attached to and detaches it.
The program may resume execution (some targets do, some don't) and will
no longer stop on signals, etc. We better not have left any breakpoints
- in the program or it'll die when it hits one. ARGS is arguments
- typed by the user (e.g. a signal to send the process). FROM_TTY
- says whether to be verbose or not. */
+ in the program or it'll die when it hits one. FROM_TTY says whether to be
+ verbose or not. */
/* Terminate the open connection to the remote debugger.
Use this when you want to detach and do something else with your gdb. */
-static void
-gdbsim_detach (struct target_ops *ops, char *args, int from_tty)
+void
+gdbsim_target::detach (inferior *inf, int from_tty)
{
if (remote_debug)
- printf_filtered ("gdbsim_detach: args \"%s\"\n", args);
+ fprintf_unfiltered (gdb_stdlog, "gdbsim_detach\n");
- unpush_target (ops); /* calls gdbsim_close to do the real work */
+ unpush_target (this); /* calls gdbsim_close to do the real work */
if (from_tty)
printf_filtered ("Ending simulator %s debugging\n", target_shortname);
}
@@ -839,7 +887,7 @@ gdbsim_resume_inferior (struct inferior *inf, void *arg)
{
struct sim_inferior_data *sim_data
= get_sim_inferior_data (inf, SIM_INSTANCE_NOT_NEEDED);
- struct resume_data *rd = arg;
+ struct resume_data *rd = (struct resume_data *) arg;
if (sim_data)
{
@@ -847,8 +895,9 @@ gdbsim_resume_inferior (struct inferior *inf, void *arg)
sim_data->resume_step = rd->step;
if (remote_debug)
- printf_filtered (_("gdbsim_resume: pid %d, step %d, signal %d\n"),
- inf->pid, rd->step, rd->siggnal);
+ fprintf_unfiltered (gdb_stdlog,
+ _("gdbsim_resume: pid %d, step %d, signal %d\n"),
+ inf->pid, rd->step, rd->siggnal);
}
/* When called from iterate_over_inferiors, a zero return causes the
@@ -857,9 +906,8 @@ gdbsim_resume_inferior (struct inferior *inf, void *arg)
return 0;
}
-static void
-gdbsim_resume (struct target_ops *ops,
- ptid_t ptid, int step, enum gdb_signal siggnal)
+void
+gdbsim_target::resume (ptid_t ptid, int step, enum gdb_signal siggnal)
{
struct resume_data rd;
struct sim_inferior_data *sim_data
@@ -876,24 +924,24 @@ gdbsim_resume (struct target_ops *ops,
either have multiple inferiors to resume or an error condition. */
if (sim_data)
- gdbsim_resume_inferior (find_inferior_pid (ptid_get_pid (ptid)), &rd);
+ gdbsim_resume_inferior (find_inferior_ptid (ptid), &rd);
else if (ptid_equal (ptid, minus_one_ptid))
iterate_over_inferiors (gdbsim_resume_inferior, &rd);
else
error (_("The program is not being run."));
}
-/* Notify the simulator of an asynchronous request to stop.
+/* Notify the simulator of an asynchronous request to interrupt.
- The simulator shall ensure that the stop request is eventually
+ The simulator shall ensure that the interrupt request is eventually
delivered to the simulator. If the call is made while the
- simulator is not running then the stop request is processed when
+ simulator is not running then the interrupt request is processed when
the simulator is next resumed.
For simulators that do not support this operation, just abort. */
static int
-gdbsim_stop_inferior (struct inferior *inf, void *arg)
+gdbsim_interrupt_inferior (struct inferior *inf, void *arg)
{
struct sim_inferior_data *sim_data
= get_sim_inferior_data (inf, SIM_INSTANCE_NEEDED);
@@ -912,25 +960,10 @@ gdbsim_stop_inferior (struct inferior *inf, void *arg)
return 0;
}
-static void
-gdbsim_stop (ptid_t ptid)
+void
+gdbsim_target::interrupt ()
{
- struct sim_inferior_data *sim_data;
-
- if (ptid_equal (ptid, minus_one_ptid))
- {
- iterate_over_inferiors (gdbsim_stop_inferior, NULL);
- }
- else
- {
- struct inferior *inf = find_inferior_pid (ptid_get_pid (ptid));
-
- if (inf == NULL)
- error (_("Can't stop pid %d. No inferior found."),
- ptid_get_pid (ptid));
-
- gdbsim_stop_inferior (inf, NULL);
- }
+ iterate_over_inferiors (gdbsim_interrupt_inferior, NULL);
}
/* GDB version of os_poll_quit callback.
@@ -943,10 +976,7 @@ gdb_os_poll_quit (host_callback *p)
deprecated_ui_loop_hook (0);
if (check_quit_flag ()) /* gdb's idea of quit */
- {
- clear_quit_flag (); /* we've stolen it */
- return 1;
- }
+ return 1;
return 0;
}
@@ -957,15 +987,14 @@ gdb_os_poll_quit (host_callback *p)
static void
gdbsim_cntrl_c (int signo)
{
- gdbsim_stop (minus_one_ptid);
+ gdbsim_ops.interrupt ();
}
-static ptid_t
-gdbsim_wait (struct target_ops *ops,
- ptid_t ptid, struct target_waitstatus *status, int options)
+ptid_t
+gdbsim_target::wait (ptid_t ptid, struct target_waitstatus *status, int options)
{
struct sim_inferior_data *sim_data;
- static RETSIGTYPE (*prev_sigint) ();
+ static sighandler_t prev_sigint;
int sigrc = 0;
enum sim_stop reason = sim_running;
@@ -985,7 +1014,7 @@ gdbsim_wait (struct target_ops *ops,
}
if (remote_debug)
- printf_filtered ("gdbsim_wait\n");
+ fprintf_unfiltered (gdb_stdlog, "gdbsim_wait\n");
#if defined (HAVE_SIGACTION) && defined (SA_RESTART)
{
@@ -1000,7 +1029,7 @@ gdbsim_wait (struct target_ops *ops,
prev_sigint = signal (SIGINT, gdbsim_cntrl_c);
#endif
sim_resume (sim_data->gdbsim_desc, sim_data->resume_step,
- sim_data->resume_siggnal);
+ sim_data->resume_siggnal);
signal (SIGINT, prev_sigint);
sim_data->resume_step = 0;
@@ -1023,13 +1052,13 @@ gdbsim_wait (struct target_ops *ops,
case GDB_SIGNAL_TRAP:
default:
status->kind = TARGET_WAITKIND_STOPPED;
- status->value.sig = sigrc;
+ status->value.sig = (enum gdb_signal) sigrc;
break;
}
break;
case sim_signalled:
status->kind = TARGET_WAITKIND_SIGNALLED;
- status->value.sig = sigrc;
+ status->value.sig = (enum gdb_signal) sigrc;
break;
case sim_running:
case sim_polling:
@@ -1046,8 +1075,8 @@ gdbsim_wait (struct target_ops *ops,
that registers contains all the registers from the program being
debugged. */
-static void
-gdbsim_prepare_to_store (struct regcache *regcache)
+void
+gdbsim_target::prepare_to_store (struct regcache *regcache)
{
/* Do nothing, since we can store individual regs. */
}
@@ -1055,19 +1084,20 @@ gdbsim_prepare_to_store (struct regcache *regcache)
/* Helper for gdbsim_xfer_partial that handles memory transfers.
Arguments are like target_xfer_partial. */
-static LONGEST
+static enum target_xfer_status
gdbsim_xfer_memory (struct target_ops *target,
gdb_byte *readbuf, const gdb_byte *writebuf,
- ULONGEST memaddr, LONGEST len)
+ ULONGEST memaddr, ULONGEST len, ULONGEST *xfered_len)
{
struct sim_inferior_data *sim_data
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
+ int l;
/* If this target doesn't have memory yet, return 0 causing the
request to be passed to a lower target, hopefully an exec
file. */
- if (!target->to_has_memory (target))
- return 0;
+ if (!target->has_memory ())
+ return TARGET_XFER_EOF;
if (!sim_data->program_loaded)
error (_("No program loaded."));
@@ -1087,42 +1117,52 @@ gdbsim_xfer_memory (struct target_ops *target,
host_address_to_string (readbuf),
host_address_to_string (writebuf),
paddress (target_gdbarch (), memaddr),
- plongest (len));
+ pulongest (len));
if (writebuf)
{
if (remote_debug && len > 0)
dump_mem (writebuf, len);
- len = sim_write (sim_data->gdbsim_desc, memaddr, writebuf, len);
+ l = sim_write (sim_data->gdbsim_desc, memaddr, writebuf, len);
}
else
{
- len = sim_read (sim_data->gdbsim_desc, memaddr, readbuf, len);
+ l = sim_read (sim_data->gdbsim_desc, memaddr, readbuf, len);
if (remote_debug && len > 0)
dump_mem (readbuf, len);
}
- return len;
+ if (l > 0)
+ {
+ *xfered_len = (ULONGEST) l;
+ return TARGET_XFER_OK;
+ }
+ else if (l == 0)
+ return TARGET_XFER_EOF;
+ else
+ return TARGET_XFER_E_IO;
}
/* Target to_xfer_partial implementation. */
-static LONGEST
-gdbsim_xfer_partial (struct target_ops *ops, enum target_object object,
- const char *annex, gdb_byte *readbuf,
- const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+enum target_xfer_status
+gdbsim_target::xfer_partial (enum target_object object,
+ const char *annex, gdb_byte *readbuf,
+ const gdb_byte *writebuf, ULONGEST offset, ULONGEST len,
+ ULONGEST *xfered_len)
{
switch (object)
{
case TARGET_OBJECT_MEMORY:
- return gdbsim_xfer_memory (ops, readbuf, writebuf, offset, len);
+ return gdbsim_xfer_memory (this, readbuf, writebuf, offset, len,
+ xfered_len);
default:
- return -1;
+ return TARGET_XFER_E_IO;
}
}
-static void
-gdbsim_files_info (struct target_ops *target)
+void
+gdbsim_target::files_info ()
{
struct sim_inferior_data *sim_data
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED);
@@ -1132,26 +1172,26 @@ gdbsim_files_info (struct target_ops *target)
file = bfd_get_filename (exec_bfd);
if (remote_debug)
- printf_filtered ("gdbsim_files_info: file \"%s\"\n", file);
+ fprintf_unfiltered (gdb_stdlog, "gdbsim_files_info: file \"%s\"\n", file);
if (exec_bfd)
{
- printf_filtered ("\tAttached to %s running program %s\n",
- target_shortname, file);
+ fprintf_unfiltered (gdb_stdlog, "\tAttached to %s running program %s\n",
+ target_shortname, file);
sim_info (sim_data->gdbsim_desc, 0);
}
}
/* Clear the simulator's notion of what the break points are. */
-static void
-gdbsim_mourn_inferior (struct target_ops *target)
+void
+gdbsim_target::mourn_inferior ()
{
struct sim_inferior_data *sim_data
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
if (remote_debug)
- printf_filtered ("gdbsim_mourn_inferior:\n");
+ fprintf_unfiltered (gdb_stdlog, "gdbsim_mourn_inferior:\n");
remove_breakpoints ();
generic_mourn_inferior ();
@@ -1162,7 +1202,7 @@ gdbsim_mourn_inferior (struct target_ops *target)
simulator must do any command interpretation work. */
void
-simulator_command (char *args, int from_tty)
+simulator_command (const char *args, int from_tty)
{
struct sim_inferior_data *sim_data;
@@ -1176,19 +1216,20 @@ simulator_command (char *args, int from_tty)
thus allocating memory that would not be garbage collected until
the ultimate destruction of the associated inferior. */
- sim_data = inferior_data (current_inferior (), sim_inferior_data_key);
+ sim_data = ((struct sim_inferior_data *)
+ inferior_data (current_inferior (), sim_inferior_data_key));
if (sim_data == NULL || sim_data->gdbsim_desc == NULL)
{
/* PREVIOUSLY: The user may give a command before the simulator
- is opened. [...] (??? assuming of course one wishes to
- continue to allow commands to be sent to unopened simulators,
- which isn't entirely unreasonable). */
+ is opened. [...] (??? assuming of course one wishes to
+ continue to allow commands to be sent to unopened simulators,
+ which isn't entirely unreasonable). */
/* The simulator is a builtin abstraction of a remote target.
- Consistent with that model, access to the simulator, via sim
- commands, is restricted to the period when the channel to the
- simulator is open. */
+ Consistent with that model, access to the simulator, via sim
+ commands, is restricted to the period when the channel to the
+ simulator is open. */
error (_("Not connected to the simulator target"));
}
@@ -1200,120 +1241,101 @@ simulator_command (char *args, int from_tty)
registers_changed ();
}
-static VEC (char_ptr) *
-sim_command_completer (struct cmd_list_element *ignore, const char *text,
- const char *word)
+static void
+sim_command_completer (struct cmd_list_element *ignore,
+ completion_tracker &tracker,
+ const char *text, const char *word)
{
struct sim_inferior_data *sim_data;
- char **tmp;
- int i;
- VEC (char_ptr) *result = NULL;
- sim_data = inferior_data (current_inferior (), sim_inferior_data_key);
+ sim_data = ((struct sim_inferior_data *)
+ inferior_data (current_inferior (), sim_inferior_data_key));
if (sim_data == NULL || sim_data->gdbsim_desc == NULL)
- return NULL;
+ return;
- tmp = sim_complete_command (sim_data->gdbsim_desc, text, word);
- if (tmp == NULL)
- return NULL;
+ /* sim_complete_command returns a NULL-terminated malloc'ed array of
+ malloc'ed strings. */
+ struct sim_completions_deleter
+ {
+ void operator() (char **ptr) const
+ {
+ for (size_t i = 0; ptr[i] != NULL; i++)
+ xfree (ptr[i]);
+ xfree (ptr);
+ }
+ };
+
+ std::unique_ptr sim_completions
+ (sim_complete_command (sim_data->gdbsim_desc, text, word));
+ if (sim_completions == NULL)
+ return;
- /* Transform the array into a VEC, and then free the array. */
- for (i = 0; tmp[i] != NULL; i++)
- VEC_safe_push (char_ptr, result, tmp[i]);
- xfree (tmp);
+ /* Count the elements and add completions from tail to head because
+ below we'll swap elements out of the array in case add_completion
+ throws and the deleter deletes until it finds a NULL element. */
+ size_t count = 0;
+ while (sim_completions[count] != NULL)
+ count++;
- return result;
+ for (size_t i = count; i > 0; i--)
+ {
+ gdb::unique_xmalloc_ptr match (sim_completions[i - 1]);
+ sim_completions[i - 1] = NULL;
+ tracker.add_completion (std::move (match));
+ }
}
/* Check to see if a thread is still alive. */
-static int
-gdbsim_thread_alive (struct target_ops *ops, ptid_t ptid)
+bool
+gdbsim_target::thread_alive (ptid_t ptid)
{
struct sim_inferior_data *sim_data
= get_sim_inferior_data_by_ptid (ptid, SIM_INSTANCE_NOT_NEEDED);
if (sim_data == NULL)
- return 0;
+ return false;
if (ptid_equal (ptid, sim_data->remote_sim_ptid))
/* The simulators' task is always alive. */
- return 1;
+ return true;
- return 0;
+ return false;
}
/* Convert a thread ID to a string. Returns the string in a static
buffer. */
-static char *
-gdbsim_pid_to_str (struct target_ops *ops, ptid_t ptid)
+const char *
+gdbsim_target::pid_to_str (ptid_t ptid)
{
return normal_pid_to_str (ptid);
}
/* Simulator memory may be accessed after the program has been loaded. */
-static int
-gdbsim_has_all_memory (struct target_ops *ops)
+bool
+gdbsim_target::has_all_memory ()
{
struct sim_inferior_data *sim_data
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
if (!sim_data->program_loaded)
- return 0;
+ return false;
- return 1;
+ return true;
}
-static int
-gdbsim_has_memory (struct target_ops *ops)
+bool
+gdbsim_target::has_memory ()
{
struct sim_inferior_data *sim_data
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
if (!sim_data->program_loaded)
- return 0;
+ return false;
- return 1;
-}
-
-/* Define the target subroutine names. */
-
-struct target_ops gdbsim_ops;
-
-static void
-init_gdbsim_ops (void)
-{
- gdbsim_ops.to_shortname = "sim";
- gdbsim_ops.to_longname = "simulator";
- gdbsim_ops.to_doc = "Use the compiled-in simulator.";
- gdbsim_ops.to_open = gdbsim_open;
- gdbsim_ops.to_close = gdbsim_close;
- gdbsim_ops.to_detach = gdbsim_detach;
- gdbsim_ops.to_resume = gdbsim_resume;
- gdbsim_ops.to_wait = gdbsim_wait;
- 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_partial = gdbsim_xfer_partial;
- gdbsim_ops.to_files_info = gdbsim_files_info;
- 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_mourn_inferior = gdbsim_mourn_inferior;
- gdbsim_ops.to_stop = gdbsim_stop;
- gdbsim_ops.to_thread_alive = gdbsim_thread_alive;
- gdbsim_ops.to_pid_to_str = gdbsim_pid_to_str;
- gdbsim_ops.to_stratum = process_stratum;
- gdbsim_ops.to_has_all_memory = gdbsim_has_all_memory;
- gdbsim_ops.to_has_memory = gdbsim_has_memory;
- gdbsim_ops.to_has_stack = default_child_has_stack;
- gdbsim_ops.to_has_registers = default_child_has_registers;
- gdbsim_ops.to_has_execution = default_child_has_execution;
- gdbsim_ops.to_magic = OPS_MAGIC;
+ return true;
}
void
@@ -1321,8 +1343,7 @@ _initialize_remote_sim (void)
{
struct cmd_list_element *c;
- init_gdbsim_ops ();
- add_target (&gdbsim_ops);
+ add_target (gdbsim_target_info, gdbsim_target_open);
c = add_com ("sim", class_obscure, simulator_command,
_("Send a command to the simulator."));