/* Generic remote debugging interface for simulators.
- Copyright 1993 Free Software Foundation, Inc.
+ Copyright 1993, 1994 Free Software Foundation, Inc.
Contributed by Cygnus Support.
- Steve Chamberlain (sac@cygnus.com) and Doug Evans (dje@cygnus.com).
+ Steve Chamberlain (sac@cygnus.com).
This file is part of GDB.
#include "target.h"
#include "gdbcore.h"
#include "remote-sim.h"
+#include "remote-utils.h"
/* Naming convention:
else
{
/* FIXME: Until read_register() returns LONGEST, we have this. */
- char value[MAX_REGISTER_RAW_SIZE];
- read_register_gen (regno, value);
- sim_store_register (regno, value);
+ char tmp[MAX_REGISTER_RAW_SIZE];
+ read_register_gen (regno, tmp);
+ sim_store_register (regno, tmp);
if (sr_get_debug ())
{
printf_filtered ("gdbsim_store_register: %d", regno);
/* FIXME: We could print something more intelligible. */
- dump_mem (value, REGISTER_RAW_SIZE (regno));
+ dump_mem (tmp, REGISTER_RAW_SIZE (regno));
}
}
}
+/* Kill the running program. This may involve closing any open files
+ and releasing other resources acquired by the simulated program. */
+
static void
gdbsim_kill ()
{
char *prog;
int fromtty;
{
- bfd *abfd;
-
if (sr_get_debug ())
printf_filtered ("gdbsim_load: prog \"%s\"\n", prog);
- inferior_pid = 0;
- program_loaded = 0;
- abfd = bfd_openr (prog, gnutarget);
-
- if (!abfd)
- error ("Unable to open file %s.", prog);
-
- if (bfd_check_format (abfd, bfd_object) == 0)
- error ("File is not an object file.");
-
- if (sim_load (abfd, prog) != 0)
- return;
+ inferior_pid = 0;
+ /* This must be done before calling gr_load_image. */
program_loaded = 1;
- sim_set_pc (abfd->start_address);
+ if (sim_load (prog, fromtty) != 0)
+ gr_load_image (prog, fromtty);
}
-/*
- * This is a utility routine that sim_load() can call to do the work.
- * The result is 0 for success, non-zero for failure.
- *
- * Eg: int sim_load (bfd *bfd, char *prog) { return sim_load_standard (bfd); }
- */
-
-sim_load_standard (abfd)
- bfd *abfd;
-{
- asection *s;
-
- s = abfd->sections;
- while (s != (asection *)NULL)
- {
- if (s->flags & SEC_LOAD)
- {
- int i;
- int delta = 4096;
- char *buffer = xmalloc (delta);
- printf_filtered ("%s\t: 0x%4x .. 0x%4x ",
- s->name, s->vma, s->vma + s->_raw_size);
- for (i = 0; i < s->_raw_size; i+= delta)
- {
- int sub_delta = delta;
- if (sub_delta > s->_raw_size - i)
- sub_delta = s->_raw_size - i ;
-
- bfd_get_section_contents (abfd, s, buffer, i, sub_delta);
- sim_write (s->vma + i, buffer, sub_delta);
- printf_filtered ("*");
- fflush (stdout);
- }
- printf_filtered ("\n");
- free (buffer);
- }
- s = s->next;
- }
-
- return 0;
-}
/* Start an inferior process and set inferior_pid to its pid.
EXEC_FILE is the file to run.
char *args;
char **env;
{
- int len,entry_pt;
+ int len;
char *arg_buf,**argv;
+ CORE_ADDR entry_pt;
if (! program_loaded)
error ("No program loaded.");
if (exec_file == 0 || exec_bfd == 0)
error ("No exec file specified.");
- entry_pt = (int) bfd_get_start_address (exec_bfd);
+ entry_pt = (CORE_ADDR) bfd_get_start_address (exec_bfd);
gdbsim_kill (NULL, NULL);
remove_breakpoints ();
strcat (arg_buf, args);
argv = buildargv (arg_buf);
make_cleanup (freeargv, (char *) argv);
- /* FIXME: remote-sim.h says targets that don't support this return
- non-zero. Perhaps distinguish between "not supported" and other errors?
- Or maybe that can be the only error. */
- if (sim_set_args (argv, env) != 0)
- return;
+ sim_create_inferior (entry_pt, argv, env);
inferior_pid = 42;
insert_breakpoints (); /* Needed to get correct instruction in cache */
- proceed (entry_pt, -1, 0);
+ proceed (entry_pt, TARGET_SIGNAL_DEFAULT, 0);
}
/* The open routine takes the rest of the parameters from the command,
int from_tty;
{
if (sr_get_debug ())
- printf_filtered ("gdbsim_open: args \"%s\"\n", args);
+ printf_filtered ("gdbsim_open: args \"%s\"\n", args ? args : "(null)");
- if (sim_open (args) != 0)
- {
- /* FIXME: This is totally bogus. sim_open should have a way to
- tell us what the error was, so we can tell the user. */
- error ("Unable to initialize simulator (insufficient memory?).");
- return;
- }
+ sim_open (args);
push_target (&gdbsim_ops);
target_fetch_registers (-1);
program_loaded = 0;
- /* FIXME: Need to call sim_close() to close all files and
- delete all mappings. */
+ sim_close (quitting);
}
/* Takes a program previously attached to and detaches it.
static void
gdbsim_resume (pid, step, siggnal)
- int pid, step, siggnal;
+ int pid, step;
+ enum target_signal siggnal;
{
if (sr_get_debug ())
printf_filtered ("gdbsim_resume: step %d, signal %d\n", step, siggnal);
- sim_resume (step, siggnal);
+ sim_resume (step, target_signal_to_host (siggnal));
}
/* Wait for inferior process to do something. Return pid of child,
just as `wait' would. */
static int
-gdbsim_wait (status)
- WAITTYPE *status;
+gdbsim_wait (pid, status)
+ int pid;
+ struct target_waitstatus *status;
{
+ int sigrc;
+ enum sim_stop reason;
+
if (sr_get_debug ())
- printf_filtered ("gdbsim_wait: ");
- WSETSTOP (*status, sim_stop_signal ());
- if (sr_get_debug ())
- printf_filtered ("status %d\n", *status);
+ printf_filtered ("gdbsim_wait\n");
+
+ sim_stop_reason (&reason, &sigrc);
+ switch (reason)
+ {
+ case sim_exited:
+ status->kind = TARGET_WAITKIND_EXITED;
+ status->value.integer = sigrc;
+ break;
+ case sim_stopped:
+ 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);
+ 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);
+ break;
+ }
+
return inferior_pid;
}
{
printf_filtered ("\tAttached to %s running program %s\n",
target_shortname, file);
- sim_info ();
+ sim_info (0);
}
}
-/* Clear the sims notion of what the break points are. */
+/* Clear the simulator's notion of what the break points are. */
static void
gdbsim_mourn_inferior ()
generic_mourn_inferior ();
}
-/* Define the target subroutine names */
+/* Put a command string, in args, out to MONITOR. Output from MONITOR
+ is placed on the users terminal until the prompt is seen. FIXME: We
+ read the characters ourseleves here cause of a nasty echo. */
-struct target_ops gdbsim_ops =
+static void
+simulator_command (args, from_tty)
+ char *args;
+ int from_tty;
{
- "sim", "simulator",
- "Use the simulator",
- gdbsim_open, gdbsim_close,
- 0, gdbsim_detach, gdbsim_resume, gdbsim_wait, /* attach */
- gdbsim_fetch_register, gdbsim_store_register,
- gdbsim_prepare_to_store,
- gdbsim_xfer_inferior_memory,
- gdbsim_files_info,
- 0, 0, /* Breakpoints */
- 0, 0, 0, 0, 0, /* Terminal handling */
- gdbsim_kill, /* kill */
- gdbsim_load,
- 0, /* lookup_symbol */
- gdbsim_create_inferior, /* create_inferior */
- gdbsim_mourn_inferior, /* mourn_inferior */
- 0, /* can_run */
- 0, /* notice_signals */
- process_stratum, 0, /* next */
- 1, 1, 1, 1, 1, /* all mem, mem, stack, regs, exec */
- 0, 0, /* Section pointers */
- OPS_MAGIC, /* Always the last thing */
+ sim_do_command (args);
+}
+
+/* Define the target subroutine names */
+
+struct target_ops gdbsim_ops = {
+ "sim", /* to_shortname */
+ "simulator", /* to_longname */
+ "Use the compiled-in simulator.", /* to_doc */
+ gdbsim_open, /* to_open */
+ gdbsim_close, /* to_close */
+ NULL, /* to_attach */
+ gdbsim_detach, /* to_detach */
+ gdbsim_resume, /* to_resume */
+ gdbsim_wait, /* to_wait */
+ gdbsim_fetch_register, /* to_fetch_registers */
+ gdbsim_store_register, /* to_store_registers */
+ gdbsim_prepare_to_store, /* to_prepare_to_store */
+ gdbsim_xfer_inferior_memory, /* to_xfer_memory */
+ gdbsim_files_info, /* to_files_info */
+ memory_insert_breakpoint, /* to_insert_breakpoint */
+ memory_remove_breakpoint, /* to_remove_breakpoint */
+ NULL, /* to_terminal_init */
+ NULL, /* to_terminal_inferior */
+ NULL, /* to_terminal_ours_for_output */
+ NULL, /* to_terminal_ours */
+ NULL, /* to_terminal_info */
+ gdbsim_kill, /* to_kill */
+ gdbsim_load, /* to_load */
+ NULL, /* to_lookup_symbol */
+ gdbsim_create_inferior, /* to_create_inferior */
+ gdbsim_mourn_inferior, /* to_mourn_inferior */
+ 0, /* to_can_run */
+ 0, /* to_notice_signals */
+ 0, /* to_thread_alive */
+ 0, /* to_stop */
+ process_stratum, /* to_stratum */
+ NULL, /* to_next */
+ 1, /* to_has_all_memory */
+ 1, /* to_has_memory */
+ 1, /* to_has_stack */
+ 1, /* to_has_registers */
+ 1, /* to_has_execution */
+ NULL, /* sections */
+ NULL, /* sections_end */
+ OPS_MAGIC, /* to_magic */
};
void
_initialize_remote_sim ()
{
add_target (&gdbsim_ops);
+
+ add_com ("sim <command>", class_obscure, simulator_command,
+ "Send a command to the simulator.");
}