X-Git-Url: http://plrg.eecs.uci.edu/git/?p=cdsspec-compiler.git;a=blobdiff_plain;f=src%2Fedu%2Fuci%2Feecs%2FspecCompiler%2FcodeGenerator%2FCodeGenerator.java;h=49299d13a5ac1b295c79210efd7ebdaac14bcf5a;hp=d38bba7f645c6191ff6b73bed4cf477477cda73e;hb=60246219b510f28980a6f93f615458e41262a23f;hpb=0a6651b877d4303c94fb0a2a9c5632acbd574f32 diff --git a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeGenerator.java b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeGenerator.java index d38bba7..49299d1 100644 --- a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeGenerator.java +++ b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeGenerator.java @@ -8,14 +8,17 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; +import edu.uci.eecs.specCompiler.specExtraction.CPClearConstruct; import edu.uci.eecs.specCompiler.specExtraction.CPDefineCheckConstruct; import edu.uci.eecs.specCompiler.specExtraction.CPDefineConstruct; import edu.uci.eecs.specCompiler.specExtraction.ClassEndConstruct; import edu.uci.eecs.specCompiler.specExtraction.ConditionalInterface; import edu.uci.eecs.specCompiler.specExtraction.Construct; import edu.uci.eecs.specCompiler.specExtraction.EntryPointConstruct; +import edu.uci.eecs.specCompiler.specExtraction.FunctionHeader; import edu.uci.eecs.specCompiler.specExtraction.GlobalConstruct; import edu.uci.eecs.specCompiler.specExtraction.IDExtractor; import edu.uci.eecs.specCompiler.specExtraction.InterfaceConstruct; @@ -44,6 +47,7 @@ public class CodeGenerator { private HashMap srcFilesInfo; private HashMap> codeAdditions; + private String homeDir; public CodeGenerator(File[] srcFiles) { this.srcFiles = srcFiles; @@ -87,17 +91,62 @@ public class CodeGenerator { } } - // Mainly rename and wrap the interface + // Wrap the interface and then renaem it private void interface2Code(InterfaceConstruct construct) { - ArrayList newCode = CodeVariables.generateInterfaceWrapper( - _semantics, construct); - int lineNum = construct.beginLineNum; - // Add it to the codeAdditions - CodeAddition addition = new CodeAddition(lineNum, newCode); - if (!codeAdditions.containsKey(construct.file)) { - codeAdditions.put(construct.file, new ArrayList()); + // If there's no define construct for it, we generate the wrapper just + // in place without declaration + InterfaceDefineConstruct defineConstruct = _semantics.interfaceName2DefineConstruct + .get(construct.name); + ArrayList newCode; + int lineNum; + CodeAddition addition; + // Then generate the wrapper if necessary + if (defineConstruct != null) { // Need to have a wrapper declaration + newCode = CodeVariables.generateInterfaceWrapperDeclaration( + _semantics, construct); + lineNum = construct.beginLineNum; + // Add the wrapper declaration + addition = new CodeAddition(lineNum, newCode); + if (!codeAdditions.containsKey(construct.file)) { + codeAdditions + .put(construct.file, new ArrayList()); + } + codeAdditions.get(construct.file).add(addition); + + // Add the wrapper definition + newCode = CodeVariables.generateInterfaceWrapperDefinition( + _semantics, construct); + lineNum = defineConstruct.beginLineNum; + // Add the wrapper declaration + addition = new CodeAddition(lineNum, newCode); + if (!codeAdditions.containsKey(defineConstruct.file)) { + codeAdditions.put(defineConstruct.file, + new ArrayList()); + } + codeAdditions.get(defineConstruct.file).add(addition); + } else { // No declaration needed but should add forward declaration in + // Class + // Last generate the definition + newCode = new ArrayList(); + if (_semantics.getOption("CLASS") == null) { + newCode.addAll(CodeVariables + .generateInterfaceWrapperDeclaration(_semantics, + construct)); + } + newCode.addAll(CodeVariables.generateInterfaceWrapperDefinition( + _semantics, construct)); + lineNum = construct.beginLineNum; + // Add the wrapper declaration + addition = new CodeAddition(lineNum, newCode); + if (!codeAdditions.containsKey(construct.file)) { + codeAdditions + .put(construct.file, new ArrayList()); + } + codeAdditions.get(construct.file).add(addition); } - codeAdditions.get(construct.file).add(addition); + + // Don't forget to rename the interface + CodeVariables.renameInterface(_semantics, construct); } private void potentialCPDefine2Code(PotentialCPDefineConstruct construct) { @@ -135,6 +184,31 @@ public class CodeGenerator { } codeAdditions.get(construct.file).add(addition); } + + private void CPClear2Code(CPClearConstruct construct) { + int lineNum = construct.beginLineNum; + ArrayList newCode = CodeVariables.generateCPClear( + _semantics, construct); + + CodeAddition addition = new CodeAddition(lineNum, newCode); + if (!codeAdditions.containsKey(construct.file)) { + codeAdditions.put(construct.file, new ArrayList()); + } + codeAdditions.get(construct.file).add(addition); + } + + + /** + * private void ClassEnd2Code(ClassEndConstruct construct) { int lineNum = + * construct.beginLineNum; ArrayList newCode = + * CodeVariables.generateStaticVarDefine(_semantics, + * _semantics.getGlobalConstruct()); + * + * CodeAddition addition = new CodeAddition(lineNum, newCode); if + * (!codeAdditions.containsKey(construct.file)) { + * codeAdditions.put(construct.file, new ArrayList()); } + * codeAdditions.get(construct.file).add(addition); } + */ private void EntryPoint2Code(EntryPointConstruct construct) { int lineNum = construct.beginLineNum; @@ -158,9 +232,10 @@ public class CodeGenerator { int curSrcLine = 0; for (int i = 0; i < additions.size(); i++) { CodeAddition addition = additions.get(i); - if (curSrcLine < addition.lineNum) { + if (curSrcLine < addition.lineNum) { // Be careful, subList is the interval [begin, end) - newContent.addAll(content.subList(curSrcLine, addition.lineNum)); + newContent + .addAll(content.subList(curSrcLine, addition.lineNum)); curSrcLine = addition.lineNum; } newContent.addAll(addition.newCode); @@ -182,15 +257,23 @@ public class CodeGenerator { CPDefine2Code((CPDefineConstruct) construct); } else if (construct instanceof CPDefineCheckConstruct) { CPDefineCheck2Code((CPDefineCheckConstruct) construct); + } else if (construct instanceof CPClearConstruct) { + CPClear2Code((CPClearConstruct) construct); } else if (construct instanceof EntryPointConstruct) { EntryPoint2Code((EntryPointConstruct) construct); } } + + // ClassEndConstruct endConstruct = _semantics.getClassEndConstruct(); + // if (endConstruct != null) { + // ClassEnd2Code(endConstruct); + // } + // Sort code additions for (File file : codeAdditions.keySet()) { ArrayList additions = codeAdditions.get(file); - if (additions.size() == 0) // Simply do nothing, already written - // once + + if (additions.size() == 0) // Simply do nothing continue; ArrayList content = _semantics.srcFilesInfo.get(file).content; Collections.sort(additions, CodeAddition.lineNumComparator); @@ -200,20 +283,56 @@ public class CodeGenerator { // Write it back to file ParserUtils.write2File(file, newContent); } - } public static void main(String[] argvs) { String homeDir = Environment.HOME_DIRECTORY; - File[] srcFiles = { -// new File(Environment.MODEL_CHECKER_TEST_DIR + "/backup_linuxrwlocks.c") }; -// new File(homeDir + "/benchmark/linuxrwlocks/linuxrwlocks.c") }; - new File(homeDir - + "/benchmark/cliffc-hashtable/simplified_cliffc_hashtable.h"), }; -// new File(homeDir + "/benchmark/ms-queue/my_queue.c"), -// new File(homeDir + "/benchmark/ms-queue/my_queue.c") }; -// new File(homeDir + "/benchmark/test/test.c") }; - CodeGenerator gen = new CodeGenerator(srcFiles); - gen.generateCode(); + + File[] srcLinuxRWLocks = { new File(homeDir + + "/benchmark/linuxrwlocks/linuxrwlocks.c") }; + + File[] srcHashtable = { + new File(homeDir + + "/benchmark/cliffc-hashtable/cliffc_hashtable.h"), + new File(homeDir + "/benchmark/cliffc-hashtable/main.cc") }; + + File[] srcMSQueue = { + new File(homeDir + "/benchmark/ms-queue/my_queue.c"), + new File(homeDir + "/benchmark/ms-queue/testcase.c"), + new File(homeDir + "/benchmark/ms-queue/testcase1.c"), + new File(homeDir + "/benchmark/ms-queue/main.c"), + new File(homeDir + "/benchmark/ms-queue/my_queue.h") }; + + File[] srcRCU = { new File(homeDir + + "/benchmark/read-copy-update/rcu.cc") }; + + File[] srcDeque = { + new File(homeDir + "/benchmark/chase-lev-deque-bugfix/deque.c"), + new File(homeDir + "/benchmark/chase-lev-deque-bugfix/main.c"), + new File(homeDir + "/benchmark/chase-lev-deque-bugfix/testcase.c"), + new File(homeDir + "/benchmark/chase-lev-deque-bugfix/deque.h") }; + + File[] srcMCSLock = { + new File(homeDir + "/benchmark/mcs-lock/mcs-lock.cc"), + new File(homeDir + "/benchmark/mcs-lock/mcs-lock.h") }; + + File[] srcSPSCQueue = { + new File(homeDir + "/benchmark/spsc-bugfix/spsc-queue.cc"), + new File(homeDir + "/benchmark/spsc-bugfix/eventcount.h"), + new File(homeDir + "/benchmark/spsc-bugfix/queue.h") }; + + File[] srcMPMCQueue = { + new File(homeDir + "/benchmark/mpmc-queue/mpmc-queue.h"), + new File(homeDir + "/benchmark/mpmc-queue/mpmc-queue.cc") }; +// +// File[][] sources = { srcLinuxRWLocks, srcMSQueue, srcRCU, +// srcDeque, srcMCSLock, srcSPSCQueue, srcMPMCQueue, srcHashtable }; + + File[][] sources = {srcMSQueue }; + // Compile all the benchmarks + for (int i = 0; i < sources.length; i++) { + CodeGenerator gen = new CodeGenerator(sources[i]); + gen.generateCode(); + } } }