added

// do not remove the following comment // JALANGI DO NOT INSTRUMENT change isPseudoGlobal to isScriptLocal
arranf · Dec 8, 2014 · 595d85a · 595d85a
1 parent 24630c4
commit 595d85a
Show file tree

Hide file tree

Showing 20 changed files with 72 additions and 13 deletions.
diff --git a/docs/analysis.md b/docs/analysis.md
@@ -40,9 +40,9 @@ API compared to analysis.js of Jalangi1.  An analysis in analysis.js can be writ
 
         this.putField = function(iid, base, offset, val, isComputed, isOpAssign){return {result:val};};
 
-        this.read = function(iid, name, val, isGlobal, isPseudoGlobal){return {result:val};};
+        this.read = function(iid, name, val, isGlobal, isScriptLocal){return {result:val};};
 
-        this.write = function(iid, name, val, lhs, isGlobal, isPseudoGlobal) {return {result:val};};
+        this.write = function(iid, name, val, lhs, isGlobal, isScriptLocal) {return {result:val};};
 
         this._return = function(iid, val){return {result:val};};
 

diff --git a/src/js/Config.js b/src/js/Config.js
@@ -1,3 +1,5 @@
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
 if (typeof J$ === 'undefined') {
     J$ = {};
 }

diff --git a/src/js/Constants.js b/src/js/Constants.js
@@ -1,3 +1,5 @@
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
 if (typeof J$ === 'undefined') {
     J$ = {};
 }

diff --git a/src/js/headers.js b/src/js/headers.js
@@ -1,3 +1,5 @@
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
 module.exports.headerSources = [
     "src/js/Constants.js",
     "src/js/Config.js",

diff --git a/src/js/instrument/astUtil.js b/src/js/instrument/astUtil.js
@@ -20,6 +20,9 @@
 /*jslint node: true */
 /*global window */
 
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
+
 if (typeof J$ === 'undefined') {
     J$ = {};
 }

diff --git a/src/js/instrument/esnstrument.js b/src/js/instrument/esnstrument.js
@@ -16,6 +16,9 @@
 
 // Author: Koushik Sen
 
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
+
 /*jslint node: true browser: true */
 /*global astUtil acorn escodegen J$ */
 
@@ -360,11 +363,11 @@ if (typeof J$ === 'undefined') {
         }
     }
 
