remove useless c_processing module, better organisation of src/ folder

zapashcanon · Jun 15, 2024 · 76870f1 · 76870f1
1 parent 373e424
commit 76870f1
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 43 deletions.
diff --git a/dune-project b/dune-project
@@ -75,4 +75,4 @@
   xmlm
   (hc (>= 0.3))
   dune-site)
- (sites (share pyc) (share binc) (share libc)))
+ (sites (share binc) (share libc)))
diff --git a/src/compile.ml → src/ast/compile.ml b/src/compile.ml → src/ast/compile.ml
diff --git a/src/compile.mli → src/ast/compile.mli b/src/compile.mli → src/ast/compile.mli
diff --git a/src/c_processing/c_share.ml b/src/c_processing/c_share.ml
diff --git a/src/c_processing/c_share.mli b/src/c_processing/c_share.mli
diff --git a/src/cmd/cmd_c.ml b/src/cmd/cmd_c.ml
@@ -11,6 +11,28 @@ type metadata =
   ; files : Fpath.t list
   }
 
+let binc_location = List.map Fpath.v C_share_site.Sites.binc
+
+let libc_location = List.map Fpath.v C_share_site.Sites.libc
+
+let find location file : Fpath.t Result.t =
+  let* l =
+    list_map
+      (fun dir ->
+        let filename = Fpath.append dir file in
+        match Bos.OS.File.exists filename with
+        | Ok true -> Ok (Some filename)
+        | Ok false -> Ok None
+        | Error (`Msg msg) -> Error (`Msg msg) )
+      location
+  in
+  let rec loop = function
+    | [] -> Error (`Msg (Format.asprintf "can't find file %a" Fpath.pp file))
+    | None :: tl -> loop tl
+    | Some file :: _tl -> Ok file
+  in
+  loop l
+
 let compile ~includes ~opt_lvl (files : Fpath.t list) : Fpath.t Result.t =
   let flags =
     let stack_size = 8 * 1024 * 1024 |> string_of_int in
@@ -37,7 +59,10 @@ let compile ~includes ~opt_lvl (files : Fpath.t list) : Fpath.t Result.t =
   let* clang_bin = OS.Cmd.resolve @@ Cmd.v "clang" in
 
   let out = Fpath.(v "a.out.wasm") in
-  let files = Cmd.of_list (List.map Fpath.to_string (C_share.libc :: files)) in
+
+  let* libc = find binc_location (Fpath.v "libc.wasm") in
+
+  let files = Cmd.of_list (List.map Fpath.to_string (libc :: files)) in
   let clang : Bos.Cmd.t = Cmd.(clang_bin %% flags % "-o" % p out %% files) in
 
   let+ () = OS.Cmd.run clang in
@@ -98,7 +123,7 @@ let cmd debug arch property _testcomp workspace workers opt_lvl includes files
   deterministic_result_order concolic solver : unit Result.t =
   if debug then Logs.set_level (Some Debug);
   let workspace = Fpath.v workspace in
-  let includes = C_share.lib_location @ includes in
+  let includes = libc_location @ includes in
   let* (_exists : bool) = OS.Dir.create ~path:true workspace in
   let* modul = compile ~includes ~opt_lvl files in
   let* () = metadata ~workspace arch property files in

diff --git a/src/dune b/src/dune
@@ -8,7 +8,6 @@
   binary_parser
   binary_to_text
   binary_types
-  c_share
   c_share_site
   check
   choice_intf

diff --git a/src/result.ml → src/utils/result.ml b/src/result.ml → src/utils/result.ml
diff --git a/src/result.mli → src/utils/result.mli b/src/result.mli → src/utils/result.mli
diff --git a/src/tracing.ml → src/utils/tracing.ml b/src/tracing.ml → src/utils/tracing.ml
diff --git a/src/tracing.mli → src/utils/tracing.mli b/src/tracing.mli → src/utils/tracing.mli
diff --git a/src/check/check.ml → src/validate/check.ml b/src/check/check.ml → src/validate/check.ml
diff --git a/src/check/check.mli → src/validate/check.mli b/src/check/check.mli → src/validate/check.mli
diff --git a/src/typecheck/typecheck.ml → src/validate/typecheck.ml b/src/typecheck/typecheck.ml → src/validate/typecheck.ml
diff --git a/src/typecheck/typecheck.mli → src/validate/typecheck.mli b/src/typecheck/typecheck.mli → src/validate/typecheck.mli
diff --git a/test/script/gc.t b/test/script/gc.t
@@ -21,7 +21,7 @@
   [23]
   $ owi script --no-exhaustion reference/proposals/gc/ref_eq.wast
   owi: internal error, uncaught exception:
-       File "src/typecheck/typecheck.ml", line 478, characters 4-10: Assertion failed
+       File "src/validate/typecheck.ml", line 478, characters 4-10: Assertion failed
 
   [125]
   $ owi script --no-exhaustion reference/proposals/gc/ref_test.wast