gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2021-10-02 16:58:29 +02:00
commit 10c9d9a214
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/lj_asm_mips.h
View File

@ -968,11 +968,16 @@ static void asm_href(ASMState *as, IRIns *ir, IROp merge)
MCLabel l_end, l_loop, l_next; MCLabel l_end, l_loop, l_next;
rset_clear(allow, tab); rset_clear(allow, tab);
#if LJ_SOFTFP32 if (!LJ_SOFTFP && irt_isnum(kt)) {
if (!isk) { key = ra_alloc1(as, refkey, RSET_FPR);
key = ra_alloc1(as, refkey, allow); tmpnum = ra_scratch(as, rset_exclude(RSET_FPR, key));
rset_clear(allow, key); } else {
if (irkey[1].o == IR_HIOP) { if (!irt_ispri(kt)) {
key = ra_alloc1(as, refkey, allow);
rset_clear(allow, key);
}
#if LJ_32
if (LJ_SOFTFP && irkey[1].o == IR_HIOP) {
if (ra_hasreg((irkey+1)->r)) { if (ra_hasreg((irkey+1)->r)) {
type = tmpnum = (irkey+1)->r; type = tmpnum = (irkey+1)->r;
tmp1 = ra_scratch(as, allow); tmp1 = ra_scratch(as, allow);
@ -983,23 +988,11 @@ static void asm_href(ASMState *as, IRIns *ir, IROp merge)
} }
rset_clear(allow, tmpnum); rset_clear(allow, tmpnum);
} else { } else {
type = ra_allock(as, (int32_t)irt_toitype(irkey->t), allow); type = ra_allock(as, (int32_t)irt_toitype(kt), allow);
rset_clear(allow, type); rset_clear(allow, type);
} }
}
#else
if (!LJ_SOFTFP && irt_isnum(kt)) {
key = ra_alloc1(as, refkey, RSET_FPR);
tmpnum = ra_scratch(as, rset_exclude(RSET_FPR, key));
} else if (!irt_ispri(kt)) {
key = ra_alloc1(as, refkey, allow);
rset_clear(allow, key);
#if LJ_32
type = ra_allock(as, (int32_t)irt_toitype(irkey->t), allow);
rset_clear(allow, type);
#endif #endif
} }
#endif
tmp2 = ra_scratch(as, allow); tmp2 = ra_scratch(as, allow);
rset_clear(allow, tmp2); rset_clear(allow, tmp2);
#if LJ_64 #if LJ_64
@ -1012,10 +1005,10 @@ static void asm_href(ASMState *as, IRIns *ir, IROp merge)
} else { } else {
int64_t k; int64_t k;
if (isk && irt_isaddr(kt)) { if (isk && irt_isaddr(kt)) {
k = ((int64_t)irt_toitype(irkey->t) << 47) | irkey[1].tv.u64; k = ((int64_t)irt_toitype(kt) << 47) | irkey[1].tv.u64;
} else { } else {
lj_assertA(irt_ispri(kt) && !irt_isnil(kt), "bad HREF key type"); lj_assertA(irt_ispri(kt) && !irt_isnil(kt), "bad HREF key type");
k = ~((int64_t)~irt_toitype(ir->t) << 47); k = ~((int64_t)~irt_toitype(kt) << 47);
} }
cmp64 = ra_allock(as, k, allow); cmp64 = ra_allock(as, k, allow);
rset_clear(allow, cmp64); rset_clear(allow, cmp64);