BinaryAnalysisPlatform · ivg · May 13, 2022 · May 12, 2022 · May 12, 2022 · May 13, 2022
diff --git a/lib/arm/arm_bit.ml b/lib/arm/arm_bit.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 open Or_error
 

diff --git a/lib/arm/arm_bit.mli b/lib/arm/arm_bit.mli
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 open Arm_types
 

diff --git a/lib/arm/arm_branch.ml b/lib/arm/arm_branch.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 open Or_error
 

diff --git a/lib/arm/arm_branch.mli b/lib/arm/arm_branch.mli
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 open Arm_types
 

diff --git a/lib/arm/arm_cond.ml b/lib/arm/arm_cond.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Regular.Std
 open Bap.Std
 

diff --git a/lib/arm/arm_cond.mli b/lib/arm/arm_cond.mli
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Regular.Std
 open Bap.Std
 open Arm_types

diff --git a/lib/arm/arm_env.ml b/lib/arm/arm_env.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Regular.Std
 open Bap.Std
 open Arm_types

diff --git a/lib/arm/arm_env.mli b/lib/arm/arm_env.mli
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 open Arm_types
 

diff --git a/lib/arm/arm_flags.ml b/lib/arm/arm_flags.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 
 open Arm_types

diff --git a/lib/arm/arm_flags.mli b/lib/arm/arm_flags.mli
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 open Arm_types
 

diff --git a/lib/arm/arm_helpers.ml b/lib/arm/arm_helpers.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 
 let sexpable_of_string t_of_sexp name =
   try Some (t_of_sexp @@ Sexp.of_string name)

