m2-internship/libunwind-eh_elf
1
0
Fork 0
mirror of https://github.com/tobast/libunwind-eh_elf.git synced 2024-11-29 02:07:39 +01:00
Code Issues Releases Activity

Include "offsets.h" instead of <signal.h> to enable cross-compilation.

Browse source 
Use offsets defined in this file instead of calculating the offsets
from sigcontext structure.

(update_frame_state): Rename from ia64_get_frame_state() and make it
static and inlined.

(unw_step): Call update_frame_state() instead of ia64_get_frame_state().

(Logical change 1.5)
This commit is contained in:
(none)!davidm 2002-02-22 21:58:53 +00:00
parent 172cc2ba9b
commit 3790561497
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/ia64/unw_step.c
View file

@ -21,13 +21,12 @@ This exception does not however invalidate any other reasons why the
executable file might be covered by the GNU General Public executable file might be covered by the GNU General Public
License. */ License. */
#include <signal.h> #include "offsets.h"
#include "rse.h" #include "rse.h"
#include "unwind_i.h" #include "unwind_i.h"
int static inline int
ia64_get_frame_state (struct ia64_cursor *c) update_frame_state (struct ia64_cursor *c)
{ {
unw_word_t prev_ip, prev_sp, prev_bsp, ip, pr, num_regs, cfm; unw_word_t prev_ip, prev_sp, prev_bsp, ip, pr, num_regs, cfm;
int ret; int ret;
@ -36,8 +35,8 @@ ia64_get_frame_state (struct ia64_cursor *c)
prev_sp = c->sp; prev_sp = c->sp;
prev_bsp = c->bsp; prev_bsp = c->bsp;
/* restore the ip */ /* update the IP cache: */
ret = ia64_get (c, c->rp_loc, &ip); ret = ia64_get (c, c->ip_loc, &ip);
if (ret < 0) if (ret < 0)
return ret; return ret;
c->ip = ip; c->ip = ip;
@ -45,8 +44,7 @@ ia64_get_frame_state (struct ia64_cursor *c)
if ((ip & 0xf) != 0) if ((ip & 0xf) != 0)
{ {
/* don't let obviously bad addresses pollute the cache */ /* don't let obviously bad addresses pollute the cache */
debug (1, "%s: rejecting bad ip=0x%lx\n", __FUNCTION__, c->ip); debug (1, "%s: rejecting bad ip=0x%lx\n", __FUNCTION__, (long) c->ip);
c->rp_loc = 0;
return -UNW_EINVALIDIP; return -UNW_EINVALIDIP;
} }
@ -64,8 +62,7 @@ ia64_get_frame_state (struct ia64_cursor *c)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = ia64_get (c, (sigcontext_addr ret = ia64_get (c, (sigcontext_addr + SIGCONTEXT_FLAGS_OFF),
+ struct_offset (struct sigcontext, sc_flags)),
&sigcontext_flags); &sigcontext_flags);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -80,8 +77,7 @@ ia64_get_frame_state (struct ia64_cursor *c)
num_regs = cfm & 0x7f; /* size of frame */ num_regs = cfm & 0x7f; /* size of frame */
} }
c->pfs_loc = (c->sp + 0x10 + struct_offset (struct sigcontext, c->pfs_loc = (c->sp + 0x10 + SIGCONTEXT_AR_PFS_OFF);
sc_ar_pfs));
} }
else else
{ {
@ -90,16 +86,15 @@ ia64_get_frame_state (struct ia64_cursor *c)
return ret; return ret;
num_regs = (cfm >> 7) & 0x7f; /* size of locals */ num_regs = (cfm >> 7) & 0x7f; /* size of locals */
} }
c->bsp = (unsigned long) ia64_rse_skip_regs ((unsigned long *) c->bsp, c->bsp = ia64_rse_skip_regs (c->bsp, -num_regs);
-num_regs);
/* restore the sp: */ /* restore the sp: */
c->sp = c->psp; c->sp = c->psp;
if (c->ip == prev_ip && c->sp == prev_sp && c->bsp == prev_bsp) if (c->ip == prev_ip && c->sp == prev_sp && c->bsp == prev_bsp)
{ {
dprintf ("%s: ip, sp, bsp remain unchanged; stopping here (ip=0x%lx)\n", dprintf ("%s: ip, sp, and bsp unchanged; stopping here (ip=0x%lx)\n",
__FUNCTION__, ip); __FUNCTION__, (long) ip);
STAT(unw.stat.api.unwind_time += ia64_get_itc () - start); STAT(unw.stat.api.unwind_time += ia64_get_itc () - start);
return -UNW_EBADFRAME; return -UNW_EBADFRAME;
} }
@ -126,7 +121,7 @@ unw_step (unw_cursor_t *cursor)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = ia64_get_frame_state (c); ret = update_frame_state (c);
if (ret < 0) if (ret < 0)
return ret; return ret;