GDB 7.6.50

gdb/remote-sim.c

 /* Generic remote debugging interface for simulators.
 
-   Copyright (C) 1993-2002, 2004-2012 Free Software Foundation, Inc.
+   Copyright (C) 1993-2013 Free Software Foundation, Inc.
 
    Contributed by Cygnus Support.
    Steve Chamberlain (sac@cygnus.com).
 
    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 3 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.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "inferior.h"
 #include "value.h"
-#include "gdb_string.h"
+#include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <setjmp.h>
 #include <errno.h>
 #include "terminal.h"
 #include "target.h"
 #include "gdbcore.h"
 #include "gdb/callback.h"
 #include "gdb/remote-sim.h"
 #include "command.h"
 #include "regcache.h"
 #include "gdb_assert.h"
 #include "sim-regno.h"
 #include "arch-utils.h"
 #include "readline/readline.h"
 #include "gdbthread.h"
 
 /* Prototypes */
 
 extern void _initialize_remote_sim (void);
 
-static void dump_mem (char *buf, int len);
-
 static void init_callbacks (void);
 
 static void end_callbacks (void);
 
 static int gdb_os_write_stdout (host_callback *, const char *, int);
 
 static void gdb_os_flush_stdout (host_callback *);
 
 static int gdb_os_write_stderr (host_callback *, const char *, int);
 
@@ skipping 10 matching lines @@
 
 static void gdb_os_error (host_callback *, const char *, ...)
      ATTRIBUTE_NORETURN;
 
 static void gdbsim_kill (struct target_ops *);
 
 static void gdbsim_load (char *prog, int fromtty);
 
 static void gdbsim_open (char *args, int from_tty);
 
-static void gdbsim_close (int quitting);
+static void gdbsim_close (void);
 
-static void gdbsim_detach (struct target_ops *ops, char *args, int from_tty);
+static void gdbsim_detach (struct target_ops *ops, const char *args,
+                           int from_tty);
 
 static void gdbsim_prepare_to_store (struct regcache *regcache);
 
 static void gdbsim_files_info (struct target_ops *target);
 
 static void gdbsim_mourn_inferior (struct target_ops *target);
 
 static void gdbsim_stop (ptid_t ptid);
 
 void simulator_command (char *args, int from_tty);
@@ skipping 170 matching lines @@
       if (sim_data->gdbsim_desc)
         {
           sim_close (sim_data->gdbsim_desc, 0);
           sim_data->gdbsim_desc = NULL;
         }
       xfree (sim_data);
     }
 }
 
 static void
