Switch gdb's TRY/CATCH to C++ try/catch

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

diff --git a/gdb/i386bsd-tdep.c b/gdb/i386bsd-tdep.c
index c82e3104328e6a9696af72c6366367d879fb45f5..15809b3b9a61ec1724ee10a2ca810ee21d2feccf 100644 (file)
--- a/gdb/i386bsd-tdep.c
+++ b/gdb/i386bsd-tdep.c
@@ -1,12 +1,12 @@
 /* Target-dependent code for i386 BSD's.
 
 /* Target-dependent code for i386 BSD's.
 

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


@@ -15,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 "arch-utils.h"
 
 #include "defs.h"
 #include "arch-utils.h"


@@ -26,25 +24,25 @@
 #include "regcache.h"
 #include "osabi.h"
 
 #include "regcache.h"
 #include "osabi.h"
 

-#include "gdb_string.h"
-

 #include "i386-tdep.h"
 
 /* Support for signal handlers.  */
 
 #include "i386-tdep.h"
 
 /* Support for signal handlers.  */
 

-/* Assuming NEXT_FRAME is for a frame following a BSD sigtramp
-   routine, return the address of the associated sigcontext structure.  */
+/* Assuming THIS_FRAME is for a BSD sigtramp routine, return the
+   address of the associated sigcontext structure.  */

 
 static CORE_ADDR
 
 static CORE_ADDR

-i386bsd_sigcontext_addr (struct frame_info *next_frame)
+i386bsd_sigcontext_addr (struct frame_info *this_frame)

 {
 {

-  char buf[4];
+  struct gdbarch *gdbarch = get_frame_arch (this_frame);
+  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+  gdb_byte buf[4];

   CORE_ADDR sp;
 
   CORE_ADDR sp;
 

-  frame_unwind_register (next_frame, I386_ESP_REGNUM, buf);
-  sp = extract_unsigned_integer (buf, 4);
+  get_frame_register (this_frame, I386_ESP_REGNUM, buf);
+  sp = extract_unsigned_integer (buf, 4, byte_order);

 
 

-  return read_memory_unsigned_integer (sp + 8, 4);
+  return read_memory_unsigned_integer (sp + 8, 4, byte_order);

 }
 \f
 
 }
 \f