PR ld/12549

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

diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index b3890b842693fb86730eb828d3eda570df94aa71..7918cfce26b95dadbc185774f9fff3b7e31393a4 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).
@@ -273,28 +273,26 @@ sim_inferior_data_cleanup (struct inferior *inf, void *data)
 static void
 dump_mem (char *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.  */
@@ -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."));
@@ -950,9 +951,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 */
+  if (check_quit_flag ())      /* gdb's idea of quit */
     {
-      quit_flag = 0;           /* we've stolen it */
+      clear_quit_flag ();      /* we've stolen it */
       return 1;
     }
   return 0;
@@ -1097,7 +1098,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);
     }
@@ -1322,5 +1323,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);
 }