diff --git a/lib/arm/arm_helpers.mli b/lib/arm/arm_helpers.mli
@@ -1,3 +1,3 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 
 val sexpable_of_string : (Sexp.t -> 'a) -> string -> 'a option
diff --git a/lib/arm/arm_insn.ml b/lib/arm/arm_insn.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Regular.Std
 open Bap.Std
 open Arm_helpers

diff --git a/lib/arm/arm_lifter.ml b/lib/arm/arm_lifter.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap_core_theory
 open Or_error
 open Bap.Std

diff --git a/lib/arm/arm_mem.ml b/lib/arm/arm_mem.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Regular.Std
 open Bap.Std
 
@@ -70,7 +70,7 @@ let lift_r  ~(dst1 : Var.t) ?(dst2 : Var.t option) ~(base : Var.t)
       let mem = Bil.var (Env.mem) in
       if [%compare.equal: size] size D then [
         Bil.move dst1 (load mem address);
-        Bil.move (uw dst2) (load mem Bil.(address + four));
+        Bil.move (Option.value_exn dst2) (load mem Bil.(address + four));
       ] else [
         assn temp (load mem address);
       ] in
@@ -94,7 +94,7 @@ let lift_r  ~(dst1 : Var.t) ?(dst2 : Var.t option) ~(base : Var.t)
       | D -> [
           Bil.move m (store v address Bil.(var dst1));
           Bil.move m (store v
-                        Bil.(address + four) Bil.(var (uw dst2)));
+                        Bil.(address + four) Bil.(var (Option.value_exn dst2)));
         ]
       | B | H | W -> [
           Bil.move m (store v address Bil.(var temp));

diff --git a/lib/arm/arm_mem.mli b/lib/arm/arm_mem.mli
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 open Arm_types
 

diff --git a/lib/arm/arm_mem_shift.ml b/lib/arm/arm_mem_shift.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Regular.Std
 open Bap.Std
 open Or_error

diff --git a/lib/arm/arm_mem_shift.mli b/lib/arm/arm_mem_shift.mli
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 open Arm_types
 

diff --git a/lib/arm/arm_mov.ml b/lib/arm/arm_mov.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap_core_theory
 open Regular.Std
 open Bap.Std

diff --git a/lib/arm/arm_mov.mli b/lib/arm/arm_mov.mli
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap_core_theory
 open Bap.Std
 open Arm_types

diff --git a/lib/arm/arm_mul.ml b/lib/arm/arm_mul.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Regular.Std
 open Bap.Std
 

diff --git a/lib/arm/arm_mul.mli b/lib/arm/arm_mul.mli
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 open Arm_types
 

diff --git a/lib/arm/arm_op.ml b/lib/arm/arm_op.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Regular.Std
 open Bap.Std
 

diff --git a/lib/arm/arm_reg.ml b/lib/arm/arm_reg.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Regular.Std
 open Bap.Std
 open Arm_helpers

diff --git a/lib/arm/arm_shift.ml b/lib/arm/arm_shift.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 open Or_error
 

diff --git a/lib/arm/arm_shift.mli b/lib/arm/arm_shift.mli
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 open Arm_types
 

diff --git a/lib/arm/arm_target.ml b/lib/arm/arm_target.ml
@@ -1,6 +1,6 @@
 let package = "bap"
 
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap_core_theory
 open Bap.Std
 open KB.Syntax

diff --git a/lib/arm/arm_types.ml b/lib/arm/arm_types.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Regular.Std
 open Bap.Std
 

diff --git a/lib/arm/arm_utils.ml b/lib/arm/arm_utils.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 
 open Arm_types

diff --git a/lib/arm/arm_utils.mli b/lib/arm/arm_utils.mli
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 open Arm_types
 

diff --git a/lib/bap/bap.ml b/lib/bap/bap.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 
 module Std = struct
   type 'a printer = Format.formatter -> 'a -> unit

diff --git a/lib/bap/bap.mli b/lib/bap/bap.mli
@@ -1,6 +1,6 @@
 (** BAP Standard Library  *)
 
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Monads.Std
 open Regular.Std
 open Graphlib.Std
@@ -459,7 +459,7 @@ module Std : sig
       The following plugin prints all sections in a file:
 
       {[
-        open Core_kernel
+        open Core_kernel[@@warning "-D"]
         open Bap.Std
         open Format
 
@@ -628,7 +628,7 @@ module Std : sig
    **)
   module Legacy : sig
     module Monad : sig
-      open Core_kernel
+      open Core_kernel[@@warning "-D"]
       module type Basic = Monad.Basic
       module type Basic2 = Monad.Basic2
       module type Infix = Monad.Infix
@@ -6636,7 +6636,7 @@ module Std : sig
 
           @param return a function that lifts user data type ['s] to type
           ['r]. It is useful when you need to perform disassembly in some
-          monad, like [Or_error], or [Lwt]. Otherwise, just use [ident]
+          monad, like [Or_error], or [Lwt]. Otherwise, just use [Fn.id]
           function and assume that ['s == 'r].
 
           The disassembler will invoke user provided callbacks. To each
@@ -10560,7 +10560,7 @@ module Std : sig
           the file, and [data] spans the data. An optional [finish]
           function can be used to propagate to the project any
           additional information that is available to the loader. It
-          defaults to [ident].
+          defaults to [Fn.id].
           @deprecated use either [Input.custom] or [Input.from_string]
           and [Input.from_bigstring].
       *)

diff --git a/lib/bap/bap_init_toplevel.ml b/lib/bap/bap_init_toplevel.ml
@@ -8,10 +8,11 @@ let install_printer printer =
 let install_printers () =
   Core_kernel.Pretty_printer.all () |>
   List.iter install_printer
+[@@warning "-D"]
 
 let main () =
   let module Bap_std_is_required = Bap.Std in
-  let module Core_kernel_is_required = Core_kernel in
+  let module Core_kernel_is_required = Core_kernel[@warning "-D"] in
   let loader = Topdirs.dir_load Format.err_formatter in
   setup_dynamic_loader loader;
   install_printers ();

diff --git a/lib/bap/bap_project.ml b/lib/bap/bap_project.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Regular.Std
 open Bap_core_theory
 open Graphlib.Std
@@ -193,7 +193,7 @@ module Input = struct
 
 
   let custom
-      ?(finish=ident)
+      ?(finish=Fn.id)
       ?(filename="")
       ?(code=Memmap.empty)
       ?(data=Memmap.empty) target () = {
@@ -204,7 +204,7 @@ module Input = struct
   }
 
   let create
-      ?(finish=ident) arch file ~code ~data () =
+      ?(finish=Fn.id) arch file ~code ~data () =
     let spec = match arch with
       | #Arch.unknown -> Ogre.Doc.empty
       | arch -> Image.Spec.from_arch arch in {
@@ -295,7 +295,7 @@ module Input = struct
       arch;
       code;
       data;
-      file = filename; finish = ident; spec;
+      file = filename; finish = Fn.id; spec;
       target;
       memory = code
     }

diff --git a/lib/bap/bap_project.mli b/lib/bap/bap_project.mli
@@ -1,6 +1,6 @@
 open Bap_knowledge
 open Bap_core_theory
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Regular.Std
 open Bap_future.Std
 open Bap_types.Std

diff --git a/lib/bap/bap_self.ml b/lib/bap/bap_self.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap_bundle.Std
 open Bap_future.Std
 open Bap_plugins.Std

diff --git a/lib/bap/bap_self.mli b/lib/bap/bap_self.mli
@@ -1,5 +1,5 @@
 open Format
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap_future.Std
 open Bap_main.Extension
 

diff --git a/lib/bap_abi/bap_abi.ml b/lib/bap_abi/bap_abi.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 
 

diff --git a/lib/bap_api/bap_api.ml b/lib/bap_api/bap_api.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 
 type filename = string

diff --git a/lib/bap_api/bap_api.mli b/lib/bap_api/bap_api.mli
@@ -13,7 +13,7 @@
 
 *)
 
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 
 type filename = string

diff --git a/lib/bap_api/bap_api_abi.ml b/lib/bap_api/bap_api_abi.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Regular.Std
 open Bap.Std
 open Bap_api

diff --git a/lib/bap_api/bap_api_abi.mli b/lib/bap_api/bap_api_abi.mli
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Regular.Std
 open Bap.Std
 open Bap_api

diff --git a/lib/bap_bml/bap_bml.ml b/lib/bap_bml/bap_bml.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 
 [@@@warning "-D"]
@@ -74,7 +74,7 @@ let (-) pref tag = pref ^ "-" ^ Value.Tag.name tag
 let (+) pref suf = if String.is_empty suf then pref else pref^"-"^suf
 
 let unit suf set is tag =
-  Mappers.Nullary.register (set-tag+suf) (marker ident tag ());
+  Mappers.Nullary.register (set-tag+suf) (marker Fn.id tag ());
   Predicates.Nullary.register (is-tag+suf) (has tag)
 
 module Markers = struct
@@ -173,13 +173,13 @@ end
 module Comment = struct
   let () =
     Mappers.Unary.register "comment" @@
-    marker ident comment;
+    marker Fn.id comment;
 end
 
 module Python = struct
   let () =
     Mappers.Unary.register "python" @@
-    marker ident python;
+    marker Fn.id python;
 end
 
 module Taint = struct

diff --git a/lib/bap_bml/bap_bml.mli b/lib/bap_bml/bap_bml.mli
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 open Bap.Std
 
 (** BML - Bap Mapping Language.

diff --git a/lib/bap_bundle/bap_bundle.ml b/lib/bap_bundle/bap_bundle.ml
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 
 module Filename = Caml.Filename
 module Sys = Caml.Sys

diff --git a/lib/bap_bundle/bap_bundle.mli b/lib/bap_bundle/bap_bundle.mli
@@ -1,4 +1,4 @@
-open Core_kernel
+open Core_kernel[@@warning "-D"]
 
 module Std : sig