* python/py-param.c (parm_constants): Avoid ARI warning

[deliverable/binutils-gdb.git] / gdb / alpha-osf1-tdep.c

diff --git a/gdb/alpha-osf1-tdep.c b/gdb/alpha-osf1-tdep.c
index 1fc988956f6b194e01a2bf7594396f95d4b7d7ad..c99780594736d3cf1730ef17082b3ec44f0da507 100644 (file)
--- a/gdb/alpha-osf1-tdep.c
+++ b/gdb/alpha-osf1-tdep.c
@@ -1,11 +1,12 @@
 /* Target-dependent code for OSF/1 on Alpha.
 /* Target-dependent code for OSF/1 on Alpha.

-   Copyright 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 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,


@@ -14,9 +15,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 "frame.h"
 
 #include "defs.h"
 #include "frame.h"


@@ -29,20 +28,24 @@
 #include "alpha-tdep.h"
 
 static int
 #include "alpha-tdep.h"
 
 static int

-alpha_osf1_pc_in_sigtramp (CORE_ADDR pc, char *func_name)
+alpha_osf1_pc_in_sigtramp (struct gdbarch *gdbarch,
+                          CORE_ADDR pc, char *func_name)

 {
   return (func_name != NULL && strcmp ("__sigtramp", func_name) == 0);
 }
 
 static CORE_ADDR
 {
   return (func_name != NULL && strcmp ("__sigtramp", func_name) == 0);
 }
 
 static CORE_ADDR

-alpha_osf1_sigcontext_addr (struct frame_info *frame)
+alpha_osf1_sigcontext_addr (struct frame_info *this_frame)

 {
 {

-  struct frame_info *next_frame = get_next_frame (frame);
-
+  struct gdbarch *gdbarch = get_frame_arch (this_frame);
+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+  struct frame_info *next_frame = get_next_frame (this_frame);
+  struct frame_id next_id = null_frame_id;
+  

   if (next_frame != NULL)
   if (next_frame != NULL)

-    return (read_memory_integer (get_frame_base (next_frame), 8));
-  else
-    return (read_memory_integer (get_frame_base (frame), 8));
+    next_id = get_frame_id (next_frame);
+
+  return (read_memory_integer (next_id.stack_addr, 8, byte_order));

 }
 
 static void
 }
 
 static void


@@ -54,18 +57,21 @@ alpha_osf1_init_abi (struct gdbarch_info info,
   /* Hook into the MDEBUG frame unwinder.  */
   alpha_mdebug_init_abi (info, gdbarch);
 
   /* Hook into the MDEBUG frame unwinder.  */
   alpha_mdebug_init_abi (info, gdbarch);
 

-  set_gdbarch_deprecated_pc_in_sigtramp (gdbarch, alpha_osf1_pc_in_sigtramp);

   /* The next/step support via procfs on OSF1 is broken when running
      on multi-processor machines. We need to use software single stepping
      instead.  */
   set_gdbarch_software_single_step (gdbarch, alpha_software_single_step);
 
   tdep->sigcontext_addr = alpha_osf1_sigcontext_addr;
   /* The next/step support via procfs on OSF1 is broken when running
      on multi-processor machines. We need to use software single stepping
      instead.  */
   set_gdbarch_software_single_step (gdbarch, alpha_software_single_step);
 
   tdep->sigcontext_addr = alpha_osf1_sigcontext_addr;

+  tdep->pc_in_sigtramp = alpha_osf1_pc_in_sigtramp;

 
   tdep->jb_pc = 2;
   tdep->jb_elt_size = 8;
 }
 
 
   tdep->jb_pc = 2;
   tdep->jb_elt_size = 8;
 }
 

+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_alpha_osf1_tdep;
+

 void
 _initialize_alpha_osf1_tdep (void)
 {
 void
 _initialize_alpha_osf1_tdep (void)
 {