package edu.uci.eecs.specCompiler.codeGenerator;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.HashSet;
import java.io.File;
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 C_CDSAnnotate = "_Z11cdsannotatemPv";
// public static final String CDSAnnotate = "cdsannotate";
- public static final String CDSAnnotate = "_Z11cdsannotatemPv";
public static final String CDSAnnotateType = "SPEC_ANALYSIS";
public static final String IDType = "call_id_t";
public static final String ANNO_HB_INIT = "anno_hb_init";
public static final String ANNO_INTERFACE_BEGIN = "anno_interface_begin";
public static final String ANNO_INTERFACE_END = "anno_interface_end";
- public static final String ANNO_POTENTIAL_CP_DEFINE = "anno_potentail_cp_define";
+ public static final String ANNO_POTENTIAL_CP_DEFINE = "anno_potential_cp_define";
public static final String ANNO_CP_DEFINE = "anno_cp_define";
public static final String ANNO_CP_DEFINE_CHECK = "anno_cp_define_check";
public static final String ANNO_HB_CONDITION = "anno_hb_condition";
public static final String SPEC_TAG = "spec_tag";
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,
return code;
}
- private static HashSet<String> getAllHeaders(SemanticsChecker semantics) {
+ public static HashSet<String> getAllHeaders(SemanticsChecker semantics) {
HashSet<String> headers = new HashSet<String>();
for (String interfaceName : semantics.interfaceName2Construct.keySet()) {
File f = semantics.interfaceName2Construct.get(interfaceName).file;
headers.addAll(semantics.srcFilesInfo.get(f).headers);
}
+ headers.add(HEADER_STDLIB);
+ headers.add(HEADER_STDINT);
+ headers.add(HEADER_MODELMEMORY);
+ headers.add(HEADER_STDINT);
+ headers.add(HEADER_CDSANNOTATE);
+// headers.add(HEADER_COMMON);
+ headers.add(HEADER_SPEC_LIB);
+ headers.add(HEADER_SPECANNOTATION);
return headers;
}
ArrayList<String> newCode = new ArrayList<String>();
HashSet<String> allHeaders = getAllHeaders(semantics);
- // All headers needed by the interface decalration
- newCode.add(COMMENT("Include all the header files that contains the interface declaration"));
- for (String header : allHeaders) {
- newCode.add(INCLUDE(header));
- }
- newCode.add("");
- // Other necessary headers
- newCode.add(INCLUDE(HEADER_STDLIB));
- newCode.add(INCLUDE(HEADER_MODELMEMORY));
- newCode.add(INCLUDE(HEADER_STDINT));
- newCode.add(INCLUDE(HEADER_CDSANNOTATE));
- newCode.add(INCLUDE(HEADER_COMMON));
- newCode.add(INCLUDE(HEADER_SPEC_LIB));
- newCode.add(INCLUDE(HEADER_SPECANNOTATION));
- newCode.add("");
SequentialDefineSubConstruct code = construct.code;
// User-defined structs first
String interfaceSize = Integer
.toString(semantics.interfaceName2Construct.size());
newCode.add(DEFINE("INTERFACE_SIZE", interfaceSize));
- newCode.add(DECLARE("void**", "func_ptr_table"));
+ // Make it static
+ newCode.add("static " + DECLARE("void**", "func_ptr_table"));
// Happens-before initialization rules
- newCode.add(DECLARE(ANNO_HB_INIT + "**", "hb_init_table"));
+ // Should make it static
+ newCode.add("static " + DECLARE(ANNO_HB_INIT + "**", "hb_init_table"));
newCode.add("");
newCode.add(COMMENT("Define function for sequential code initialization"));
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
String templateDecl = semantics.getTemplateFullStr();
if (templateList == null) {
newCode.add(DECLARE("void**", varPrefix + "func_ptr_table"));
- newCode.add(DECLARE("void**", varPrefix + "hb_init_table"));
+ newCode.add(DECLARE("anno_hb_init**", varPrefix + "hb_init_table"));
for (int i = 0; i < construct.code.declareVar.size(); i++) {
VariableDeclaration varDecl = construct.code.declareVar.get(i);
newCode.add(DECLARE(varDecl.type, varPrefix + varDecl.name));
newCode.add(templateDecl);
newCode.add(DECLARE("void**", varPrefix + "func_ptr_table"));
newCode.add(templateDecl);
- newCode.add(DECLARE("void**", varPrefix + "hb_init_table"));
+ newCode.add(DECLARE("anno_hb_init**", varPrefix + "hb_init_table"));
for (int i = 0; i < construct.code.declareVar.size(); i++) {
VariableDeclaration varDecl = construct.code.declareVar.get(i);
newCode.add(templateDecl);
}
// 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
SemanticsChecker semantics, InterfaceConstruct construct) {
ArrayList<String> newCode = new ArrayList<String>();
String interfaceName = construct.name;
- // Generate necessary header file (might be redundant but never mind)
- newCode.add(INCLUDE(HEADER_STDLIB));
- newCode.add(INCLUDE(HEADER_MODELMEMORY));
- newCode.add(INCLUDE(HEADER_CDSANNOTATE));
- newCode.add(INCLUDE(HEADER_SPECANNOTATION));
- newCode.add(INCLUDE(HEADER_SPEC_LIB));
FunctionHeader header = getFunctionHeader(semantics, construct);
String interfaceNum = Integer.toString(semantics.interface2Num
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 + ";");
// Generate redundant header files
newCode.add(COMMENT("Automatically generated code for potential commit point: "
+ construct.label));
- newCode.add(COMMENT("Include redundant headers"));
- newCode.add(INCLUDE(HEADER_STDINT));
- newCode.add(INCLUDE(HEADER_CDSANNOTATE));
- newCode.add(INCLUDE(HEADER_SPECANNOTATION));
newCode.add("");
// Add annotation
newCode.add("if (" + construct.condition + ") {");
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;
}
// Generate redundant header files
newCode.add(COMMENT("Automatically generated code for commit point define check: "
+ construct.label));
- newCode.add(COMMENT("Include redundant headers"));
- newCode.add(INCLUDE(HEADER_STDINT));
- newCode.add(INCLUDE(HEADER_CDSANNOTATE));
newCode.add("");
// Add annotation
newCode.add("if (" + construct.condition + ") {");
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;
}