[gdbserver] Move malloc.h include to server.h.

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

diff --git a/gdb/amd64fbsd-tdep.c b/gdb/amd64fbsd-tdep.c
index 062fc9ac6b7eb005bf577b223aa9ea4b132f4dc1..18ef0473e344421d00859869ff3637b85e1b59b9 100644 (file)
--- a/gdb/amd64fbsd-tdep.c
+++ b/gdb/amd64fbsd-tdep.c
@@ -1,12 +1,13 @@
 /* Target-dependent code for FreeBSD/amd64.
 
 /* Target-dependent code for FreeBSD/amd64.
 

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


@@ -15,9 +16,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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, 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"


@@ -35,18 +34,18 @@
 
 /* Support for signal handlers.  */
 
 
 /* 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

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

 {
   CORE_ADDR sp;
 
   /* The `struct sigcontext' (which really is an `ucontext_t' on
      FreeBSD/amd64) lives at a fixed offset in the signal frame.  See
      <machine/sigframe.h>.  */
 {
   CORE_ADDR sp;
 
   /* The `struct sigcontext' (which really is an `ucontext_t' on
      FreeBSD/amd64) lives at a fixed offset in the signal frame.  See
      <machine/sigframe.h>.  */

-  sp = frame_unwind_register_unsigned (next_frame, AMD64_RSP_REGNUM);
+  sp = frame_unwind_register_unsigned (this_frame, AMD64_RSP_REGNUM);

   return sp + 16;
 }
 \f
   return sp + 16;
 }
 \f


@@ -88,8 +87,8 @@ static int amd64fbsd_r_reg_offset[] =
 };
 
 /* Location of the signal trampoline.  */
 };
 
 /* Location of the signal trampoline.  */

-CORE_ADDR amd64fbsd_sigtramp_start_addr = 0x7fffffffffc0;
-CORE_ADDR amd64fbsd_sigtramp_end_addr = 0x7fffffffffe0;
+CORE_ADDR amd64fbsd_sigtramp_start_addr = 0x7fffffffffc0ULL;
+CORE_ADDR amd64fbsd_sigtramp_end_addr = 0x7fffffffffe0ULL;

 
 /* From <machine/signal.h>.  */
 int amd64fbsd_sc_reg_offset[] =
 
 /* From <machine/signal.h>.  */
 int amd64fbsd_sc_reg_offset[] =


@@ -182,7 +181,7 @@ amd64fbsd_collect_uthread (const struct regcache *regcache,
     }
 }
 
     }
 }
 

-void
+static void

 amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);