minor 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 ea1cb66dcdf3c9799d32261cb46b029d18a70eb7..e7aff534043e7e1b263c1d612cb3875919d9a0e5 100644 (file)
--- a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
+++ b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
@@ -39,7 +39,6 @@ public class CodeVariables {
        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 CDSAnnotateType = "SPEC_ANALYSIS";
        public static final String IDType = "call_id_t";
@@ -87,16 +86,6 @@ public class CodeVariables {
        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++) {
@@ -173,7 +162,7 @@ public class CodeVariables {
        }
 
        private static String ANNOTATE(SemanticsChecker semantics, String structName) {
-               return CDSAnnotate(semantics) + "(" + CDSAnnotateType + ", " + structName + ");";
+               return CDSAnnotate + "(" + CDSAnnotateType + ", " + structName + ");";
        }
 
        private static ArrayList<String> DEFINE_INFO_STRUCT(String interfaceName,
@@ -267,10 +256,10 @@ public class CodeVariables {
                headers.add(HEADER_STDLIB);
                headers.add(HEADER_STDINT);
                headers.add(HEADER_MODELMEMORY);
+               headers.add(HEADER_SPEC_LIB);
                headers.add(HEADER_STDINT);
                headers.add(HEADER_CDSANNOTATE);
 //             headers.add(HEADER_COMMON);
-               headers.add(HEADER_SPEC_LIB);
                headers.add(HEADER_SPECANNOTATION);
                return headers;
        }