add spsc

[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 aeace485b78e6c8453c9a7bfee3d1d9d3f07010f..ea1cb66dcdf3c9799d32261cb46b029d18a70eb7 100644 (file)
--- a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
+++ b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
@@ -269,7 +269,7 @@ public class CodeVariables {
                headers.add(HEADER_MODELMEMORY);
                headers.add(HEADER_STDINT);
                headers.add(HEADER_CDSANNOTATE);
-               headers.add(HEADER_COMMON);
+//             headers.add(HEADER_COMMON);
                headers.add(HEADER_SPEC_LIB);
                headers.add(HEADER_SPECANNOTATION);
                return headers;
@@ -374,9 +374,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"));
@@ -438,7 +440,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));
@@ -447,7 +449,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);