projects / cdsspec-compiler.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
save it
[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 980e42064d74cb09dd1533fbeff413e5ab5591d1..af2ebcaf218008363756bfda7412ea2e78b81b4f 100644 (file)
--- a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
+++ b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
@@ -35,11 +35,13 @@ public class CodeVariables {
        public static final String HEADER_CDSANNOTATE = "<cdsannotate.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 = "id_t";
+       public static final String IDType = "call_id_t";
 
        public static final String SPEC_ANNO_TYPE = "spec_anno_type";
+       public static final String SPEC_ANNO_TYPE_FUNC_TABLE_INIT = "FUNC_TABLE_INIT";
        public static final String SPEC_ANNO_TYPE_HB_INIT = "HB_INIT";
        public static final String SPEC_ANNO_TYPE_INTERFACE_BEGIN = "INTERFACE_BEGIN";
        public static final String SPEC_ANNO_TYPE_HB_CONDITION = "HB_CONDITION";
@@ -51,6 +53,7 @@ public class CodeVariables {
        public static final String SPEC_ANNOTATION_FIELD_TYPE = "type";
        public static final String SPEC_ANNOTATION_FIELD_ANNO = "annotation";
 
+       public static final String ANNO_FUNC_TABLE_INIT = "anno_func_table_init";
        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";
@@ -158,7 +161,7 @@ public class CodeVariables {
                for (int i = 0; i < header.args.size(); i++) {
                        code.add(DECLARE(header.args.get(i)));
                }
-               code.add("} " + interfaceName + "_info {");
+               code.add("} " + interfaceName + "_info;");
                return code;
        }
 
@@ -187,7 +190,7 @@ public class CodeVariables {
                if (!header.returnType.equals("void") || header.args.size() != 0) {
                        String infoStructType = interfaceName + "_info", infoStructName = "theInfo";
                        code.add(DECLARE_DEFINE(infoStructType + "*", infoStructName,
-                                       BRACE(infoStructType) + "info"));
+                                       BRACE(infoStructType + "*") + "info"));
                        if (!header.returnType.equals("void")) {
                                code.add((DECLARE_DEFINE(header.returnType, MACRO_RETURN,
                                                GET_FIELD_BY_PTR(infoStructName, MACRO_RETURN))));
@@ -221,6 +224,8 @@ public class CodeVariables {
                if (construct.postAction.size() > 0) {
                        code.addAll(construct.postAction);
                }
+               // Return true finally
+               code.add("return true;");
 
                code.add("}");
 
@@ -275,9 +280,11 @@ public class CodeVariables {
                }
                newCode.add("");
                // Other necessary headers
+               newCode.add(INCLUDE(HEADER_STDLIB));
                newCode.add(INCLUDE(HEADER_STDINT));
                newCode.add(INCLUDE(HEADER_CDSANNOTATE));
                newCode.add(INCLUDE(HEADER_SPEC_LIB));
+               newCode.add(INCLUDE(HEADER_SPECANNOTATION));
                newCode.add("");
 
                SequentialDefineSubConstruct code = construct.code;
@@ -289,6 +296,13 @@ public class CodeVariables {
                        newCode.addAll(declareStruct);
                        newCode.add("");
                }
+               // User-defined variables
+               ArrayList<VariableDeclaration> varDecls = code.declareVar;
+               for (int i = 0; i < varDecls.size(); i++) {
+                       VariableDeclaration varDecl = varDecls.get(i);
+                       // Don't forget to make them static
+                       newCode.add(makeVariablesStatic(varDecl));
+               }
                // User-defined functions
                newCode.add(COMMENT("All other user-defined functions"));
                ArrayList<ArrayList<String>> defineFuncs = code.defineFuncs;
@@ -304,7 +318,8 @@ public class CodeVariables {
                                        .get(interfaceName);
                        FunctionHeader funcHeader = getFunctionHeader(semantics, iConstruct);
                        // Define necessary info structure
-                       if (!funcHeader.returnType.equals("void") || funcHeader.args.size() > 0) {
+                       if (!funcHeader.returnType.equals("void")
+                                       || funcHeader.args.size() > 0) {
                                newCode.add(COMMENT("Definition of interface info struct: "
                                                + interfaceName));
                                newCode.addAll(DEFINE_INFO_STRUCT(interfaceName, funcHeader));
@@ -316,14 +331,14 @@ public class CodeVariables {
                        // Define ID function
                        newCode.add(COMMENT("ID function of interface: " + interfaceName));
                        newCode.addAll(DEFINE_ID_FUNC(interfaceName, iConstruct.idCode));
-                       newCode.add(COMMENT("End of ID function: + " + interfaceName));
+                       newCode.add(COMMENT("End of ID function: " + interfaceName));
                        newCode.add("");
 
                        // Define check_action function
                        newCode.add(COMMENT("Check action function of interface: "
                                        + interfaceName));
                        newCode.addAll(DEFINE_CHECK_ACTION_FUNC(iConstruct, funcHeader));
-                       newCode.add(COMMENT("End of check action function: + "
+                       newCode.add(COMMENT("End of check action function: "
                                        + interfaceName));
                        newCode.add("");
                }
@@ -332,13 +347,6 @@ public class CodeVariables {
                                .toString(semantics.interfaceName2Construct.size());
                newCode.add(DEFINE("INTERFACE_SIZE", interfaceSize));
                newCode.add(DECLARE("void**", "func_ptr_table"));
-               // User-defined variables
-               ArrayList<VariableDeclaration> varDecls = code.declareVar;
-               for (int i = 0; i < varDecls.size(); i++) {
-                       VariableDeclaration varDecl = varDecls.get(i);
-                       // Don't forget to make them static
-                       newCode.add(makeVariablesStatic(varDecl));
-               }
 
                newCode.add("");
                newCode.add(COMMENT("Define function for sequential code initialization"));
@@ -358,8 +366,19 @@ public class CodeVariables {
                newCode.add("");
                // Init user-defined variables
                newCode.addAll(construct.code.initVar);
+               // Pass function table info
+               newCode.add(COMMENT("Pass function table info"));
+               String structName = "anno_func_table_init", anno = "func_init";
+               newCode.add(DECLARE(ANNO_FUNC_TABLE_INIT, structName));
+               newCode.add(ASSIGN(structName, "size", "INTERFACE_SIZE"));
+               newCode.add(ASSIGN(structName, "table", "func_ptr_table"));
+               newCode.add(DECLARE(SPEC_ANNOTATION, anno));
+               newCode.add(ASSIGN(anno, "type", SPEC_ANNO_TYPE_FUNC_TABLE_INIT));
+               newCode.add(ASSIGN_PTR(anno, "annotation", structName));
+               newCode.add(ANNOTATE(anno));
+
                // Pass Happens-before relationship
-               generateHBInitAnnotation(semantics);
+               newCode.addAll(generateHBInitAnnotation(semantics));
                newCode.add("}");
                newCode.add(COMMENT("End of Global construct generation in class"));
 
@@ -470,6 +489,14 @@ public class CodeVariables {
                }
 
                // Generate wrapper header
+               // If it's not in a class, we should declare the wrapper function
+               if (semantics.getClassName() == null) {
+                       FunctionHeader renamedHeader = header
+                                       .getRenamedHeader(SPEC_INTERFACE_WRAPPER);
+                       newCode.add(COMMENT("Declaration of the wrapper"));
+                       newCode.add(renamedHeader + ";");
+                       newCode.add("");
+               }
                newCode.add(header.toString() + " {");
                // Wrapper function body
                newCode.add(COMMENT("Interface begins"));
@@ -479,12 +506,12 @@ public class CodeVariables {
                newCode.add(ASSIGN(structName, "interface_num", interfaceNum));
                String anno = "annotation_interface_begin";
                newCode.add(DECLARE(SPEC_ANNOTATION, anno));
-               newCode.add(ASSIGN(structName, "type", SPEC_ANNO_TYPE_INTERFACE_BEGIN));
-               newCode.add(ASSIGN_PTR(structName, "annotation", structName));
+               newCode.add(ASSIGN(anno, "type", SPEC_ANNO_TYPE_INTERFACE_BEGIN));
+               newCode.add(ASSIGN_PTR(anno, "annotation", structName));
                newCode.add(ANNOTATE(anno));
                // Call original renamed function
                if (header.returnType.equals("void")) {
-                       newCode.add(header.getRenamedCall(SPEC_INTERFACE_WRAPPER));
+                       newCode.add(header.getRenamedCall(SPEC_INTERFACE_WRAPPER) + ";");
                } else {
                        newCode.add(DECLARE_DEFINE(header.returnType, MACRO_RETURN,
                                        header.getRenamedCall(SPEC_INTERFACE_WRAPPER)));
@@ -513,7 +540,7 @@ public class CodeVariables {
                if (!header.returnType.equals("void") || header.args.size() > 0) {
                        infoStructType = interfaceName + "_info";
                        infoName = "info";
-                       newCode.add(DECLARE_DEFINE(infoStructType, infoName,
+                       newCode.add(DECLARE_DEFINE(infoStructType + "*", infoName,
                                        BRACE(infoStructType + "*") + " malloc(sizeof("
                                                        + infoStructType + "))"));
                        if (!header.returnType.equals("void")) {
@@ -534,7 +561,11 @@ public class CodeVariables {
                newCode.add(DECLARE(SPEC_ANNOTATION, anno));
                newCode.add(ASSIGN(anno, "type", SPEC_ANNO_TYPE_INTERFACE_END));
                newCode.add(ASSIGN_PTR(anno, "annotation", structName));
-               ANNOTATE(anno);
+               newCode.add(ANNOTATE(anno));
+               // Return __RET__ if it's not void
+               if (!header.returnType.equals("void")) {
+                       newCode.add("return " + MACRO_RETURN + ";");
+               }
                // End of the wrapper function
                newCode.add("}");
 
This is the public repository for the CDSSpec specification compiler.