m2-internship/libunwind-eh_elf
1
0
Fork 0
mirror of https://github.com/tobast/libunwind-eh_elf.git synced 2025-04-18 02:22:16 +02:00
Code Issues Releases Activity

(local_resume): Call ia64_install_cursor() instead of _Uia64_install_cursor().

Browse source 
(ia64_local_resume): Call local_resume().
(remote_install_cursor): Reenable old code.  Update MEMIFY for loc array changes.

(Logical change 1.85)
This commit is contained in:
mostang.com!davidm 2003-04-23 19:22:42 +00:00
parent 8e85e811c0
commit 6c584b7b68
1 changed files with 8 additions and 11 deletions

19
src/ia64/Gresume-ia64.c
View file

@ -136,13 +136,13 @@ local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg)
extra.r17 = c->eh_args[2]; extra.r17 = c->eh_args[2];
extra.r18 = c->eh_args[3]; extra.r18 = c->eh_args[3];
} }
_Uia64_install_cursor (c, pri_unat, (unw_word_t *) &extra); ia64_install_cursor (c, pri_unat, (unw_word_t *) &extra);
} }
HIDDEN int HIDDEN int
ia64_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg) ia64_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg)
{ {
return -UNW_EINVAL; return local_resume (as, cursor, arg);
} }
#endif /* !UNW_REMOTE_ONLY */ #endif /* !UNW_REMOTE_ONLY */
@ -152,7 +152,6 @@ ia64_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg)
static inline int static inline int
remote_install_cursor (struct cursor *c) remote_install_cursor (struct cursor *c)
{ {
#if 0
#ifndef __hpux #ifndef __hpux
int (*access_reg) (unw_addr_space_t, unw_regnum_t, unw_word_t *, int (*access_reg) (unw_addr_space_t, unw_regnum_t, unw_word_t *,
int write, void *); int write, void *);
@ -169,12 +168,11 @@ remote_install_cursor (struct cursor *c)
memory, not registers. Furthermore, R4-R7 and NAT4-NAT7 are memory, not registers. Furthermore, R4-R7 and NAT4-NAT7 are
taken care of by ia64_local_resume() so they don't need to be taken care of by ia64_local_resume() so they don't need to be
handled here. */ handled here. */
unw_word_t *locp; # define MEMIFY(preg, reg) \
# define MEMIFY(preg, reg) \ do { \
do { \ if (IA64_IS_REG_LOC (c->loc[(preg)])) \
locp = ((unw_word_t *) c) + unw.preg_index[(preg)]; \ c->loc[(preg)] = IA64_LOC_ADDR((unw_word_t) \
if (IA64_IS_REG_LOC (*locp)) \ tdep_uc_addr(c->as_arg, (reg)), 0); \
*locp = (unw_word_t) tdep_uc_addr (c->as_arg, (reg)); \
} while (0) } while (0)
MEMIFY (IA64_REG_PR, UNW_IA64_PR); MEMIFY (IA64_REG_PR, UNW_IA64_PR);
MEMIFY (IA64_REG_PFS, UNW_IA64_AR_PFS); MEMIFY (IA64_REG_PFS, UNW_IA64_AR_PFS);
@ -230,10 +228,9 @@ remote_install_cursor (struct cursor *c)
} }
return (*c->as->acc.resume) (c->as, (unw_cursor_t *) c, c->as_arg); return (*c->as->acc.resume) (c->as, (unw_cursor_t *) c, c->as_arg);
#endif #endif
#endif
} }
#endif #endif /* !UNW_LOCAL_ONLY */
int int
unw_resume (unw_cursor_t *cursor) unw_resume (unw_cursor_t *cursor)