2010-08-30 Yao Qi <yao@codesourcery.com>

[deliverable/binutils-gdb.git] / gdb / i386gnu-nat.c

diff --git a/gdb/i386gnu-nat.c b/gdb/i386gnu-nat.c
index 82f9ee57647b7192e071cde5a1d4b6f7aecca489..bd49e28042eaf92a93f34e987bd454a34c53d921 100644 (file)
--- a/gdb/i386gnu-nat.c
+++ b/gdb/i386gnu-nat.c
@@ -1,12 +1,13 @@
 /* Low level interface to i386 running the GNU Hurd.
 /* Low level interface to i386 running the GNU Hurd.

-   Copyright 1992, 1995, 1996, 1998, 2000, 2001
-   Free Software Foundation, Inc.
+
+   Copyright (C) 1992, 1995, 1996, 1998, 2000, 2001, 2004, 2007, 2008, 2009,
+   2010 Free Software Foundation, Inc.

 
    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
 
    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
+   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,


@@ -15,9 +16,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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, 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"


@@ -27,6 +26,7 @@
 #include "gdb_assert.h"
 #include <errno.h>
 #include <stdio.h>
 #include "gdb_assert.h"
 #include <errno.h>
 #include <stdio.h>

+#include "gdb_string.h"

 
 #include <mach.h>
 #include <mach_error.h>
 
 #include <mach.h>
 #include <mach_error.h>


@@ -57,12 +57,14 @@ static int reg_offset[] =
 };
 
 #define REG_ADDR(state, regnum) ((char *)(state) + reg_offset[regnum])
 };
 
 #define REG_ADDR(state, regnum) ((char *)(state) + reg_offset[regnum])

+#define CREG_ADDR(state, regnum) ((const char *)(state) + reg_offset[regnum])

 
 \f
 
 \f

-/* Get the whole floating-point state of THREAD and record the
-   values of the corresponding (pseudo) registers.  */
+/* Get the whole floating-point state of THREAD and record the values
+   of the corresponding (pseudo) registers.  */
+

 static void
 static void

-fetch_fpregs (struct proc *thread)
+fetch_fpregs (struct regcache *regcache, struct proc *thread)

 {
   mach_msg_type_number_t count = i386_FLOAT_STATE_COUNT;
   struct i386_float_state state;
 {
   mach_msg_type_number_t count = i386_FLOAT_STATE_COUNT;
   struct i386_float_state state;


@@ -72,57 +74,56 @@ fetch_fpregs (struct proc *thread)
                          (thread_state_t) &state, &count);
   if (err)
     {
                          (thread_state_t) &state, &count);
   if (err)
     {

-      warning ("Couldn't fetch floating-point state from %s",
+      warning (_("Couldn't fetch floating-point state from %s"),

               proc_string (thread));
       return;
     }
 
   if (!state.initialized)
               proc_string (thread));
       return;
     }
 
   if (!state.initialized)

-    /* The floating-point state isn't initialized.  */

     {
     {

-      int i;
-
-      for (i = FP0_REGNUM; i <= FOP_REGNUM; i++)
-       supply_register (i, NULL);
-
-      return;
+      /* The floating-point state isn't initialized.  */
+      i387_supply_fsave (regcache, -1, NULL);
+    }
+  else
+    {
+      /* Supply the floating-point registers.  */
+      i387_supply_fsave (regcache, -1, state.hw_state);

     }
     }

-
-  /* Supply the floating-point registers.  */
-  i387_supply_fsave (state.hw_state);

 }
 
 #ifdef HAVE_SYS_PROCFS_H
 /* These two calls are used by the core-regset.c code for
    reading ELF core files.  */
 void
 }
 
 #ifdef HAVE_SYS_PROCFS_H
 /* These two calls are used by the core-regset.c code for
    reading ELF core files.  */
 void

-supply_gregset (gdb_gregset_t *gregs)
+supply_gregset (struct regcache *regcache, const gdb_gregset_t *gregs)

 {
   int i;
   for (i = 0; i < I386_NUM_GREGS; i++)
 {
   int i;
   for (i = 0; i < I386_NUM_GREGS; i++)

-    supply_register (i, REG_ADDR (gregs, i));
+    regcache_raw_supply (regcache, i, CREG_ADDR (gregs, i));

 }
 
 void
 }
 
 void

-supply_fpregset (gdb_fpregset_t *fpregs)
+supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregs)

 {
 {

-  i387_supply_fsave ((char *) fpregs);
+  i387_supply_fsave (regcache, -1, fpregs);

 }
 #endif
 
 /* Fetch register REGNO, or all regs if REGNO is -1.  */
 }
 #endif
 
 /* Fetch register REGNO, or all regs if REGNO is -1.  */

