2011-02-21 Hui Zhu <teawater@gmail.com>

[deliverable/binutils-gdb.git] / gdb / linux-tdep.c

diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index 07fd67c887d1c1b22de73356d4ccbfa173d7b31d..c09d6e8719daca5d24db20017decec89ff0bf889 100644 (file)
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for GNU/Linux, architecture independent.
 
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -23,6 +23,26 @@
 #include "auxv.h"
 #include "target.h"
 #include "elf/common.h"
+#include "inferior.h"
+
+static struct gdbarch_data *linux_gdbarch_data_handle;
+
+struct linux_gdbarch_data
+  {
+    struct type *siginfo_type;
+  };
+
+static void *
+init_linux_gdbarch_data (struct gdbarch *gdbarch)
+{
+  return GDBARCH_OBSTACK_ZALLOC (gdbarch, struct linux_gdbarch_data);
+}
+
+static struct linux_gdbarch_data *
+get_linux_gdbarch_data (struct gdbarch *gdbarch)
+{
+  return gdbarch_data (gdbarch, linux_gdbarch_data_handle);
+}
 
 /* This function is suitable for architectures that don't
    extend/override the standard siginfo structure.  */
@@ -30,12 +50,17 @@
 struct type *
 linux_get_siginfo_type (struct gdbarch *gdbarch)
 {
+  struct linux_gdbarch_data *linux_gdbarch_data;
   struct type *int_type, *uint_type, *long_type, *void_ptr_type;
   struct type *uid_type, *pid_type;
   struct type *sigval_type, *clock_type;
   struct type *siginfo_type, *sifields_type;
   struct type *type;
 
+  linux_gdbarch_data = get_linux_gdbarch_data (gdbarch);
+  if (linux_gdbarch_data->siginfo_type != NULL)
+    return linux_gdbarch_data->siginfo_type;
+
   int_type = arch_integer_type (gdbarch, gdbarch_int_bit (gdbarch),
                                0, "int");
   uint_type = arch_integer_type (gdbarch, gdbarch_int_bit (gdbarch),
@@ -135,6 +160,8 @@ linux_get_siginfo_type (struct gdbarch *gdbarch)
                                       "_sifields", sifields_type,
                                       TYPE_LENGTH (long_type));
 
+  linux_gdbarch_data->siginfo_type = siginfo_type;
+
   return siginfo_type;
 }
 
@@ -152,3 +179,35 @@ linux_has_shared_address_space (void)
 
   return target_is_uclinux;
 }
+
+/* This is how we want PTIDs from core files to be printed.  */
+
+static char *
+linux_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid)
+{
+  static char buf[80];
+
+  if (ptid_get_lwp (ptid) != 0)
+    {
+      snprintf (buf, sizeof (buf), "LWP %ld", ptid_get_lwp (ptid));
+      return buf;
+    }
+
+  return normal_pid_to_str (ptid);
+}
+
+/* To be called from the various GDB_OSABI_LINUX handlers for the
+   various GNU/Linux architectures and machine types.  */
+
+void
+linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+{
+  set_gdbarch_core_pid_to_str (gdbarch, linux_core_pid_to_str);
+}
+
+void
+_initialize_linux_tdep (void)
+{
+  linux_gdbarch_data_handle =
+    gdbarch_data_register_post_init (init_linux_gdbarch_data);
+}