2012-04-02 Tristan Gingold <gingold@adacore.com>

	* i386-darwin-tdep.c (i386_darwin_thread_state_reg_offset): Fix
	SS offset.
	* i386-darwin-nat.c (i386_darwin_fetch_inferior_registers): Fix
	format_string.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f76ee76f61fb3927b3add1d10a1d0032c773671d..fc3a5a0e7ab9a9f9d85a27b14c60db484b500bea 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-02  Tristan Gingold  <gingold@adacore.com>
+
+       * i386-darwin-tdep.c (i386_darwin_thread_state_reg_offset): Fix
+       SS offset.
+       * i386-darwin-nat.c (i386_darwin_fetch_inferior_registers): Fix
+       format_string.
+
 2012-04-02  Tristan Gingold  <gingold@adacore.com>
 
        PR gdb/13901

diff --git a/gdb/i386-darwin-nat.c b/gdb/i386-darwin-nat.c
index ced290352c72e57f6cfc5f465538504f8cc61524..21e0c8093ae82663092b9c9206f9a865a50f6481 100644 (file)
--- a/gdb/i386-darwin-nat.c
+++ b/gdb/i386-darwin-nat.c
@@ -70,7 +70,7 @@ i386_darwin_fetch_inferior_registers (struct target_ops *ops,
          if (ret != KERN_SUCCESS)
            {
              printf_unfiltered (_("Error calling thread_get_state for "
-                                  "GP registers for thread 0x%ulx"),
+                                  "GP registers for thread 0x%lx\n"),
                                 current_thread);
              MACH_CHECK_ERROR (ret);
            }
@@ -90,7 +90,7 @@ i386_darwin_fetch_inferior_registers (struct target_ops *ops,
          if (ret != KERN_SUCCESS)
            {
              printf_unfiltered (_("Error calling thread_get_state for "
-                                  "float registers for thread 0x%ulx"),
+                                  "float registers for thread 0x%lx\n"),
                                 current_thread);
              MACH_CHECK_ERROR (ret);
            }
@@ -114,8 +114,8 @@ i386_darwin_fetch_inferior_registers (struct target_ops *ops,
          if (ret != KERN_SUCCESS)
            {
              printf_unfiltered (_("Error calling thread_get_state for "
-                                  "GP registers for thread 0x%ulx"),
-                                current_thread);
+                                  "GP registers for thread 0x%lx\n"),
+                                (unsigned long) current_thread);
              MACH_CHECK_ERROR (ret);
            }
          for (i = 0; i < I386_NUM_GREGS; i++)
@@ -139,8 +139,8 @@ i386_darwin_fetch_inferior_registers (struct target_ops *ops,
          if (ret != KERN_SUCCESS)
            {
              printf_unfiltered (_("Error calling thread_get_state for "
-                                  "float registers for thread 0x%ulx"),
-                                current_thread);
+                                  "float registers for thread 0x%lx\n"),
+                                (unsigned long) current_thread);
              MACH_CHECK_ERROR (ret);
            }
           i387_supply_fxsave (regcache, -1, &fp_regs.__fpu_fcw);

diff --git a/gdb/i386-darwin-tdep.c b/gdb/i386-darwin-tdep.c
index ed2ca124394d32426f5b7f1c03976c3b910b942b..c353154bf0b5a4e432887b32311b7c19fc0b622a 100644 (file)
--- a/gdb/i386-darwin-tdep.c
+++ b/gdb/i386-darwin-tdep.c
@@ -56,7 +56,7 @@ int i386_darwin_thread_state_reg_offset[] =
   10 * 4,   /* EIP */
    9 * 4,   /* EFLAGS */
   11 * 4,   /* CS */
-   8,       /* SS */
+   8 * 4,   /* SS */
   12 * 4,   /* DS */
   13 * 4,   /* ES */
   14 * 4,   /* FS */