projects / cdsspec-compiler.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
more fix
[cdsspec-compiler.git] / src / edu / uci / eecs / specCompiler / codeGenerator / CodeVariables.java
diff --git a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
index b79d38b962202a170664a65a696e99bd579325b9..47c2e9c3cfbffec404a443200a3f506e8a1d4927 100644 (file)
--- a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
+++ b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
@@ -1,6 +1,7 @@
 package edu.uci.eecs.specCompiler.codeGenerator;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.io.File;
 
@@ -27,8 +28,8 @@ public class CodeVariables {
        public static final String HEADER_THREADS = "<threads.h>";
        public static final String HEADER_STDINT = "<stdint.h>";
        public static final String HEADER_MODELMEMORY = "<model_memory.h>";
-       public static final String ThreadIDType = "thrd_t";
-       public static final String GET_THREAD_ID = "thrd_current";
+       public static final String HEADER_MODELTYPES = "<modeltypes.h>";
+       public static final String ThreadIDType = "thread_id_t";
        public static final String BOOLEAN = "bool";
        public static final String UINT64 = "uint64_t";
 
@@ -37,8 +38,8 @@ public class CodeVariables {
        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 = "cdsannotate";
-       public static final String CDSAnnotate = "_Z11cdsannotatemPv";
        public static final String CDSAnnotateType = "SPEC_ANALYSIS";
        public static final String IDType = "call_id_t";
 
@@ -59,7 +60,7 @@ public class CodeVariables {
        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";
@@ -78,14 +79,13 @@ public class CodeVariables {
        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 final String MACRO_THREAD_ID = "__TID__";
 
        public static void printCode(ArrayList<String> code) {
                for (int i = 0; i < code.size(); i++) {
@@ -161,7 +161,7 @@ public class CodeVariables {
                return type + " " + var + " = " + val + ";";
        }
 
-       private static String ANNOTATE(String structName) {
+       private static String ANNOTATE(SemanticsChecker semantics, String structName) {
                return CDSAnnotate + "(" + CDSAnnotateType + ", " + structName + ");";
        }
 
@@ -179,10 +179,31 @@ public class CodeVariables {
                return code;
        }
 
-       private static ArrayList<String> DEFINE_ID_FUNC(String interfaceName,
-                       String idCode) {
+       private static ArrayList<String> DEFINE_ID_FUNC(
+                       InterfaceConstruct construct, FunctionHeader header) {
+               String interfaceName = construct.name;
                ArrayList<String> code = new ArrayList<String>();
-               code.add("inline static " + IDType + " " + interfaceName + "_id() {");
+               String idCode = construct.idCode;
+               code.add("inline static " + IDType + " " + interfaceName + "_id("
+                               + "void *info, " + ThreadIDType + " " + MACRO_THREAD_ID + ") {");
+
+               // Read info struct
+               if (!header.returnType.equals("void") || header.args.size() != 0) {
+                       String infoStructType = interfaceName + "_info", infoStructName = "theInfo";
+                       code.add(DECLARE_DEFINE(infoStructType + "*", infoStructName,
+                                       BRACE(infoStructType + "*") + "info"));
+                       if (!header.returnType.equals("void")) {
+                               code.add((DECLARE_DEFINE(header.returnType, MACRO_RETURN,
+                                               GET_FIELD_BY_PTR(infoStructName, MACRO_RETURN))));
+                       }
+                       for (int i = 0; i < header.args.size(); i++) {
+                               String type = header.args.get(i).type, var = header.args.get(i).name;
+                               code.add((DECLARE_DEFINE(type, var,
+                                               GET_FIELD_BY_PTR(infoStructName, var))));
+                       }
+                       code.add("");
+               }
+
                if (!idCode.equals("")) {
                        code.add(DECLARE_DEFINE(IDType, MACRO_ID, idCode));
                } else {
@@ -198,8 +219,8 @@ public class CodeVariables {
                String interfaceName = construct.name;
                ArrayList<String> code = new ArrayList<String>();
                code.add("inline static bool " + interfaceName
-                               + "_check_action(void *info, " + IDType + " " + MACRO_ID
-                               + ") {");
+                               + "_check_action(void *info, " + IDType + " " + MACRO_ID + ", "
+                               + ThreadIDType + " " + MACRO_THREAD_ID + ") {");
                code.add(DECLARE("bool", "check_passed"));
                // Read info struct
                if (!header.returnType.equals("void") || header.args.size() != 0) {
@@ -247,12 +268,21 @@ public class CodeVariables {
                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_MODELTYPES);
+               headers.add(HEADER_SPEC_LIB);
+               headers.add(HEADER_STDINT);
+               headers.add(HEADER_CDSANNOTATE);
+               // headers.add(HEADER_COMMON);
+               headers.add(HEADER_SPECANNOTATION);
                return headers;
        }
 
@@ -295,22 +325,6 @@ public class CodeVariables {
                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
                newCode.add(COMMENT("All other user-defined structs"));
@@ -354,7 +368,7 @@ public class CodeVariables {
 
                        // Define ID function
                        newCode.add(COMMENT("ID function of interface: " + interfaceName));
-                       newCode.addAll(DEFINE_ID_FUNC(interfaceName, iConstruct.idCode));
+                       newCode.addAll(DEFINE_ID_FUNC(iConstruct, funcHeader));
                        newCode.add(COMMENT("End of ID function: " + interfaceName));
                        newCode.add("");
 
@@ -370,9 +384,11 @@ public class CodeVariables {
                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"));
@@ -405,7 +421,7 @@ public class CodeVariables {
                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
@@ -434,7 +450,7 @@ public class CodeVariables {
                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));
@@ -443,7 +459,7 @@ public class CodeVariables {
                        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);
@@ -517,17 +533,26 @@ public class CodeVariables {
        }
 
        // 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>();
+       // 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) {
-               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;
+               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
@@ -535,12 +560,6 @@ public class CodeVariables {
                        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
@@ -555,11 +574,12 @@ public class CodeVariables {
                newCode.add(STRUCT_NEW_DECLARE_DEFINE(ANNO_INTERFACE_BEGIN,
                                "interface_begin"));
                newCode.add(ASSIGN_TO_PTR(structName, "interface_num", interfaceNum));
+
                String anno = "annotation_interface_begin";
                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) + ";");
@@ -582,7 +602,7 @@ public class CodeVariables {
                        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("");
                }
@@ -597,7 +617,7 @@ public class CodeVariables {
                        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
@@ -626,7 +646,7 @@ public class CodeVariables {
                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 + ";");
@@ -687,10 +707,6 @@ public class CodeVariables {
                // 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 + ") {");
@@ -704,7 +720,7 @@ public class CodeVariables {
                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;
        }
@@ -719,9 +735,6 @@ public class CodeVariables {
                // 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 + ") {");
@@ -733,7 +746,7 @@ public class CodeVariables {
                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;
        }
@@ -755,7 +768,7 @@ public class CodeVariables {
                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;
        }
This is the public repository for the CDSSpec specification compiler.