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

Fix compilation with FFI disabled.

Browse Source
This commit is contained in:
Mike Pall 2012-08-26 14:36:00 +02:00
parent dad6645098
commit cf3a263044
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lj_asm.c
View File

@ -808,9 +808,9 @@ static void asm_snap_alloc1(ASMState *as, IRRef ref)
asm_snap_alloc1(as, ir->op2); asm_snap_alloc1(as, ir->op2);
if (LJ_32 && (ir+1)->o == IR_HIOP) if (LJ_32 && (ir+1)->o == IR_HIOP)
asm_snap_alloc1(as, (ir+1)->op2); asm_snap_alloc1(as, (ir+1)->op2);
} } else
#endif #endif
else { /* Allocate stored values for TNEW, TDUP and CNEW. */ { /* Allocate stored values for TNEW, TDUP and CNEW. */
IRIns *irs; IRIns *irs;
lua_assert(ir->o == IR_TNEW || ir->o == IR_TDUP || ir->o == IR_CNEW); lua_assert(ir->o == IR_TNEW || ir->o == IR_TDUP || ir->o == IR_CNEW);
for (irs = IR(as->snapref-1); irs > ir; irs--) for (irs = IR(as->snapref-1); irs > ir; irs--)

4
src/lj_lex.c
View File

@ -108,7 +108,8 @@ static void lex_number(LexState *ls, TValue *tv)
setitype(tv, LJ_TISNUM); setitype(tv, LJ_TISNUM);
} else if (fmt == STRSCAN_NUM) { } else if (fmt == STRSCAN_NUM) {
/* Already in correct format. */ /* Already in correct format. */
} else if (LJ_HASFFI && fmt != STRSCAN_ERROR) { #if LJ_HASFFI
} else if (fmt != STRSCAN_ERROR) {
lua_State *L = ls->L; lua_State *L = ls->L;
GCcdata *cd; GCcdata *cd;
lua_assert(fmt == STRSCAN_I64 || fmt == STRSCAN_U64 || fmt == STRSCAN_IMAG); lua_assert(fmt == STRSCAN_I64 || fmt == STRSCAN_U64 || fmt == STRSCAN_IMAG);
@ -126,6 +127,7 @@ static void lex_number(LexState *ls, TValue *tv)
*(uint64_t *)cdataptr(cd) = tv->u64; *(uint64_t *)cdataptr(cd) = tv->u64;
} }
lj_parse_keepcdata(ls, tv, cd); lj_parse_keepcdata(ls, tv, cd);
#endif
} else { } else {
lua_assert(fmt == STRSCAN_ERROR); lua_assert(fmt == STRSCAN_ERROR);
lj_lex_error(ls, TK_number, LJ_ERR_XNUMBER); lj_lex_error(ls, TK_number, LJ_ERR_XNUMBER);