From e0160b16b7c3d2d8215fcb99c293a2e56e741c05 Mon Sep 17 00:00:00 2001 From: "hp.com!davidm" Date: Fri, 25 Apr 2003 07:44:23 +0000 Subject: [PATCH] (linux_interrupt): New function. (update_frame_state): Handle ABI_MARKER_LINUX_INTERRUPT by calling linux_interrupt(). If c->abi_marker is non-zero, copy it to c->last_abi_marker. (Logical change 1.89) --- src/ia64/Gstep-ia64.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/ia64/Gstep-ia64.c b/src/ia64/Gstep-ia64.c index a8bced2f..c49cea74 100644 --- a/src/ia64/Gstep-ia64.c +++ b/src/ia64/Gstep-ia64.c @@ -59,6 +59,31 @@ linux_sigtramp (struct cursor *c, unw_word_t *num_regsp) #endif } +static inline int +linux_interrupt (struct cursor *c, unw_word_t *num_regsp) +{ +#if defined(UNW_LOCAL_ONLY) + /* Perhaps libunwind will some day become the Linux kernel unwinder. + Until such time, linux_interrupt() is needed only for non-local + unwinding. */ + return -UNW_EINVAL; +#else + unw_word_t sc_addr, num_regs; + + sc_addr = c->sigcontext_addr = c->sp + 0x10; + + if ((c->pr & (1UL << LINUX_PT_P_NONSYS)) != 0) + num_regs = c->cfm & 0x7f; + else + num_regs = 0; + + /* do what can't be described by unwind directives: */ + c->loc[IA64_REG_PFS] = IA64_LOC_ADDR (sc_addr + LINUX_PT_PFS_OFF, 0); + *num_regsp = num_regs; /* size of frame */ + return 0; +#endif +} + static inline int hpux_sigtramp (struct cursor *c, unw_word_t *num_regsp) { @@ -221,6 +246,7 @@ update_frame_state (struct cursor *c) num_regs = 0; if (unlikely (c->abi_marker)) { + c->last_abi_marker = c->abi_marker; switch (c->abi_marker) { case ABI_MARKER_LINUX_SIGTRAMP: @@ -229,6 +255,12 @@ update_frame_state (struct cursor *c) return ret; break; + case ABI_MARKER_LINUX_INTERRUPT: + c->as->abi = ABI_LINUX; + if ((ret = linux_interrupt (c, &num_regs)) < 0) + return ret; + break; + case ABI_MARKER_HP_UX_SIGTRAMP: c->as->abi = ABI_HPUX; if ((ret = hpux_sigtramp (c, &num_regs)) < 0)