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;
new ArrayList<CodeAddition>());
}
codeAdditions.get(defineConstruct.file).add(addition);
- } else { // No declaration needed
+ } else { // No declaration needed but should add forward declaration
// Last generate the definition
- newCode = CodeVariables.generateInterfaceWrapperDefinition(
- _semantics, construct);
+ newCode = new ArrayList<String>();
+ newCode.addAll(CodeVariables.generateInterfaceWrapperDeclaration(_semantics, construct));
+ newCode.addAll(CodeVariables.generateInterfaceWrapperDefinition(
+ _semantics, construct));
lineNum = construct.beginLineNum;
// Add the wrapper declaration
addition = new CodeAddition(lineNum, newCode);
}
for (File file : codeAdditions.keySet()) {
ArrayList<CodeAddition> additions = codeAdditions.get(file);
-
+
if (additions.size() == 0) // Simply do nothing
continue;
ArrayList<String> content = _semantics.srcFilesInfo.get(file).content;
// Insert generated annotation to the source files
ArrayList<String> newContent = insertAnnotation2Src(additions,
content);
- ArrayList<String> finalContent = new ArrayList<String>(headerCode.size() + newContent.size());
+ ArrayList<String> finalContent = new ArrayList<String>(
+ headerCode.size() + newContent.size());
finalContent.addAll(headerCode);
finalContent.addAll(newContent);
// Write it back to file
public static void main(String[] argvs) {
String homeDir = Environment.HOME_DIRECTORY;
File[] srcFiles = {
-// 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/main.c"),
-// new File(homeDir + "/benchmark/ms-queue/my_queue.h") };
-
+// 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/main.c"),
+// new File(homeDir + "/benchmark/ms-queue/my_queue.h") };
+
new File(homeDir + "/benchmark/read-copy-update/rcu.cc") };
CodeGenerator gen = new CodeGenerator(srcFiles);
gen.generateCode();
public static final String HEADER_COMMON = "<common.h>";
public static final String HEADER_SPECANNOTATION = "<specannotation.h>";
public static final String HEADER_CDSTRACE = "<cdstrace.h>";
- // public static final String CDSAnnotate = "cdsannotate";
- public static final String CDSAnnotate = "_Z11cdsannotatemPv";
+ public static final String CDSAnnotate = "cdsannotate";
+ public static final String C_CDSAnnotate = "_Z11cdsannotatemPv";
// public static final String CDSAnnotate = "cdsannotate";
public static final String CDSAnnotateType = "SPEC_ANALYSIS";
public static final String IDType = "call_id_t";
public static final String SPEC_TAG_CURRENT = "current";
public static final String SPEC_TAG_NEXT = "next";
- public static final String MODEL_MALLOC = "model_malloc";
// Macro
public static final String MACRO_ID = "__ID__";
public static final String MACRO_COND = "__COND_SAT__";
public static final String MACRO_RETURN = "__RET__";
public static final String MACRO_ATOMIC_RETURN = "__ATOMIC_RET__";
+
+ public static String CDSAnnotate(SemanticsChecker semantics) {
+ String LANG = semantics.getOption("LANG");
+ boolean isCPP = LANG == null || !LANG.equals("C");
+ if (isCPP) {
+ return CDSAnnotate;
+ } else {
+ return C_CDSAnnotate;
+ }
+ }
public static void printCode(ArrayList<String> code) {
for (int i = 0; i < code.size(); i++) {
return type + " " + var + " = " + val + ";";
}
- private static String ANNOTATE(String structName) {
- return CDSAnnotate + "(" + CDSAnnotateType + ", " + structName + ");";
+ private static String ANNOTATE(SemanticsChecker semantics, String structName) {
+ return CDSAnnotate(semantics) + "(" + CDSAnnotateType + ", " + structName + ");";
}
private static ArrayList<String> DEFINE_INFO_STRUCT(String interfaceName,
newCode.add(STRUCT_NEW_DECLARE_DEFINE(SPEC_ANNOTATION, anno));
newCode.add(ASSIGN_TO_PTR(anno, "type", SPEC_ANNO_TYPE_INIT));
newCode.add(ASSIGN_TO_PTR(anno, "annotation", structName));
- newCode.add(ANNOTATE(anno));
+ newCode.add(ANNOTATE(semantics, anno));
newCode.add("");
// Init user-defined variables
}
// Only generate the declaration of the wrapper, don't do any renaming
- public static ArrayList<String> generateInterfaceWrapperDeclaration(
- SemanticsChecker semantics, InterfaceConstruct construct) {
- ArrayList<String> newCode = new ArrayList<String>();
+// public static ArrayList<String> generateInterfaceWrapperDeclaration(
+// SemanticsChecker semantics, InterfaceConstruct construct) {
+// ArrayList<String> newCode = new ArrayList<String>();
+// FunctionHeader header = getFunctionHeader(semantics, construct);
+// newCode.add(COMMENT("Declaration of the wrapper"));
+// String templateStr = header.getTemplateFullStr();
+// newCode.add(templateStr);
+// newCode.add(header.getFuncStr() + ";");
+// newCode.add("");
+//
+// return newCode;
+// }
+
+ public static ArrayList<String> generateInterfaceWrapperDeclaration(SemanticsChecker semantics, InterfaceConstruct construct) {
FunctionHeader header = getFunctionHeader(semantics, construct);
- newCode.add(COMMENT("Declaration of the wrapper"));
- String templateStr = header.getTemplateFullStr();
- newCode.add(templateStr);
- newCode.add(header.getFuncStr() + ";");
- newCode.add("");
-
- return newCode;
+ ArrayList<String> declaration = new ArrayList<String>();
+ declaration.add(header.getRenamedHeader(SPEC_INTERFACE_WRAPPER).getDeclaration() + ";");
+ return declaration;
}
// Only generate the definition of the wrapper, don't do any renaming
newCode.add(STRUCT_NEW_DECLARE_DEFINE(SPEC_ANNOTATION, anno));
newCode.add(ASSIGN_TO_PTR(anno, "type", SPEC_ANNO_TYPE_INTERFACE_BEGIN));
newCode.add(ASSIGN_TO_PTR(anno, "annotation", structName));
- newCode.add(ANNOTATE(anno));
+ newCode.add(ANNOTATE(semantics, anno));
// Call original renamed function
if (header.returnType.equals("void")) {
newCode.add(header.getRenamedCall(SPEC_INTERFACE_WRAPPER) + ";");
newCode.add(STRUCT_NEW_DECLARE_DEFINE(SPEC_ANNOTATION, anno));
newCode.add(ASSIGN_TO_PTR(anno, "type", SPEC_ANNO_TYPE_HB_CONDITION));
newCode.add(ASSIGN_TO_PTR(anno, "annotation", structName));
- newCode.add(ANNOTATE(anno));
+ newCode.add(ANNOTATE(semantics, anno));
newCode.add("}");
newCode.add("");
}
newCode.add(STRUCT_NEW_DECLARE_DEFINE(SPEC_ANNOTATION, anno));
newCode.add(ASSIGN_TO_PTR(anno, "type", SPEC_ANNO_TYPE_HB_CONDITION));
newCode.add(ASSIGN_TO_PTR(anno, "annotation", structName));
- newCode.add(ANNOTATE(anno));
+ newCode.add(ANNOTATE(semantics, anno));
newCode.add("");
}
// Interface end
newCode.add(STRUCT_NEW_DECLARE_DEFINE(SPEC_ANNOTATION, anno));
newCode.add(ASSIGN_TO_PTR(anno, "type", SPEC_ANNO_TYPE_INTERFACE_END));
newCode.add(ASSIGN_TO_PTR(anno, "annotation", structName));
- newCode.add(ANNOTATE(anno));
+ newCode.add(ANNOTATE(semantics, anno));
// Return __RET__ if it's not void
if (!header.returnType.equals("void")) {
newCode.add("return " + MACRO_RETURN + ";");
newCode.add(ASSIGN_TO_PTR(anno, "type",
SPEC_ANNO_TYPE_POTENTIAL_CP_DEFINE));
newCode.add(ASSIGN_TO_PTR(anno, "annotation", structName));
- newCode.add(ANNOTATE(anno));
+ newCode.add(ANNOTATE(semantics, anno));
newCode.add("}");
return newCode;
}
newCode.add(STRUCT_NEW_DECLARE_DEFINE(SPEC_ANNOTATION, anno));
newCode.add(ASSIGN_TO_PTR(anno, "type", SPEC_ANNO_TYPE_CP_DEFINE_CHECK));
newCode.add(ASSIGN_TO_PTR(anno, "annotation", structName));
- newCode.add(ANNOTATE(anno));
+ newCode.add(ANNOTATE(semantics, anno));
newCode.add("}");
return newCode;
}
newCode.add(STRUCT_NEW_DECLARE_DEFINE(SPEC_ANNOTATION, anno));
newCode.add(ASSIGN_TO_PTR(anno, "type", SPEC_ANNO_TYPE_CP_DEFINE));
newCode.add(ASSIGN_TO_PTR(anno, "annotation", structName));
- newCode.add(ANNOTATE(anno));
+ newCode.add(ANNOTATE(semantics, anno));
newCode.add("}");
return newCode;
}