2004-08-20 Michael Chastain <mec.gnu@mindspring.com>

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

diff --git a/gdb/amd64fbsd-tdep.c b/gdb/amd64fbsd-tdep.c
index b2c3108b978fe11651cf9e79950b4b800fd98ee7..e4e02abb61cb4725af0f4a3f15011b4304a20285 100644 (file)
--- a/gdb/amd64fbsd-tdep.c
+++ b/gdb/amd64fbsd-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for FreeBSD/amd64.
 
-   Copyright 2003 Free Software Foundation, Inc.
+   Copyright 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -28,7 +28,8 @@
 
 #include "gdb_string.h"
 
-#include "x86-64-tdep.h"
+#include "amd64-tdep.h"
+#include "solib-svr4.h"
 
 /* Support for signal handlers.  */
 
@@ -43,7 +44,7 @@ amd64fbsd_sigcontext_addr (struct frame_info *next_frame)
   /* 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, X86_64_RSP_REGNUM);
+  sp = frame_unwind_register_unsigned (next_frame, AMD64_RSP_REGNUM);
   return sp + 16;
 }
 \f
@@ -58,23 +59,38 @@ amd64fbsd_sigcontext_addr (struct frame_info *next_frame)
 /* From <machine/reg.h>.  */
 static int amd64fbsd_r_reg_offset[] =
 {
-  14 * 8, 11 * 8,              /* %rax, %rbx */
-  13 * 8, 12 * 8,              /* %rcx, %rdx */
-  9 * 8, 8 * 8,                        /* %rsi, %rdi */
-  10 * 8, 20 * 8,              /* %rbp, %rsp */
-  7 * 8, 6 * 8, 5 * 8, 4 * 8,  /* %r8 ... */
-  3 * 8, 2 * 8, 1 * 8, 0 * 8,  /* ... %r15 */
-  17 * 8, 19 * 8,              /* %rip, %eflags */
-  -1, -1,                      /* %ds, %es */
-  -1, -1                       /* %fs, %gs */
+  14 * 8,                      /* %rax */
+  11 * 8,                      /* %rbx */
+  13 * 8,                      /* %rcx */
+  12 * 8,                      /* %rdx */
+  9 * 8,                       /* %rsi */
+  8 * 8,                       /* %rdi */
+  10 * 8,                      /* %rbp */
+  20 * 8,                      /* %rsp */
+  7 * 8,                       /* %r8 ... */
+  6 * 8,
+  5 * 8,
+  4 * 8,
+  3 * 8,
+  2 * 8,
+  1 * 8,
+  0 * 8,                       /* ... %r15 */
+  17 * 8,                      /* %rip */
+  19 * 8,                      /* %eflags */
+  18 * 8,                      /* %cs */
+  21 * 8,                      /* %ss */
+  -1,                          /* %ds */
+  -1,                          /* %es */
+  -1,                          /* %fs */
+  -1                           /* %gs */
 };
 
 /* Location of the signal trampoline.  */
-CORE_ADDR amd64fbsd_sigtramp_start = 0x7fffffffffc0;
-CORE_ADDR amd64fbsd_sigtramp_end = 0x7fffffffffe0;
+CORE_ADDR amd64fbsd_sigtramp_start_addr = 0x7fffffffffc0;
+CORE_ADDR amd64fbsd_sigtramp_end_addr = 0x7fffffffffe0;
 
 /* From <machine/signal.h>.  */
-int amd64fbsd_sc_reg_offset[X86_64_NUM_GREGS] =
+int amd64fbsd_sc_reg_offset[] =
 {
   24 + 6 * 8,                  /* %rax */
   24 + 7 * 8,                  /* %rbx */
@@ -83,17 +99,19 @@ int amd64fbsd_sc_reg_offset[X86_64_NUM_GREGS] =
   24 + 1 * 8,                  /* %rsi */
   24 + 0 * 8,                  /* %rdi */
   24 + 8 * 8,                  /* %rbp */
-  24 + 21 * 8,                 /* %rsp */
-  24 + 4 * 8,                  /* %r8 */
-  24 + 5 * 8,                  /* %r9 */
-  24 + 9 * 8,                  /* %r10 */
-  24 + 10 * 8,                 /* %r11 */
-  24 + 11 * 8,                 /* %r12 */
-  24 + 12 * 8,                 /* %r13 */
-  24 + 13 * 8,                 /* %r14 */
-  24 + 14 * 8,                 /* %r15 */
-  24 + 18 * 8,                 /* %rip */
-  24 + 20 * 8,                 /* %eflags */
+  24 + 22 * 8,                 /* %rsp */
+  24 + 4 * 8,                  /* %r8 ... */
+  24 + 5 * 8,
+  24 + 9 * 8,
+  24 + 10 * 8,
+  24 + 11 * 8,
+  24 + 12 * 8,
+  24 + 13 * 8,
+  24 + 14 * 8,                 /* ... %r15 */
+  24 + 19 * 8,                 /* %rip */
+  24 + 21 * 8,                 /* %eflags */
+  24 + 20 * 8,                 /* %cs */
+  24 + 23 * 8,                 /* %ss */
   -1,                          /* %ds */
   -1,                          /* %es */
   -1,                          /* %fs */
@@ -112,13 +130,17 @@ amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   tdep->gregset_num_regs = ARRAY_SIZE (amd64fbsd_r_reg_offset);
   tdep->sizeof_gregset = 22 * 8;
 
-  x86_64_init_abi (info, gdbarch);
+  amd64_init_abi (info, gdbarch);
 
-  tdep->sigtramp_start = amd64fbsd_sigtramp_start;
-  tdep->sigtramp_end = amd64fbsd_sigtramp_end;
+  tdep->sigtramp_start = amd64fbsd_sigtramp_start_addr;
+  tdep->sigtramp_end = amd64fbsd_sigtramp_end_addr;
   tdep->sigcontext_addr = amd64fbsd_sigcontext_addr;
   tdep->sc_reg_offset = amd64fbsd_sc_reg_offset;
   tdep->sc_num_regs = ARRAY_SIZE (amd64fbsd_sc_reg_offset);
+
+  /* FreeBSD uses SVR4-style shared libraries.  */
+  set_solib_svr4_fetch_link_map_offsets
+    (gdbarch, svr4_lp64_fetch_link_map_offsets);
 }
 \f