/* Prototypes */
+extern void _initialize_remote_sim PARAMS ((void));
+
+extern int (*ui_loop_hook) PARAMS ((int signo));
+
static void dump_mem PARAMS ((char *buf, int len));
static void init_callbacks PARAMS ((void));
static void gdbsim_stop PARAMS ((void));
-static void simulator_command PARAMS ((char *args, int from_tty));
+void simulator_command PARAMS ((char *args, int from_tty));
/* Naming convention:
{
b[0] = buf[i];
b[1] = 0;
- if (target_output_hook)
- target_output_hook (b);
- else
- fputs_filtered (b, gdb_stdout);
+ fputs_unfiltered (b, gdb_stdtarg);
}
return len;
}
{
b[0] = buf[i];
b[1] = 0;
- if (target_output_hook)
- target_output_hook (b);
- else
- fputs_filtered (b, gdb_stderr);
+ fputs_unfiltered (b, gdb_stdtarg);
}
return len;
}
for (regno = 0; regno < NUM_REGS; regno++)
gdbsim_fetch_register (regno);
}
- else if (reg_names[regno] != NULL && *reg_names[regno] != '\0')
+ else if (REGISTER_NAME (regno) != NULL && *REGISTER_NAME (regno) != '\0')
{
char buf[MAX_REGISTER_RAW_SIZE];
int nr_bytes = sim_fetch_register (gdbsim_desc, regno, buf, REGISTER_RAW_SIZE (regno));
&& warn_user)
{
printf_unfiltered ("Size of register %s (%d) incorrect (%d instead of %d))",
- reg_names [regno], regno,
+ REGISTER_NAME (regno), regno,
nr_bytes, REGISTER_RAW_SIZE (regno));
warn_user = 0;
}
for (regno = 0; regno < NUM_REGS; regno++)
gdbsim_store_register (regno);
}
- else if (reg_names[regno] != NULL && *reg_names[regno] != '\0')
+ else if (REGISTER_NAME (regno) != NULL && *REGISTER_NAME (regno) != '\0')
{
char tmp[MAX_REGISTER_RAW_SIZE];
int nr_bytes;
char *arg_buf,**argv;
if (exec_file == 0 || exec_bfd == 0)
- warning ("No exec file specified.");
+ warning ("No executable file specified.");
if (! program_loaded)
warning ("No program loaded.");
strcat (arg_buf, " ");
strcat (arg_buf, args);
argv = buildargv (arg_buf);
- make_cleanup (freeargv, (char *) argv);
+ make_cleanup_freeargv (argv);
}
else
argv = NULL;
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). */
-#ifdef TARGET_BYTE_ORDER_SELECTABLE
- if (!target_byte_order_auto)
+ if (TARGET_BYTE_ORDER_SELECTABLE_P
+ && !TARGET_BYTE_ORDER_AUTO)
{
switch (TARGET_BYTE_ORDER)
{
fatal ("Value of TARGET_BYTE_ORDER unknown");
}
}
-#endif
/* Specify the architecture of the target when it has been
explicitly specified */
- if (!target_architecture_auto)
+ if (!TARGET_ARCHITECTURE_AUTO)
{
strcat (arg_buf, " --architecture=");
- strcat (arg_buf, target_architecture->printable_name);
+ strcat (arg_buf, TARGET_ARCHITECTURE->printable_name);
}
/* finally, any explicit args */
if (args)
argv = buildargv (arg_buf);
if (argv == NULL)
error ("Insufficient memory available to allocate simulator arg list.");
- make_cleanup (freeargv, (char *) argv);
+ make_cleanup_freeargv (argv);
init_callbacks ();
gdbsim_desc = sim_open (SIM_OPEN_DEBUG, &gdb_callback, exec_bfd, argv);
gdb_os_poll_quit (p)
host_callback *p;
{
+ if (ui_loop_hook != NULL)
+ ui_loop_hook (0);
+
notice_quit ();
if (quit_flag) /* gdb's idea of quit */
{
/* Pass the command argument through to the simulator verbatim. The
simulator must do any command interpretation work. */
-static void
+void
simulator_command (args, from_tty)
char *args;
int from_tty;
/* Define the target subroutine names */
struct target_ops gdbsim_ops ;
-static void init_gdbsim_ops(void)
+
+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_attach = NULL;
- gdbsim_ops.to_detach = gdbsim_detach;
+ gdbsim_ops.to_attach = NULL;
+ gdbsim_ops.to_post_attach = NULL;
+ gdbsim_ops.to_require_attach = NULL;
+ gdbsim_ops.to_detach = gdbsim_detach;
+ gdbsim_ops.to_require_detach = NULL;
gdbsim_ops.to_resume = gdbsim_resume;
- gdbsim_ops.to_wait = gdbsim_wait;
+ gdbsim_ops.to_wait = gdbsim_wait;
+ gdbsim_ops.to_post_wait = NULL;
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_load = gdbsim_load;
gdbsim_ops.to_lookup_symbol = NULL;
gdbsim_ops.to_create_inferior = gdbsim_create_inferior;
+ gdbsim_ops.to_post_startup_inferior = NULL;
+ gdbsim_ops.to_acknowledge_created_inferior = NULL;
+ gdbsim_ops.to_clone_and_follow_inferior = NULL;
+ gdbsim_ops.to_post_follow_inferior_by_clone = NULL;
+ gdbsim_ops.to_insert_fork_catchpoint = NULL;
+ gdbsim_ops.to_remove_fork_catchpoint = NULL;
+ gdbsim_ops.to_insert_vfork_catchpoint = NULL;
+ gdbsim_ops.to_remove_vfork_catchpoint = NULL;
+ gdbsim_ops.to_has_forked = NULL;
+ gdbsim_ops.to_has_vforked = NULL;
+ gdbsim_ops.to_can_follow_vfork_prior_to_exec = NULL;
+ gdbsim_ops.to_post_follow_vfork = NULL;
+ gdbsim_ops.to_insert_exec_catchpoint = NULL;
+ gdbsim_ops.to_remove_exec_catchpoint = NULL;
+ gdbsim_ops.to_has_execd = NULL;
+ gdbsim_ops.to_reported_exec_events_per_exec_call = NULL;
+ gdbsim_ops.to_has_exited = NULL;
gdbsim_ops.to_mourn_inferior = gdbsim_mourn_inferior;
gdbsim_ops.to_can_run = 0;
gdbsim_ops.to_notice_signals = 0;
gdbsim_ops.to_thread_alive = 0;
- gdbsim_ops.to_stop = gdbsim_stop;
+ gdbsim_ops.to_stop = gdbsim_stop;
+ gdbsim_ops.to_pid_to_exec_file = NULL;
+ gdbsim_ops.to_core_file_to_sym_file = NULL;
gdbsim_ops.to_stratum = process_stratum;
gdbsim_ops.DONT_USE = NULL;
gdbsim_ops.to_has_all_memory = 1;
_initialize_remote_sim ()
{
init_gdbsim_ops() ;
-
add_target (&gdbsim_ops);
add_com ("sim <command>", class_obscure, simulator_command,