X-Git-Url: http://git.annexia.org/?p=virt-mem.git;a=blobdiff_plain;f=lib%2Fvirt_mem_mmap.ml;h=3b84a2611a39d51c40ad0509e6da84d17cddc5f4;hp=963e10da91ac1933b1e2e8089f8771564010e45f;hb=8eb1c2c4f71819108ceea4731f4dad75775ce6ae;hpb=2a2bfda6e5e3b8e5a0363c11919ea2c273097152

diff --git a/lib/virt_mem_mmap.ml b/lib/virt_mem_mmap.ml
index 963e10d..3b84a26 100644
--- a/lib/virt_mem_mmap.ml
+++ b/lib/virt_mem_mmap.ml
@@ -33,7 +33,7 @@ open Virt_mem_utils
 type ('a,'b) t = {
   mappings : mapping list;
   wordsize : wordsize option;
-  endian : Bitmatch.endian option;
+  endian : Bitstring.endian option;
 }
 and mapping = {
   start : addr;
@@ -213,9 +213,9 @@ and string_of_addr t addr =
   let bits = bits_of_wordsize (get_wordsize t) in
   let e = get_endian t in
   let bs = BITSTRING { addr : bits : endian (e) } in
-  Bitmatch.string_of_bitstring bs
+  Bitstring.string_of_bitstring bs
 *)
-(* XXX bitmatch is missing 'construct_int64_le_unsigned' so we
+(* XXX bitstring is missing 'construct_int64_le_unsigned' so we
  * have to force this to 32 bits for the moment.
  *)
 and string_of_addr t addr =
@@ -223,12 +223,12 @@ and string_of_addr t addr =
   assert (bits = 32);
   let e = get_endian t in
   let bs = BITSTRING { Int64.to_int32 addr : 32 : endian (e) } in
-  Bitmatch.string_of_bitstring bs
+  Bitstring.string_of_bitstring bs
 
 and addr_of_string t str =
   let bits = bits_of_wordsize (get_wordsize t) in
   let e = get_endian t in
-  let bs = Bitmatch.bitstring_of_string str in
+  let bs = Bitstring.bitstring_of_string str in
   bitmatch bs with
   | { addr : bits : endian (e) } -> addr
   | { _ } -> invalid_arg "addr_of_string"
@@ -287,7 +287,7 @@ let get_bytes t addr len =
 let get_int32 t addr =
   let e = get_endian t in
   let str = get_bytes t addr 4 in
-  let bs = Bitmatch.bitstring_of_string str in
+  let bs = Bitstring.bitstring_of_string str in
   bitmatch bs with
   | { addr : 32 : endian (e) } -> addr
   | { _ } -> invalid_arg "follow_pointer"
@@ -295,7 +295,7 @@ let get_int32 t addr =
 let get_int64 t addr =
   let e = get_endian t in
   let str = get_bytes t addr 8 in
-  let bs = Bitmatch.bitstring_of_string str in
+  let bs = Bitstring.bitstring_of_string str in
   bitmatch bs with
   | { addr : 64 : endian (e) } -> addr
   | { _ } -> invalid_arg "follow_pointer"
@@ -373,7 +373,7 @@ let follow_pointer t addr =
   let e = get_endian t in
   let bits = bits_of_wordsize ws in
   let str = get_bytes t addr (bytes_of_wordsize ws) in
-  let bs = Bitmatch.bitstring_of_string str in
+  let bs = Bitstring.bitstring_of_string str in
   bitmatch bs with
   | { addr : bits : endian (e) } -> addr
   | { _ } -> invalid_arg "follow_pointer"