Add option for task state analysis

diff --git a/Robust/src/IR/State.java b/Robust/src/IR/State.java
index c0862f54e93cf77e0b9c325efb941b35a90c446d..ed3e5979eeb8a23224870b91477d2ac3e3185a73 100644 (file)
--- a/Robust/src/IR/State.java
+++ b/Robust/src/IR/State.java
@@ -23,6 +23,7 @@ public class State {
     /** Boolean flag which indicates whether compiler is compiling a task-based
      * program. */
     public boolean TASK;
+    public boolean TASKSTATE=false;
     public boolean THREAD=false;
     public boolean INSTRUCTIONFAILURE=false;
     public String structfile;

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 8151d7d1d98ef3b50b507a2a14a8e2e462ccb708..275091ce4b725611eac9e92ae2a01cbb3b07c485 100644 (file)
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -10,7 +10,6 @@ import IR.Flat.BuildFlat;
 import IR.Flat.BuildCode;
 import IR.State;
 import IR.TypeUtil;
-//import IR.PrintTree;
 import Analysis.TaskStateAnalysis.TaskAnalysis;
 
 public class Main {
@@ -37,6 +36,8 @@ public class Main {
              state.CONSCHECK=true;
          else if (option.equals("-task"))
              state.TASK=true;
+         else if (option.equals("-taskstate"))
+             state.TASKSTATE=true;
          else if (option.equals("-thread"))
              state.THREAD=true;
          else if (option.equals("-instructionfailures"))
@@ -52,6 +53,7 @@ public class Main {
              System.out.println("-task -- compiler for tasks");
              System.out.println("-thread -- threads");
              System.out.println("-instructionfailures -- insert code for instruction level failures");
+             System.out.println("-taskstate -- do task state analysis");
              System.out.println("-help -- print out help");
              System.exit(0);
          } else {
@@ -93,9 +95,6 @@ public class Main {
       BuildIR bir=new BuildIR(state);
       bir.buildtree();
       
-//      PrintTree ptree=new PrintTree(state);
- //     ptree.buildtree();
-
       TypeUtil tu=new TypeUtil(state);
       
       SemanticCheck sc=new SemanticCheck(state,tu);
@@ -105,16 +104,13 @@ public class Main {
       BuildFlat bf=new BuildFlat(state,tu);
       bf.buildFlat();
 
-//      System.out.println("Flat");
-//    PrintTree ptree1=new PrintTree(state);
-//  ptree1.buildtree();
-
-//     TaskAnalysis ta=new TaskAnalysis(state,bf.getMap());
-//     ta.taskAnalysis();
-//     ta.printAdjList();
-
-
-
+      if (state.TASKSTATE) {
+         TaskAnalysis ta=new TaskAnalysis(state,bf.getMap());
+         ta.taskAnalysis();
+      }
+      
+      
+      
       BuildCode bc=new BuildCode(state, bf.getMap(), tu);
       bc.buildCode();
       System.exit(0);