Update for current bap and core_kernel 0.14.1 (#12)

* Update for current bap and core_kernel 0.14.1

* Fix tracedump.ml

Author: thestr4ng3r

_oasis

@@ -12,7 +12,7 @@ Library "bap-frames"
   Modules:         Frame_arch, Frame_events, Frame_mach, Frame_piqi, Frame_reader, Frame_enum
   FindlibName:     bap-frames
   BuildTools:      piqi
-  BuildDepends:    bap, bap-traces, core_kernel, piqirun.pb, ppx_jane
+  BuildDepends:    bap, bap-traces, core_kernel, core_kernel.binary_packing, piqirun.pb, ppx_jane
   CompiledObject:  best
   DataFiles:       ../piqi/*.piqi
 

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: c47fcdcf848520d4c6201f726377213a)
+# DO NOT EDIT (digest: 3601e9f0e79ce412a23bf65aba46dbe9)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -19,17 +19,38 @@ true: annot, bin_annot
 <lib/*.ml{,i,y}>: pkg_bap
 <lib/*.ml{,i,y}>: pkg_bap-traces
 <lib/*.ml{,i,y}>: pkg_core_kernel
+<lib/*.ml{,i,y}>: pkg_core_kernel.binary_packing
 <lib/*.ml{,i,y}>: pkg_piqirun.pb
-<lib/*.ml{,i,y}>: pkg_ppx_deriving.std
 <lib/*.ml{,i,y}>: pkg_ppx_jane
 # Library bap-plugin-frames
 "plugin/bap-plugin-frames.cmxs": use_bap-plugin-frames
 <plugin/*.ml{,i,y}>: pkg_bap
 <plugin/*.ml{,i,y}>: pkg_bap-traces
 <plugin/*.ml{,i,y}>: pkg_core_kernel
+<plugin/*.ml{,i,y}>: pkg_core_kernel.binary_packing
 <plugin/*.ml{,i,y}>: pkg_piqirun.pb
-<plugin/*.ml{,i,y}>: pkg_ppx_deriving.std
 <plugin/*.ml{,i,y}>: pkg_ppx_jane
 <plugin/*.ml{,i,y}>: use_bap-frames
+# Library frames-tests
+"test/frames-tests.cmxs": use_frames-tests
+# Executable run_frames_tests
+<test/run_frames_tests.{native,byte}>: pkg_bap
+<test/run_frames_tests.{native,byte}>: pkg_bap-traces
+<test/run_frames_tests.{native,byte}>: pkg_core_kernel
+<test/run_frames_tests.{native,byte}>: pkg_core_kernel.binary_packing
+<test/run_frames_tests.{native,byte}>: pkg_oUnit
+<test/run_frames_tests.{native,byte}>: pkg_piqirun.pb
+<test/run_frames_tests.{native,byte}>: pkg_ppx_jane
+<test/run_frames_tests.{native,byte}>: use_bap-frames
+<test/run_frames_tests.{native,byte}>: use_frames-tests
+<test/*.ml{,i,y}>: pkg_bap
+<test/*.ml{,i,y}>: pkg_bap-traces
+<test/*.ml{,i,y}>: pkg_core_kernel
+<test/*.ml{,i,y}>: pkg_core_kernel.binary_packing
+<test/*.ml{,i,y}>: pkg_oUnit
+<test/*.ml{,i,y}>: pkg_piqirun.pb
+<test/*.ml{,i,y}>: pkg_ppx_jane
+<test/*.ml{,i,y}>: use_bap-frames
+<test/*.ml{,i,y}>: use_frames-tests
 # OASIS_STOP
 <libtrace>: -traverse

myocamlbuild.ml

@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 5b609f7614c506a9b5ee564a95aeb514) *)
+(* DO NOT EDIT (digest: 5654b884edf5267e4adea62d7ab38556) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
@@ -105,10 +105,7 @@ module OASISString = struct
         ok := false;
       incr str_idx
     done;
-    if !what_idx = String.length what then
-      true
-    else
-      false
+    !what_idx = String.length what
 
 
   let strip_starts_with ~what str =
@@ -131,10 +128,7 @@ module OASISString = struct
         ok := false;
       decr str_idx
     done;
-    if !what_idx = -1 then
-      true
-    else
-      false
+    !what_idx = -1
 
 
   let strip_ends_with ~what str =
@@ -177,6 +171,13 @@ module OASISString = struct
     else
       s
 
+
+  let split str c =
+    let idx = String.index str c in
+    String.sub str 0 idx,
+    String.sub str (idx + 1) (String.length str - idx - 1)
+
+
 end
 
 module OASISUtils = struct
@@ -440,7 +441,7 @@ module OASISExpr = struct
 end
 
 
-# 443 "myocamlbuild.ml"
+# 444 "myocamlbuild.ml"
 module BaseEnvLight = struct
 (* # 22 "src/base/BaseEnvLight.ml" *)
 
@@ -520,7 +521,7 @@ module BaseEnvLight = struct
 end
 
 
-# 523 "myocamlbuild.ml"
+# 524 "myocamlbuild.ml"
 module MyOCamlbuildFindlib = struct
 (* # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
 
@@ -746,6 +747,9 @@ module MyOCamlbuildBase = struct
 (* # 110 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
 
 
+  let env_filename = Pathname.basename BaseEnvLight.default_filename
+
+
   let dispatch_combine lst =
     fun e ->
       List.iter
@@ -878,23 +882,27 @@ module MyOCamlbuildBase = struct
 end
 
 
-# 881 "myocamlbuild.ml"
+# 885 "myocamlbuild.ml"
 open Ocamlbuild_plugin;;
 let package_default =
   {
      MyOCamlbuildBase.lib_ocaml =
-       [("bap-frames", ["lib"], []); ("bap-plugin-frames", ["plugin"], [])];
+       [
+          ("bap-frames", ["lib"], []);
+          ("bap-plugin-frames", ["plugin"], []);
+          ("frames-tests", ["test"], [])
+       ];
      lib_c = [];
      flags = [];
-     includes = [("plugin", ["lib"])]
+     includes = [("test", ["lib"]); ("plugin", ["lib"])]
   }
   ;;
 
 let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
 
 let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
 
-# 898 "myocamlbuild.ml"
+# 906 "myocamlbuild.ml"
 (* OASIS_STOP *)
 let oasis_env =
   BaseEnvLight.load

plugin/frame_trace_plugin.ml

@@ -13,7 +13,7 @@ let create_frame_reader uri =
         val mutable tid = None
         method switch id' =
           match tid with
-          | Some id when id = id' -> false
+          | Some id when Int64.equal id id' -> false
           | _ -> tid <- Some id'; true
       end
 
@@ -48,7 +48,9 @@ module Frame_proto : Trace.P = struct
     List.exists ~f:(fun same -> same tag) checkers
 
   let probe uri =
-    Uri.scheme uri = Some "file" &&
+    (match Uri.scheme uri with
+      | Some s -> String.equal s "file"
+      | None -> false) &&
     Filename.check_suffix (Uri.path uri) ".frames"
 end
 
@@ -57,7 +59,7 @@ let build_reader tool uri id =
     let reader = create_frame_reader uri in
     Trace.Reader.{ tool; meta = reader#meta; next = fun () -> reader#next } in
   try Ok (build ()) with
-  | Unix.Unix_error (err, _, _) -> Result.fail (`System_error err)
+  | Caml_unix.Unix_error (err, _, _) -> Result.fail (`System_error err)
   | exn -> Result.fail (`Protocol_error (Error.of_exn  exn))
 
 let () =