/* This file is part of the program psim.
- Copyright (C) 1994-1996, Andrew Cagney <cagney@highland.com.au>
+ Copyright 1994, 1995, 1996, 1998, 2003 Andrew Cagney
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#endif
#endif
-#include "defs.h"
+#include "libiberty.h"
#include "bfd.h"
-#include "callback.h"
-#include "remote-sim.h"
+#include "gdb/callback.h"
+#include "gdb/remote-sim.h"
+#include "gdb/signals.h"
+
+/* Define the rate at which the simulator should poll the host
+ for a quit. */
+#ifndef POLL_QUIT_INTERVAL
+#define POLL_QUIT_INTERVAL 0x20
+#endif
+static int poll_quit_count = POLL_QUIT_INTERVAL;
/* Structures used by the simulator, for gdb just have static structures */
-static psim *simulator;
+psim *simulator;
static device *root_device;
-static const char *register_names[] = REGISTER_NAMES;
static host_callback *callbacks;
-/* For communication between sim_load and sim_create_inferior.
- This can be made to go away, please do. */
-static unsigned_word entry_point;
-
SIM_DESC
sim_open (SIM_OPEN_KIND kind,
host_callback *callback,
- struct _bfd *abfd,
+ struct bfd *abfd,
char **argv)
{
callbacks = callback;
SIM_RC
sim_load (SIM_DESC sd, char *prog, bfd *abfd, int from_tty)
{
- char **argv;
TRACE(trace_gdb, ("sim_load(prog=%s, from_tty=%d) called\n",
prog, from_tty));
ASSERT(prog != NULL);
- /* parse the arguments, assume that the file is argument 0 */
- argv = buildargv(prog);
- ASSERT(argv != NULL && argv[0] != NULL);
-
/* create the simulator */
TRACE(trace_gdb, ("sim_load() - first time, create the simulator\n"));
- simulator = psim_create(argv[0], root_device);
+ simulator = psim_create(prog, root_device);
/* bring in all the data section */
psim_init(simulator);
- /* release the arguments */
- freeargv(argv);
-
/* get the start address */
- if (abfd != NULL)
- entry_point = bfd_get_start_address (abfd);
- else
+ if (abfd == NULL)
{
- abfd = bfd_openr (argv[0], 0);
+ abfd = bfd_openr (prog, 0);
if (abfd == NULL)
error ("psim: can't open \"%s\": %s\n",
- argv[0], bfd_errmsg (bfd_get_error ()));
+ prog, bfd_errmsg (bfd_get_error ()));
if (!bfd_check_format (abfd, bfd_object))
{
const char *errmsg = bfd_errmsg (bfd_get_error ());
bfd_close (abfd);
error ("psim: \"%s\" is not an object file: %s\n",
- argv[0], errmsg);
+ prog, errmsg);
}
- entry_point = bfd_get_start_address (abfd);
bfd_close (abfd);
}
}
-void
-sim_kill (SIM_DESC sd)
-{
- TRACE(trace_gdb, ("sim_kill(void) called\n"));
- /* do nothing, nothing to do */
-}
-
-
int
sim_read (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length)
{
int
-sim_write (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length)
+sim_write (SIM_DESC sd, SIM_ADDR mem, const unsigned char *buf, int length)
{
int result = psim_write_memory(simulator, MAX_NR_PROCESSORS,
buf, mem, length,
return result;
}
-
-void
-sim_fetch_register (SIM_DESC sd, int regno, unsigned char *buf)
-{
- if (simulator == NULL) {
- return;
- }
- TRACE(trace_gdb, ("sim_fetch_register(regno=%d(%s), buf=0x%lx)\n",
- regno, register_names[regno], (long)buf));
- psim_read_register(simulator, MAX_NR_PROCESSORS,
- buf, register_names[regno],
- raw_transfer);
-}
-
-
-void
-sim_store_register (SIM_DESC sd, int regno, unsigned char *buf)
-{
- if (simulator == NULL)
- return;
- TRACE(trace_gdb, ("sim_store_register(regno=%d(%s), buf=0x%lx)\n",
- regno, register_names[regno], (long)buf));
- psim_write_register(simulator, MAX_NR_PROCESSORS,
- buf, register_names[regno],
- raw_transfer);
-}
-
-
void
sim_info (SIM_DESC sd, int verbose)
{
SIM_RC
-sim_create_inferior (SIM_DESC sd, char **argv, char **envp)
+sim_create_inferior (SIM_DESC sd,
+ struct bfd *abfd,
+ char **argv,
+ char **envp)
{
+ unsigned_word entry_point;
TRACE(trace_gdb, ("sim_create_inferior(start_address=0x%x, ...)\n",
entry_point));
+ if (simulator == NULL)
+ error ("No program loaded");
+
+ if (abfd != NULL)
+ entry_point = bfd_get_start_address (abfd);
+ else
+ entry_point = 0xfff00000; /* ??? */
+
psim_init(simulator);
psim_stack(simulator, argv, envp);
- psim_write_register(simulator, -1 /* all start at same PC */,
- &entry_point, "pc", cooked_transfer);
+ ASSERT (psim_write_register(simulator, -1 /* all start at same PC */,
+ &entry_point, "pc", cooked_transfer) > 0);
return SIM_RC_OK;
}
case was_continuing:
*reason = sim_stopped;
if (status.signal == 0)
- *sigrc = SIGTRAP;
+ *sigrc = GDB_SIGNAL_TRAP;
else
*sigrc = status.signal;
break;
case was_trap:
*reason = sim_stopped;
- *sigrc = SIGTRAP;
+ *sigrc = GDB_SIGNAL_TRAP;
break;
case was_exited:
*reason = sim_exited;
}
}
+char **
+sim_complete_command (SIM_DESC sd, char *text, char *word)
+{
+ return NULL;
+}
+
+/* Polling, if required */
+
+void
+sim_io_poll_quit (void)
+{
+ if (callbacks->poll_quit != NULL && poll_quit_count-- < 0)
+ {
+ poll_quit_count = POLL_QUIT_INTERVAL;
+ if (callbacks->poll_quit (callbacks))
+ psim_stop (simulator);
+ }
+}
+
+
/* Map simulator IO operations onto the corresponding GDB I/O
functions.
{
switch (CURRENT_STDIO) {
case DO_USE_STDIO:
- gdb_flush (gdb_stdout);
+ callbacks->flush_stdout (callbacks);
break;
case DONT_USE_STDIO:
break;
}
}
+void
+sim_io_error (SIM_DESC sd, const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ callbacks->evprintf_filtered (callbacks, fmt, ap);
+ va_end(ap);
+ callbacks->error (callbacks, "");
+}
+
/****/
void *
memset(memory, 0, size);
return memory;
}
-
-void zfree(void *data)
-{
- mfree(NULL, data);
-}