1
0
Fork 0
mirror of https://github.com/tobast/libunwind-eh_elf.git synced 2024-12-25 04:23:42 +01:00

(ia64_access_reg): When writing UNW_REG_IP, invalidate the proc_info if the new

IP is outside the range of the old procedure.
	When writing one of the exception argument registers, track the update
	in c->eh_valid_mask.

(Logical change 1.45)
This commit is contained in:
mostang.com!davidm 2003-02-08 10:10:59 +00:00
parent d20530f7ab
commit 7377d07464

View file

@ -247,7 +247,11 @@ ia64_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp,
case UNW_REG_IP: case UNW_REG_IP:
if (write) if (write)
{
c->ip = *valp; /* also update the IP cache */ c->ip = *valp; /* also update the IP cache */
if (c->pi_valid && (*valp < c->pi.start_ip || *valp >= c->pi.end_ip))
c->pi_valid = 0; /* new IP outside of current proc */
}
loc = c->ip_loc; loc = c->ip_loc;
break; break;
@ -319,7 +323,8 @@ ia64_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp,
case UNW_IA64_AR_EC: case UNW_IA64_AR_EC:
if (write) if (write)
{ {
c->cfm = (c->cfm & ~((unw_word_t) 0x3f << 52)) | ((*valp & 0x3f) << 52); c->cfm = ((c->cfm & ~((unw_word_t) 0x3f << 52))
| ((*valp & 0x3f) << 52));
return ia64_put (c, c->cfm_loc, c->cfm); return ia64_put (c, c->cfm_loc, c->cfm);
} }
else else
@ -379,16 +384,20 @@ ia64_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp,
break; break;
case UNW_IA64_GR + 15 ... UNW_IA64_GR + 18: case UNW_IA64_GR + 15 ... UNW_IA64_GR + 18:
if (c->is_signal_frame) mask = 1 << (reg - (UNW_IA64_GR + 15));
loc = ia64_scratch_loc (c, reg);
else
{
if (write) if (write)
{
c->eh_args[reg - (UNW_IA64_GR + 15)] = *valp; c->eh_args[reg - (UNW_IA64_GR + 15)] = *valp;
else c->eh_valid_mask |= mask;
return 0;
}
else if ((c->eh_valid_mask & mask) != 0)
{
*valp = c->eh_args[reg - (UNW_IA64_GR + 15)] = *valp; *valp = c->eh_args[reg - (UNW_IA64_GR + 15)] = *valp;
return 0; return 0;
} }
else
loc = ia64_scratch_loc (c, reg);
break; break;
case UNW_IA64_GR + 2 ... UNW_IA64_GR + 3: case UNW_IA64_GR + 2 ... UNW_IA64_GR + 3: