diff options
| author | Mark Kettenis <kettenis@gnu.org> | 2003-09-12 19:27:38 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@gnu.org> | 2003-09-12 19:27:38 +0000 |
| commit | 212c460caa80563e19a42d7ea15c219a9e0c547d (patch) | |
| tree | 8ed73af308abed35d61b714ef08dca075a15f728 | |
| parent | 68856ea3783a77c5c597c7bf21125e28af8c5cc1 (diff) | |
| download | gdb-212c460caa80563e19a42d7ea15c219a9e0c547d.zip gdb-212c460caa80563e19a42d7ea15c219a9e0c547d.tar.gz gdb-212c460caa80563e19a42d7ea15c219a9e0c547d.tar.bz2 | |
* 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.
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/amd64fbsd-tdep.c | 52 |
2 files changed, 35 insertions, 26 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 18f03da..90eefe0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2003-09-12 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. + 2003-09-12 Andrew Cagney <cagney@redhat.com> * ppc-sysv-tdep.c (align_up, align_down): Replace "round2" macro. diff --git a/gdb/amd64fbsd-tdep.c b/gdb/amd64fbsd-tdep.c index e72c140..9f6c217 100644 --- a/gdb/amd64fbsd-tdep.c +++ b/gdb/amd64fbsd-tdep.c @@ -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 info, struct gdbarch *gdbarch) 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; |