* linux-low.c (regsets_store_inferior_registers): Read the regset

	from the target before filling it.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 4646b35c172ad1075753534f9676dccb8d51879b..a84b4784d57a45d0bfb396c31f8fb77efd434bb5 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-15  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * linux-low.c (regsets_store_inferior_registers): Read the regset
+       from the target before filling it.
+
 2006-02-08  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * server.c (attach_inferior): Return SIGTRAP for a successful

diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 93768038a0abb1229a401e4f5bc6f8be7d309f1a..8518484fa76e5b8849ce6866c32921d7e9b40adf 100644 (file)
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -1,5 +1,6 @@
 /* Low level interface to ptrace, for the remote server for GDB.
-   Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -1286,8 +1287,21 @@ regsets_store_inferior_registers ()
        }
 
       buf = malloc (regset->size);
-      regset->fill_function (buf);
-      res = ptrace (regset->set_request, inferior_pid, 0, buf);
+
+      /* First fill the buffer with the current register set contents,
+        in case there are any items in the kernel's regset that are
+        not in gdbserver's regcache.  */
+      res = ptrace (regset->get_request, inferior_pid, 0, buf);
+
+      if (res == 0)
+       {
+         /* Then overlay our cached registers on that.  */
+         regset->fill_function (buf);
+
+         /* Only now do we write the register set.  */
+         res = ptrace (regset->set_request, inferior_pid, 0, buf);
+       }
+
       if (res < 0)
        {
          if (errno == EIO)