2013-07-19 Hui Zhu <hui@codesourcery.com>

[external/binutils.git] / gdb / remote-sim.c

diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 0e7d84e..fda3735 100644 (file)
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -1,6 +1,6 @@
 /* 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).
@@ -46,7 +46,7 @@
 
 extern void _initialize_remote_sim (void);
 
-static void dump_mem (char *buf, int len);
+static void dump_mem (gdb_byte *buf, int len);
 
 static void init_callbacks (void);
 
@@ -78,7 +78,7 @@ 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);
 
@@ -271,30 +271,28 @@ sim_inferior_data_cleanup (struct inferior *inf, void *data)
 }
 
 static void
-dump_mem (char *buf, int len)
+dump_mem (gdb_byte *buf, int len)
 {
-  if (len <= 8)
+  printf_filtered ("\t");
+
+  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);
+      printf_filtered ("0x%08x", l[0]);
+      if (len == 8)
+       printf_filtered (" 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++)
+       printf_filtered ("0x%02x ", buf[i]);
     }
+
+  printf_filtered ("\n");
 }
 
 /* Initialize gdb_callback.  */
@@ -448,7 +446,7 @@ gdbsim_fetch_register (struct target_ops *ops,
       {
        /* 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);
@@ -459,7 +457,7 @@ gdbsim_fetch_register (struct target_ops *ops,
     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));
@@ -516,7 +514,7 @@ gdbsim_store_register (struct target_ops *ops,
     }
   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);
@@ -642,6 +640,9 @@ gdbsim_create_inferior (struct target_ops *target, char *exec_file, char *args,
   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."));
@@ -781,23 +782,16 @@ gdbsim_close_inferior (struct inferior *inf, void *arg)
   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);
+    printf_filtered ("gdbsim_close\n");
 
   iterate_over_inferiors (gdbsim_close_inferior, NULL);
 
@@ -950,13 +944,9 @@ 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 */
-    {
-      quit_flag = 0;           /* we've stolen it */
-      return 1;
-    }
-  else if (immediate_quit)
+  if (check_quit_flag ())      /* gdb's idea of quit */
     {
+      clear_quit_flag ();      /* we've stolen it */
       return 1;
     }
   return 0;
@@ -1101,7 +1091,7 @@ gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len,
       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);
+                      paddress (target_gdbarch (), memaddr), len, write);
       if (remote_debug && write)
        dump_mem (myaddr, len);
     }
@@ -1198,16 +1188,29 @@ simulator_command (char *args, int from_tty)
   registers_changed ();
 }
 
-static char **
-sim_command_completer (struct cmd_list_element *ignore, char *text, char *word)
+static VEC (char_ptr) *
+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;
 
-  return sim_complete_command (sim_data->gdbsim_desc, text, word);
+  tmp = sim_complete_command (sim_data->gdbsim_desc, text, word);
+  if (tmp == NULL)
+    return NULL;
+
+  /* Transform the array into a VEC, and then free the array.  */
+  for (i = 0; tmp[i] != NULL; i++)
+    VEC_safe_push (char_ptr, result, tmp[i]);
+  xfree (tmp);
+
+  return result;
 }
 
 /* Check to see if a thread is still alive.  */
@@ -1314,5 +1317,5 @@ _initialize_remote_sim (void)
   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);
 }