diff options
author | Mike Pall <mike> | 2011-10-22 01:59:10 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2011-10-22 01:59:10 +0200 |
commit | c805a49d304c344d69630a4282d21d753c70e1bd (patch) | |
tree | cb3aa44be781e82fcca3c9a82ccbe48176cba109 /src/lj_opt_split.c | |
parent | ff7f7a7180d25da9d425671a48867b50bb7e7ac2 (diff) | |
download | luajit-c805a49d304c344d69630a4282d21d753c70e1bd.tar.gz luajit-c805a49d304c344d69630a4282d21d753c70e1bd.tar.bz2 luajit-c805a49d304c344d69630a4282d21d753c70e1bd.zip |
Separate/rename NUM/FLOAT <-> I64/U64 conversion functions.
Diffstat (limited to 'src/lj_opt_split.c')
-rw-r--r-- | src/lj_opt_split.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lj_opt_split.c b/src/lj_opt_split.c index 61275b03..bd785d65 100644 --- a/src/lj_opt_split.c +++ b/src/lj_opt_split.c | |||
@@ -338,7 +338,7 @@ static void split_ir(jit_State *J) | |||
338 | #if LJ_32 && LJ_HASFFI | 338 | #if LJ_32 && LJ_HASFFI |
339 | if (st == IRT_I64 || st == IRT_U64) { | 339 | if (st == IRT_I64 || st == IRT_U64) { |
340 | hi = split_call_l(J, hisubst, oir, ir, | 340 | hi = split_call_l(J, hisubst, oir, ir, |
341 | st == IRT_I64 ? IRCALL_softfp_l2d : IRCALL_softfp_ul2d); | 341 | st == IRT_I64 ? IRCALL_fp64_l2d : IRCALL_fp64_ul2d); |
342 | break; | 342 | break; |
343 | } | 343 | } |
344 | #endif | 344 | #endif |
@@ -435,10 +435,10 @@ static void split_ir(jit_State *J) | |||
435 | #if LJ_SOFTFP | 435 | #if LJ_SOFTFP |
436 | if (st == IRT_NUM) { /* NUM to 64 bit int conv. */ | 436 | if (st == IRT_NUM) { /* NUM to 64 bit int conv. */ |
437 | hi = split_call_l(J, hisubst, oir, ir, | 437 | hi = split_call_l(J, hisubst, oir, ir, |
438 | irt_isi64(ir->t) ? IRCALL_softfp_d2l : IRCALL_softfp_d2ul); | 438 | irt_isi64(ir->t) ? IRCALL_fp64_d2l : IRCALL_fp64_d2ul); |
439 | } else if (st == IRT_FLOAT) { /* FLOAT to 64 bit int conv. */ | 439 | } else if (st == IRT_FLOAT) { /* FLOAT to 64 bit int conv. */ |
440 | nir->o = IR_CALLN; | 440 | nir->o = IR_CALLN; |
441 | nir->op2 = irt_isi64(ir->t) ? IRCALL_softfp_f2l : IRCALL_softfp_f2ul; | 441 | nir->op2 = irt_isi64(ir->t) ? IRCALL_fp64_f2l : IRCALL_fp64_f2ul; |
442 | hi = split_emit(J, IRTI(IR_HIOP), nref, nref); | 442 | hi = split_emit(J, IRTI(IR_HIOP), nref, nref); |
443 | } | 443 | } |
444 | #else | 444 | #else |
@@ -518,7 +518,7 @@ static void split_ir(jit_State *J) | |||
518 | #if LJ_SOFTFP | 518 | #if LJ_SOFTFP |
519 | if (irt_isfloat(ir->t)) { | 519 | if (irt_isfloat(ir->t)) { |
520 | split_call_l(J, hisubst, oir, ir, | 520 | split_call_l(J, hisubst, oir, ir, |
521 | st == IRT_I64 ? IRCALL_softfp_l2f : IRCALL_softfp_ul2f); | 521 | st == IRT_I64 ? IRCALL_fp64_l2f : IRCALL_fp64_ul2f); |
522 | J->cur.nins--; /* Drop unused HIOP. */ | 522 | J->cur.nins--; /* Drop unused HIOP. */ |
523 | } | 523 | } |
524 | #else | 524 | #else |