"task_struct", (
"struct task_struct {", "};", true,
[ "state"; "prio"; "normal_prio"; "static_prio";
- "tasks'prev"; "tasks'next"; "comm"]
+ "tasks'prev"; "tasks'next"; "mm"; "active_mm"; "comm"; "pid" ]
);
(*
"mm_struct", (
);
]
-let debug = true
+let debug = false
open Camlp4.PreCast
open Syntax
let infos = Sys.readdir kernelsdir in
let infos = Array.to_list infos in
let infos = List.filter (fun name -> String.ends_with name ".info") infos in
- let infos = List.map ((//) kernelsdir) infos in
+ let infos = List.map ( (//) kernelsdir) infos in
(* Regular expressions. We really really should use ocaml-mikmatch ... *)
let re_oldformat = Pcre.regexp "^RPM: \\d+: \\(build \\d+\\) ([-\\w]+) ([\\w.]+) ([\\w.]+) \\(.*?\\) (\\w+)" in
match struct_name with
| None -> nested_fields
| Some prefix ->
- List.map (
- fun (name, details) -> (prefix ^ "'" ^ name, details)
- ) nested_fields in
+ List.map (
+ fun (name, details) -> (prefix ^ "'" ^ name, details)
+ ) nested_fields in
(* Parse the rest. *)
nested_fields @ parse basename rest
let subs = Pcre.exec ~rex:re_offsetsize line in
let offset = int_of_string (Pcre.get_substring subs 1) in
let size = int_of_string (Pcre.get_substring subs 2) in
- (name, (`Ptr struct_name, offset, size)) :: parse basename lines
+ (name, (`Ptr struct_name, offset, size))
+ :: parse basename lines
with
Not_found -> parse basename lines
);
let subs = Pcre.exec ~rex:re_offsetsize line in
let offset = int_of_string (Pcre.get_substring subs 1) in
let size = int_of_string (Pcre.get_substring subs 2) in
- (name, (`Str width, offset, size)) :: parse basename lines
+ (name, (`Str width, offset, size))
+ :: parse basename lines
with
Not_found -> parse basename lines
);
let datas = List.map (
fun (basename, version, arch, bodies) ->
let structures = List.filter_map (
- fun (name, (_, _, _, wanted_fields)) ->
+ fun (struct_name, (_, _, _, wanted_fields)) ->
let body =
- try Some (Hashtbl.find bodies name) with Not_found -> None in
+ try Some (Hashtbl.find bodies struct_name)
+ with Not_found -> None in
match body with
| None -> None
| Some body ->
List.iter (
fun wanted_field ->
if not (List.mem_assoc wanted_field fields) then
- failwith (sprintf "%s: structure %s is missing required field %s" basename name wanted_field)
+ failwith (sprintf "%s: structure %s is missing required field %s" basename struct_name wanted_field)
) wanted_fields;
- Some (name, (fields, total_size))
+ (* Prefix all the field names with the structure name. *)
+ let fields =
+ List.map (fun (name, details) ->
+ struct_name ^ "_" ^ name, details) fields in
+
+ Some (struct_name, (fields, total_size))
) what in
(basename, version, arch, structures)
let files =
List.map (
fun (name, _) ->
- name,
- List.filter_map (
- fun (basename, version, arch, structures) ->
- try Some (basename, version, arch, List.assoc name structures)
- with Not_found -> None
- ) datas
+ let kernels =
+ List.filter_map (
+ fun (basename, version, arch, structures) ->
+ try Some (basename, version, arch, List.assoc name structures)
+ with Not_found -> None
+ ) datas in
+
+ (* Sort the kernels, which makes the generated output more stable
+ * and makes patches more useful.
+ *)
+ let kernels = List.sort kernels in
+
+ name, kernels
) what in
let datas = () in ignore datas; (* garbage collect *)
!i in
(basename, version, arch, total_size, j)
) kernels in
- struct_name, kernels, field_types, List.rev !xs
+ let parsers = List.rev !xs in
+ struct_name, kernels, field_types, parsers
) files in
(* How much did we save by sharing? *)
let fields = List.map (
function
| (name, `Int) ->
- <:ctyp< $lid:name$ : int >>
- | (name, `Ptr struct_name) ->
- <:ctyp< $lid:name$ : [`$lid:struct_name$] int64 >>
+ <:ctyp< $lid:name$ : int64 >>
+ | (name, `Ptr _) ->
+ <:ctyp< $lid:name$ : Virt_mem_mmap.addr >>
| (name, `Str _) ->
<:ctyp< $lid:name$ : string >>
) field_types in
struct_type, struct_sig in
(* The shared parser functions.
+ *
* We could include bitmatch statements directly in here, but
* what happens is that the macros get expanded here, resulting
- * in unreadable generated code. So instead just do a textual
- * substitution later by post-processing the generated files.
- * Not type-safe, but we can't have everything.
+ * in (even more) unreadable generated code. So instead just
+ * do a textual substitution later by post-processing the
+ * generated files. Not type-safe, but we can't have
+ * everything.
*)
let parser_stmts, parser_subs =
let parser_stmts = List.map (
let fnname = sprintf "parser_%d" i in
<:str_item<
let $lid:fnname$ bits = $str:fnname$
- >>
+ >>
) parsers in
let parser_stmts =
let parser_subs = List.map (
fun (i, (endian, fields)) ->
let fnname = sprintf "parser_%d" i in
- let patterns = "" and assignments = "" in (* XXX *)
+ let endian =
+ match endian with
+ | Bitstring.LittleEndian -> "littleendian"
+ | Bitstring.BigEndian -> "bigendian"
+ | _ -> assert false in
+ let patterns =
+ (* Fields must be sorted by offset, otherwise bitmatch
+ * will complain.
+ *)
+ let cmp (_, (_, o1, _)) (_, (_, o2, _)) = compare o1 o2 in
+ let fields = List.sort ~cmp fields in
+ String.concat ";\n " (
+ List.map (
+ function
+ | (field_name, (`Int, offset, size))
+ | (field_name, (`Ptr _, offset, size)) ->
+ (* 'zero+' is a hack to force the type to int64. *)
+ sprintf "%s : zero+%d : offset(%d), %s"
+ field_name (size*8) (offset*8) endian
+ | (field_name, (`Str width, offset, size)) ->
+ sprintf "%s : %d : offset(%d), string"
+ field_name (width*8) (offset*8)
+ ) fields
+ ) in
+ let assignments =
+ String.concat ";\n " (
+ List.map (
+ function
+ | (field_name, (`Ptr "list_head", offset, size)) ->
+ sprintf "%s = Int64.sub %s %dL" field_name field_name offset
+ | (field_name, _) ->
+ sprintf "%s = %s" field_name field_name
+ ) fields
+ ) in
+
let sub =
- sprintf "bitmatch bits with
- | { %s } -> { %s }
- | { _ } -> raise (ParseError (%S, %S, \"failed to match kernel structure\"))"
- patterns assignments struct_name fnname in
+ sprintf "
+ bitmatch bits with
+ | { %s } ->
+ { %s }
+ | { _ } ->
+ raise (ParseError (struct_name, %S, match_err))"
+ patterns assignments fnname in
+
fnname, sub
) parsers in
) <:str_item< let map = StringMap.empty >> kernels in
<:str_item<
- module StringMap = Map.Make (String)
+ module StringMap = Map.Make (String) ;;
$stmts$
>> in
(* Code (.ml file). *)
let code = <:str_item<
let warning = "This code is automatically generated from the kernel database by kerneldb-to-parser program. Any edits you make will be lost."
- exception ParseError of string ;;
+ let zero = 0
+ let struct_name = $str:struct_name$
+ let match_err = "failed to match kernel structure"
+ exception ParseError of string * string * string;;
$struct_type$
$parser_stmts$
$version_map$
type kernel_version = string
- let known version = StringMap.mem version map
- let size version =
+ let $lid:struct_name^"_known"$ version = StringMap.mem version map
+ let $lid:struct_name^"_size"$ version =
let _, size = StringMap.find version map in
size
- let get version bits =
+ let $lid:struct_name^"_of_bits"$ version bits =
let parsefn, _ = StringMap.find version map in
parsefn bits
+ let $lid:"get_"^struct_name$ version mem addr =
+ let parsefn, size = StringMap.find version map in
+ let bytes = Virt_mem_mmap.get_bytes mem addr size in
+ let bits = Bitstring.bitstring_of_string bytes in
+ parsefn bits
>> in
(* Interface (.mli file). *)
let interface = <:sig_item<
- exception ParseError of string ;;
+ exception ParseError of string * string * string;;
$struct_sig$
+ val struct_name : string
type kernel_version = string
- val known : kernel_version -> bool
- val size : kernel_version -> int
- val get : kernel_version -> Bitstring.bitstring -> t
+ val $lid:struct_name^"_known"$ : kernel_version -> bool
+ val $lid:struct_name^"_size"$ : kernel_version -> int
+ val $lid:struct_name^"_of_bits"$ :
+ kernel_version -> Bitstring.bitstring -> t
+ val $lid:"get_"^struct_name$ : kernel_version ->
+ ('a, 'b, [`HasMapping]) Virt_mem_mmap.t -> Virt_mem_mmap.addr -> t
>> in
- (struct_name, code, interface)
+ (struct_name, code, interface, parser_subs)
) files in
(* Finally generate the output files. *)
+ let re_subst = Pcre.regexp "^(.*)\"(parser_\\d+)\"(.*)$" in
+
List.iter (
- fun (struct_name, code, interface) ->
+ fun (struct_name, code, interface, parser_subs) ->
+ (* Interface (.mli file). *)
+ let output_file = outputdir // "kernel_" ^ struct_name ^ ".mli" in
+ printf "Writing %s interface to %s ...\n%!" struct_name output_file;
+ Printers.OCaml.print_interf ~output_file interface;
+
+ (* Implementation (.ml file). *)
let output_file = outputdir // "kernel_" ^ struct_name ^ ".ml" in
printf "Writing %s implementation to %s ...\n%!" struct_name output_file;
- Printers.OCaml.print_implem ~output_file code;
- let output_file = outputdir // "kernel_" ^ struct_name ^ ".mli" in
- printf "Writing %s interface to %s ...\n%!" struct_name output_file;
- Printers.OCaml.print_interf ~output_file interface
+ let new_output_file = output_file ^ ".new" in
+ Printers.OCaml.print_implem ~output_file:new_output_file code;
+
+ (* Substitute the parser bodies in the output file. *)
+ let ichan = open_in new_output_file in
+ let ochan = open_out output_file in
+
+ let rec loop () =
+ let line = input_line ichan in
+ let line =
+ if Pcre.pmatch ~rex:re_subst line then (
+ let subs = Pcre.exec ~rex:re_subst line in
+ let start = Pcre.get_substring subs 1 in
+ let template = Pcre.get_substring subs 2 in
+ let rest = Pcre.get_substring subs 3 in
+ let sub = List.assoc template parser_subs in
+ start ^ sub ^ rest
+ ) else line in
+ output_string ochan line; output_char ochan '\n';
+ loop ()
+ in
+ (try loop () with End_of_file -> ());
+
+ close_out ochan;
+ close_in ichan;
+
+ Unix.unlink new_output_file
) files
git.annexia.org / virt-mem.git / blobdiff