X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FMakefile;h=51b7b93da2d9cad532b61ac049b8b654d705489f;hb=9e0601a3c2495436fa391815bab140087a0eda84;hp=de977953ff39a4b6fad424e75bd4363b6390e9fb;hpb=dc3e28e69175aefbac119060873edda856f173fa;p=IRC.git

diff --git a/Robust/src/Makefile b/Robust/src/Makefile
index de977953..51b7b93d 100644
--- a/Robust/src/Makefile
+++ b/Robust/src/Makefile
@@ -26,6 +26,7 @@ IR/Flat/FlatNew.class IR/Flat/FlatNode.class IR/Flat/FlatNop.class	\
 IR/Flat/FlatOpNode.class IR/Flat/FlatReturnNode.class			\
 IR/Flat/FlatSetElementNode.class IR/Flat/FlatSetFieldNode.class		\
 IR/Flat/FlatTagDeclaration.class IR/Flat/NodePair.class			\
+IR/Flat/FlatPrefetchNode.class						\
 IR/Flat/ParamsObject.class IR/Flat/TempDescriptor.class			\
 IR/Flat/TempFlagPair.class IR/Flat/TempObject.class			\
 IR/Flat/TempTagPair.class IR/Tree/ArrayAccessNode.class			\
@@ -69,38 +70,116 @@ Analysis/TaskStateAnalysis/TaskAnalysis.class				\
 Analysis/TaskStateAnalysis/TaskEdges.class				\
 Analysis/TaskStateAnalysis/TaskGraph.class				\
 Analysis/TaskStateAnalysis/TaskNode.class				\
+Analysis/TaskStateAnalysis/FlagComparator.class				\
 Analysis/TaskStateAnalysis/TaskNodeNamer.class Util/Edge.class		\
+Analysis/FlatIRGraph/FlatIRGraph.class                                  \
+Analysis/OwnershipAnalysis/OwnershipAnalysis.class                      \
+Analysis/OwnershipAnalysis/OwnershipGraph.class                         \
+Analysis/OwnershipAnalysis/OwnershipNode.class                          \
+Analysis/OwnershipAnalysis/LabelNode.class                              \
+Analysis/OwnershipAnalysis/HeapRegionNode.class                         \
+Analysis/OwnershipAnalysis/ReferenceEdge.class                          \
+Analysis/OwnershipAnalysis/AllocationSite.class                         \
+Analysis/OwnershipAnalysis/TokenTuple.class                             \
+Analysis/OwnershipAnalysis/TokenTupleSet.class                          \
+Analysis/OwnershipAnalysis/ReachabilitySet.class                        \
+Analysis/OwnershipAnalysis/ChangeTuple.class                            \
+Analysis/OwnershipAnalysis/ChangeTupleSet.class                         \
+Analysis/OwnershipAnalysis/Canonical.class                              \
+Analysis/OwnershipAnalysis/MethodContext.class                          \
+Analysis/MLP/MLPAnalysis.class 						\
+Analysis/MLP/VariableSourceToken.class 					\
+Analysis/MLP/SVKey.class 						\
+Analysis/MLP/VarSrcTokTable.class					\
 Util/GraphNode.class Util/Namer.class Util/Relation.class		\
 Interface/HTTPHeader.class Interface/HTTPResponse.class			\
 Interface/HTTPServices.class Interface/HashStrings.class		\
 Interface/JhttpServer.class Interface/JhttpWorker.class			\
 Interface/LogFile.class Interface/Pair.class				\
-Interface/WebInterface.class Analysis/Prefetch/PrefetchAnalysis.class
+Interface/WebInterface.class Analysis/Prefetch/PrefetchAnalysis.class	\
+Analysis/Prefetch/PrefetchPair.class Analysis/Prefetch/PairMap.class    \
+Analysis/Prefetch/IndexDescriptor.class                                 \
+Analysis/Scheduling/ClassNode.class                                     \
+Analysis/Scheduling/ScheduleAnalysis.class                              \
+Analysis/Scheduling/ScheduleEdge.class                                  \
+Analysis/Scheduling/ScheduleNode.class                                  \
+Analysis/Scheduling/CoreSimulator.class                                 \
+Analysis/Scheduling/FIFORSchedule.class                                 \
+Analysis/Scheduling/ObjectSimulator.class                               \
+Analysis/Scheduling/RuntimeSchedule.class                               \
+Analysis/Scheduling/Schedule.class                                      \
+Analysis/Scheduling/ScheduleSimulator.class                             \
+Analysis/Scheduling/SchedulingUtil.class                                \
+Analysis/Scheduling/TaskSimulator.class                                 \
+Analysis/Scheduling/TransTaskSimulator.class
 
