Refactoring of conversion ops, part 2: cleanup cdata conversions.

2010-12-30 00:42:00 +01:00
parent 8bcc5ed021
commit 158de60b8c
3 changed files with 85 additions and 75 deletions
--- a/src/lj_cconv.c
+++ b/src/lj_cconv.c
@@ -335,7 +335,8 @@ void lj_cconv_ct_ct(CTState *cts, CType *d, CType *s,

  case CCX(P, F):
    if (!(flags & CCF_CAST) || !(flags & CCF_FROMTV)) goto err_conv;
-    dinfo = CTINFO(CT_NUM, CTF_UNSIGNED);
+    /* The signed conversion is cheaper. x64 really has 47 bit pointers. */
+    dinfo = CTINFO(CT_NUM, (LJ_64 && dsize == 8) ? 0 : CTF_UNSIGNED);
    goto conv_I_F;

  case CCX(P, P):