This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[PATCH] Fix FreeBSD/amd64 sigtramp recognition
- From: Mark Kettenis <kettenis at chello dot nl>
- To: gdb-patches at sources dot redhat dot com
- Cc: ac131313 at redhat dot com
- Date: Fri, 12 Sep 2003 21:30:01 +0200 (CEST)
- Subject: [PATCH] Fix FreeBSD/amd64 sigtramp recognition
This never worked :-( but does now :-).
Checked in on mainline.
Andrew, can I check this in on the branch too? The FreeBSD/amd64 is a
new target, so this doesn't fix a regression, but it fixes a genuine
bug. And it can't hurt other targets.
Mark
Index: ChangeLog
from Mark Kettenis <kettenis@gnu.org>
* amd64fbsd-tdep.c: Fix sigtramp recognition.
(amd64fbsd_sigcontext_addr): Rewrite.
(amd64fbsd_sigtramp_start, amd64fbsd_sigtramp_end): Initialize
with correct values.
(amd64fbsd_sc_reg_offset): Initialize with correct values.
(amd64fbsd_init_abi): Fix typo.
Index: amd64fbsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/amd64fbsd-tdep.c,v
retrieving revision 1.1
diff -u -p -r1.1 amd64fbsd-tdep.c
--- amd64fbsd-tdep.c 13 Jul 2003 16:15:59 -0000 1.1
+++ amd64fbsd-tdep.c 12 Sep 2003 19:26:23 -0000
@@ -37,42 +37,42 @@
static CORE_ADDR
amd64fbsd_sigcontext_addr (struct frame_info *next_frame)
{
- char buf[8];
CORE_ADDR sp;
- frame_unwind_register (next_frame, X86_64_RSP_REGNUM, buf);
- sp = extract_unsigned_integer (buf, 8);
-
- return read_memory_unsigned_integer (sp + 16, 8);
+ /* 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);
+ return sp + 16;
}
/* FreeBSD 5.1-RELEASE or later. */
/* Location of the signal trampoline. */
-CORE_ADDR amd64fbsd_sigtramp_start = 0x7fffffffc0;
-CORE_ADDR amd64fbsd_sigtramp_end = 0x7fffffffe0;
+CORE_ADDR amd64fbsd_sigtramp_start = 0x7fffffffffc0;
+CORE_ADDR amd64fbsd_sigtramp_end = 0x7fffffffffe0;
/* From <machine/signal.h>. */
int amd64fbsd_sc_reg_offset[X86_64_NUM_GREGS] =
{
- 24 + 14 * 8, /* %rax */
- 24 + 11 * 8, /* %rbx */
- 24 + 13 * 8, /* %rcx */
- 24 + 12 * 8, /* %rdx */
- 24 + 9 * 8, /* %rsi */
- 24 + 8 * 8, /* %rdi */
- 24 + 10 * 8, /* %rbp */
- 24 + 20 * 8, /* %rsp */
- 24 + 7 * 8, /* %r8 */
- 24 + 6 * 8, /* %r9 */
- 24 + 5 * 8, /* %r10 */
- 24 + 4 * 8, /* %r11 */
- 24 + 3 * 8, /* %r12 */
- 24 + 2 * 8, /* %r13 */
- 24 + 1 * 8, /* %r14 */
- 24 + 0 * 8, /* %r15 */
- 24 + 17 * 8, /* %rip */
- 24 + 19 * 8, /* %eflags */
+ 24 + 6 * 8, /* %rax */
+ 24 + 7 * 8, /* %rbx */
+ 24 + 3 * 8, /* %rcx */
+ 24 + 2 * 8, /* %rdx */
+ 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 */
-1, /* %ds */
-1, /* %es */
-1, /* %fs */
@@ -90,7 +90,7 @@ amd64fbsd_init_abi (struct gdbarch_info
x86_64_init_abi (info, gdbarch);
tdep->sigtramp_start = amd64fbsd_sigtramp_start;
- tdep->sigtramp_end = amd64fbsd_sigtramp_start;
+ tdep->sigtramp_end = amd64fbsd_sigtramp_end;
tdep->sigcontext_addr = amd64fbsd_sigcontext_addr;
tdep->sc_reg_offset = amd64fbsd_sc_reg_offset;
tdep->sc_num_regs = X86_64_NUM_GREGS;