aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2012-08-26 14:36:00 +0200
committerMike Pall <mike>2012-08-26 14:36:00 +0200
commitcf3a2630443e3522d68c62a184df11ad1914ec44 (patch)
tree1038e6957457ba0d219902a836c3e3d7e1dac075 /src
parentdad66450981325405c50fe75955e1d0bd3ffb423 (diff)
downloadluajit-cf3a2630443e3522d68c62a184df11ad1914ec44.tar.gz
luajit-cf3a2630443e3522d68c62a184df11ad1914ec44.tar.bz2
luajit-cf3a2630443e3522d68c62a184df11ad1914ec44.zip
Fix compilation with FFI disabled.
Diffstat (limited to 'src')
-rw-r--r--src/lj_asm.c4
-rw-r--r--src/lj_lex.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/lj_asm.c b/src/lj_asm.c
index 8deddd65..bdc86dd0 100644
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -808,9 +808,9 @@ static void asm_snap_alloc1(ASMState *as, IRRef ref)
808 asm_snap_alloc1(as, ir->op2); 808 asm_snap_alloc1(as, ir->op2);
809 if (LJ_32 && (ir+1)->o == IR_HIOP) 809 if (LJ_32 && (ir+1)->o == IR_HIOP)
810 asm_snap_alloc1(as, (ir+1)->op2); 810 asm_snap_alloc1(as, (ir+1)->op2);
811 } 811 } else
812#endif 812#endif
813 else { /* Allocate stored values for TNEW, TDUP and CNEW. */ 813 { /* Allocate stored values for TNEW, TDUP and CNEW. */
814 IRIns *irs; 814 IRIns *irs;
815 lua_assert(ir->o == IR_TNEW || ir->o == IR_TDUP || ir->o == IR_CNEW); 815 lua_assert(ir->o == IR_TNEW || ir->o == IR_TDUP || ir->o == IR_CNEW);
816 for (irs = IR(as->snapref-1); irs > ir; irs--) 816 for (irs = IR(as->snapref-1); irs > ir; irs--)
diff --git a/src/lj_lex.c b/src/lj_lex.c
index 55e2bea1..c85ea314 100644
--- a/src/lj_lex.c
+++ b/src/lj_lex.c
@@ -108,7 +108,8 @@ static void lex_number(LexState *ls, TValue *tv)
108 setitype(tv, LJ_TISNUM); 108 setitype(tv, LJ_TISNUM);
109 } else if (fmt == STRSCAN_NUM) { 109 } else if (fmt == STRSCAN_NUM) {
110 /* Already in correct format. */ 110 /* Already in correct format. */
111 } else if (LJ_HASFFI && fmt != STRSCAN_ERROR) { 111#if LJ_HASFFI
112 } else if (fmt != STRSCAN_ERROR) {
112 lua_State *L = ls->L; 113 lua_State *L = ls->L;
113 GCcdata *cd; 114 GCcdata *cd;
114 lua_assert(fmt == STRSCAN_I64 || fmt == STRSCAN_U64 || fmt == STRSCAN_IMAG); 115 lua_assert(fmt == STRSCAN_I64 || fmt == STRSCAN_U64 || fmt == STRSCAN_IMAG);
@@ -126,6 +127,7 @@ static void lex_number(LexState *ls, TValue *tv)
126 *(uint64_t *)cdataptr(cd) = tv->u64; 127 *(uint64_t *)cdataptr(cd) = tv->u64;
127 } 128 }
128 lj_parse_keepcdata(ls, tv, cd); 129 lj_parse_keepcdata(ls, tv, cd);
130#endif
129 } else { 131 } else {
130 lua_assert(fmt == STRSCAN_ERROR); 132 lua_assert(fmt == STRSCAN_ERROR);
131 lj_lex_error(ls, TK_number, LJ_ERR_XNUMBER); 133 lj_lex_error(ls, TK_number, LJ_ERR_XNUMBER);