toC, pipeline merge

Author: oshimayuki1124

lib/pipeline.ml

@@ -360,11 +360,12 @@ let build_run_bench ~log_dir ~file ~mode_str ~itr ~mutants_length ~config =
   close_out oc;
   (* .c 生成 *)
   let oc = open_out (asprintf "%s/bench/%s%s.c" log_dir file mode_str) in
-  Printf.fprintf oc "%s\n%s\n%s\n%s"
-    (asprintf "#include <stdio.h>\n#include <sys/time.h>\n#include <sys/resource.h>\n#include \"../../../libC/types.h\"\n#include \"../../../benchC/bench_json.h\"\n#include \"%s%s_mutants.h\"\n#ifdef HASH\n#include \"../../../libC/crc.h\"\n#endif\n" file mode_str)
+  Printf.fprintf oc "%s\n%s\n%s\n%s\n%s"
+    (asprintf "#include <stdio.h>\n#include <gc.h>\n#include <sys/time.h>\n#include <sys/resource.h>\n#include \"../../../libC/types.h\"\n#include \"../../../benchC/bench_json.h\"\n#include \"%s%s_mutants.h\"\n#ifdef HASH\n#include \"../../../libC/crc.h\"\n#endif\n" file mode_str)
+    "#define GC_INITIAL_HEAP_SIZE 1048576\n"
     (asprintf "#define MUTANTS_LENGTH %d\n#define ITR %d\n" mutants_length itr)
     "#ifndef STATIC\nrange *range_list;\n#endif\nstatic double times[MUTANTS_LENGTH][ITR];\nint i;\nstruct rusage start_usage, end_usage;\n"
-    "int main(){\n";
+    "int main(){\nGC_INIT();\n";
   let rec print_itr n =
     if n = mutants_length + 1 then ()
     else begin 
@@ -381,7 +382,7 @@ let build_run_bench ~log_dir ~file ~mode_str ~itr ~mutants_length ~config =
     (asprintf "#include <stdio.h>\n#include <gc.h>\n#include \"../../../libC/types.h\"\n#include \"../../../benchC/bench_json.h\"\n#include \"%s%s_mutants.h\"\n#ifdef HASH\n#include \"../../../libC/crc.h\"\n#endif\n" file mode_str)
     (asprintf "#define MUTANTS_LENGTH %d\n" mutants_length)
     "#ifndef STATIC\nrange *range_list;\n#endif\nstatic int gc_counts[MUTANTS_LENGTH], cast_counts[MUTANTS_LENGTH], inference_counts[MUTANTS_LENGTH], longest[MUTANTS_LENGTH];\nint i;\nint gc_num, gc_tmp, current_cast, current_inference, current_longest;\n"
-    "int main(){\n";
+    "int main(){\nGC_INIT();\n";
   let rec print_itr n =
     if n = mutants_length + 1 then ()
     else begin 

lib/toC.ml

@@ -695,15 +695,16 @@ let toC_program ?(bench=0) ~config ppf (Prog (toplevel, f)) =
   let ranges = RangeManager.get_definitions () in
   let crcs = CrcManager.get_definitions () in
   let init_crcs = if !is_static then "" else "#ifdef HASH\ninit_crcs();\n#endif\n" in
-  fprintf ppf "%s\n%a%a%a%a%s%s%s%a%s"
+  fprintf ppf "%s\n%s\n%a%a%a%a%s%s%s%a%s"
     (asprintf "#include <gc.h>\n#include \"../%slibC/runtime.h\"\n"
       (if bench = 0 then "" else "../../"))
+    (if bench = 0 then "#define GC_INITIAL_HEAP_SIZE 1048576\n" else "")
     toC_tys tys
     toC_ranges ranges
     toC_crcs crcs
     toC_fundefs toplevel
     (if bench = 0 && not !is_static then "range *range_list;\n\n" else "")
-    (if bench = 0 then asprintf "int main() {\n%s" init_crcs else asprintf "int mutant%d() {\n%s" bench init_crcs)
+    (if bench = 0 then asprintf "int main() {\nGC_INIT();\n%s" init_crcs else asprintf "int mutant%d() {\n%s" bench init_crcs)
     (if List.length ranges != 0 then "range_list = local_range_list;\n" else "")
     toC_exp f
     "}"

libC/types.h

@@ -30,12 +30,6 @@ typedef enum ground_ty : uint8_t {
 
 typedef struct ty ty;
 
-typedef intptr_t dyn;
-
-#ifndef CAST
-typedef struct v_d v_d;
-#endif //CAST
-
 #endif //not STATIC
 
 typedef intptr_t value;