+JAVAFILES=IR/*.java \
+	IR/Flat/*.java \
+	IR/Tree/*.java \
+	Main/*.java \
+	Analysis/CallGraph/*.java \
+	Analysis/FlatIRGraph/*.java \
+	Analysis/Loops/*.java \
+	Analysis/Locality/*.java \
+	Analysis/OwnershipAnalysis/*.java \
+	Analysis/MLP/*.java \
+	Analysis/Prefetch/*.java \
+	Analysis/Scheduling/*.java \
+	Analysis/TaskStateAnalysis/*.java \
+	Util/*.java \
+	ClassLibrary/*.java \
+	ClassLibrary/gnu/*.java \
+	Interface/*.java \
+	Lex/*.java
 
+CFILES=Runtime/*.c \
+	Runtime/*.h \
+	Runtime/DSTM/interface/*.c \
+	Runtime/DSTM/interface/*.h
 
+all: compiler javadoc
 
-all: Parse/Sym.class Parse/Parser.class $(CLASSFILES) javadoc
+compiler: Parse/Sym.java Parse/Parser.java cleanclass classfiles
+
+classfiles:
+	./ourjavac -cp ../cup:.:$(CLASSPATH) Main/Main.java
 
 wc:
 	wc Interface/*.java Analysis/*/*.java IR/*.java IR/*/*.java Lex/*.java Util/*.java ClassLibrary/*.java
 
 wcrun:
-	wc Runtime/*.[c,h]
+	wc Runtime/*.[c,h] Runtime/DSTM/interface/*.[c,h]
 
 Parse/Parser.java Parse/Sym.java: Parse/java14.cup
 	cd Parse && \
         java -cp ../../cup:$(CLASSPATH) java_cup.Main -parser Parser -symbols Sym < java14.cup
 
 %.class: %.java
-	javac -cp ../cup:.:$(CLASSPATH) $<
+	./ourjavac -cp ../cup:.:$(CLASSPATH) $<
+
+tabbing: 
+	uncrustify -c java.cfg --no-backup $(JAVAFILES)
+	uncrustify -c c.cfg --no-backup $(CFILES)
+
+commit: tabbing
+	cvs commit .
+
+update:	tabbing
+	cvs update -d .
+
+mytabbing:
+	uncrustify -c myjava.cfg --no-backup $(JAVAFILES)
+	uncrustify -c myc.cfg --no-backup $(CFILES)
 
 javadoc:
 	mkdir javadoc
-	javadoc -classpath ../cup:.:$(CLASSPATH) -sourcepath . -private -d javadoc Lex Util IR IR.Tree IR.Flat Analysis Analysis.CallGraph Analysis.Flag Analysis.TaskStateAnalysis Analysis.Locality Main 
+	javadoc -classpath ../cup:.:$(CLASSPATH) -sourcepath . -private -d javadoc Lex Util IR IR.Tree IR.Flat Analysis Analysis.CallGraph Analysis.Flag Analysis.TaskStateAnalysis Analysis.Locality Analysis.Prefetch Main Analysis.OwnershipAnalysis Analysis.MLP Analysis.Scheduling
 
 clean:
-	rm IR/*.class IR/Tree/*.class Main/*.class Lex/*.class Parse/*.class Parse/Sym.java Parse/Parser.java IR/Flat/*.class classdefs.h methodheaders.h methods.c structdefs.h virtualtable.h task.h taskdefs.c taskdefs.h Analysis/*.class Analysis/Flag/*.class Analysis/CallGraph/*.class  Analysis/TaskStateAnalysis/*.class Interface/*.class Util/*.class Analysis/Locality/*.class
+	rm -f IR/*.class IR/Tree/*.class Main/*.class Lex/*.class Parse/*.class Parse/Sym.java Parse/Parser.java IR/Flat/*.class classdefs.h methodheaders.h methods.c structdefs.h virtualtable.h task.h taskdefs.c taskdefs.h Analysis/*.class Analysis/Flag/*.class Analysis/CallGraph/*.class  Analysis/TaskStateAnalysis/*.class Interface/*.class Util/*.class Analysis/Locality/*.class Analysis/Prefetch/*.class Analysis/FlatIRGraph/*.class Analysis/OwnershipAnalysis/*.class Analysis/MLP/*.class Analysis/Scheduling/*.class Analysis/Loops/*.class
+
+cleanclass:
+	rm -f IR/*.class IR/Tree/*.class Main/*.class IR/Flat/*.class Analysis/*.class Analysis/Flag/*.class Analysis/CallGraph/*.class  Analysis/TaskStateAnalysis/*.class Interface/*.class Util/*.class Analysis/Locality/*.class Analysis/Prefetch/*.class Analysis/FlatIRGraph/*.class Analysis/OwnershipAnalysis/*.class Analysis/MLP/*.class Analysis/Scheduling/*.class Analysis/Loops/*.class
 
 cleandoc:
-	rm -rf javadoc
\ No newline at end of file
+	rm -rf javadoc