diff options
| author | Paul Brook <paul@codesourcery.com> | 2004-12-08 18:24:27 +0000 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2004-12-08 18:24:27 +0000 |
| commit | 4215937f2ae78c90bb7481911cb0163d70fa3b68 (patch) | |
| tree | f07893e170118fd01de3a6112cce98b55e2d2f99 | |
| parent | 2459f208c5b872bd66f7a1829bd1a2688a0f38dc (diff) | |
* config/arm/unwind-arm.c (selfrel_offset): remove.
(EIT_comparator): Use selfrel_offset31.
(get_eit_entry): Ditto.
(__gnu_unwind_pr_common): Ditto.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/csl-arm-2004-q3-branch@91911 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog.csl-arm | 7 | ||||
| -rw-r--r-- | gcc/config/arm/unwind-arm.c | 17 |
2 files changed, 12 insertions, 12 deletions
diff --git a/gcc/ChangeLog.csl-arm b/gcc/ChangeLog.csl-arm index 0f43358eb33..b8c70027dba 100644 --- a/gcc/ChangeLog.csl-arm +++ b/gcc/ChangeLog.csl-arm @@ -1,3 +1,10 @@ +2004-12-08 Paul Brook <paul@codesourcery.com> + + * config/arm/unwind-arm.c (selfrel_offset): remove. + (EIT_comparator): Use selfrel_offset31. + (get_eit_entry): Ditto. + (__gnu_unwind_pr_common): Ditto. + 2004-11-19 Paul Brook <paul@codesourcery.com> * unwind-arm.h: Don't include stdio.h. Add prototype for abort(). diff --git a/gcc/config/arm/unwind-arm.c b/gcc/config/arm/unwind-arm.c index 1c42bdf7ccc..b84caf5fa97 100644 --- a/gcc/config/arm/unwind-arm.c +++ b/gcc/config/arm/unwind-arm.c @@ -317,13 +317,6 @@ _Unwind_VRS_Result _Unwind_VRS_Pop (_Unwind_Context *context, /* Core unwinding functions. */ -/* Dereference a self-relative offset. */ -static inline _uw -selfrel_offset (const _uw *p) -{ - return *p + (_uw) p; -} - /* Dereference a 31-bit self-relative offset. */ static inline _uw selfrel_offset31 (const _uw *p) @@ -349,9 +342,9 @@ EIT_comparator (const void *ck, const void *ce) _uw next_fn; _uw this_fn; - this_fn = selfrel_offset (&eitp->fnoffset); + this_fn = selfrel_offset31 (&eitp->fnoffset); if (next_eitp != &__exidx_end) - next_fn = selfrel_offset (&next_eitp->fnoffset); + next_fn = selfrel_offset31 (&next_eitp->fnoffset); else next_fn = ~(_uw) 0; @@ -379,7 +372,7 @@ get_eit_entry (_Unwind_Control_Block *ucbp, _uw return_address) UCB_PR_ADDR (ucbp) = 0; return _URC_FAILURE; } - ucbp->pr_cache.fnstart = selfrel_offset (&eitp->fnoffset); + ucbp->pr_cache.fnstart = selfrel_offset31 (&eitp->fnoffset); /* Can this frame be unwound at all? */ if (eitp->content == EXIDX_CANTUNWIND) @@ -930,8 +923,8 @@ __gnu_unwind_pr_common (_Unwind_State state, /* Cleanup in range, and we are running cleanups. */ _uw lp; - /* Landing pad address is 31-bit pc-relatvie offset. */ - lp = selfrel_offset (data); + /* Landing pad address is 31-bit pc-relatvie offset. */ + lp = selfrel_offset31 (data); data++; /* Save the exception data pointer. */ ucbp->cleanup_cache.bitpattern[0] = (_uw) data; |