-dump_mem (char *buf, int len)
+dump_mem (const gdb_byte *buf, int len)
 {
-  if (len <= 8)
+  fputs_unfiltered ("\t", gdb_stdlog);
+
+  if (len == 8 || len == 4)
     {
-      if (len == 8 || len == 4)
-        {
-          long l[2];
+      uint32_t l[2];
 
-          memcpy (l, buf, len);
-          printf_filtered ("\t0x%lx", l[0]);
-          if (len == 8)
-            printf_filtered (" 0x%lx", l[1]);
-          printf_filtered ("\n");
-        }
-      else
-        {
-          int i;
+      memcpy (l, buf, len);
+      fprintf_unfiltered (gdb_stdlog, "0x%08x", l[0]);
+      if (len == 8)
+        fprintf_unfiltered (gdb_stdlog, " 0x%08x", l[1]);
+    }
+  else
+    {
+      int i;
 
-          printf_filtered ("\t");
-          for (i = 0; i < len; i++)
-            printf_filtered ("0x%x ", buf[i]);
-          printf_filtered ("\n");
-        }
+      for (i = 0; i < len; i++)
+        fprintf_unfiltered (gdb_stdlog, "0x%02x ", buf[i]);
     }
+
+  fputs_unfiltered ("\n", gdb_stdlog);
 }
 
 /* Initialize gdb_callback.  */
 
 static void
 init_callbacks (void)
 {
   if (!callbacks_initialized)
     {
       gdb_callback = default_callback;
@@ skipping 133 matching lines @@
     }
 
   switch (gdbarch_register_sim_regno (gdbarch, regno))
     {
     case LEGACY_SIM_REGNO_IGNORE:
       break;
     case SIM_REGNO_DOES_NOT_EXIST:
       {
         /* For moment treat a `does not exist' register the same way
            as an ``unavailable'' register.  */
-        char buf[MAX_REGISTER_SIZE];
+        gdb_byte buf[MAX_REGISTER_SIZE];
         int nr_bytes;
 
         memset (buf, 0, MAX_REGISTER_SIZE);
         regcache_raw_supply (regcache, regno, buf);
         break;
       }
       
     default:
       {
         static int warn_user = 1;
-        char buf[MAX_REGISTER_SIZE];
+        gdb_byte buf[MAX_REGISTER_SIZE];
         int nr_bytes;
 
         gdb_assert (regno >= 0 && regno < gdbarch_num_regs (gdbarch));
         memset (buf, 0, MAX_REGISTER_SIZE);
         nr_bytes = sim_fetch_register (sim_data->gdbsim_desc,
                                        gdbarch_register_sim_regno
                                          (gdbarch, regno),
                                        buf,
                                        register_size (gdbarch, regno));
         if (nr_bytes > 0
@@ skipping 10 matching lines @@
             warn_user = 0;
           }
         /* FIXME: cagney/2002-05-27: Should check `nr_bytes == 0'
            indicating that GDB and the SIM have different ideas about
            which registers are fetchable.  */
         /* Else if (nr_bytes < 0): an old simulator, that doesn't
            think to return the register size.  Just assume all is ok.  */
         regcache_raw_supply (regcache, regno, buf);
         if (remote_debug)
           {
-            printf_filtered ("gdbsim_fetch_register: %d", regno);
+            fprintf_unfiltered (gdb_stdlog,
+                                "gdbsim_fetch_register: %d", regno);
             /* FIXME: We could print something more intelligible.  */
             dump_mem (buf, register_size (gdbarch, regno));
           }
         break;
       }
     }
 }
 
 
 static void
 gdbsim_store_register (struct target_ops *ops,
                        struct regcache *regcache, int regno)
 {
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   struct sim_inferior_data *sim_data
     = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED);
 
   if (regno == -1)
     {
       for (regno = 0; regno < gdbarch_num_regs (gdbarch); regno++)
         gdbsim_store_register (ops, regcache, regno);
       return;
     }
   else if (gdbarch_register_sim_regno (gdbarch, regno) >= 0)
     {
-      char tmp[MAX_REGISTER_SIZE];
+      gdb_byte tmp[MAX_REGISTER_SIZE];
       int nr_bytes;
 
       regcache_cooked_read (regcache, regno, tmp);
       nr_bytes = sim_store_register (sim_data->gdbsim_desc,
                                      gdbarch_register_sim_regno
                                        (gdbarch, regno),
                                      tmp, register_size (gdbarch, regno));
       if (nr_bytes > 0 && nr_bytes != register_size (gdbarch, regno))
         internal_error (__FILE__, __LINE__,
                         _("Register size different to expected"));
       if (nr_bytes < 0)
         internal_error (__FILE__, __LINE__,
                         _("Register %d not updated"), regno);
       if (nr_bytes == 0)
         warning (_("Register %s not updated"),
                  gdbarch_register_name (gdbarch, regno));
 
       if (remote_debug)
         {
-          printf_filtered ("gdbsim_store_register: %d", regno);
+          fprintf_unfiltered (gdb_stdlog, "gdbsim_store_register: %d", regno);
           /* FIXME: We could print something more intelligible.  */
           dump_mem (tmp, register_size (gdbarch, 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 (struct target_ops *ops)
 {
   if (remote_debug)
-    printf_filtered ("gdbsim_kill\n");
+    fprintf_unfiltered (gdb_stdlog, "gdbsim_kill\n");
 
   /* There is no need to `kill' running simulator - the simulator is
      not running.  Mourning it is enough.  */
   target_mourn_inferior ();
 }
 
 /* Load an executable file into the target process.  This is expected to
    not only bring new code into the target process, but also to update
    GDB's symbol tables to match.  */
 
@@ skipping 10 matching lines @@
 
   argv = gdb_buildargv (args);
   make_cleanup_freeargv (argv);
 
   prog = tilde_expand (argv[0]);
 
   if (argv[1] != NULL)
     error (_("GDB sim does not yet support a load offset."));
 
   if (remote_debug)
-    printf_filtered ("gdbsim_load: prog \"%s\"\n", prog);
+    fprintf_unfiltered (gdb_stdlog, "gdbsim_load: prog \"%s\"\n", prog);
 
   /* 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 (sim_data->gdbsim_desc, prog, NULL, fromtty) == SIM_RC_FAIL)
     error (_("unable to load program"));
 
   /* FIXME: If a load command should reset the targets registers then
      a call to sim_create_inferior() should go here.  */
 
@@ skipping 17 matching lines @@
     = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED);
   int len;
   char *arg_buf, **argv;
 
   if (exec_file == 0 || exec_bfd == 0)
     warning (_("No executable file specified."));
   if (!sim_data->program_loaded)
     warning (_("No program loaded."));
 
   if (remote_debug)
-    printf_filtered ("gdbsim_create_inferior: exec_file \"%s\", args \"%s\"\n",
-                     (exec_file ? exec_file : "(NULL)"),
-                     args);
+    fprintf_unfiltered (gdb_stdlog,
+                        "gdbsim_create_inferior: exec_file \"%s\", args \"%s\"\n",
+                        (exec_file ? exec_file : "(NULL)"),
+                        args);
 
   if (ptid_equal (inferior_ptid, sim_data->remote_sim_ptid))
     gdbsim_kill (target);
   remove_breakpoints ();
   init_wait_for_inferior ();
 
   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 = gdb_buildargv (arg_buf);
       make_cleanup_freeargv (argv);
     }
   else
     argv = NULL;
 
+  if (!have_inferiors ())
+    init_thread_list ();
+
   if (sim_create_inferior (sim_data->gdbsim_desc, exec_bfd, argv, env)
       != SIM_RC_OK)
     error (_("Unable to create sim inferior."));
 
   inferior_ptid = sim_data->remote_sim_ptid;
   inferior_appeared (current_inferior (), ptid_get_pid (inferior_ptid));
   add_thread_silent (inferior_ptid);
 
   insert_breakpoints ();        /* Needed to get correct instruction
                                    in cache.  */
 
   clear_proceed_status ();
 }
 
 /* The open routine takes the rest of the parameters from the command,
    and (if successful) pushes a new target onto the stack.
    Targets should supply this routine, if only to provide an error message.  */
 /* Called when selecting the simulator.  E.g. (gdb) target sim name.  */
 
 static void
 gdbsim_open (char *args, int from_tty)
 {
   int len;
   char *arg_buf;
   struct sim_inferior_data *sim_data;
   SIM_DESC gdbsim_desc;
 
   if (remote_debug)
-    printf_filtered ("gdbsim_open: args \"%s\"\n", args ? args : "(null)");
+    fprintf_unfiltered (gdb_stdlog,
+                        "gdbsim_open: args \"%s\"\n", args ? args : "(null)");
 
   /* Ensure that the sim target is not on the target stack.  This is
      necessary, because if it is on the target stack, the call to
      push_target below will invoke sim_close(), thus freeing various
      state (including a sim instance) that we allocate prior to
      invoking push_target().  We want to delay the push_target()
      operation until after we complete those operations which could
      error out.  */
   if (gdbsim_is_open)
     unpush_target (&gdbsim_ops);
@@ skipping 90 matching lines @@
       if (find_inferior_pid (ptid_get_pid (ptid)) != NULL)
         {
           switch_to_thread (ptid);
           generic_mourn_inferior ();
         }
     }
 
   return 0;
 }
 
