From: bdemsky <bdemsky>
Date: Tue, 25 Mar 2008 05:43:51 +0000 (+0000)
Subject: more changes
X-Git-Tag: preEdgeChange~204
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=de4ee25884231637e53a871db3261d5d74e9e9c7;p=IRC.git

more changes
---

diff --git a/Robust/src/Analysis/TaskStateAnalysis/TaskQueueIterator.java b/Robust/src/Analysis/TaskStateAnalysis/TaskQueueIterator.java
index 909aa5e5..7e6898aa 100644
--- a/Robust/src/Analysis/TaskStateAnalysis/TaskQueueIterator.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/TaskQueueIterator.java
@@ -56,6 +56,11 @@ public class TaskQueueIterator {
 	    i=0;
 	}
 
+	if (i==0&&index==0&&ftsarray[0]!=null&&!needit) {
+	    needinit=false;
+	    return true;
+	}
+
 	objloop:
 	for(;i<ftsarray.length;i++) {
 	    FlagState currfs=ftsarray[i].fs;
diff --git a/Robust/src/Analysis/TaskStateAnalysis/TaskTagAnalysis.java b/Robust/src/Analysis/TaskStateAnalysis/TaskTagAnalysis.java
index 47cb02d9..a3b63820 100644
--- a/Robust/src/Analysis/TaskStateAnalysis/TaskTagAnalysis.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/TaskTagAnalysis.java
@@ -40,6 +40,28 @@ public class TaskTagAnalysis {
 	    tasktable.put(td, new TaskQueue(td));
 	}
 	doAnalysis();
+	doOutput();
+    }
+
+    private void doOutput() {
+	try {
+	for(Iterator<TagDescriptor> tagit=tsresults.keySet().iterator();tagit.hasNext();) {
+	    TagDescriptor tag=tagit.next();
+	    Set<TagState> set=tsresults.get(tag);
+	    File dotfile_flagstates= new File("tag"+tag.getSymbol()+".dot");
+	    FileOutputStream dotstream=new FileOutputStream(dotfile_flagstates,false);
+	    TagState.DOTVisitor.visit(dotstream,set);
+	}
+	for(Iterator<ClassDescriptor> cdit=fsresults.keySet().iterator();cdit.hasNext();) {
+	    ClassDescriptor cd=cdit.next();
+	    Set<TagState> set=fsresults.get(cd);
+	    File dotfile_flagstates= new File("class"+cd.getSymbol()+".dot");
+	    FileOutputStream dotstream=new FileOutputStream(dotfile_flagstates,false);
+	    TagState.DOTVisitor.visit(dotstream,set);
+	}
+	} catch (Exception e) {
+	    e.printStackTrace();
+	}
     }
 
     private void doAnalysis() {
@@ -62,9 +84,12 @@ public class TaskTagAnalysis {
 	    FlagState fs=fsit.next();
 	    FlagTagState fts=new FlagTagState(ts, fs);
 	    for(int i=0;i<td.numParameters();i++) {
+		System.out.println("Trying to enqueue "+td);
 		if (canEnqueue(td, i, fs)) {
+		    System.out.println("Enqueued");
 		    TaskQueueIterator tqi=tq.enqueue(i, fts);
 		    while(tqi.hasNext()) {
+			System.out.println("binding");
 			processBinding(tqi);
 			tqi.next();
 		    }
diff --git a/Robust/src/IR/FlagDescriptor.java b/Robust/src/IR/FlagDescriptor.java
index e18393fd..4df76913 100644
--- a/Robust/src/IR/FlagDescriptor.java
+++ b/Robust/src/IR/FlagDescriptor.java
@@ -7,8 +7,7 @@ package IR;
  */
 
 public class FlagDescriptor extends Descriptor {
-    public static final String InitialFlag="initialstate";
-
+    public final static String InitialFlag="initialstate";
 
     public FlagDescriptor(String identifier) {
 	super(identifier);
diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 5515266d..41f573a5 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -1427,8 +1427,7 @@ public class BuildCode {
 	    generateFlatFlagActionNode(fm, lb, (FlatFlagActionNode) fn, output);
 	    return;
 	case FKind.FlatPrefetchNode:
-	    if (!state.excprefetch.contains(fm.getMethod().getClassMethodName()))
-		generateFlatPrefetchNode(fm,lb, (FlatPrefetchNode) fn, output);
+	    generateFlatPrefetchNode(fm,lb, (FlatPrefetchNode) fn, output);
 	    return;
 	}
 	throw new Error();