X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FIR%2FState.java;h=e5799435657ce856fe10bf9a89b13925cc640b05;hb=25427cb954180677d4a7b23b578e117df455d892;hp=cd46ba6085e6ff0d2bda99ad48aa5f0de834145b;hpb=3a53b44ad7d4e38376af04573dcfa7ddd596d96a;p=IRC.git

diff --git a/Robust/src/IR/State.java b/Robust/src/IR/State.java
index cd46ba60..e5799435 100644
--- a/Robust/src/IR/State.java
+++ b/Robust/src/IR/State.java
@@ -3,6 +3,7 @@ import IR.Tree.*;
 import IR.Flat.*;
 import IR.*;
 import Util.Lattice;
+import Util.Pair;
 
 import java.util.*;
 import Analysis.TaskStateAnalysis.*;
@@ -39,9 +40,7 @@ public class State {
     this.selfloops=new HashSet();
     this.excprefetch=new HashSet();
     this.classpath=new Vector();
-    this.cd2locationOrderMap=new Hashtable();
-    this.cd2locationPropertyMap=new Hashtable();
-    this.fn2labelMap=new Hashtable(); 
+    this.fn2labelMap=new Hashtable();
     this.lines=0;
   }
 
@@ -70,6 +69,7 @@ public class State {
   /** Boolean flag which indicates whether compiler is compiling a task-based
    * program. */
   public boolean JNI=false;
+  public boolean CAPTURE_NULL_DEREFERENCES=false;
   public boolean POINTER=false;
   public boolean COREPROF=false;
   public boolean WEBINTERFACE=false;
@@ -94,7 +94,7 @@ public class State {
   public String OWNERSHIPDEBUGCALLEE=null;
   public String OWNERSHIPDEBUGCALLER=null;
 
-  
+
   public boolean DISJOINT=false;
 
   public int DISJOINTALLOCDEPTH=1;
@@ -126,15 +126,21 @@ public class State {
 
   public boolean DISJOINTDEBUGSCHEDULING=false;
 
+  public boolean DISJOINT_WRITE_ALL_NODE_FINAL_GRAPHS=false;
+
+  public boolean POINTSTO_CHECK_V_RUNTIME=false;
+
+
   public boolean OOOJAVA=false;
   public boolean OOODEBUG=false;
   public boolean RCR=false;
   public boolean RCR_DEBUG=false;
   public boolean RCR_DEBUG_VERBOSE=false;
   public boolean NOSTALLTR=false;
-  
+
   //SSJava
   public boolean SSJAVA=false;
+  public boolean SSJAVADEBUG=false;
 
 
   public boolean OPTIONAL=false;
@@ -148,7 +154,7 @@ public class State {
   public boolean METHODEFFECTS=false;
   public static double TRUEPROB=0.8;
   public static boolean PRINTFLAT=false;
-  
+
   //DSM options
   public boolean DSM=false;
   public boolean DSMTASK=false;
@@ -166,10 +172,11 @@ public class State {
   public boolean DELAYCOMP=false;
   public boolean DUALVIEW=false;
   public boolean HYBRID=false;
-  
+
   // Bamboo options
   public boolean MULTICORE=false;
   public boolean MULTICOREGC=false;
+  public boolean PMC=false;
   public boolean BAMBOOCOMPILETIME = false;
   public boolean ARRAYBOUNDARYCHECK=true;
   public boolean RAW=false;
@@ -185,7 +192,7 @@ public class State {
   // MGC options
   public boolean MGC=false;
   public boolean OBJECTLOCKDEBUG=false;
-  
+
   //Other options
   public String structfile;
   public String main;
@@ -208,8 +215,6 @@ public class State {
   private int numtasks=0;
   private int numstaticblocks=0;
   private int arraycount=0;
-  public Hashtable cd2locationOrderMap;
-  public Hashtable cd2locationPropertyMap;
   public Hashtable fn2labelMap;
   public boolean OPTIMIZE=false;
   public boolean LINENUM=false;
@@ -259,7 +264,7 @@ public class State {
     TypeDescriptor td=new TypeDescriptor(n);
     return td;
   }
-  
+
   public static TypeDescriptor getTypeDescriptor(String n) {
     TypeDescriptor td=new TypeDescriptor(n);
     return td;
@@ -278,15 +283,15 @@ public class State {
       sclasses.add(tdn);
     }
   }
-  
+
   public int numClasses() {
     return numclasses;
   }
-  
+
   public int numInterfaces() {
     return numinterfaces;
   }
-  
+
   public int numStaticBlocks() {
     return numstaticblocks;
   }
@@ -306,7 +311,7 @@ public class State {
   public SymbolTable getTaskSymbolTable() {
     return tasks;
   }
-  
+
   public SymbolTable getSClassSymbolTable() {
     return sclasses;
   }
@@ -358,21 +363,5 @@ public class State {
     tasks.add(td);
     numtasks++;
   }
-  
-  public void addLocationOrder(ClassDescriptor cd, Lattice order){
-    cd2locationOrderMap.put(cd,order);
-  }
-  
-  public Hashtable getCd2LocationOrder(){
-    return cd2locationOrderMap;
-  }
-  
-  public void addLocationPropertySet(ClassDescriptor cd, Set<String> set){
-    cd2locationPropertyMap.put(cd,set);
-  }
-  
-  public Hashtable getCd2LocationPropertyMap(){
-    return cd2locationPropertyMap;
-  }
-  
+
 }