modified instrumentation so that a script execution can be repeated b…

…y returning true from J$.Sr()
Berkeley-Correctness-Group · Jun 4, 2013 · e20eedf · e20eedf
1 parent 5ae3801
commit e20eedf
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/inputs.js b/inputs.js
diff --git a/src/js/instrument/esnstrument.js b/src/js/instrument/esnstrument.js
@@ -657,15 +657,15 @@
 
     var labelCounter = 0;
 
-    function wrapFunBodyWithTryCatch(node, body) {
+    function wrapScriptBodyWithTryCatch(node, body) {
         printIidToLoc(node);
         var l = labelCounter++;
         var ret = replaceInStatement(
             "function n() { jalangiLabel"+l+": while(true) { try {"+RP+"1} catch("+PREFIX1+
                 "e) { console.log("+PREFIX1+"e); console.log("+
                 PREFIX1+"e.stack); throw "+PREFIX1+
-                "e; } finally { if ("+logFunctionReturnFunName+"("+
-                RP+"2)) continue jalangiLabel"+l+";\n else \n  return "+logReturnAggrFunName+"();\n }\n }}", body,
+                "e; } finally { if ("+logScriptExitFunName+"("+
+                RP+"2)) continue jalangiLabel"+l+";\n else \n  break jalangiLabel"+l+";\n }\n }}", body,
             getIid()
         );
         //console.log(JSON.stringify(ret));
@@ -675,20 +675,38 @@
         return ret;
     }
 
-    function wrapScriptBodyWithTryCatch(node, body) {
+    function wrapFunBodyWithTryCatch(node, body) {
         printIidToLoc(node);
-        var ret = replaceInStatement("try {"+RP+"1} catch("+PREFIX1+
+        var l = labelCounter++;
+        var ret = replaceInStatement(
+            "function n() { jalangiLabel"+l+": while(true) { try {"+RP+"1} catch("+PREFIX1+
                 "e) { console.log("+PREFIX1+"e); console.log("+
                 PREFIX1+"e.stack); throw "+PREFIX1+
-                "e; } finally { "+logScriptExitFunName+"("+
-                RP+"2); }",
-            body,
+                "e; } finally { if ("+logFunctionReturnFunName+"("+
+                RP+"2)) continue jalangiLabel"+l+";\n else \n  return "+logReturnAggrFunName+"();\n }\n }}", body,
             getIid()
         );
+        //console.log(JSON.stringify(ret));
+
+        ret = ret[0].body.body;
         transferLoc(ret[0], node);
         return ret;
     }
 
+//    function wrapScriptBodyWithTryCatch(node, body) {
+//        printIidToLoc(node);
+//        var ret = replaceInStatement("try {"+RP+"1} catch("+PREFIX1+
+//                "e) { console.log("+PREFIX1+"e); console.log("+
+//                PREFIX1+"e.stack); throw "+PREFIX1+
+//                "e; } finally { "+logScriptExitFunName+"("+
+//                RP+"2); }",
+//            body,
+//            getIid()
+//        );
+//        transferLoc(ret[0], node);
+//        return ret;
+//    }
+
     function prependScriptBody(node, body) {
         var path = require('path');
         var preFile = path.resolve(__dirname,'../analysis.js');
@@ -727,7 +745,7 @@
         var body = createCallAsScriptEnterStatement(node, modFile).
             concat(syncDefuns(node, scope, true)).
             concat(body0);
-        return wrapScriptBodyWithTryCatch(node, body);
+        return body;
     }
 
 
@@ -1031,8 +1049,9 @@
 
     var visitorOps = {
         "Program": function(node) {
+            var body = wrapScriptBodyWithTryCatch(node, node.body)
             if (!tryCatch) {
-                var ret = prependScriptBody(node, node.body);
+                var ret = prependScriptBody(node, body);
                 node.body = ret;
 
             }