Disable displaced stepping if trying it fails

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

diff --git a/gdb/ia64-linux-tdep.c b/gdb/ia64-linux-tdep.c
index 3bdf2a106c5c3e19e91a7b72b34acf3b1cf61754..805c15f2a2c0c2fe8781da5b4c75f95be517109a 100644 (file)
--- a/gdb/ia64-linux-tdep.c
+++ b/gdb/ia64-linux-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for the IA-64 for GDB, the GNU debugger.
 
-   Copyright (C) 2000-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -201,20 +201,14 @@ static const struct regset ia64_linux_fpregset =
     ia64_linux_supply_fpregset, regcache_collect_regset
   };
 
-static const struct regset *
-ia64_linux_regset_from_core_section (struct gdbarch *gdbarch,
-                                    const char *sect_name,
-                                    size_t sect_size)
+static void
+ia64_linux_iterate_over_regset_sections (struct gdbarch *gdbarch,
+                                        iterate_over_regset_sections_cb *cb,
+                                        void *cb_data,
+                                        const struct regcache *regcache)
 {
-  if (strcmp (sect_name, ".reg") == 0
-      && sect_size >= IA64_LINUX_GREGS_SIZE)
-    return &ia64_linux_gregset;
-
-  if (strcmp (sect_name, ".reg2") == 0
-      && sect_size >= IA64_LINUX_FPREGS_SIZE)
-    return &ia64_linux_fpregset;
-
-  return NULL;
+  cb (".reg", IA64_LINUX_GREGS_SIZE, &ia64_linux_gregset, NULL, cb_data);
+  cb (".reg2", IA64_LINUX_FPREGS_SIZE, &ia64_linux_fpregset, NULL, cb_data);
 }
 
 static void
@@ -248,8 +242,8 @@ ia64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
                                              svr4_fetch_objfile_link_map);
 
   /* Core file support. */
-  set_gdbarch_regset_from_core_section (gdbarch,
-                                       ia64_linux_regset_from_core_section);
+  set_gdbarch_iterate_over_regset_sections
+    (gdbarch, ia64_linux_iterate_over_regset_sections);
 
   /* SystemTap related.  */
   set_gdbarch_stap_register_prefixes (gdbarch, stap_register_prefixes);