prefetch changes

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index a3c003320b3945af1accd119a5125a6317ee946d..3d97da60a2783774c1454948361640da6a4fec1b 100644 (file)
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -405,12 +405,8 @@ public class BuildCode {
            outclassdefs.println("  int flag;");
            outclassdefs.println("  void * flagptr;");
            if(state.OPTIONAL){
-               outclassdefs.println("  int failedstatus;");
-               outclassdefs.println("  int hashcode;");
                outclassdefs.println("  int numexitfses;");
                outclassdefs.println("  int * exitfses;");
-               outclassdefs.println("  int numotds;");
-               outclassdefs.println("  struct optionaltaskdescriptor ** otds;");
            }
        }
        printClassStruct(typeutil.getClass(TypeUtil.ObjectClass), outclassdefs);

diff --git a/Robust/src/IR/State.java b/Robust/src/IR/State.java
index 9df0cc3235d9d2067de8914edc0b1f491e09839a..8fb9d9691eac259aec28dd9c6ce6c036200716f7 100644 (file)
--- a/Robust/src/IR/State.java
+++ b/Robust/src/IR/State.java
@@ -43,6 +43,7 @@ public class State {
     public boolean WEBINTERFACE=false;
     public boolean TASK=false;
     public boolean DSM=false;
+    public boolean PREFETCH=false;
     public boolean TASKSTATE=false;
     public boolean OPTIONAL=false;
     public boolean THREAD=false;

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 3a371b0527b8b0048b11a1998d5e35ab92c963d8..126d21a56e5f75e5f35b7f7f1e99f488650afbee 100644 (file)
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -19,6 +19,7 @@ import Analysis.TaskStateAnalysis.ExecutionGraph;
 import Analysis.TaskStateAnalysis.SafetyAnalysis;
 import Analysis.Locality.LocalityAnalysis;
 import Analysis.Locality.GenerateConversions;
+import Analysis.Prefetch.PrefetchAnalysis;
 import Interface.*;
 
 public class Main {
@@ -33,6 +34,8 @@ public class Main {
          String option=args[i];
          if (option.equals("-precise"))
              IR.Flat.BuildCode.GENERATEPRECISEGC=true;
+         else if (option.equals("-prefetch"))
+             state.PREFETCH=true;
          else if (option.equals("-dir"))
              IR.Flat.BuildCode.PREFIX=args[++i]+"/";
          else if (option.equals("-classlibrary"))
@@ -158,6 +161,9 @@ public class Main {
 
       if (state.DSM) {
          CallGraph callgraph=new CallGraph(state);
+         if (state.PREFETCH) {
+             PrefetchAnalysis pa=new PrefetchAnalysis(state, callgraph, tu);
+         }
          LocalityAnalysis la=new LocalityAnalysis(state, callgraph, tu);
          GenerateConversions gc=new GenerateConversions(la, state);
          BuildCode bc=new BuildCode(state, bf.getMap(), tu, la);