-/* Does whatever cleanup is required for a target that we are no longer
-   going to be calling.  Argument says whether we are quitting gdb and
-   should not get hung in case of errors, or whether we want a clean
-   termination even if it takes a while.  This routine is automatically
-   always called just before a routine is popped off the target stack.
-   Closing file descriptors and freeing memory are typical things it should
-   do.  */
 /* Close out all files and local state before this target loses control.  */
 
 static void
-gdbsim_close (int quitting)
+gdbsim_close (void)
 {
   struct sim_inferior_data *sim_data
     = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
 
   if (remote_debug)
-    printf_filtered ("gdbsim_close: quitting %d\n", quitting);
+    fprintf_unfiltered (gdb_stdlog, "gdbsim_close\n");
 
   iterate_over_inferiors (gdbsim_close_inferior, NULL);
 
   if (sim_argv != NULL)
     {
       freeargv (sim_argv);
       sim_argv = NULL;
     }
 
   end_callbacks ();
 
   gdbsim_is_open = 0;
 }
 
 /* Takes a program previously attached to and detaches it.
    The program may resume execution (some targets do, some don't) and will
    no longer stop on signals, etc.  We better not have left any breakpoints
    in the program or it'll die when it hits one.  ARGS is arguments
    typed by the user (e.g. a signal to send the process).  FROM_TTY
    says whether to be verbose or not.  */
 /* Terminate the open connection to the remote debugger.
    Use this when you want to detach and do something else with your gdb.  */
 
 static void
