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

(linux_scratch_loc): Add "nat_bitnr"-pointer argument.

Browse source 
Handle NaT-bit registers by returning not just the
	NaT-word address, but also the NaT-bit number.
(hpux_scratch_loc): Add "nat_bitnr"-pointer argument.
(ia64_scratch_loc): Likewise.
(access_nat): Add "nat_bitnr" argument.  Rename "loc" to "nat_loc".
	Greatly simplify now that we have the NaT-word and the
	NaT bit-number readily available.
(access_reg): Pass NaT-bit number to access_nat().
	Handle scratch NaT-bit registers in a more generic fashion,
	now that we can.  Adjust all calls to ia64_scratch_loc() for
	third argument.

(Logical change 1.181)
This commit is contained in:
mostang.com!davidm 2004-02-27 08:54:25 +00:00
parent 9316bbb8f4
commit 50488aece3
1 changed files with 120 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

167
src/ia64/Gregs-ia64.c
View file

@ -32,20 +32,22 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#include "unwind_i.h" #include "unwind_i.h"
static inline ia64_loc_t static inline ia64_loc_t
linux_scratch_loc (struct cursor *c, unw_regnum_t reg) linux_scratch_loc (struct cursor *c, unw_regnum_t reg, uint8_t *nat_bitnr)
{ {
#if !defined(UNW_LOCAL_ONLY) || defined(__linux) #if !defined(UNW_LOCAL_ONLY) || defined(__linux)
unw_word_t addr = c->sigcontext_addr, flags, tmp_addr; unw_word_t addr = c->sigcontext_addr, flags, tmp_addr;
int i; int i;
switch (c->last_abi_marker) if (c->last_abi_marker == ABI_MARKER_LINUX_SIGTRAMP
|| c->last_abi_marker == ABI_MARKER_OLD_LINUX_SIGTRAMP)
{ {
case ABI_MARKER_OLD_LINUX_SIGTRAMP:
case ABI_MARKER_LINUX_SIGTRAMP:
switch (reg) switch (reg)
{ {
case UNW_IA64_NAT + 2 ... UNW_IA64_NAT + 3: case UNW_IA64_NAT + 2 ... UNW_IA64_NAT + 3:
case UNW_IA64_NAT + 8 ... UNW_IA64_NAT + 31: case UNW_IA64_NAT + 8 ... UNW_IA64_NAT + 31:
/* Linux sigcontext contains the NaT bit of scratch register
N in bit position N of the sc_nat member. */
*nat_bitnr = (reg - UNW_IA64_NAT);
addr += LINUX_SC_NAT_OFF; addr += LINUX_SC_NAT_OFF;
break; break;
@ -91,8 +93,18 @@ linux_scratch_loc (struct cursor *c, unw_regnum_t reg)
return IA64_REG_LOC (c, reg); return IA64_REG_LOC (c, reg);
} }
return IA64_LOC_ADDR (addr, 0); return IA64_LOC_ADDR (addr, 0);
}
else
{
int is_nat = 0;
case ABI_MARKER_LINUX_INTERRUPT: if ((unsigned) (reg - UNW_IA64_NAT) < 128)
{
is_nat = 1;
reg -= (UNW_IA64_NAT - UNW_IA64_GR);
}
if (c->last_abi_marker == ABI_MARKER_LINUX_INTERRUPT)
{
switch (reg) switch (reg)
{ {
case UNW_IA64_BR + 6 ... UNW_IA64_BR + 7: case UNW_IA64_BR + 6 ... UNW_IA64_BR + 7:
@ -125,9 +137,9 @@ linux_scratch_loc (struct cursor *c, unw_regnum_t reg)
default: default:
return IA64_REG_LOC (c, reg); return IA64_REG_LOC (c, reg);
} }
return IA64_LOC_ADDR (addr, 0); }
else if (c->last_abi_marker == ABI_MARKER_OLD_LINUX_INTERRUPT)
case ABI_MARKER_OLD_LINUX_INTERRUPT: {
switch (reg) switch (reg)
{ {
case UNW_IA64_GR + 1 ... UNW_IA64_GR + 3: case UNW_IA64_GR + 1 ... UNW_IA64_GR + 3:
@ -156,17 +168,23 @@ linux_scratch_loc (struct cursor *c, unw_regnum_t reg)
default: default:
return IA64_REG_LOC (c, reg); return IA64_REG_LOC (c, reg);
} }
}
if (is_nat)
{
/* For Linux pt-regs structure, bit number is determined by
the UNaT slot number (as determined by st8.spill) and the
bits are saved wherever the (primary) UNaT was saved. */
*nat_bitnr = ia64_unat_slot_num (addr);
return c->loc[IA64_REG_PRI_UNAT_MEM];
}
return IA64_LOC_ADDR (addr, 0); return IA64_LOC_ADDR (addr, 0);
default:
break;
} }
#endif #endif
return IA64_NULL_LOC; return IA64_NULL_LOC;
} }
static inline ia64_loc_t static inline ia64_loc_t
hpux_scratch_loc (struct cursor *c, unw_regnum_t reg) hpux_scratch_loc (struct cursor *c, unw_regnum_t reg, uint8_t *nat_bitnr)
{ {
#if !defined(UNW_LOCAL_ONLY) || defined(__hpux) #if !defined(UNW_LOCAL_ONLY) || defined(__hpux)
return IA64_LOC_UC_REG (reg, c->sigcontext_addr); return IA64_LOC_UC_REG (reg, c->sigcontext_addr);
@ -176,18 +194,15 @@ hpux_scratch_loc (struct cursor *c, unw_regnum_t reg)
} }
HIDDEN ia64_loc_t HIDDEN ia64_loc_t
ia64_scratch_loc (struct cursor *c, unw_regnum_t reg) ia64_scratch_loc (struct cursor *c, unw_regnum_t reg, uint8_t *nat_bitnr)
{ {
if (c->sigcontext_addr) if (c->sigcontext_addr)
switch (c->as->abi)
{ {
case ABI_LINUX: if (c->as->abi == ABI_LINUX)
return linux_scratch_loc (c, reg); return linux_scratch_loc (c, reg, nat_bitnr);
else if (c->as->abi == ABI_HPUX)
case ABI_HPUX: return hpux_scratch_loc (c, reg, nat_bitnr);
return hpux_scratch_loc (c, reg); else
default:
return IA64_NULL_LOC; return IA64_NULL_LOC;
} }
else else
@ -219,20 +234,20 @@ update_nat (struct cursor *c, ia64_loc_t nat_loc, unw_word_t mask,
} }
static int static int
access_nat (struct cursor *c, ia64_loc_t loc, ia64_loc_t reg_loc, access_nat (struct cursor *c,
ia64_loc_t nat_loc, ia64_loc_t reg_loc, uint8_t nat_bitnr,
unw_word_t *valp, int write) unw_word_t *valp, int write)
{ {
unw_word_t mask = 0; unw_word_t mask = 0;
ia64_loc_t nat_loc;
unw_fpreg_t tmp; unw_fpreg_t tmp;
int ret, reg; int ret;
if (IA64_IS_UC_LOC (reg_loc)) if (IA64_IS_UC_LOC (reg_loc))
{ {
if (write) if (write)
return ia64_put (c, loc, *valp); return ia64_put (c, nat_loc, *valp);
else else
return ia64_get (c, loc, valp); return ia64_get (c, nat_loc, valp);
} }
if (IA64_IS_FP_LOC (reg_loc)) if (IA64_IS_FP_LOC (reg_loc))
@ -280,27 +295,13 @@ access_nat (struct cursor *c, ia64_loc_t loc, ia64_loc_t reg_loc,
return ret; return ret;
} }
if (IA64_IS_MEMSTK_NAT (loc))
{
nat_loc = loc;
if (IA64_IS_NULL_LOC (nat_loc)) if (IA64_IS_NULL_LOC (nat_loc))
/* There was no primary UNaT, implying that the NaT bits are
still in ar.unat. This can happen for leaf-routines. */
nat_loc = c->loc[IA64_REG_UNAT];
assert (!IA64_IS_REG_LOC (reg_loc));
mask = (unw_word_t) 1 << ia64_rse_slot_num (IA64_GET_ADDR (reg_loc));
}
else
{ {
reg = IA64_GET_REG (loc); /* NaT bit is not saved. This happens if a general register is
assert (reg >= 0 && reg < 128); saved to a branch register. Since the NaT bit gets lost, we
if (!reg) need to drop it here, too. Note that if the NaT bit had been
{ set when the save occurred, it would have caused a NaT
/* NaT bit is not saved. This happens if a general register consumption fault. */
is saved to a branch register. Since the NaT bit gets
lost, we need to drop it here, too. Note that if the NaT
bit had been set when the save occurred, it would have
caused a NaT consumption fault. */
if (write) if (write)
{ {
if (*valp) if (*valp)
@ -311,58 +312,7 @@ access_nat (struct cursor *c, ia64_loc_t loc, ia64_loc_t reg_loc,
return 0; return 0;
} }
if (reg >= 4 && reg <= 7) mask = (unw_word_t) 1 << nat_bitnr;
{
/* NaT bit is saved in a NaT register. This happens when
one general register is saved to another general
register. */
#ifdef UNW_LOCAL_ONLY
ucontext_t *uc = c->as_arg;
mask = ((unw_word_t) 1) << reg;
nat_loc = IA64_LOC_ADDR ((unw_word_t) &uc->uc_mcontext.sc_nat, 0);
#else
if (write)
ret = ia64_put (c, IA64_REG_LOC (c, UNW_IA64_NAT + reg), *valp);
else
ret = ia64_get (c, IA64_REG_LOC (c, UNW_IA64_NAT + reg), valp);
return ret;
#endif
}
else if (reg >= 32)
{
struct rbs_area *rbs;
unw_word_t reg_addr = IA64_GET_ADDR (reg_loc);
/* NaT bit is saved in a stacked register. */
assert (!IA64_IS_REG_LOC (reg_loc));
rbs = rbs_find (c, reg_addr);
if (!rbs)
return -UNW_EBADREG;
nat_loc = rbs_get_rnat_loc (rbs, reg_addr);
mask = (unw_word_t) 1 << ia64_rse_slot_num (reg_addr);
}
else
{
/* NaT bit is saved in a scratch register. */
#if !defined(UNW_LOCAL_ONLY) || defined(__linux)
if (c->last_abi_marker == ABI_MARKER_LINUX_SIGTRAMP
|| c->last_abi_marker == ABI_MARKER_OLD_LINUX_SIGTRAMP)
{
nat_loc = IA64_LOC_ADDR (c->sigcontext_addr + LINUX_SC_NAT_OFF,
0);
mask = (unw_word_t) 1 << reg;
}
else
#endif
{
if (write)
return ia64_put (c, loc, *valp);
else
return ia64_get (c, loc, valp);
}
}
}
return update_nat (c, nat_loc, mask, valp, write); return update_nat (c, nat_loc, mask, valp, write);
} }
@ -373,6 +323,7 @@ tdep_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp,
ia64_loc_t loc, reg_loc, nat_loc; ia64_loc_t loc, reg_loc, nat_loc;
unw_word_t nat, mask, pr; unw_word_t nat, mask, pr;
int ret, readonly = 0; int ret, readonly = 0;
uint8_t nat_bitnr;
switch (reg) switch (reg)
{ {
@ -409,7 +360,8 @@ tdep_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp,
case UNW_IA64_NAT + 4 ... UNW_IA64_NAT + 7: case UNW_IA64_NAT + 4 ... UNW_IA64_NAT + 7:
loc = c->loc[IA64_REG_NAT4 + (reg - (UNW_IA64_NAT + 4))]; loc = c->loc[IA64_REG_NAT4 + (reg - (UNW_IA64_NAT + 4))];
reg_loc = c->loc[IA64_REG_R4 + (reg - (UNW_IA64_NAT + 4))]; reg_loc = c->loc[IA64_REG_R4 + (reg - (UNW_IA64_NAT + 4))];
return access_nat (c, loc, reg_loc, valp, write); nat_bitnr = c->nat_bitnr[reg - (UNW_IA64_NAT + 4)];
return access_nat (c, loc, reg_loc, nat_bitnr, valp, write);
case UNW_IA64_AR_BSP: loc = c->loc[IA64_REG_BSP]; break; case UNW_IA64_AR_BSP: loc = c->loc[IA64_REG_BSP]; break;
case UNW_IA64_AR_BSPSTORE: loc = c->loc[IA64_REG_BSPSTORE]; break; case UNW_IA64_AR_BSPSTORE: loc = c->loc[IA64_REG_BSPSTORE]; break;
@ -506,13 +458,14 @@ tdep_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp,
case UNW_IA64_NAT + 2 ... UNW_IA64_NAT + 3: case UNW_IA64_NAT + 2 ... UNW_IA64_NAT + 3:
case UNW_IA64_NAT + 8 ... UNW_IA64_NAT + 31: case UNW_IA64_NAT + 8 ... UNW_IA64_NAT + 31:
loc = ia64_scratch_loc (c, reg); loc = ia64_scratch_loc (c, reg, &nat_bitnr);
if (c->sigcontext_addr) if (!(IA64_IS_REG_LOC (loc) || IA64_IS_UC_LOC (loc)
|| IA64_IS_FP_LOC (loc)))
{ {
mask = (unw_word_t) 1 << (reg - UNW_IA64_NAT); /* We're dealing with a NaT bit stored in memory. */
mask = (unw_word_t) 1 << nat_bitnr;
ret = ia64_get (c, loc, &nat); if ((ret = ia64_get (c, loc, &nat)) < 0)
if (ret < 0)
return ret; return ret;
if (write) if (write)
@ -543,7 +496,7 @@ tdep_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp,
return 0; return 0;
} }
else else
loc = ia64_scratch_loc (c, reg); loc = ia64_scratch_loc (c, reg, NULL);
break; break;
case UNW_IA64_GR + 2 ... UNW_IA64_GR + 3: case UNW_IA64_GR + 2 ... UNW_IA64_GR + 3:
@ -556,7 +509,7 @@ tdep_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp,
case UNW_IA64_AR_CSD: case UNW_IA64_AR_CSD:
case UNW_IA64_AR_SSD: case UNW_IA64_AR_SSD:
case UNW_IA64_AR_CCV: case UNW_IA64_AR_CCV:
loc = ia64_scratch_loc (c, reg); loc = ia64_scratch_loc (c, reg, NULL);
break; break;
default: default:
@ -607,12 +560,12 @@ tdep_access_fpreg (struct cursor *c, int reg, unw_fpreg_t *valp,
break; break;
case UNW_IA64_FR + 6 ... UNW_IA64_FR + 15: case UNW_IA64_FR + 6 ... UNW_IA64_FR + 15:
loc = ia64_scratch_loc (c, reg); loc = ia64_scratch_loc (c, reg, NULL);
break; break;
case UNW_IA64_FR + 32 ... UNW_IA64_FR + 127: case UNW_IA64_FR + 32 ... UNW_IA64_FR + 127:
reg = rotate_fr (c, reg - UNW_IA64_FR) + UNW_IA64_FR; reg = rotate_fr (c, reg - UNW_IA64_FR) + UNW_IA64_FR;
loc = ia64_scratch_loc (c, reg); loc = ia64_scratch_loc (c, reg, NULL);
break; break;
default: default: