X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fremote-sim.c;h=109d01d977322c3e709d895e2bf49b2072c18444;hb=72ec28b8afa357cdde70c612b4e0e9f37a34f8e4;hp=dbecaa00f36cff2642cbb2f5dde57d1aaaca28f5;hpb=de43d7d0059427148461aede30bb07db993fae4b;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index dbecaa00f3..109d01d977 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -1,29 +1,30 @@ /* Generic remote debugging interface for simulators. - Copyright 1993 Free Software Foundation, Inc. + Copyright 1993, 1994, 1996, 1997, 2000 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. + This file is part of GDB. -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 -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include "defs.h" #include "inferior.h" -#include "wait.h" +#include "gdb_wait.h" #include "value.h" -#include +#include "gdb_string.h" #include #include #include @@ -32,13 +33,80 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "terminal.h" #include "target.h" #include "gdbcore.h" +#include "callback.h" #include "remote-sim.h" #include "remote-utils.h" +#include "command.h" + +/* 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 end_callbacks PARAMS ((void)); + +static int gdb_os_write_stdout PARAMS ((host_callback *, const char *, int)); + +static void gdb_os_flush_stdout PARAMS ((host_callback *)); + +static int gdb_os_write_stderr PARAMS ((host_callback *, const char *, int)); + +static void gdb_os_flush_stderr PARAMS ((host_callback *)); + +static int gdb_os_poll_quit PARAMS ((host_callback *)); + +/* printf_filtered is depreciated */ +static void gdb_os_printf_filtered PARAMS ((host_callback *, const char *,...)); + +static void gdb_os_vprintf_filtered PARAMS ((host_callback *, const char *, va_list)); + +static void gdb_os_evprintf_filtered PARAMS ((host_callback *, const char *, va_list)); + +static void gdb_os_error PARAMS ((host_callback *, const char *,...)); + +static void gdbsim_fetch_register PARAMS ((int regno)); + +static void gdbsim_store_register PARAMS ((int regno)); + +static void gdbsim_kill PARAMS ((void)); + +static void gdbsim_load PARAMS ((char *prog, int fromtty)); + +static void gdbsim_create_inferior PARAMS ((char *exec_file, char *args, char **env)); + +static void gdbsim_open PARAMS ((char *args, int from_tty)); + +static void gdbsim_close PARAMS ((int quitting)); + +static void gdbsim_detach PARAMS ((char *args, int from_tty)); + +static void gdbsim_resume PARAMS ((int pid, int step, enum target_signal siggnal)); + +static int gdbsim_wait PARAMS ((int pid, struct target_waitstatus * status)); + +static void gdbsim_prepare_to_store PARAMS ((void)); + +static int gdbsim_xfer_inferior_memory PARAMS ((CORE_ADDR memaddr, + char *myaddr, int len, + int write, + struct target_ops * target)); + +static void gdbsim_files_info PARAMS ((struct target_ops * target)); + +static void gdbsim_mourn_inferior PARAMS ((void)); + +static void gdbsim_stop PARAMS ((void)); + +void simulator_command PARAMS ((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. */ /* Forward data declarations */ @@ -46,6 +114,12 @@ extern struct target_ops gdbsim_ops; static int program_loaded = 0; +/* We must keep track of whether the simulator has been opened or not because + GDB can call a target's close routine twice, but sim_close doesn't allow + this. We also need to record the result of sim_open so we can pass it + back to the other sim_foo routines. */ +static SIM_DESC gdbsim_desc = 0; + static void dump_mem (buf, len) char *buf; @@ -57,7 +131,7 @@ dump_mem (buf, len) { long l[2]; memcpy (l, buf, len); - printf_filtered ("\t0x%x", l[0]); + printf_filtered ("\t0x%lx", l[0]); printf_filtered (len == 8 ? " 0x%x\n" : "\n", l[1]); } else @@ -71,20 +145,180 @@ dump_mem (buf, len) } } +static host_callback gdb_callback; +static int callbacks_initialized = 0; + +/* Initialize gdb_callback. */ + +static void +init_callbacks () +{ + if (!callbacks_initialized) + { + gdb_callback = default_callback; + gdb_callback.init (&gdb_callback); + gdb_callback.write_stdout = gdb_os_write_stdout; + gdb_callback.flush_stdout = gdb_os_flush_stdout; + gdb_callback.write_stderr = gdb_os_write_stderr; + gdb_callback.flush_stderr = gdb_os_flush_stderr; + gdb_callback.printf_filtered = gdb_os_printf_filtered; + gdb_callback.vprintf_filtered = gdb_os_vprintf_filtered; + gdb_callback.evprintf_filtered = gdb_os_evprintf_filtered; + gdb_callback.error = gdb_os_error; + gdb_callback.poll_quit = gdb_os_poll_quit; + gdb_callback.magic = HOST_CALLBACK_MAGIC; + callbacks_initialized = 1; + } +} + +/* Release callbacks (free resources used by them). */ + +static void +end_callbacks () +{ + if (callbacks_initialized) + { + gdb_callback.shutdown (&gdb_callback); + callbacks_initialized = 0; + } +} + +/* GDB version of os_write_stdout callback. */ + +static int +gdb_os_write_stdout (p, buf, len) + host_callback *p; + const char *buf; + int len; +{ + int i; + char b[2]; + + ui_file_write (gdb_stdtarg, buf, len); + return len; +} + +/* GDB version of os_flush_stdout callback. */ + +static void +gdb_os_flush_stdout (p) + host_callback *p; +{ + gdb_flush (gdb_stdtarg); +} + +/* GDB version of os_write_stderr callback. */ + +static int +gdb_os_write_stderr (p, buf, len) + host_callback *p; + const char *buf; + int len; +{ + int i; + char b[2]; + + for (i = 0; i < len; i++) + { + b[0] = buf[i]; + b[1] = 0; + fputs_unfiltered (b, gdb_stdtarg); + } + return len; +} + +/* GDB version of os_flush_stderr callback. */ + +static void +gdb_os_flush_stderr (p) + host_callback *p; +{ + gdb_flush (gdb_stderr); +} + +/* GDB version of printf_filtered callback. */ + +static void +gdb_os_printf_filtered (host_callback * p, const char *format,...) +{ + va_list args; + va_start (args, format); + + vfprintf_filtered (gdb_stdout, format, args); + + va_end (args); +} + +/* GDB version of error vprintf_filtered. */ + +static void +gdb_os_vprintf_filtered (host_callback * p, const char *format, va_list ap) +{ + vfprintf_filtered (gdb_stdout, format, ap); +} + +/* GDB version of error evprintf_filtered. */ + +static void +gdb_os_evprintf_filtered (host_callback * p, const char *format, va_list ap) +{ + vfprintf_filtered (gdb_stderr, format, ap); +} + +/* GDB version of error callback. */ + +static void +gdb_os_error (host_callback * p, const char *format,...) +{ + if (error_hook) + (*error_hook) (); + else + { + va_list args; + va_start (args, format); + verror (format, args); + va_end (args); + } +} + +#ifndef REGISTER_SIM_REGNO +#define REGISTER_SIM_REGNO(N) (N) +#endif + static void gdbsim_fetch_register (regno) -int regno; + int regno; { - if (regno == -1) + static int warn_user = 1; + if (regno == -1) { for (regno = 0; regno < NUM_REGS; regno++) gdbsim_fetch_register (regno); } - else + else if (REGISTER_NAME (regno) != NULL + && *REGISTER_NAME (regno) != '\0') { char buf[MAX_REGISTER_RAW_SIZE]; - - sim_fetch_register (regno, buf); + int nr_bytes; + if (REGISTER_SIM_REGNO (regno) >= 0) + nr_bytes = sim_fetch_register (gdbsim_desc, + REGISTER_SIM_REGNO (regno), + buf, REGISTER_RAW_SIZE (regno)); + else + nr_bytes = 0; + if (nr_bytes == 0) + /* register not applicable, supply zero's */ + memset (buf, 0, MAX_REGISTER_RAW_SIZE); + else if (nr_bytes > 0 && nr_bytes != REGISTER_RAW_SIZE (regno) + && warn_user) + { + fprintf_unfiltered (gdb_stderr, + "Size of register %s (%d/%d) incorrect (%d instead of %d))", + REGISTER_NAME (regno), + regno, REGISTER_SIM_REGNO (regno), + nr_bytes, REGISTER_RAW_SIZE (regno)); + warn_user = 0; + } supply_register (regno, buf); if (sr_get_debug ()) { @@ -95,37 +329,48 @@ int regno; } } + static void gdbsim_store_register (regno) -int regno; + int regno; { - if (regno == -1) + if (regno == -1) { for (regno = 0; regno < NUM_REGS; regno++) gdbsim_store_register (regno); } - else + else if (REGISTER_NAME (regno) != NULL + && *REGISTER_NAME (regno) != '\0' + && REGISTER_SIM_REGNO (regno) >= 0) { - /* 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]; + int nr_bytes; + read_register_gen (regno, tmp); + nr_bytes = sim_store_register (gdbsim_desc, + REGISTER_SIM_REGNO (regno), + tmp, REGISTER_RAW_SIZE (regno)); + if (nr_bytes > 0 && nr_bytes != REGISTER_RAW_SIZE (regno)) + internal_error ("Register size different to expected"); 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 () { if (sr_get_debug ()) printf_filtered ("gdbsim_kill\n"); - sim_kill (); /* close fd's, remove mappings */ + /* There is no need to `kill' running simulator - the simulator is + not running */ inferior_pid = 0; } @@ -138,74 +383,27 @@ gdbsim_load (prog, fromtty) 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); + inferior_pid = 0; - if (bfd_check_format (abfd, bfd_object) == 0) - error ("File is not an object file."); + /* FIXME: We will print two messages on error. + Need error to either not print anything if passed NULL or need + another routine that doesn't take any arguments. */ + if (sim_load (gdbsim_desc, prog, NULL, fromtty) == SIM_RC_FAIL) + error ("unable to load program"); - if (sim_load (abfd, prog) != 0) - return; + /* FIXME: If a load command should reset the targets registers then + a call to sim_create_inferior() should go here. */ program_loaded = 1; - - sim_set_pc (abfd->start_address); } -/* - * 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 *abfd, char *prog) { return sim_load_standard (abfd); } - */ - -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. - ALLARGS is a string containing the arguments to the program. + ARGS is a string containing the arguments to the program. ENV is the environment vector to pass. Errors reported with error(). On VxWorks and various standalone systems, we ignore exec_file. */ /* This is called not only when we first attach, but also when the @@ -217,42 +415,45 @@ gdbsim_create_inferior (exec_file, args, env) char *args; char **env; { - int len,entry_pt; - char *arg_buf,**argv; + int len; + char *arg_buf, **argv; - if (! program_loaded) - error ("No program loaded."); + if (exec_file == 0 || exec_bfd == 0) + warning ("No executable file specified."); + if (!program_loaded) + warning ("No program loaded."); if (sr_get_debug ()) printf_filtered ("gdbsim_create_inferior: exec_file \"%s\", args \"%s\"\n", - exec_file, args); - - if (exec_file == 0 || exec_bfd == 0) - error ("No exec file specified."); - - entry_pt = (int) bfd_get_start_address (exec_bfd); + (exec_file ? exec_file : "(NULL)"), + args); - gdbsim_kill (NULL, NULL); + gdbsim_kill (); remove_breakpoints (); init_wait_for_inferior (); - len = 5 + strlen (exec_file) + 1 + strlen (args) + 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 = 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; + if (exec_file != NULL) + { + len = strlen (exec_file) + 1 + strlen (args) + 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 = buildargv (arg_buf); + make_cleanup_freeargv (argv); + } + else + argv = NULL; + sim_create_inferior (gdbsim_desc, exec_bfd, argv, env); inferior_pid = 42; insert_breakpoints (); /* Needed to get correct instruction in cache */ - proceed (entry_pt, -1, 0); + + clear_proceed_status (); + + /* NB: Entry point already set by sim_create_inferior. */ + proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 0); } /* The open routine takes the rest of the parameters from the command, @@ -265,20 +466,72 @@ gdbsim_open (args, from_tty) char *args; int from_tty; { - if (sr_get_debug ()) - printf_filtered ("gdbsim_open: args \"%s\"\n", args); + int len; + char *arg_buf; + char **argv; - if (sim_open (args) != 0) + if (sr_get_debug ()) + printf_filtered ("gdbsim_open: args \"%s\"\n", args ? args : "(null)"); + + /* Remove current simulator if one exists. Only do this if the simulator + has been opened because sim_close requires it. + This is important because the call to push_target below will cause + sim_close to be called if the simulator is already open, but push_target + is called after sim_open! We can't move the call to push_target before + the call to sim_open because sim_open may invoke `error'. */ + if (gdbsim_desc != NULL) + unpush_target (&gdbsim_ops); + + len = (7 + 1 /* gdbsim */ + + strlen (" -E little") + + strlen (" --architecture=xxxxxxxxxx") + + (args ? strlen (args) : 0) + + 50) /* slack */ ; + arg_buf = (char *) alloca (len); + 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). */ + if (TARGET_BYTE_ORDER_SELECTABLE_P + && !TARGET_BYTE_ORDER_AUTO) + { + switch (TARGET_BYTE_ORDER) + { + case BIG_ENDIAN: + strcat (arg_buf, " -E big"); + break; + case LITTLE_ENDIAN: + strcat (arg_buf, " -E little"); + break; + default: + internal_error ("Value of TARGET_BYTE_ORDER unknown"); + } + } + /* Specify the architecture of the target when it has been + explicitly specified */ + if (!TARGET_ARCHITECTURE_AUTO) { - /* 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; + strcat (arg_buf, " --architecture="); + strcat (arg_buf, TARGET_ARCHITECTURE->printable_name); } + /* finally, any explicit args */ + if (args) + { + strcat (arg_buf, " "); /* 1 */ + strcat (arg_buf, args); + } + argv = buildargv (arg_buf); + if (argv == NULL) + error ("Insufficient memory available to allocate simulator arg list."); + make_cleanup_freeargv (argv); + + init_callbacks (); + gdbsim_desc = sim_open (SIM_OPEN_DEBUG, &gdb_callback, exec_bfd, argv); + + if (gdbsim_desc == 0) + error ("unable to create simulator instance"); push_target (&gdbsim_ops); target_fetch_registers (-1); - printf_filtered ("Connected to the simulator.\n"); } @@ -300,8 +553,13 @@ gdbsim_close (quitting) program_loaded = 0; - /* FIXME: Need to call sim_close() to close all files and - delete all mappings. */ + if (gdbsim_desc != NULL) + { + sim_close (gdbsim_desc, quitting); + gdbsim_desc = NULL; + } + + end_callbacks (); } /* Takes a program previously attached to and detaches it. @@ -314,7 +572,7 @@ gdbsim_close (quitting) Use this when you want to detach and do something else with your gdb. */ static void -gdbsim_detach (args,from_tty) +gdbsim_detach (args, from_tty) char *args; int from_tty; { @@ -325,35 +583,146 @@ gdbsim_detach (args,from_tty) if (from_tty) printf_filtered ("Ending simulator %s debugging\n", target_shortname); } - + /* Resume execution of the target process. STEP says whether to single-step or to run free; SIGGNAL is the signal value (e.g. SIGINT) to be given to the target, or zero for no signal. */ +static enum target_signal resume_siggnal; +static int resume_step; + static void gdbsim_resume (pid, step, siggnal) - int pid, step, siggnal; + int pid, step; + enum target_signal siggnal; { + if (inferior_pid != 42) + error ("The program is not being run."); + if (sr_get_debug ()) printf_filtered ("gdbsim_resume: step %d, signal %d\n", step, siggnal); - sim_resume (step, siggnal); + resume_siggnal = siggnal; + resume_step = step; +} + +/* Notify the simulator of an asynchronous request to stop. + + The simulator shall ensure that the stop 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 + the simulator is next resumed. + + For simulators that do not support this operation, just abort */ + +static void +gdbsim_stop () +{ + if (!sim_stop (gdbsim_desc)) + { + quit (); + } +} + +/* GDB version of os_poll_quit callback. + Taken from gdb/util.c - should be in a library */ + +static int +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 */ + { + quit_flag = 0; /* we've stolen it */ + return 1; + } + else if (immediate_quit) + { + return 1; + } + return 0; } /* Wait for inferior process to do something. Return pid of child, or -1 in case of error; store status through argument pointer STATUS, - just as `wait' would. */ + just as `wait' would. */ + +static void +gdbsim_cntrl_c (signo) + int signo; +{ + gdbsim_stop (); +} static int gdbsim_wait (pid, status) int pid; - WAITTYPE *status; + struct target_waitstatus *status; { + static RETSIGTYPE (*prev_sigint) (); + int sigrc = 0; + enum sim_stop reason = sim_running; + 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"); + +#if defined (HAVE_SIGACTION) && defined (SA_RESTART) + { + struct sigaction sa, osa; + sa.sa_handler = gdbsim_cntrl_c; + sigemptyset (&sa.sa_mask); + sa.sa_flags = 0; + sigaction (SIGINT, &sa, &osa); + prev_sigint = osa.sa_handler; + } +#else + prev_sigint = signal (SIGINT, gdbsim_cntrl_c); +#endif + sim_resume (gdbsim_desc, resume_step, + target_signal_to_host (resume_siggnal)); + signal (SIGINT, prev_sigint); + resume_step = 0; + + sim_stop_reason (gdbsim_desc, &reason, &sigrc); + + switch (reason) + { + case sim_exited: + status->kind = TARGET_WAITKIND_EXITED; + status->value.integer = sigrc; + break; + case sim_stopped: + switch (sigrc) + { + case SIGABRT: + quit (); + break; + case SIGINT: + case SIGTRAP: + default: + 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; + } + 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; + case sim_running: + case sim_polling: + /* FIXME: Is this correct? */ + break; + } + return inferior_pid; } @@ -375,29 +744,32 @@ gdbsim_xfer_inferior_memory (memaddr, myaddr, len, write, target) char *myaddr; int len; int write; - struct target_ops *target; /* ignored */ + struct target_ops *target; /* ignored */ { - if (! program_loaded) + if (!program_loaded) error ("No program loaded."); if (sr_get_debug ()) { - printf_filtered ("gdbsim_xfer_inferior_memory: myaddr 0x%x, memaddr 0x%x, len %d, write %d\n", - myaddr, memaddr, len, write); + /* FIXME: Send to something other than STDOUT? */ + printf_filtered ("gdbsim_xfer_inferior_memory: myaddr 0x"); + gdb_print_host_address (myaddr, gdb_stdout); + printf_filtered (", memaddr 0x%s, len %d, write %d\n", + paddr_nz (memaddr), len, write); if (sr_get_debug () && write) - dump_mem(myaddr, len); + dump_mem (myaddr, len); } if (write) { - len = sim_write (memaddr, myaddr, len); + len = sim_write (gdbsim_desc, memaddr, myaddr, len); } - else + else { - len = sim_read (memaddr, myaddr, len); + len = sim_read (gdbsim_desc, memaddr, myaddr, len); if (sr_get_debug () && len > 0) - dump_mem(myaddr, len); - } + dump_mem (myaddr, len); + } return len; } @@ -417,15 +789,15 @@ gdbsim_files_info (target) { printf_filtered ("\tAttached to %s running program %s\n", target_shortname, file); - sim_info (); + sim_info (gdbsim_desc, 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 () -{ +gdbsim_mourn_inferior () +{ if (sr_get_debug ()) printf_filtered ("gdbsim_mourn_inferior:\n"); @@ -433,35 +805,168 @@ gdbsim_mourn_inferior () generic_mourn_inferior (); } +static int +gdbsim_insert_breakpoint (addr, contents_cache) + CORE_ADDR addr; + char *contents_cache; +{ +#ifdef SIM_HAS_BREAKPOINTS + SIM_RC retcode; + + retcode = sim_set_breakpoint (gdbsim_desc, addr); + + switch (retcode) + { + case SIM_RC_OK: + return 0; + case SIM_RC_INSUFFICIENT_RESOURCES: + return ENOMEM; + default: + return EIO; + } +#else + return memory_insert_breakpoint (addr, contents_cache); +#endif +} + +static int +gdbsim_remove_breakpoint (addr, contents_cache) + CORE_ADDR addr; + char *contents_cache; +{ +#ifdef SIM_HAS_BREAKPOINTS + SIM_RC retcode; + + retcode = sim_clear_breakpoint (gdbsim_desc, addr); + + switch (retcode) + { + case SIM_RC_OK: + case SIM_RC_UNKNOWN_BREAKPOINT: + return 0; + case SIM_RC_INSUFFICIENT_RESOURCES: + return ENOMEM; + default: + return EIO; + } +#else + return memory_remove_breakpoint (addr, contents_cache); +#endif +} + +/* Pass the command argument through to the simulator verbatim. The + simulator must do any command interpretation work. */ + +void +simulator_command (args, from_tty) + char *args; + int from_tty; +{ + if (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). */ + + /* 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. */ + + error ("Not connected to the simulator target"); + } + + sim_do_command (gdbsim_desc, args); + + /* Invalidate the register cache, in case the simulator command does + something funny. */ + registers_changed (); +} + /* Define the target subroutine names */ -struct target_ops gdbsim_ops = -{ - "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 */ -}; +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_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_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_xfer_memory = gdbsim_xfer_inferior_memory; + gdbsim_ops.to_files_info = gdbsim_files_info; + gdbsim_ops.to_insert_breakpoint = gdbsim_insert_breakpoint; + gdbsim_ops.to_remove_breakpoint = gdbsim_remove_breakpoint; + gdbsim_ops.to_terminal_init = NULL; + gdbsim_ops.to_terminal_inferior = NULL; + gdbsim_ops.to_terminal_ours_for_output = NULL; + gdbsim_ops.to_terminal_ours = NULL; + gdbsim_ops.to_terminal_info = NULL; + gdbsim_ops.to_kill = gdbsim_kill; + 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_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; + gdbsim_ops.to_has_memory = 1; + gdbsim_ops.to_has_stack = 1; + gdbsim_ops.to_has_registers = 1; + gdbsim_ops.to_has_execution = 1; + gdbsim_ops.to_sections = NULL; + gdbsim_ops.to_sections_end = NULL; + gdbsim_ops.to_magic = OPS_MAGIC; + +#ifdef TARGET_REDEFINE_DEFAULT_OPS + TARGET_REDEFINE_DEFAULT_OPS (&gdbsim_ops); +#endif +} void _initialize_remote_sim () { + init_gdbsim_ops (); add_target (&gdbsim_ops); + + add_com ("sim ", class_obscure, simulator_command, + "Send a command to the simulator."); }