aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2010-02-24 20:02:20 +0100
committerMike Pall <mike>2010-02-24 20:02:20 +0100
commit4e73488985be5e67d33ee8eb32cd62a62a6d21cc (patch)
tree8d9246fef8945e24b5db79e6246eae9360a88436 /src
parent4c9f71be5d4449b717870092839c47a1d5db0dca (diff)
downloadluajit-4e73488985be5e67d33ee8eb32cd62a62a6d21cc.tar.gz
luajit-4e73488985be5e67d33ee8eb32cd62a62a6d21cc.tar.bz2
luajit-4e73488985be5e67d33ee8eb32cd62a62a6d21cc.zip
Fix 64 bit conversion warnings.
Diffstat (limited to 'src')
-rw-r--r--src/lib_jit.c2
-rw-r--r--src/lj_asm.c2
-rw-r--r--src/lj_record.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib_jit.c b/src/lib_jit.c
index 34e5bd34..e64ea9e4 100644
--- a/src/lib_jit.c
+++ b/src/lib_jit.c
@@ -99,7 +99,7 @@ LJLIB_CF(jit_status)
99 setboolV(L->top++, (J->flags & JIT_F_ON) ? 1 : 0); 99 setboolV(L->top++, (J->flags & JIT_F_ON) ? 1 : 0);
100 flagbits_to_strings(L, J->flags, JIT_F_CPU_FIRST, JIT_F_CPUSTRING); 100 flagbits_to_strings(L, J->flags, JIT_F_CPU_FIRST, JIT_F_CPUSTRING);
101 flagbits_to_strings(L, J->flags, JIT_F_OPT_FIRST, JIT_F_OPTSTRING); 101 flagbits_to_strings(L, J->flags, JIT_F_OPT_FIRST, JIT_F_OPTSTRING);
102 return L->top - L->base; 102 return (int)(L->top - L->base);
103#else 103#else
104 setboolV(L->top++, 0); 104 setboolV(L->top++, 0);
105 return 1; 105 return 1;
diff --git a/src/lj_asm.c b/src/lj_asm.c
index 24467dbc..0b6ebc09 100644
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -1047,7 +1047,7 @@ static void asm_guardcc(ASMState *as, int cc)
1047 MCode *p = as->mcp; 1047 MCode *p = as->mcp;
1048 if (LJ_UNLIKELY(p == as->invmcp)) { 1048 if (LJ_UNLIKELY(p == as->invmcp)) {
1049 as->loopinv = 1; 1049 as->loopinv = 1;
1050 *(int32_t *)(p+1) = target - (p+5); 1050 *(int32_t *)(p+1) = jmprel(p+5, target);
1051 target = p; 1051 target = p;
1052 cc ^= 1; 1052 cc ^= 1;
1053 if (as->realign) { 1053 if (as->realign) {
diff --git a/src/lj_record.c b/src/lj_record.c
index 3f2abcdf..da9c221c 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -497,7 +497,7 @@ static void rec_call_setup(jit_State *J, BCReg func, ptrdiff_t nargs)
497 trfunc = lj_ir_kfunc(J, funcV(functv)); 497 trfunc = lj_ir_kfunc(J, funcV(functv));
498 emitir(IRTG(IR_EQ, IRT_FUNC), fbase[0], trfunc); 498 emitir(IRTG(IR_EQ, IRT_FUNC), fbase[0], trfunc);
499 fbase[0] = trfunc | TREF_FRAME; 499 fbase[0] = trfunc | TREF_FRAME;
500 J->maxslot = nargs; 500 J->maxslot = (BCReg)nargs;
501} 501}
502 502
503/* Record call. */ 503/* Record call. */
@@ -1568,12 +1568,12 @@ static void LJ_FASTCALL recff_string_range(jit_State *J, RecordFFData *rd)
1568 ptrdiff_t i, len = end - start; 1568 ptrdiff_t i, len = end - start;
1569 if (len > 0) { 1569 if (len > 0) {
1570 TRef trslen = emitir(IRTI(IR_SUB), trend, trstart); 1570 TRef trslen = emitir(IRTI(IR_SUB), trend, trstart);
1571 emitir(IRTGI(IR_EQ), trslen, lj_ir_kint(J, len)); 1571 emitir(IRTGI(IR_EQ), trslen, lj_ir_kint(J, (int32_t)len));
1572 if (J->baseslot + len > LJ_MAX_JSLOTS) 1572 if (J->baseslot + len > LJ_MAX_JSLOTS)
1573 lj_trace_err_info(J, LJ_TRERR_STACKOV); 1573 lj_trace_err_info(J, LJ_TRERR_STACKOV);
1574 rd->nres = len; 1574 rd->nres = len;
1575 for (i = 0; i < len; i++) { 1575 for (i = 0; i < len; i++) {
1576 TRef tmp = emitir(IRTI(IR_ADD), trstart, lj_ir_kint(J, i)); 1576 TRef tmp = emitir(IRTI(IR_ADD), trstart, lj_ir_kint(J, (int32_t)i));
1577 tmp = emitir(IRT(IR_STRREF, IRT_PTR), trstr, tmp); 1577 tmp = emitir(IRT(IR_STRREF, IRT_PTR), trstr, tmp);
1578 J->base[i] = emitir(IRT(IR_XLOAD, IRT_U8), tmp, IRXLOAD_READONLY); 1578 J->base[i] = emitir(IRT(IR_XLOAD, IRT_U8), tmp, IRXLOAD_READONLY);
1579 } 1579 }