bfd:

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

diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 2d8f3a73cb18e6af95e7fc3d4f54cdaf36f8e5a8..9d014e16dff3897b6de370ff98234c9bcf74fbc7 100644 (file)
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -1,7 +1,7 @@
 /* Generic remote debugging interface for simulators.
 
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 /* Generic remote debugging interface for simulators.
 
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

 
    Contributed by Cygnus Support.
    Steve Chamberlain (sac@cygnus.com).
 
    Contributed by Cygnus Support.
    Steve Chamberlain (sac@cygnus.com).


@@ -10,7 +10,7 @@
 
    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
 
    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
+   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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -19,9 +19,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "inferior.h"
 
 #include "defs.h"
 #include "inferior.h"


@@ -43,6 +41,7 @@
 #include "sim-regno.h"
 #include "arch-utils.h"
 #include "readline/readline.h"
 #include "sim-regno.h"
 #include "arch-utils.h"
 #include "readline/readline.h"

+#include "gdbthread.h"

 
 /* Prototypes */
 
 
 /* Prototypes */
 


@@ -73,9 +72,9 @@ static void gdb_os_evprintf_filtered (host_callback *, const char *, va_list);
 
 static void gdb_os_error (host_callback *, const char *, ...);
 
 
 static void gdb_os_error (host_callback *, const char *, ...);
 

-static void gdbsim_fetch_register (int regno);
+static void gdbsim_fetch_register (struct regcache *regcache, int regno);

 
 

-static void gdbsim_store_register (int regno);
+static void gdbsim_store_register (struct regcache *regcache, int regno);

 
 static void gdbsim_kill (void);
 
 
 static void gdbsim_kill (void);
 


@@ -91,13 +90,13 @@ static void gdbsim_resume (ptid_t ptid, int step, enum target_signal siggnal);
 
 static ptid_t gdbsim_wait (ptid_t ptid, struct target_waitstatus *status);
 
 
 static ptid_t gdbsim_wait (ptid_t ptid, struct target_waitstatus *status);
 

-static void gdbsim_prepare_to_store (void);
+static void gdbsim_prepare_to_store (struct regcache *regcache);

 
 static void gdbsim_files_info (struct target_ops *target);
 
 static void gdbsim_mourn_inferior (void);
 
 
 static void gdbsim_files_info (struct target_ops *target);
 
 static void gdbsim_mourn_inferior (void);
 

-static void gdbsim_stop (void);
+static void gdbsim_stop (ptid_t ptid);

 
 void simulator_command (char *args, int from_tty);
 
 
 void simulator_command (char *args, int from_tty);
 


@@ -117,6 +116,12 @@ static int program_loaded = 0;
    back to the other sim_foo routines.  */
 static SIM_DESC gdbsim_desc = 0;
 
    back to the other sim_foo routines.  */
 static SIM_DESC gdbsim_desc = 0;
 

+/* This is the ptid we use while we're connected to the simulator.
+   Its value is arbitrary, as the simulator target don't have a notion
+   or processes or threads, but we need something non-null to place in
+   inferior_ptid.  */
+static ptid_t remote_sim_ptid;
+

 static void
 dump_mem (char *buf, int len)
 {
 static void
 dump_mem (char *buf, int len)
 {


@@ -271,24 +276,25 @@ gdb_os_error (host_callback * p, const char *format,...)
 }
 
 int
 }
 
 int

-one2one_register_sim_regno (int regnum)
+one2one_register_sim_regno (struct gdbarch *gdbarch, int regnum)

 {
   /* Only makes sense to supply raw registers.  */
 {
   /* Only makes sense to supply raw registers.  */

-  gdb_assert (regnum >= 0 && regnum < NUM_REGS);
+  gdb_assert (regnum >= 0 && regnum < gdbarch_num_regs (gdbarch));

   return regnum;
 }
 
 static void
   return regnum;
 }
 
 static void