-void
-gnu_fetch_registers (int regno)
+static void
+gnu_fetch_registers (struct target_ops *ops,
+                    struct regcache *regcache, int regno)

 {
   struct proc *thread;
 
   /* Make sure we know about new threads.  */
 {
   struct proc *thread;
 
   /* Make sure we know about new threads.  */

-  inf_update_procs (current_inferior);
+  inf_update_procs (gnu_current_inf);

 
 

-  thread = inf_tid_to_thread (current_inferior, PIDGET (inferior_ptid));
+  thread = inf_tid_to_thread (gnu_current_inf,
+                             ptid_get_tid (inferior_ptid));

   if (!thread)
   if (!thread)

-    error ("Can't fetch registers from thread %d: No such thread",
-          PIDGET (inferior_ptid));
+    error (_("Can't fetch registers from thread %s: No such thread"),
+          target_pid_to_str (inferior_ptid));

 
   if (regno < I386_NUM_GREGS || regno == -1)
     {
 
   if (regno < I386_NUM_GREGS || regno == -1)
     {


@@ -132,7 +133,7 @@ gnu_fetch_registers (int regno)
       state = proc_get_state (thread, 0);
       if (!state)
        {
       state = proc_get_state (thread, 0);
       if (!state)
        {

-         warning ("Couldn't fetch registers from %s",
+         warning (_("Couldn't fetch registers from %s"),

                   proc_string (thread));
          return;
        }
                   proc_string (thread));
          return;
        }


@@ -144,14 +145,17 @@ gnu_fetch_registers (int regno)
          proc_debug (thread, "fetching all register");
 
          for (i = 0; i < I386_NUM_GREGS; i++)
          proc_debug (thread, "fetching all register");
 
          for (i = 0; i < I386_NUM_GREGS; i++)

-           supply_register (i, REG_ADDR (state, i));
+           regcache_raw_supply (regcache, i, REG_ADDR (state, i));

          thread->fetched_regs = ~0;
        }
       else
        {
          thread->fetched_regs = ~0;
        }
       else
        {

-         proc_debug (thread, "fetching register %s", REGISTER_NAME (regno));
+         proc_debug (thread, "fetching register %s",
+                     gdbarch_register_name (get_regcache_arch (regcache),
+                                            regno));

 
 

-         supply_register (regno, REG_ADDR (state, regno));
+         regcache_raw_supply (regcache, regno,
+                              REG_ADDR (state, regno));

          thread->fetched_regs |= (1 << regno);
        }
     }
          thread->fetched_regs |= (1 << regno);
        }
     }


@@ -160,7 +164,7 @@ gnu_fetch_registers (int regno)
     {
       proc_debug (thread, "fetching floating-point registers");
 
     {
       proc_debug (thread, "fetching floating-point registers");
 

-      fetch_fpregs (thread);
+      fetch_fpregs (regcache, thread);

     }
 }
 \f
     }
 }
 \f


@@ -168,7 +172,7 @@ gnu_fetch_registers (int regno)
 /* Store the whole floating-point state into THREAD using information
    from the corresponding (pseudo) registers.  */
 static void
 /* Store the whole floating-point state into THREAD using information
    from the corresponding (pseudo) registers.  */
 static void

-store_fpregs (struct proc *thread, int regno)
+store_fpregs (const struct regcache *regcache, struct proc *thread, int regno)

 {
   mach_msg_type_number_t count = i386_FLOAT_STATE_COUNT;
   struct i386_float_state state;
 {
   mach_msg_type_number_t count = i386_FLOAT_STATE_COUNT;
   struct i386_float_state state;


@@ -178,38 +182,41 @@ store_fpregs (struct proc *thread, int regno)
                          (thread_state_t) &state, &count);
   if (err)
     {
                          (thread_state_t) &state, &count);
   if (err)
     {

-      warning ("Couldn't fetch floating-point state from %s",
+      warning (_("Couldn't fetch floating-point state from %s"),

               proc_string (thread));
       return;
     }
 
   /* FIXME: kettenis/2001-07-15: Is this right?  Should we somehow
      take into account DEPRECATED_REGISTER_VALID like the old code did?  */
               proc_string (thread));
       return;
     }
 
   /* FIXME: kettenis/2001-07-15: Is this right?  Should we somehow
      take into account DEPRECATED_REGISTER_VALID like the old code did?  */

-  i387_fill_fsave (state.hw_state, regno);
+  i387_collect_fsave (regcache, regno, state.hw_state);

 
   err = thread_set_state (thread->port, i386_FLOAT_STATE,
                          (thread_state_t) &state, i386_FLOAT_STATE_COUNT);
   if (err)
     {
 
   err = thread_set_state (thread->port, i386_FLOAT_STATE,
                          (thread_state_t) &state, i386_FLOAT_STATE_COUNT);
   if (err)
     {

-      warning ("Couldn't store floating-point state into %s",
+      warning (_("Couldn't store floating-point state into %s"),

               proc_string (thread));
       return;
     }
 }
 
 /* Store at least register REGNO, or all regs if REGNO == -1.  */
               proc_string (thread));
       return;
     }
 }
 
 /* Store at least register REGNO, or all regs if REGNO == -1.  */

