Merge branch 'gctrace-origin' into auditlog

.travis.yml

@@ -1,10 +1,8 @@
 language: nix
 sudo: false
-env:
+script:
   - nix-build -A test-O3
   - nix-build -A test-O2
   - nix-build -A test-O1
   - nix-build -A test-nojit
   - nix-build -A check-generated-code --arg check true
-script:
-  - $test

check-generated-code.nix

@@ -9,23 +9,12 @@ in
 
 overrideDerivation raptorjit (as:
   {
-    preBuild = ''
-      pushd src
-      mkdir old
-      for f in ${generatedFiles}; do
-        cp $f old/
-      done
-      popd
-    '' + as.preBuild;
     checkPhase = ''
-      pushd src
-      mkdir new
       for f in ${generatedFiles}; do
-        cp $f new/
+        echo "checking $f.."
+        diff -u src/reusevm/$f src/$f
       done
-      echo "Checking that in-tree generated VM code is up-to-date..."
-      diff -u old new || (echo "Error: Stale generated code"; exit 1)
-      popd
+      echo "all files ok"
     '';
     doCheck = true;
   })

raptorjit.nix

@@ -15,7 +15,7 @@ mkDerivation rec {
     ];
   dontStrip = true;         # No extra stripping (preserve debug info)
   installPhase = ''
-    install -D src/luajit $out/bin/raptorjit
+    install -D src/raptorjit $out/bin/raptorjit
     install -D src/lj_dwarf.dwo $out/lib/raptorjit.dwo
   '';
 

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

@@ -113,6 +113,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);

src/reusevm/lj_ffdef.h

@@ -146,6 +146,11 @@ FFDEF(jit_off)
 FFDEF(jit_flush)
 FFDEF(jit_status)
 FFDEF(jit_opt_start)
+FFDEF(jit_vmprofile_open)
+FFDEF(jit_vmprofile_close)
+FFDEF(jit_vmprofile_select)
+FFDEF(jit_vmprofile_start)
+FFDEF(jit_vmprofile_stop)
 FFDEF(ffi_meta___index)
 FFDEF(ffi_meta___newindex)
 FFDEF(ffi_meta___eq)

src/reusevm/lj_libdef.h

@@ -291,6 +291,21 @@ static const uint8_t lj_lib_init_jit_opt[] = {
 };
 #endif
 
+#ifdef LJLIB_MODULE_jit_vmprofile
+#undef LJLIB_MODULE_jit_vmprofile
+static const lua_CFunction lj_lib_cf_jit_vmprofile[] = {
+  lj_cf_jit_vmprofile_open,
+  lj_cf_jit_vmprofile_close,
+  lj_cf_jit_vmprofile_select,
+  lj_cf_jit_vmprofile_start,
+  lj_cf_jit_vmprofile_stop
+};
+static const uint8_t lj_lib_init_jit_vmprofile[] = {
+148,57,5,4,111,112,101,110,5,99,108,111,115,101,6,115,101,108,101,99,116,5,
+115,116,97,114,116,4,115,116,111,112,255
+};
+#endif
+
 #ifdef LJLIB_MODULE_ffi_meta
 #undef LJLIB_MODULE_ffi_meta
 static const lua_CFunction lj_lib_cf_ffi_meta[] = {
@@ -314,7 +329,7 @@ static const lua_CFunction lj_lib_cf_ffi_meta[] = {
   lj_cf_ffi_meta___ipairs
 };
 static const uint8_t lj_lib_init_ffi_meta[] = {
-148,57,19,7,95,95,105,110,100,101,120,10,95,95,110,101,119,105,110,100,101,
+153,57,19,7,95,95,105,110,100,101,120,10,95,95,110,101,119,105,110,100,101,
 120,4,95,95,101,113,5,95,95,108,101,110,4,95,95,108,116,4,95,95,108,101,8,95,
 95,99,111,110,99,97,116,6,95,95,99,97,108,108,5,95,95,97,100,100,5,95,95,115,
 117,98,5,95,95,109,117,108,5,95,95,100,105,118,5,95,95,109,111,100,5,95,95,
@@ -332,7 +347,7 @@ static const lua_CFunction lj_lib_cf_ffi_clib[] = {
   lj_cf_ffi_clib___gc
 };
 static const uint8_t lj_lib_init_ffi_clib[] = {
-166,57,3,7,95,95,105,110,100,101,120,10,95,95,110,101,119,105,110,100,101,120,
+171,57,3,7,95,95,105,110,100,101,120,10,95,95,110,101,119,105,110,100,101,120,
 4,95,95,103,99,255
 };
 #endif
@@ -344,7 +359,7 @@ static const lua_CFunction lj_lib_cf_ffi_callback[] = {
   lj_cf_ffi_callback_set
 };
 static const uint8_t lj_lib_init_ffi_callback[] = {
-169,57,3,4,102,114,101,101,3,115,101,116,252,1,199,95,95,105,110,100,101,120,
+174,57,3,4,102,114,101,101,3,115,101,116,252,1,199,95,95,105,110,100,101,120,
 250,255
 };
 #endif
@@ -371,7 +386,7 @@ static const lua_CFunction lj_lib_cf_ffi[] = {
   lj_cf_ffi_load
 };
 static const uint8_t lj_lib_init_ffi[] = {
-171,57,23,4,99,100,101,102,3,110,101,119,4,99,97,115,116,6,116,121,112,101,
+176,57,23,4,99,100,101,102,3,110,101,119,4,99,97,115,116,6,116,121,112,101,
 111,102,8,116,121,112,101,105,110,102,111,6,105,115,116,121,112,101,6,115,105,
 122,101,111,102,7,97,108,105,103,110,111,102,8,111,102,102,115,101,116,111,
 102,5,101,114,114,110,111,6,115,116,114,105,110,103,4,99,111,112,121,4,102,

src/reusevm/lj_recdef.h

@@ -149,6 +149,11 @@ static const uint16_t recff_idmap[] = {
 0,
 0,
 0,
+0,
+0,
+0,
+0,
+0,
 0x2f00+(0),
 0x2f00+(1),
 0x3000+(MM_eq),