-    function wrapRead(node, name, val, isReUseIid, isGlobal, isPseudoGlobal) {
+    function wrapRead(node, name, val, isReUseIid, isGlobal, isScriptLocal) {
         if (!Config.INSTR_READ || Config.INSTR_READ(name, node)) {
             printIidToLoc(node);
             var ret = replaceInExpr(
-                logReadFunName + "(" + RP + "1, " + RP + "2, " + RP + "3," + (isGlobal ? "true" : "false") + "," + (isPseudoGlobal ? "true" : "false") + ")",
+                logReadFunName + "(" + RP + "1, " + RP + "2, " + RP + "3," + (isGlobal ? "true" : "false") + "," + (isScriptLocal ? "true" : "false") + ")",
                 isReUseIid ? getPrevIidNoInc() : getIid(),
                 name,
                 val
@@ -409,12 +412,12 @@ if (typeof J$ === 'undefined') {
         return ret;
     }
 
-    function wrapWrite(node, name, val, lhs, isGlobal, isPseudoGlobal, isDeclaration) {
+    function wrapWrite(node, name, val, lhs, isGlobal, isScriptLocal, isDeclaration) {
         if (!Config.INSTR_WRITE || Config.INSTR_WRITE(name, node)) {
             printIidToLoc(node);
             var ret = replaceInExpr(
                 logWriteFunName + "(" + RP + "1, " + RP + "2, " + RP + "3, " + RP + "4," + (isGlobal ? "true" : "false") +
-                "," + (isPseudoGlobal ? "true" : "false") + "," + (isDeclaration ? "true" : "false") + ")",
+                "," + (isScriptLocal ? "true" : "false") + "," + (isDeclaration ? "true" : "false") + ")",
                 getIid(),
                 name,
                 val,

diff --git a/src/js/instrument/instUtil.js b/src/js/instrument/instUtil.js
@@ -16,6 +16,9 @@
 
 // Author: Manu Sridharan
 
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
+
 /*jslint node: true */
 var fs = require('fs');
 var path = require('path');

diff --git a/src/js/runtime/analysis.js b/src/js/runtime/analysis.js
@@ -16,6 +16,9 @@
 
 // Author: Koushik Sen
 
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
+
 
 // wrap in anonymous function to create local namespace when in browser
 // create / reset J$ global variable to hold analysis runtime
@@ -291,12 +294,12 @@ if (typeof J$ === 'undefined') {
 
     // variable write
     // isGlobal means that the variable is global and not declared as var
-    // isPseudoGlobal means that the variable is global and is declared as var
-    function R(iid, name, val, isGlobal, isPseudoGlobal) {
+    // isScriptLocal means that the variable is global and is declared as var
+    function R(iid, name, val, isGlobal, isScriptLocal) {
         var aret;
 
         if (sandbox.analysis && sandbox.analysis.read) {
-            aret = sandbox.analysis.read(iid, name, val, isGlobal, isPseudoGlobal);
+            aret = sandbox.analysis.read(iid, name, val, isGlobal, isScriptLocal);
             if (aret) {
                 val = aret.result;
             }
@@ -305,10 +308,10 @@ if (typeof J$ === 'undefined') {
     }
 
     // variable write
-    function W(iid, name, val, lhs, isGlobal, isPseudoGlobal, isDeclaration) {
+    function W(iid, name, val, lhs, isGlobal, isScriptLocal, isDeclaration) {
         var aret;
         if (sandbox.analysis && sandbox.analysis.write) {
-            aret = sandbox.analysis.write(iid, name, val, lhs, isGlobal, isPseudoGlobal);
+            aret = sandbox.analysis.write(iid, name, val, lhs, isGlobal, isScriptLocal);
             if (aret) {
                 val = aret.result;
             }

diff --git a/src/js/runtime/analysisCallbackTemplate.js b/src/js/runtime/analysisCallbackTemplate.js
@@ -17,6 +17,8 @@
 
 // Author: Koushik Sen
 
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
 
 // In the following callbacks one can choose to not return anything.
 // If all of the callbacks return nothing, we get a passive analysis where the
@@ -53,9 +55,9 @@
 
         this.putField = function(iid, base, offset, val, isComputed, isOpAssign){return {result:val};};
 
-        this.read = function(iid, name, val, isGlobal, isPseudoGlobal){return {result:val};};
+        this.read = function(iid, name, val, isGlobal, isScriptLocal){return {result:val};};
 
-        this.write = function(iid, name, val, lhs, isGlobal, isPseudoGlobal) {return {result:val};};
+        this.write = function(iid, name, val, lhs, isGlobal, isScriptLocal) {return {result:val};};
 
         this._return = function(iid, val){return {result:val};};
 

diff --git a/src/js/runtime/iidToLocation.js b/src/js/runtime/iidToLocation.js
@@ -15,6 +15,8 @@
  */
 
 // Author: Koushik Sen
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
 
 if (typeof J$ === 'undefined') {
     J$ = {};

diff --git a/src/js/sample_analyses/ChainedAnalyses.js b/src/js/sample_analyses/ChainedAnalyses.js
@@ -1,3 +1,8 @@
+// Author: Koushik Sen
+
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
+
 (function (sandbox) {
     function ChainedAnalyses() {
 

diff --git a/src/js/sample_analyses/dlint/CheckNaN.js b/src/js/sample_analyses/dlint/CheckNaN.js
@@ -18,6 +18,8 @@
 
 // Author: Koushik Sen
 
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
 
 
 (function (sandbox) {

diff --git a/src/js/sample_analyses/dlint/CompareFunctionWithPrimitives.js b/src/js/sample_analyses/dlint/CompareFunctionWithPrimitives.js
@@ -1,3 +1,8 @@
+// Author: Koushik Sen
+
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
+
 // probably forgot to call a function before comparison
 (function (sandbox) {
     function MyAnalysis () {

diff --git a/src/js/sample_analyses/dlint/ConcatUndefinedToString.js b/src/js/sample_analyses/dlint/ConcatUndefinedToString.js
@@ -1,3 +1,9 @@
+// Author: Koushik Sen
+
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
+
+
 (function (sandbox) {
     function MyAnalysis () {
         var iidToLocation = sandbox.iidToLocation;

diff --git a/src/js/sample_analyses/dlint/FunCalledWithMoreArguments.js b/src/js/sample_analyses/dlint/FunCalledWithMoreArguments.js
@@ -17,6 +17,8 @@
 
 // Author: Koushik Sen
 
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
 
 // In the following callbacks one can choose to not return anything.
 // If all of the callbacks return nothing, we get a passive analysis where the

diff --git a/src/js/sample_analyses/dlint/ShadowProtoProperty.js b/src/js/sample_analyses/dlint/ShadowProtoProperty.js
@@ -16,6 +16,9 @@
 
 // Author: Koushik Sen
 
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
+
 
 // In the following callbacks one can choose to not return anything.
 // If all of the callbacks return nothing, we get a passive analysis where the

diff --git a/src/js/sample_analyses/dlint/UndefinedOffset.js b/src/js/sample_analyses/dlint/UndefinedOffset.js
@@ -17,6 +17,9 @@
 
 // Author: Koushik Sen
 
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
+
 
 (function (sandbox) {
 

diff --git a/src/js/sample_analyses/dlint/Utils.js b/src/js/sample_analyses/dlint/Utils.js
@@ -16,6 +16,9 @@
 
 // Author: Koushik Sen
 
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
+
 (function (sandbox) {
     function Utils () {
         var Constants = sandbox.Constants;

diff --git a/src/js/sample_analyses/dsjs/Dsjs.js b/src/js/sample_analyses/dsjs/Dsjs.js
@@ -1,3 +1,8 @@
+// Author: Koushik Sen
+
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
+
 // run the following in the JALANGI_HOME directory
 // python scripts/dsjs.py tests/octane/richards; open jalangi_tmp/index.html
 

diff --git a/src/js/template.js b/src/js/template.js
@@ -1,3 +1,6 @@
+// do not remove the following comment
+// JALANGI DO NOT INSTRUMENT
+
 // add relative path of this file in headers.js
 
 if (typeof J$ === 'undefined') {