Merge #81 branch 'gctrace-origin' into integrate

check-generated-code.nix

@@ -11,8 +11,10 @@ overrideDerivation raptorjit (as:
   {
     checkPhase = ''
       for f in ${generatedFiles}; do
+        echo "checking $f.."
         diff -u src/reusevm/$f src/$f
       done
+      echo "all files ok"
     '';
     doCheck = true;
   })

src/lj_jit.h

@@ -199,6 +199,8 @@ typedef struct GCtrace {
   TraceNo1 root;	/* Root trace of side trace (or 0 for root traces). */
   TraceNo1 nextroot;	/* Next root trace for same prototype. */
   TraceNo1 nextside;	/* Next side trace of same root trace. */
+  TraceNo1 parent;      /* Parent of this trace (or 0 for root traces). */
+  ExitNo exitno;        /* Exit number in parent (valid for side-traces only). */
   uint8_t sinktags;	/* Trace has SINK tags. */
   uint8_t unused1;
 } GCtrace;

src/lj_trace.c

@@ -109,6 +109,8 @@ static void trace_save(jit_State *J, GCtrace *T)
   size_t szins = (J->cur.nins-J->cur.nk)*sizeof(IRIns);
   char *p = (char *)T + sztr;
   memcpy(T, &J->cur, sizeof(GCtrace));
+  T->parent = J->parent;
+  T->exitno = J->exitno;
   setgcrefr(T->nextgc, J2G(J)->gc.root);
   setgcrefp(J2G(J)->gc.root, T);
   newwhite(J2G(J), T);