/* 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.
}
}
+/* Kill the running program. This may involve closing any open files
+ and releasing other resources acquired by the simulated program. */
+
static void
gdbsim_kill ()
{
if (sr_get_debug ())
printf_filtered ("gdbsim_load: prog \"%s\"\n", prog);
- inferior_pid = 0;
+ inferior_pid = 0;
+
+ /* This must be done before calling gr_load_image. */
program_loaded = 1;
- gr_load_image (prog, fromtty);
+
+ if (sim_load (prog, fromtty) != 0)
+ gr_load_image (prog, fromtty);
}
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,
static int
gdbsim_wait (pid, status)
int pid;
- WAITTYPE *status;
+ struct target_waitstatus *status;
{
int sigrc;
enum sim_stop reason;
if (sr_get_debug ())
- printf_filtered ("gdbsim_wait: ");
+ printf_filtered ("gdbsim_wait\n");
+
sim_stop_reason (&reason, &sigrc);
- if (reason == sim_exited)
- WSETEXIT (*status, sigrc);
- else
- WSETSTOP (*status, sigrc);
- if (sr_get_debug ())
- printf_filtered ("status %d\n", *status);
+ 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 (printf_filtered, 0);
+ sim_info (0);
}
}
gdbsim_prepare_to_store,
gdbsim_xfer_inferior_memory,
gdbsim_files_info,
- 0, 0, /* Breakpoints */
+ memory_insert_breakpoint,
+ memory_remove_breakpoint,
0, 0, 0, 0, 0, /* Terminal handling */
gdbsim_kill, /* kill */
- gdbsim_load,
+ gdbsim_load, /* load */
0, /* lookup_symbol */
- gdbsim_create_inferior, /* create_inferior */
- gdbsim_mourn_inferior, /* mourn_inferior */
+ gdbsim_create_inferior, /* create_inferior */
+ gdbsim_mourn_inferior, /* mourn_inferior */
0, /* can_run */
0, /* notice_signals */
+ 0, /* to_stop */
process_stratum, 0, /* next */
1, 1, 1, 1, 1, /* all mem, mem, stack, regs, exec */
0, 0, /* Section pointers */