Major 32/64 bit cleanups in assembler and exit handling.

Add 64 bit lightuserdata handling. Keep the tagged 64 bit value.
Allocate/save/restore 64 bit spill slots for 64 bit lightuserdata.
Fix code generation for 64 bit loads/stores/moves/compares.
Fix code generation for stack pointer adjustments.
Add fixed spill slot definitions for x64. Reduce reserved spill slots.
Disable STRREF + ADD fusion in 64 bit mode (avoid negative 32 bit ofs).

1 files changed, 10 insertions, 0 deletions

diff --git a/src/lj_snap.c b/src/lj_snap.c
index 2b82e672..86890a26 100644
--- a/src/lj_snap.c
+++ b/src/lj_snap.c
@@ -279,6 +279,11 @@ const BCIns *lj_snap_restore(jit_State *J, void *exptr)
           setintV(o, *sps);
         } else if (irt_isnum(t)) {
           o->u64 = *(uint64_t *)sps;
+#if LJ_64
+        } else if (irt_islightud(t)) {
+          /* 64 bit lightuserdata which may escape already has the tag bits. */
+          o->u64 = *(uint64_t *)sps;
+#endif
         } else {
           lua_assert(!irt_ispri(t));  /* PRI refs never have a spill slot. */
           setgcrefi(o->gcr, *sps);
@@ -291,6 +296,11 @@ const BCIns *lj_snap_restore(jit_State *J, void *exptr)
           setintV(o, ex->gpr[r-RID_MIN_GPR]);
         } else if (irt_isnum(t)) {
           setnumV(o, ex->fpr[r-RID_MIN_FPR]);
+#if LJ_64
+        } else if (irt_islightud(t)) {
+          /* 64 bit lightuserdata which may escape already has the tag bits. */
+          o->u64 = ex->gpr[r-RID_MIN_GPR];
+#endif
         } else {
           if (!irt_ispri(t))
             setgcrefi(o->gcr, ex->gpr[r-RID_MIN_GPR]);