-void
-gnu_store_registers (int regno)
+static void
+gnu_store_registers (struct target_ops *ops,
+                    struct regcache *regcache, int regno)

 {
   struct proc *thread;
 {
   struct proc *thread;

+  struct gdbarch *gdbarch = get_regcache_arch (regcache);

 
   /* Make sure we know about new threads.  */
 
   /* Make sure we know about new threads.  */

-  inf_update_procs (current_inferior);
+  inf_update_procs (gnu_current_inf);

 
 

-  thread = inf_tid_to_thread (current_inferior, PIDGET (inferior_ptid));
+  thread = inf_tid_to_thread (gnu_current_inf,
+                             ptid_get_tid (inferior_ptid));

   if (!thread)
   if (!thread)

-    error ("Couldn't store registers into thread %d: No such thread",
-          PIDGET (inferior_ptid));
+    error (_("Couldn't store registers into thread %s: No such thread"),
+          target_pid_to_str (inferior_ptid));

 
   if (regno < I386_NUM_GREGS || regno == -1)
     {
 
   if (regno < I386_NUM_GREGS || regno == -1)
     {


@@ -225,7 +232,7 @@ gnu_store_registers (int regno)
       state = proc_get_state (thread, 1);
       if (!state)
        {
       state = proc_get_state (thread, 1);
       if (!state)
        {

-         warning ("Couldn't store registers into %s", proc_string (thread));
+         warning (_("Couldn't store registers into %s"), proc_string (thread));

          return;
        }
 
          return;
        }
 


@@ -242,23 +249,20 @@ gnu_store_registers (int regno)
            if ((thread->fetched_regs & (1 << check_regno))
                && memcpy (REG_ADDR (&old_state, check_regno),
                           REG_ADDR (state, check_regno),
            if ((thread->fetched_regs & (1 << check_regno))
                && memcpy (REG_ADDR (&old_state, check_regno),
                           REG_ADDR (state, check_regno),

-                          REGISTER_RAW_SIZE (check_regno)))
+                          register_size (gdbarch, check_regno)))

              /* Register CHECK_REGNO has changed!  Ack!  */
              {
              /* Register CHECK_REGNO has changed!  Ack!  */
              {

-               warning ("Register %s changed after the thread was aborted",
-                        REGISTER_NAME (check_regno));
+               warning (_("Register %s changed after the thread was aborted"),
+                        gdbarch_register_name (gdbarch, check_regno));

                if (regno >= 0 && regno != check_regno)
                  /* Update GDB's copy of the register.  */
                if (regno >= 0 && regno != check_regno)
                  /* Update GDB's copy of the register.  */

-                 supply_register (check_regno, REG_ADDR (state, check_regno));
+                 regcache_raw_supply (regcache, check_regno,
+                                      REG_ADDR (state, check_regno));

                else
                else

-                 warning ("... also writing this register!  Suspicious...");
+                 warning (_("... also writing this register!  Suspicious..."));

              }
        }
 
              }
        }
 

-#define fill(state, regno)                                               \
-  memcpy (REG_ADDR(state, regno), &registers[REGISTER_BYTE (regno)],     \
-          REGISTER_RAW_SIZE (regno))
-

       if (regno == -1)
        {
          int i;
       if (regno == -1)
        {
          int i;


@@ -266,15 +270,16 @@ gnu_store_registers (int regno)
          proc_debug (thread, "storing all registers");
 
          for (i = 0; i < I386_NUM_GREGS; i++)
          proc_debug (thread, "storing all registers");
 
          for (i = 0; i < I386_NUM_GREGS; i++)

-           if (deprecated_register_valid[i])
-             fill (state, i);
+           if (regcache_valid_p (regcache, i))
+             regcache_raw_collect (regcache, i, REG_ADDR (state, i));

        }
       else
        {
        }
       else
        {

-         proc_debug (thread, "storing register %s", REGISTER_NAME (regno));
+         proc_debug (thread, "storing register %s",
+                     gdbarch_register_name (gdbarch, regno));

 
 

-         gdb_assert (deprecated_register_valid[regno]);
-         fill (state, regno);
+         gdb_assert (regcache_valid_p (regcache, regno));
+         regcache_raw_collect (regcache, regno, REG_ADDR (state, regno));

        }
 
       /* Restore the T bit.  */
        }
 
       /* Restore the T bit.  */


@@ -282,12 +287,28 @@ gnu_store_registers (int regno)
       ((struct i386_thread_state *)state)->efl |= trace;
     }
 
       ((struct i386_thread_state *)state)->efl |= trace;
     }
 

-#undef fill
-

   if (regno >= I386_NUM_GREGS || regno == -1)
     {
       proc_debug (thread, "storing floating-point registers");
 
   if (regno >= I386_NUM_GREGS || regno == -1)
     {
       proc_debug (thread, "storing floating-point registers");
 

-      store_fpregs (thread, regno);
+      store_fpregs (regcache, thread, regno);

     }
 }
     }
 }

+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_i386gnu_nat;
+
+void
+_initialize_i386gnu_nat (void)
+{
+  struct target_ops *t;
+
+  /* Fill in the generic GNU/Hurd methods.  */
+  t = gnu_target ();
+
+  t->to_fetch_registers = gnu_fetch_registers;
+  t->to_store_registers = gnu_store_registers;
+
+  /* Register the target.  */
+  add_target (t);
+}