Final 1.3 update

.travis.yml

@@ -37,7 +37,7 @@ addons:
     - opam
 env:
   global:
-  - OPAMYES=true PACKAGE=bap TESTS=false BAP_RUN_TEST=true BAP_RUN_CHECK=true OPAM_SWITCH=$OCAML_VERSION
+  - OPAMYES=true PACKAGE=bap BAP_DEBUG=true TESTS=false BAP_RUN_TEST=true BAP_RUN_CHECK=true OPAM_SWITCH=$OCAML_VERSION
   matrix:
   - OCAML_VERSION=4.02
   - OCAML_VERSION=4.03

Makefile

@@ -9,6 +9,7 @@ build: setup.ml
 
 .PHONY: doc
 doc:
+	@ocamlbuild -pkg bap bapdoc.native
 	make -C doc
 
 all:

bapdoc.ml

@@ -8,10 +8,6 @@
 
  *)
 
-#use "topfind";;
-#require "findlib";;
-#require "bap";;
-
 open Core_kernel.Std
 open Bap_plugins.Std
 
@@ -55,6 +51,11 @@ let libraries = [
   ];
 ]
 
+let std_libraries = [
+  "Bap"; "Core_kernel"; "Regular"; "Graphlib"; "Future"; "Monads";
+  "Bap_primus"
+]
+
 let frontends = [
   "bap", "bap main frontend";
   "bap-mc", "machine code playground";
@@ -242,6 +243,8 @@ let plugins =
 let plugins_index =
   sprintf "\n\n{2 Plugins}\n%s" plugins
 
+let hides = String.concat ~sep:"," std_libraries
+let argot = if Dynlink.is_native then "argot.cmxs" else "argot.cmo"
 
 let render modules =
   let intro,out = Filename.open_temp_file "intro" ".txt" in
@@ -256,10 +259,10 @@ let render modules =
       "-html";
       "-colorize-code";
       "-short-paths";
-      "-i /home/ivg/.opam/devel/lib/argot";
-      "-g argot.cmo";
+      "-i"; Pkg.dir "argot";
+      "-g"; argot;
       "-short-functors";
-      "-hide Bap.Std,Core_kernel.Std,Regular.Std,Graphlib.Std,Future.Std,Monads.Std,Bap_primus.Std";
+      "-hide"; hides;
       "-passopt -search-frame";
       "-passopt -search";
       "-passopt -full-text";

doc/Makefile

@@ -1,3 +1,14 @@
-.PHONY: doc
-doc:
-	@ocaml ../bapdoc.ml 2>bapdoc.log
+.PHONY: doc argot
+
+
+doc: argot
+	../bapdoc.native 2>bapdoc.log
+
+
+argot:
+	git clone https://github.com/ivg/argot.git
+	cd argot; git checkout 1.2-devel
+	cd argot && sh configure
+	make -C argot all
+	make -C argot install
+	rm -rf argot

lib/arm/arm_cond.ml

@@ -27,7 +27,7 @@ let of_int_exn = function
 let create w =
   let open Or_error in
   Word.to_int w >>= fun w ->
-  try_with (fun () -> of_int_exn w)
+  try_with ~backtrace:true (fun () -> of_int_exn w)
 
 include Regular.Make(struct
     type t = cond [@@deriving bin_io, compare, sexp]

lib/arm/arm_lifter.ml

@@ -1038,10 +1038,7 @@ let arm_ops_exn ops () =
         ~error:(Error.create "unsupported operand" op Op.sexp_of_t )
         (Arm_op.create op))
 
-let arm_ops ops = try_with (arm_ops_exn ops)
-
-
-
+let arm_ops ops = try_with ~backtrace:true (arm_ops_exn ops)
 
 module CPU = struct
   include Arm_env
@@ -1125,4 +1122,4 @@ let insn_exn mem insn : bil Or_error.t =
 let lift mem insn =
   try insn_exn mem insn >>| resolve_pc mem with
   | Lifting_failed msg -> errorf "%s:%s" (Basic.Insn.name insn) msg
-  | exn -> of_exn exn
+  | exn -> of_exn ~backtrace:`Get exn

lib/arm/arm_mem.ml

@@ -52,7 +52,8 @@ let lift_r  ~(dst1 : Var.t) ?(dst2 : Var.t option) ~(base : Var.t)
   let load  m n   = Bil.(load  m n LittleEndian typ) in
 
   let temp = match size with
-    | B | H -> tmp reg32_t
+    | B -> tmp reg8_t
+    | H -> tmp reg16_t
     | _ -> dst1 in
 
   let four = Bil.int (Word.of_int 4 ~width:32) in

lib/arm/arm_mem_shift.ml

@@ -44,7 +44,7 @@ let lift_r_op ~dest1 ?dest2 ?shift ~base ~offset mode sign size operation =
     | `Imm w ->
       let width = Word.bitwidth w in
       let _1 = Word.one 32 in
-      let min_32 = Word.Int_exn.(_1 lsl Word.of_int 31 ~width) in
+      let min_32 = Word.(_1 lsl Word.of_int 31 ~width) in
       if Word.(w = min_32)
       then Bil.(int Word.(zero width))
       else Bil.(int w) in

lib/arm/arm_shift.ml

@@ -47,7 +47,7 @@ let shift_c ~src shift_type ~shift t =
     let ret1 = Bil.(src lsr e1) in
     let carryin = Bil.(cast unsigned bits (var Env.cf) lsl (bits_e - e1)) in
     let shifted = Bil.(ret1 lor carryin) in
-    let carry = nth_bit Bil.(int (Word.zero 0)) src in
+    let carry = nth_bit Bil.(int (Word.zero 1)) src in
     shifted, carry
 
 let r_shift ~src shift_type ~shift t =