-gdbsim_detach (struct target_ops *ops, char *args, int from_tty)
+gdbsim_detach (struct target_ops *ops, const char *args, int from_tty)
 {
   if (remote_debug)
-    printf_filtered ("gdbsim_detach: args \"%s\"\n", args);
+    fprintf_unfiltered (gdb_stdlog, "gdbsim_detach: args \"%s\"\n", args);
 
-  pop_target ();                /* calls gdbsim_close to do the real work */
+  unpush_target (ops);          /* calls gdbsim_close to do the real work */
   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.  */
 
 struct resume_data
 {
   enum gdb_signal siggnal;
   int step;
 };
 
 static int
 gdbsim_resume_inferior (struct inferior *inf, void *arg)
 {
   struct sim_inferior_data *sim_data
     = get_sim_inferior_data (inf, SIM_INSTANCE_NOT_NEEDED);
   struct resume_data *rd = arg;
 
   if (sim_data)
     {
       sim_data->resume_siggnal = rd->siggnal;
       sim_data->resume_step = rd->step;
 
       if (remote_debug)
-        printf_filtered (_("gdbsim_resume: pid %d, step %d, signal %d\n"),
-                         inf->pid, rd->step, rd->siggnal);
+        fprintf_unfiltered (gdb_stdlog,
+                            _("gdbsim_resume: pid %d, step %d, signal %d\n"),
+                            inf->pid, rd->step, rd->siggnal);
     }
 
   /* When called from iterate_over_inferiors, a zero return causes the
      iteration process to proceed until there are no more inferiors to
      consider.  */
   return 0;
 }
 
 static void
 gdbsim_resume (struct target_ops *ops,
@@ skipping 73 matching lines @@
 
 /* GDB version of os_poll_quit callback.
    Taken from gdb/util.c - should be in a library.  */
 
 static int
 gdb_os_poll_quit (host_callback *p)
 {
   if (deprecated_ui_loop_hook != NULL)
     deprecated_ui_loop_hook (0);
 
-  if (quit_flag)                /* gdb's idea of quit */
+  if (check_quit_flag ())       /* gdb's idea of quit */
     {
-      quit_flag = 0;            /* we've stolen it */
-      return 1;
-    }
-  else if (immediate_quit)
-    {
+      clear_quit_flag ();       /* we've stolen it */
       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.  */
 
 static void
@@ skipping 20 matching lines @@
   else
     {
       sim_data = get_sim_inferior_data_by_ptid (ptid, SIM_INSTANCE_NEEDED);
       if (sim_data == NULL)
         error (_("Unable to wait for pid %d.  Inferior not found."),
                ptid_get_pid (ptid));
       inferior_ptid = ptid;
     }
 
   if (remote_debug)
-    printf_filtered ("gdbsim_wait\n");
+    fprintf_unfiltered (gdb_stdlog, "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;
   }
@@ skipping 46 matching lines @@
    which store all the registers in one fell swoop, this makes sure
    that registers contains all the registers from the program being
    debugged.  */
 
 static void
 gdbsim_prepare_to_store (struct regcache *regcache)
 {
   /* Do nothing, since we can store individual regs.  */
 }
 
-/* Transfer LEN bytes between GDB address MYADDR and target address
-   MEMADDR.  If WRITE is non-zero, transfer them to the target,
-   otherwise transfer them from the target.  TARGET is unused.
+/* Helper for gdbsim_xfer_partial that handles memory transfers.
+   Arguments are like target_xfer_partial.  */
 
-   Returns the number of bytes transferred.  */
-
-static int
-gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len,
-                             int write, struct mem_attrib *attrib,
-                             struct target_ops *target)
+static LONGEST
+gdbsim_xfer_memory (struct target_ops *target,
+                    gdb_byte *readbuf, const gdb_byte *writebuf,
+                    ULONGEST memaddr, LONGEST len)
 {
   struct sim_inferior_data *sim_data
     = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
 
   /* If this target doesn't have memory yet, return 0 causing the
      request to be passed to a lower target, hopefully an exec
      file.  */
   if (!target->to_has_memory (target))
     return 0;
 
   if (!sim_data->program_loaded)
     error (_("No program loaded."));
 
   /* Note that we obtained the sim_data pointer above using
      SIM_INSTANCE_NOT_NEEDED.  We do this so that we don't needlessly
      allocate a sim instance prior to loading a program.   If we
      get to this point in the code though, gdbsim_desc should be
      non-NULL.  (Note that a sim instance is needed in order to load
      the program...)  */
   gdb_assert (sim_data->gdbsim_desc != NULL);
 
   if (remote_debug)
+    fprintf_unfiltered (gdb_stdlog,
+                        "gdbsim_xfer_memory: readbuf %s, writebuf %s, "
+                        "memaddr %s, len %s\n",
+                        host_address_to_string (readbuf),
+                        host_address_to_string (writebuf),
+                        paddress (target_gdbarch (), memaddr),
+                        plongest (len));
+
+  if (writebuf)
     {
-      /* 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 %s, len %d, write %d\n",
-                       paddress (target_gdbarch, memaddr), len, write);
-      if (remote_debug && write)
-        dump_mem (myaddr, len);
-    }
-
-  if (write)
-    {
-      len = sim_write (sim_data->gdbsim_desc, memaddr, myaddr, len);
+      if (remote_debug && len > 0)
+        dump_mem (writebuf, len);
+      len = sim_write (sim_data->gdbsim_desc, memaddr, writebuf, len);
     }
   else
     {
-      len = sim_read (sim_data->gdbsim_desc, memaddr, myaddr, len);
+      len = sim_read (sim_data->gdbsim_desc, memaddr, readbuf, len);
       if (remote_debug && len > 0)
-        dump_mem (myaddr, len);
+        dump_mem (readbuf, len);
     }
   return len;
 }
 
+/* Target to_xfer_partial implementation.  */
+
+static LONGEST
+gdbsim_xfer_partial (struct target_ops *ops, enum target_object object,
+                     const char *annex, gdb_byte *readbuf,
+                     const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+{
+  switch (object)
+    {
+    case TARGET_OBJECT_MEMORY:
+      return gdbsim_xfer_memory (ops, readbuf, writebuf, offset, len);
+
+    default:
+      return -1;
+    }
+}
+
 static void
 gdbsim_files_info (struct target_ops *target)
 {
   struct sim_inferior_data *sim_data
     = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED);
   const char *file = "nothing";
 
   if (exec_bfd)
     file = bfd_get_filename (exec_bfd);
 
   if (remote_debug)
-    printf_filtered ("gdbsim_files_info: file \"%s\"\n", file);
+    fprintf_unfiltered (gdb_stdlog, "gdbsim_files_info: file \"%s\"\n", file);
 
   if (exec_bfd)
     {
-      printf_filtered ("\tAttached to %s running program %s\n",
-                       target_shortname, file);
+      fprintf_unfiltered (gdb_stdlog, "\tAttached to %s running program %s\n",
+                          target_shortname, file);
       sim_info (sim_data->gdbsim_desc, 0);
     }
 }
 
 /* Clear the simulator's notion of what the break points are.  */
 
 static void
 gdbsim_mourn_inferior (struct target_ops *target)
 {
   struct sim_inferior_data *sim_data
     = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
 
   if (remote_debug)
-    printf_filtered ("gdbsim_mourn_inferior:\n");
+    fprintf_unfiltered (gdb_stdlog, "gdbsim_mourn_inferior:\n");
 
   remove_breakpoints ();
   generic_mourn_inferior ();
   delete_thread_silent (sim_data->remote_sim_ptid);
 }
 
 /* Pass the command argument through to the simulator verbatim.  The
    simulator must do any command interpretation work.  */
 
 void
@@ skipping 29 matching lines @@
     }
 
   sim_do_command (sim_data->gdbsim_desc, args);
 
   /* Invalidate the register cache, in case the simulator command does
      something funny.  */
   registers_changed ();
 }
 
 static VEC (char_ptr) *
-sim_command_completer (struct cmd_list_element *ignore, char *text, char *word)
+sim_command_completer (struct cmd_list_element *ignore, const char *text,
+                       const char *word)
 {
   struct sim_inferior_data *sim_data;
   char **tmp;
   int i;
   VEC (char_ptr) *result = NULL;
 
   sim_data = inferior_data (current_inferior (), sim_inferior_data_key);
   if (sim_data == NULL || sim_data->gdbsim_desc == NULL)
     return NULL;
 
@@ skipping 73 matching lines @@
   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_detach = gdbsim_detach;
   gdbsim_ops.to_resume = gdbsim_resume;
   gdbsim_ops.to_wait = gdbsim_wait;
   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.deprecated_xfer_memory = gdbsim_xfer_inferior_memory;
+  gdbsim_ops.to_xfer_partial = gdbsim_xfer_partial;
   gdbsim_ops.to_files_info = gdbsim_files_info;
   gdbsim_ops.to_insert_breakpoint = memory_insert_breakpoint;
   gdbsim_ops.to_remove_breakpoint = memory_remove_breakpoint;
   gdbsim_ops.to_kill = gdbsim_kill;
   gdbsim_ops.to_load = gdbsim_load;
   gdbsim_ops.to_create_inferior = gdbsim_create_inferior;
   gdbsim_ops.to_mourn_inferior = gdbsim_mourn_inferior;
   gdbsim_ops.to_stop = gdbsim_stop;
   gdbsim_ops.to_thread_alive = gdbsim_thread_alive;
   gdbsim_ops.to_pid_to_str = gdbsim_pid_to_str;
@@ skipping 12 matching lines @@
   struct cmd_list_element *c;
 
   init_gdbsim_ops ();
   add_target (&gdbsim_ops);
 
   c = add_com ("sim", class_obscure, simulator_command,
                _("Send a command to the simulator."));
   set_cmd_completer (c, sim_command_completer);
 
   sim_inferior_data_key
-    = register_inferior_data_with_cleanup (sim_inferior_data_cleanup);
+    = register_inferior_data_with_cleanup (NULL, sim_inferior_data_cleanup);
 }