From 1c8265c3f3bbbd7289c1c03ab1a3a4cee2e711d3 Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Mon, 17 May 2021 10:01:35 -0400
Subject: [PATCH] bv: refactor for performance and readability

---
 src/data/CCBV.ml  | 8 +++++---
 src/data/CCBV.mli | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/data/CCBV.ml b/src/data/CCBV.ml
index de421f18..6580e1e9 100644
--- a/src/data/CCBV.ml
+++ b/src/data/CCBV.ml
@@ -252,16 +252,18 @@ let iter bv f =
   assert (len <= Array.length bv.a);
   for n = 0 to len - 2 do
     let j = width_ * n in
+    let word_n = Array.unsafe_get bv.a n in
     for i = 0 to width_ - 1 do
-      f (j+i) (bv.a.(n) land (1 lsl i) <> 0)
+      f (j+i) ((word_n land (1 lsl i)) <> 0)
     done
   done;
   if bv.size > 0 then (
     let j = width_ * (len - 1) in
     let r = bv.size mod width_ in
     let final_length = if r = 0 then width_ else r in
+    let final_word = Array.unsafe_get bv.a (len-1) in
     for i = 0 to final_length - 1 do
-      f (j + i) (bv.a.(len - 1) land (1 lsl i) <> 0)
+      f (j + i) ((final_word land (1 lsl i)) <> 0)
     done
   )
 
@@ -294,7 +296,7 @@ let iter bv f =
     List.length l = n && List.for_all (fun (_,b) -> b) l)
 *)
 
-let iter_true bv f =
+let[@inline] iter_true bv f =
   iter bv (fun i b -> if b then f i else ())
 
 (*$T
diff --git a/src/data/CCBV.mli b/src/data/CCBV.mli
index a30a8861..7829c6ad 100644
--- a/src/data/CCBV.mli
+++ b/src/data/CCBV.mli
@@ -79,7 +79,8 @@ val of_list : int list -> t
 (** From a list of true bits.
 
     The bits are interpreted as indices into the returned bitvector, so the final
-    bitvector will have [length t] equal to 1 more than max of list indices. *)
+    bitvector [bv] will have [length bv] equal to 1 more than max of list indices.
+*)
 
 val first : t -> int option
 (** First set bit, or return [None].