-gdbsim_fetch_register (int regno)
+gdbsim_fetch_register (struct regcache *regcache, int regno)

 {
 {

+  struct gdbarch *gdbarch = get_regcache_arch (regcache);

   if (regno == -1)
     {
   if (regno == -1)
     {

-      for (regno = 0; regno < NUM_REGS; regno++)
-       gdbsim_fetch_register (regno);
+      for (regno = 0; regno < gdbarch_num_regs (gdbarch); regno++)
+       gdbsim_fetch_register (regcache, regno);

       return;
     }
 
       return;
     }
 

-  switch (REGISTER_SIM_REGNO (regno))
+  switch (gdbarch_register_sim_regno (gdbarch, regno))

     {
     case LEGACY_SIM_REGNO_IGNORE:
       break;
     {
     case LEGACY_SIM_REGNO_IGNORE:
       break;


@@ -299,27 +305,32 @@ gdbsim_fetch_register (int regno)
        char buf[MAX_REGISTER_SIZE];
        int nr_bytes;
        memset (buf, 0, MAX_REGISTER_SIZE);
        char buf[MAX_REGISTER_SIZE];
        int nr_bytes;
        memset (buf, 0, MAX_REGISTER_SIZE);

-       regcache_raw_supply (current_regcache, regno, buf);
-       set_register_cached (regno, -1);
+       regcache_raw_supply (regcache, regno, buf);

        break;
       }
        break;
       }

+      

     default:
       {
        static int warn_user = 1;
        char buf[MAX_REGISTER_SIZE];
        int nr_bytes;
     default:
       {
        static int warn_user = 1;
        char buf[MAX_REGISTER_SIZE];
        int nr_bytes;

-       gdb_assert (regno >= 0 && regno < NUM_REGS);
+       gdb_assert (regno >= 0 && regno < gdbarch_num_regs (gdbarch));

        memset (buf, 0, MAX_REGISTER_SIZE);
        nr_bytes = sim_fetch_register (gdbsim_desc,
        memset (buf, 0, MAX_REGISTER_SIZE);
        nr_bytes = sim_fetch_register (gdbsim_desc,

-                                      REGISTER_SIM_REGNO (regno),
-                                      buf, register_size (current_gdbarch, regno));
-       if (nr_bytes > 0 && nr_bytes != register_size (current_gdbarch, regno) && warn_user)
+                                      gdbarch_register_sim_regno
+                                        (gdbarch, regno),
+                                      buf,
+                                      register_size (gdbarch, regno));
+       if (nr_bytes > 0
+           && nr_bytes != register_size (gdbarch, regno) && warn_user)

          {
            fprintf_unfiltered (gdb_stderr,
                                "Size of register %s (%d/%d) incorrect (%d instead of %d))",
          {
            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_size (current_gdbarch, regno));
+                               gdbarch_register_name (gdbarch, regno),
+                               regno,
+                               gdbarch_register_sim_regno
+                                 (gdbarch, regno),
+                               nr_bytes, register_size (gdbarch, regno));

            warn_user = 0;
          }
        /* FIXME: cagney/2002-05-27: Should check `nr_bytes == 0'
            warn_user = 0;
          }
        /* FIXME: cagney/2002-05-27: Should check `nr_bytes == 0'


@@ -327,12 +338,12 @@ gdbsim_fetch_register (int regno)
           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.  */
           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 (current_regcache, regno, buf);
+       regcache_raw_supply (regcache, regno, buf);

        if (remote_debug)
          {
            printf_filtered ("gdbsim_fetch_register: %d", regno);
            /* FIXME: We could print something more intelligible.  */
        if (remote_debug)
          {
            printf_filtered ("gdbsim_fetch_register: %d", regno);
            /* FIXME: We could print something more intelligible.  */

-           dump_mem (buf, register_size (current_gdbarch, regno));
+           dump_mem (buf, register_size (gdbarch, regno));

          }
        break;
       }
          }
        break;
       }


@@ -341,23 +352,25 @@ gdbsim_fetch_register (int regno)
 
 
 static void
 
 
 static void

-gdbsim_store_register (int regno)
+gdbsim_store_register (struct regcache *regcache, int regno)

 {
 {

+  struct gdbarch *gdbarch = get_regcache_arch (regcache);

   if (regno == -1)
     {
   if (regno == -1)
     {

-      for (regno = 0; regno < NUM_REGS; regno++)
-       gdbsim_store_register (regno);
+      for (regno = 0; regno < gdbarch_num_regs (gdbarch); regno++)
+       gdbsim_store_register (regcache, regno);

       return;
     }
       return;
     }

-  else if (REGISTER_SIM_REGNO (regno) >= 0)
+  else if (gdbarch_register_sim_regno (gdbarch, regno) >= 0)

     {
       char tmp[MAX_REGISTER_SIZE];
       int nr_bytes;
     {
       char tmp[MAX_REGISTER_SIZE];
       int nr_bytes;

-      regcache_cooked_read (current_regcache, regno, tmp);
+      regcache_cooked_read (regcache, regno, tmp);

       nr_bytes = sim_store_register (gdbsim_desc,
       nr_bytes = sim_store_register (gdbsim_desc,

-                                    REGISTER_SIM_REGNO (regno),
-                                    tmp, register_size (current_gdbarch, regno));
-      if (nr_bytes > 0 && nr_bytes != register_size (current_gdbarch, regno))
+                                    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"));
       /* FIXME: cagney/2002-05-27: Should check `nr_bytes == 0'
        internal_error (__FILE__, __LINE__,
                        _("Register size different to expected"));
       /* FIXME: cagney/2002-05-27: Should check `nr_bytes == 0'


@@ -367,7 +380,7 @@ gdbsim_store_register (int regno)
        {
          printf_filtered ("gdbsim_store_register: %d", regno);
          /* FIXME: We could print something more intelligible.  */
        {
          printf_filtered ("gdbsim_store_register: %d", regno);
          /* FIXME: We could print something more intelligible.  */

-         dump_mem (tmp, register_size (current_gdbarch, regno));
+         dump_mem (tmp, register_size (gdbarch, regno));

        }
     }
 }
        }
     }
 }


@@ -446,7 +459,8 @@ gdbsim_create_inferior (char *exec_file, char *args, char **env, int from_tty)
                     (exec_file ? exec_file : "(NULL)"),
                     args);
 
                     (exec_file ? exec_file : "(NULL)"),
                     args);
 

