Merge branch 'v2.1' into temp-v3bp-syntax1temp-v3bp-syntax1

3 files changed, 12 insertions, 5 deletions

diff --git a/src/lj_asm_x86.h b/src/lj_asm_x86.h
index 943cf2b77..3c024092c 100644
--- a/src/lj_asm_x86.h
+++ b/src/lj_asm_x86.h
@@ -1112,10 +1112,12 @@ static void asm_tvptr(ASMState *as, Reg dest, IRRef ref, MSize mode)
     } else {
 #if LJ_GC64
       if (irref_isk(ref)) {
+        Reg tmp;
         TValue k;
         lj_ir_kvalue(as->J->L, &k, ir);
-        emit_movmroi(as, dest, 4, k.u32.hi);
-        emit_movmroi(as, dest, 0, k.u32.lo);
+        tmp = ra_scratch(as, rset_exclude(RSET_GPR, dest));
+        emit_rmro(as, XO_MOVto, tmp|REX_64, dest, 0);
+        emit_loadu64(as, tmp, k.u64);
       } else {
         /* TODO: 64 bit store + 32 bit load-modify-store is suboptimal. */
         Reg src = ra_alloc1(as, ref, rset_exclude(RSET_GPR, dest));
@@ -2787,8 +2789,9 @@ static void asm_stack_restore(ASMState *as, SnapShot *snap)
           emit_i32(as, -1);
           emit_rmro(as, XO_MOVmi, REX_64, RID_BASE, ofs);
         } else {
-          emit_movmroi(as, RID_BASE, ofs+4, k.u32.hi);
-          emit_movmroi(as, RID_BASE, ofs, k.u32.lo);
+          Reg tmp = ra_scratch(as, rset_exclude(RSET_GPR, RID_BASE));
+          emit_rmro(as, XO_MOVto, tmp|REX_64, RID_BASE, ofs);
+          emit_loadu64(as, tmp, k.u64);
         }
 #else
       } else if (!irt_ispri(ir->t)) {
diff --git a/src/lj_ccallback.c b/src/lj_ccallback.c
index 724dea607..2ed84507a 100644
--- a/src/lj_ccallback.c
+++ b/src/lj_ccallback.c
@@ -704,6 +704,10 @@ static void callback_conv_result(CTState *cts, lua_State *L, TValue *o)
     if (ctr->size <= 4 &&
         (LJ_ABI_SOFTFP || ctype_isinteger_or_bool(ctr->info)))
       *(int64_t *)dp = (int64_t)*(int32_t *)dp;
+#elif LJ_TARGET_X64
+    /* Always zero-extend results to 64 bits. */
+    if (ctr->size <= 4 && ctype_isinteger_or_bool(ctr->info))
+      *(uint64_t *)dp = (uint64_t)*(uint32_t *)dp;
 #endif
 #if LJ_TARGET_X86
     if (ctype_isfp(ctr->info))
diff --git a/src/lj_profile.c b/src/lj_profile.c
index 5b2a2b6c7..ea65fcb8f 100644
--- a/src/lj_profile.c
+++ b/src/lj_profile.c
@@ -359,6 +359,7 @@ LUA_API void luaJIT_profile_stop(lua_State *L)
   ProfileState *ps = &profile_state;
   global_State *g = ps->g;
   if (G(L) == g) {  /* Only stop profiler if started by this VM. */
+    ps->g = NULL;
     profile_timer_stop(ps);
     g->hookmask &= ~HOOK_PROFILE;
     lj_dispatch_update(g, 0);
@@ -368,7 +369,6 @@ LUA_API void luaJIT_profile_stop(lua_State *L)
 #endif
     lj_buf_free(g, &ps->sb);
     ps->sb.w = ps->sb.e = NULL;
-    ps->g = NULL;
   }
 }