type ('a,'b) t = {
mappings : mapping list;
wordsize : wordsize option;
- endian : Bitmatch.endian option;
+ endian : Bitstring.endian option;
}
and mapping = {
start : addr;
if addr &^ 7L <> 0L then
invalid_arg "add_file: mapping address must be aligned to 8 bytes";
let size = String.length str in
- (* Use Bigarray.Array1. XXX We should just use the string. *)
+ (* Copy the string data to a Bigarray. *)
let arr = Array1.create char c_layout size in
for i = 0 to size-1 do
Array1.set arr i (String.unsafe_get str i)
in
loop mappings
+(* The following functions are actually written in C
+ * because memmem(3) is likely to be much faster than anything
+ * we could write in OCaml.
+ *
+ * Also OCaml bigarrays are specifically designed to be accessed
+ * easily from C:
+ * http://caml.inria.fr/pub/docs/manual-ocaml/manual043.html
+ *)
+(*
(* Array+offset = string? *)
let string_at arr offset str strlen =
let j = ref offset in
loop ()
)
else Some start
+*)
+external _find_in :
+ int -> int -> string -> (char,int8_unsigned_elt,c_layout) Array1.t ->
+ int option = "virt_mem_mmap_find_in"
(* Generic find function. *)
let _find t start align str =
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 =
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"
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"
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"
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"