-  gdbsim_kill ();
+  if (ptid_equal (inferior_ptid, remote_sim_ptid))
+    gdbsim_kill ();

   remove_breakpoints ();
   init_wait_for_inferior ();
 
   remove_breakpoints ();
   init_wait_for_inferior ();
 


@@ -465,7 +479,9 @@ gdbsim_create_inferior (char *exec_file, char *args, char **env, int from_tty)
     argv = NULL;
   sim_create_inferior (gdbsim_desc, exec_bfd, argv, env);
 
     argv = NULL;
   sim_create_inferior (gdbsim_desc, exec_bfd, argv, env);
 

-  inferior_ptid = pid_to_ptid (42);
+  inferior_ptid = remote_sim_ptid;
+  add_thread_silent (inferior_ptid);
+

   target_mark_running (&gdbsim_ops);
   insert_breakpoints ();       /* Needed to get correct instruction in cache */
 
   target_mark_running (&gdbsim_ops);
   insert_breakpoints ();       /* Needed to get correct instruction in cache */
 


@@ -574,6 +590,7 @@ gdbsim_close (int quitting)
 
   end_callbacks ();
   generic_mourn_inferior ();
 
   end_callbacks ();
   generic_mourn_inferior ();

+  delete_thread_silent (remote_sim_ptid);

 }
 
 /* Takes a program previously attached to and detaches it.
 }
 
 /* Takes a program previously attached to and detaches it.


@@ -606,7 +623,7 @@ static int resume_step;
 static void
 gdbsim_resume (ptid_t ptid, int step, enum target_signal siggnal)
 {
 static void
 gdbsim_resume (ptid_t ptid, int step, enum target_signal siggnal)
 {

-  if (PIDGET (inferior_ptid) != 42)
+  if (!ptid_equal (inferior_ptid, remote_sim_ptid))

     error (_("The program is not being run."));
 
   if (remote_debug)
     error (_("The program is not being run."));
 
   if (remote_debug)


@@ -626,7 +643,7 @@ gdbsim_resume (ptid_t ptid, int step, enum target_signal siggnal)
    For simulators that do not support this operation, just abort */
 
 static void
    For simulators that do not support this operation, just abort */
 
 static void

