Enable the nextDoublt() call for reading input files

[IRC.git] / Robust / src / Makefile

diff --git a/Robust/src/Makefile b/Robust/src/Makefile
index 03fd6e95bc865f9c748cb8371e88eb306ae5fc68..56fb4302843a08dd89a068b4833ad5ac6006a40f 100644 (file)
--- a/Robust/src/Makefile
+++ b/Robust/src/Makefile
@@ -15,6 +15,7 @@ IR/State.class IR/SymbolTable.class IR/TagDescriptor.class            \
 IR/TagVarDescriptor.class IR/TaskDescriptor.class                      \
 IR/TypeDescriptor.class IR/TypeUtil.class IR/VarDescriptor.class       \
 IR/Virtual.class IR/Flat/BuildCode.class IR/Flat/BuildFlat.class       \
+IR/Flat/BuildOoOJavaCode.class                                         \
 IR/Flat/FKind.class IR/Flat/FlatAtomicEnterNode.class                  \
 IR/Flat/FlatAtomicExitNode.class IR/Flat/FlatBackEdge.class            \
 IR/Flat/FlatCall.class IR/Flat/FlatCastNode.class                      \
@@ -86,7 +87,21 @@ Analysis/OwnershipAnalysis/ReachabilitySet.class                        \
 Analysis/OwnershipAnalysis/ChangeTuple.class                            \
 Analysis/OwnershipAnalysis/ChangeTupleSet.class                         \
 Analysis/OwnershipAnalysis/Canonical.class                              \
+Analysis/OwnershipAnalysis/MethodContext.class                          \
+Analysis/OwnershipAnalysis/ParameterDecomposition.class                        \
+Analysis/OwnershipAnalysis/AccessPath.class                             \
+Analysis/Disjoint/DisjointAnalysis.class                               \
+Analysis/Disjoint/ReachGraph.class                                     \
+Analysis/OoOJava/OoOJavaAnalysis.class                                 \
+Analysis/OoOJava/CodePlan.class                                                \
+Analysis/OoOJava/SVKey.class                                           \
+Analysis/OoOJava/VSTWrapper.class                                      \
+Analysis/OoOJava/VarSrcTokTable.class                                  \
+Analysis/OoOJava/VariableSourceToken.class                             \
+Analysis/OoOJava/ContextTaskNames.class                                        \
 Util/GraphNode.class Util/Namer.class Util/Relation.class              \
+Util/UtilAlgorithms.class                                               \
+Util/InputFileTranslator.class                                               \
 Interface/HTTPHeader.class Interface/HTTPResponse.class                        \
 Interface/HTTPServices.class Interface/HashStrings.class               \
 Interface/JhttpServer.class Interface/JhttpWorker.class                        \
@@ -106,7 +121,7 @@ Analysis/Scheduling/Schedule.class                                      \
 Analysis/Scheduling/ScheduleSimulator.class                             \
 Analysis/Scheduling/SchedulingUtil.class                                \
 Analysis/Scheduling/TaskSimulator.class                                 \
-Analysis/Scheduling/TransTaskSimulator.class
+Analysis/Scheduling/TransTaskSimulator.class 
 
 JAVAFILES=IR/*.java \
        IR/Flat/*.java \
@@ -114,15 +129,21 @@ JAVAFILES=IR/*.java \
        Main/*.java \
        Analysis/CallGraph/*.java \
        Analysis/FlatIRGraph/*.java \
+       Analysis/Loops/*.java \
        Analysis/Locality/*.java \
        Analysis/OwnershipAnalysis/*.java \
+       Analysis/Disjoint/*.java \
+       Analysis/OoOJava/*.java \
+       Analysis/Pointer/*.java \
        Analysis/Prefetch/*.java \
        Analysis/Scheduling/*.java \
+        Analysis/SSJava/*.java \
        Analysis/TaskStateAnalysis/*.java \
        Util/*.java \
        ClassLibrary/*.java \
        ClassLibrary/gnu/*.java \
-       Interface/*.java
+       Interface/*.java \
+       Lex/*.java
 
 CFILES=Runtime/*.c \
        Runtime/*.h \
@@ -131,24 +152,27 @@ CFILES=Runtime/*.c \
 
 all: compiler javadoc
 
-compiler: Parse/Sym.class Parse/Parser.class $(CLASSFILES)
+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
+       wc Interface/*.java Analysis/*/*.java IR/*.java IR/*/*.java Lex/*.java Util/*.java ClassLibrary/*.java Main/*.java
 
 wcrun:
-       wc Runtime/*.[c,h]
+       wc Runtime/*.[c,h] Runtime/DSTM/interface*/*.[c,h] Runtime/STM/*.[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 standard.cfg --no-backup $(JAVAFILES)
-       uncrustify -c standard.cfg --no-backup $(CFILES)
+       uncrustify -c java.cfg --no-backup $(JAVAFILES)
+       uncrustify -c c.cfg --no-backup $(CFILES)
 
 commit: tabbing
        cvs commit .
@@ -157,15 +181,18 @@ update:   tabbing
        cvs update -d .
 
 mytabbing:
-       uncrustify -c my.cfg --no-backup $(JAVAFILES)
-       uncrustify -c my.cfg --no-backup $(CFILES)
+       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 Analysis.Prefetch Main Analysis.OwnershipAnalysis Analysis.Scheduling
+       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.Disjoint Analysis.Scheduling
 
 clean:
-       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/Scheduling/*.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/Disjoint/*.class Analysis/OoOJava/*.class Analysis/Scheduling/*.class Analysis/Loops/*.class Analysis/Pointer/*.class Analysis/SSJava/*.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/Disjoint/*.class Analysis/OoOJava/*.class Analysis/Scheduling/*.class Analysis/Loops/*.class Analysis/Pointer/*.class Analysis/SSJava/*.class
 
 cleandoc:
        rm -rf javadoc