DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 32/64 bit portability issue with upval->v.

Browse Source
This commit is contained in:
Mike Pall
2010-01-09 21:11:35 +01:00
parent ece20f8ca2
commit a33204ae5e
7 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lj_record.c
View File

@@ -790,8 +790,8 @@ static TRef rec_upvalue(jit_State *J, uint32_t uv, TRef val)
int needbarrier = 0;
if (!uvp->closed) {
/* In current stack? */
if (uvp->v >= J->L->stack && uvp->v < J->L->maxstack) {
int32_t slot = (int32_t)(uvp->v - (J->L->base - J->baseslot));
if (uvval(uvp) >= J->L->stack && uvval(uvp) < J->L->maxstack) {
int32_t slot = (int32_t)(uvval(uvp) - (J->L->base - J->baseslot));
if (slot >= 0) { /* Aliases an SSA slot? */
slot -= (int32_t)J->baseslot; /* Note: slot number may be negative! */
/* NYI: add IR to guard that it's still aliasing the same slot. */
@@ -810,7 +810,7 @@ static TRef rec_upvalue(jit_State *J, uint32_t uv, TRef val)
uref = tref_ref(emitir(IRTG(IR_UREFC, IRT_PTR), fn, uv));
}
if (val == 0) { /* Upvalue load */
IRType t = itype2irt(uvp->v);
IRType t = itype2irt(uvval(uvp));
TRef res = emitir(IRTG(IR_ULOAD, t), uref, 0);
if (irtype_ispri(t)) res = TREF_PRI(t); /* Canonicalize primitive refs. */
return res;