}
}
- // Mainly rename and wrap the interface
+ // Wrap the interface and then renaem it
private void interface2Code(InterfaceConstruct construct) {
- // First rename the interface
- CodeVariables.renameInterface(_semantics, construct);
-
// If there's no define construct for it, we generate the wrapper just
// in place without declaration
InterfaceDefineConstruct defineConstruct = _semantics.interfaceName2DefineConstruct
CodeAddition addition;
// Then generate the wrapper if necessary
if (defineConstruct != null) { // Need to have a wrapper declaration
- newCode = CodeVariables.generateInterfaceWrapperDeclaration(_semantics, construct);
+ newCode = CodeVariables.generateInterfaceWrapperDeclaration(
+ _semantics, construct);
lineNum = construct.beginLineNum;
// Add the wrapper declaration
addition = new CodeAddition(lineNum, newCode);
if (!codeAdditions.containsKey(construct.file)) {
- codeAdditions.put(construct.file, new ArrayList<CodeAddition>());
+ codeAdditions
+ .put(construct.file, new ArrayList<CodeAddition>());
}
codeAdditions.get(construct.file).add(addition);
-
+
// Add the wrapper definition
- newCode = CodeVariables.generateInterfaceWrapperDefinition(_semantics, construct);
+ newCode = CodeVariables.generateInterfaceWrapperDefinition(
+ _semantics, construct);
lineNum = defineConstruct.beginLineNum;
// Add the wrapper declaration
addition = new CodeAddition(lineNum, newCode);
if (!codeAdditions.containsKey(defineConstruct.file)) {
- codeAdditions.put(defineConstruct.file, new ArrayList<CodeAddition>());
+ codeAdditions.put(defineConstruct.file,
+ new ArrayList<CodeAddition>());
}
codeAdditions.get(defineConstruct.file).add(addition);
} else { // No declaration needed
// Last generate the definition
- newCode = CodeVariables.generateInterfaceWrapperDefinition(_semantics, construct);
+ newCode = CodeVariables.generateInterfaceWrapperDefinition(
+ _semantics, construct);
lineNum = construct.beginLineNum;
// Add the wrapper declaration
addition = new CodeAddition(lineNum, newCode);
if (!codeAdditions.containsKey(construct.file)) {
- codeAdditions.put(construct.file, new ArrayList<CodeAddition>());
+ codeAdditions
+ .put(construct.file, new ArrayList<CodeAddition>());
}
codeAdditions.get(construct.file).add(addition);
}
-
+
+ // Don't forget to rename the interface
+ CodeVariables.renameInterface(_semantics, construct);
}
private void potentialCPDefine2Code(PotentialCPDefineConstruct construct) {
// Sort code additions
for (File file : codeAdditions.keySet()) {
ArrayList<CodeAddition> additions = codeAdditions.get(file);
- if (additions.size() == 0) // Simply do nothing, already written
- // once
+ if (additions.size() == 0) // Simply do nothing
continue;
ArrayList<String> content = _semantics.srcFilesInfo.get(file).content;
Collections.sort(additions, CodeAddition.lineNumComparator);
public static void main(String[] argvs) {
String homeDir = Environment.HOME_DIRECTORY;
File[] srcFiles = {
- // new File(Environment.MODEL_CHECKER_TEST_DIR +
- // "/backup_linuxrwlocks.c") };
- // new File(homeDir + "/benchmark/linuxrwlocks/linuxrwlocks.c") };
- new File(homeDir
- + "/benchmark/cliffc-hashtable/simplified_cliffc_hashtable.h"), };
- // new File(homeDir + "/benchmark/ms-queue/my_queue.c"),
- // new File(homeDir + "/benchmark/ms-queue/my_queue.c") };
+ // new File(Environment.MODEL_CHECKER_TEST_DIR +
+ // "/backup_linuxrwlocks.c") };
+ // new File(homeDir + "/benchmark/linuxrwlocks/linuxrwlocks.c")
+ // };
+ // new File(homeDir
+ // +
+ // "/benchmark/cliffc-hashtable/simplified_cliffc_hashtable.h"),
+ // };
+ new File(homeDir + "/benchmark/ms-queue/my_queue.c"),
+ new File(homeDir + "/benchmark/ms-queue/my_queue.h") };
// new File(homeDir + "/benchmark/test/test.c") };
CodeGenerator gen = new CodeGenerator(srcFiles);
gen.generateCode();
private static ArrayList<String> DEFINE_ID_FUNC(String interfaceName,
String idCode) {
ArrayList<String> code = new ArrayList<String>();
- code.add("static " + IDType + " " + interfaceName + "_id() {");
+ code.add("inline static " + IDType + " " + interfaceName + "_id() {");
if (!idCode.equals("")) {
code.add(DECLARE_DEFINE(IDType, MACRO_ID, idCode));
} else {
InterfaceConstruct construct, FunctionHeader header) {
String interfaceName = construct.name;
ArrayList<String> code = new ArrayList<String>();
- code.add("static bool " + interfaceName + "_check_action(void *info, "
+ code.add("inline static bool " + interfaceName + "_check_action(void *info, "
+ IDType + " " + MACRO_ID + ") {");
code.add(DECLARE("bool", "check_passed"));
// Read info struct
private static void makeFunctionStatic(ArrayList<String> funcDefine) {
String headLine = funcDefine.get(0);
- headLine = "static " + headLine;
+ headLine = "inline static " + headLine;
funcDefine.set(0, headLine);
}
newCode.add("");
newCode.add(COMMENT("Define function for sequential code initialization"));
- newCode.add("static void __sequential_init() {");
+ newCode.add("inline static void __sequential_init() {");
// Init func_ptr_table
newCode.add(COMMENT("Init func_ptr_table"));
newCode.add(ASSIGN("func_ptr_table", "(void**) malloc(sizeof(void*) * "