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 2013-05-08 11:06:45 +02:00
commit 71ce1e8706
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lj_ffrecord.c
View File

@ -269,7 +269,7 @@ static void LJ_FASTCALL recff_tonumber(jit_State *J, RecordFFData *rd)
{ {
TRef tr = J->base[0]; TRef tr = J->base[0];
TRef base = J->base[1]; TRef base = J->base[1];
if (tr && base) { if (tr && !tref_isnil(base)) {
base = lj_opt_narrow_toint(J, base); base = lj_opt_narrow_toint(J, base);
if (!tref_isk(base) || IR(tref_ref(base))->i != 10) if (!tref_isk(base) || IR(tref_ref(base))->i != 10)
recff_nyiu(J); recff_nyiu(J);
@ -693,7 +693,7 @@ static void LJ_FASTCALL recff_string_range(jit_State *J, RecordFFData *rd)
end = argv2int(J, &rd->argv[2]); end = argv2int(J, &rd->argv[2]);
} }
} else { /* string.byte(str, [,start [,end]]) */ } else { /* string.byte(str, [,start [,end]]) */
if (J->base[1]) { if (!tref_isnil(J->base[1])) {
start = argv2int(J, &rd->argv[1]); start = argv2int(J, &rd->argv[1]);
trstart = lj_opt_narrow_toint(J, J->base[1]); trstart = lj_opt_narrow_toint(J, J->base[1]);
trend = J->base[2]; trend = J->base[2];
@ -778,7 +778,7 @@ static void LJ_FASTCALL recff_string_rep(jit_State *J, RecordFFData *rd)
TRef str = lj_ir_tostr(J, J->base[0]); TRef str = lj_ir_tostr(J, J->base[0]);
TRef rep = lj_opt_narrow_toint(J, J->base[1]); TRef rep = lj_opt_narrow_toint(J, J->base[1]);
TRef hdr, tr, str2 = 0; TRef hdr, tr, str2 = 0;
if (J->base[2]) { if (!tref_isnil(J->base[2])) {
TRef sep = lj_ir_tostr(J, J->base[2]); TRef sep = lj_ir_tostr(J, J->base[2]);
int32_t vrep = argv2int(J, &rd->argv[1]); int32_t vrep = argv2int(J, &rd->argv[1]);
emitir(IRTGI(vrep > 1 ? IR_GT : IR_LE), rep, lj_ir_kint(J, 1)); emitir(IRTGI(vrep > 1 ? IR_GT : IR_LE), rep, lj_ir_kint(J, 1));