-gdbsim_stop (void)
+gdbsim_stop (ptid_t ptid)

 {
   if (!sim_stop (gdbsim_desc))
     {
 {
   if (!sim_stop (gdbsim_desc))
     {


@@ -662,7 +679,7 @@ gdb_os_poll_quit (host_callback *p)
 static void
 gdbsim_cntrl_c (int signo)
 {
 static void
 gdbsim_cntrl_c (int signo)
 {

-  gdbsim_stop ();
+  gdbsim_stop (remote_sim_ptid);

 }
 
 static ptid_t
 }
 
 static ptid_t


@@ -733,7 +750,7 @@ gdbsim_wait (ptid_t ptid, struct target_waitstatus *status)
    debugged.  */
 
 static void
    debugged.  */
 
 static void

-gdbsim_prepare_to_store (void)
+gdbsim_prepare_to_store (struct regcache *regcache)

 {
   /* Do nothing, since we can store individual regs */
 }
 {
   /* Do nothing, since we can store individual regs */
 }


@@ -812,6 +829,7 @@ gdbsim_mourn_inferior (void)
   remove_breakpoints ();
   target_mark_exited (&gdbsim_ops);
   generic_mourn_inferior ();
   remove_breakpoints ();
   target_mark_exited (&gdbsim_ops);
   generic_mourn_inferior ();

+  delete_thread_silent (remote_sim_ptid);

 }
 
 /* Pass the command argument through to the simulator verbatim.  The
 }
 
 /* Pass the command argument through to the simulator verbatim.  The


@@ -843,6 +861,35 @@ simulator_command (char *args, int from_tty)
   registers_changed ();
 }
 
   registers_changed ();
 }
 

+/* Check to see if a thread is still alive.  */
+
+static int
+gdbsim_thread_alive (ptid_t ptid)
+{
+  if (ptid_equal (ptid, remote_sim_ptid))
+    /* The simulators' task is always alive.  */
+    return 1;
+
+  return 0;
+}
+
+/* Convert a thread ID to a string.  Returns the string in a static
+   buffer.  */
+
+static char *
+gdbsim_pid_to_str (ptid_t ptid)
+{
+  static char buf[64];
+
+  if (ptid_equal (remote_sim_ptid, ptid))
+    {
+      xsnprintf (buf, sizeof buf, "Thread <main>");
+      return buf;
+    }
+
+  return normal_pid_to_str (ptid);
+}
+

 /* Define the target subroutine names */
 
 struct target_ops gdbsim_ops;
 /* Define the target subroutine names */
 
 struct target_ops gdbsim_ops;


@@ -870,6 +917,8 @@ init_gdbsim_ops (void)
   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_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;

   gdbsim_ops.to_stratum = process_stratum;
   gdbsim_ops.to_has_all_memory = 1;
   gdbsim_ops.to_has_memory = 1;
   gdbsim_ops.to_stratum = process_stratum;
   gdbsim_ops.to_has_all_memory = 1;
   gdbsim_ops.to_has_memory = 1;


@@ -877,10 +926,6 @@ init_gdbsim_ops (void)
   gdbsim_ops.to_has_registers = 1;
   gdbsim_ops.to_has_execution = 1;
   gdbsim_ops.to_magic = OPS_MAGIC;
   gdbsim_ops.to_has_registers = 1;
   gdbsim_ops.to_has_execution = 1;
   gdbsim_ops.to_magic = OPS_MAGIC;

-
-#ifdef TARGET_REDEFINE_DEFAULT_OPS
-  TARGET_REDEFINE_DEFAULT_OPS (&gdbsim_ops);
-#endif

 }
 
 void
 }
 
 void


@@ -891,4 +936,8 @@ _initialize_remote_sim (void)
 
   add_com ("sim", class_obscure, simulator_command,
           _("Send a command to the simulator."));
 
   add_com ("sim", class_obscure, simulator_command,
           _("Send a command to the simulator."));

+
+  /* Yes, 42000 is arbitrary.  The only sense out of it, is that it
+     isn't 0.  */
+  remote_sim_ptid = ptid_build (42000, 0, 42000);

 }
 }