* i386-linux-tdep.c (i386_linux_sigtramp_saved_pc,

i386_linux_sigtramp_saved_sp): Make static.
(i386_linux_frame_saved_pc): New function based on the old
FRAME_SAVED_PC macro, but use read_memory_unsigned_integer instead
of read_memory_integer.
* config/i386/tm-linux.h (sigtramp_saved_pc): Remove definition.
(i386_linux_sigtramp_saved_pc): Remove prototype.
(FRAME_SAVED_PC): Redefine in terms of i386_linux_frame_saved_pc.
(i386_linux_frame_saved_pc): New prototype.
This commit is contained in:
Mark Kettenis
2001-03-26 19:51:47 +00:00
parent 10a5181444
commit 50e27f84bf
3 changed files with 38 additions and 16 deletions

View File

@@ -255,7 +255,7 @@ i386_linux_sigcontext_addr (struct frame_info *frame)
/* Assuming FRAME is for a Linux sigtramp routine, return the saved
program counter. */
CORE_ADDR
static CORE_ADDR
i386_linux_sigtramp_saved_pc (struct frame_info *frame)
{
CORE_ADDR addr;
@@ -269,7 +269,7 @@ i386_linux_sigtramp_saved_pc (struct frame_info *frame)
/* Assuming FRAME is for a Linux sigtramp routine, return the saved
stack pointer. */
CORE_ADDR
static CORE_ADDR
i386_linux_sigtramp_saved_sp (struct frame_info *frame)
{
CORE_ADDR addr;
@@ -277,6 +277,28 @@ i386_linux_sigtramp_saved_sp (struct frame_info *frame)
return read_memory_integer (addr + LINUX_SIGCONTEXT_SP_OFFSET, 4);
}
/* Return the saved program counter for FRAME. */
CORE_ADDR
i386_linux_frame_saved_pc (struct frame_info *frame)
{
if (frame->signal_handler_caller)
return i386_linux_sigtramp_saved_pc (frame);
/* See comment in "i386/tm-linux.h" for an explanation what this
"FRAMELESS_SIGNAL" stuff is supposed to do.
FIXME: kettenis/2001-03-26: That comment should eventually be
moved to this file. */
if (FRAMELESS_SIGNAL (frame))
{
CORE_ADDR sp = i386_linux_sigtramp_saved_sp (frame->next);
return read_memory_unsigned_integer (sp, 4);
}
return read_memory_unsigned_integer (frame->frame + 4, 4);
}
/* Immediately after a function call, return the saved pc. */
CORE_ADDR