OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* amd64obsd-tdep.c (amd64obsd_sigtramp_p): Replace hexadecimal 

offset with decimal offset.
(amd64obsd_sigcontext_addr): Return correct address for entire
signal trampoline.
This commit is contained in:
Mark Kettenis 2004-05-15 21:06:50 +00:00
parent c5ae18403c
commit 0fe85704c4
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,5 +1,10 @@
2004-05-15 Mark Kettenis <kettenis@gnu.org>
* amd64obsd-tdep.c (amd64obsd_sigtramp_p): Replace hexadecimal
offset with decimal offset.
(amd64obsd_sigcontext_addr): Return correct address for entire
signal trampoline.
* vax-tdep.c (vax_frame_num_args): Use get_frame_base_address
instead of get_frame_base.

22
gdb/amd64obsd-tdep.c
View File

@ -109,7 +109,7 @@ amd64obsd_sigtramp_p (struct frame_info *next_frame)
/* If we can't read the instructions at START_PC, return zero. */
buf = alloca (sizeof sigreturn);
if (target_read_memory (start_pc + 0x7, buf, sizeof sigreturn))
if (target_read_memory (start_pc + 7, buf, sizeof sigreturn))
return 0;
/* Check for sigreturn(2). */
@ -125,9 +125,25 @@ amd64obsd_sigtramp_p (struct frame_info *next_frame)
static CORE_ADDR
amd64obsd_sigcontext_addr (struct frame_info *next_frame)
{
CORE_ADDR pc = frame_pc_unwind (next_frame);
ULONGEST offset = (pc & (amd64obsd_page_size - 1));
/* The %rsp register points at `struct sigcontext' upon entry of a
signal trampoline. */
return frame_unwind_register_unsigned (next_frame, AMD64_RSP_REGNUM);
signal trampoline. The relevant part of the trampoline is
call *%rax
movq %rsp, %rdi
pushq %rdi
movq $SYS_sigreturn,%rax
int $0x80
(see /usr/src/sys/arch/amd64/amd64/locore.S). The `pushq'
instruction clobbers %rsp, but its value is saved in `%rdi'. */
if (offset > 6)
return frame_unwind_register_unsigned (next_frame, AMD64_RDI_REGNUM);
else
return frame_unwind_register_unsigned (next_frame, AMD64_RSP_REGNUM);
}
/* OpenBSD 3.5 or later. */