diff options
| author | Bernhard Schommer <bschommer@users.noreply.github.com> | 2019-09-12 17:03:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 17:03:14 +0200 |
| commit | a7c8e4f4ef4a5f0a15283cd3f0999f3fa24e581d (patch) | |
| tree | a2960647cb46ecb19a6a63539f2a894df7fd1474 /backend/JsonAST.ml | |
| parent | f3bdf0c70faa9e69359bd06b78570c60a569a7cb (diff) | |
| download | compcert-kvx-a7c8e4f4ef4a5f0a15283cd3f0999f3fa24e581d.tar.gz compcert-kvx-a7c8e4f4ef4a5f0a15283cd3f0999f3fa24e581d.zip | |
Reworked json export.
The json export prints formatted json, which takes a lot of
additional time, however the result is only consumed by other tools
and not meant for human reading.
This commit implements several small changes in order to speedup
the json export:
* Removal of usage of the Format Module
* Replacing `fprintf` calls by calls to function that print
directly, such as `output_string`, etc.
* Replacing list of all instruction names by a set of all
instructions
Diffstat (limited to 'backend/JsonAST.ml')
| -rw-r--r-- | backend/JsonAST.ml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/backend/JsonAST.ml b/backend/JsonAST.ml index 4e57106f..8905e252 100644 --- a/backend/JsonAST.ml +++ b/backend/JsonAST.ml @@ -15,7 +15,6 @@ open Asm open AST open C2C open Json -open Format open Sections @@ -54,8 +53,8 @@ let pp_section pp sec = | Section_ais_annotation -> () (* There should be no info in the debug sections *) let pp_int_opt pp = function - | None -> fprintf pp "0" - | Some i -> fprintf pp "%d" i + | None -> output_string pp "0" + | Some i -> pp_jint pp i let pp_fundef pp_inst pp (name,fn) = let alignment = atom_alignof name @@ -119,9 +118,8 @@ let pp_program pp pp_inst prog = pp_jobject_end pp let pp_mnemonics pp mnemonic_names = - let mnemonic_names = List.sort (String.compare) mnemonic_names in - let new_line pp () = pp_print_string pp "\n" in - pp_print_list ~pp_sep:new_line pp_print_string pp mnemonic_names + let new_line pp () = Format.pp_print_string pp "\n" in + Format.pp_print_list ~pp_sep:new_line Format.pp_print_string pp mnemonic_names let jdump_magic_number = "CompCertJDUMPRelease: " ^ Version.version @@ -153,4 +151,4 @@ let pp_ast pp pp_inst ast sourcename = pp_jmember pp "Compilation Unit" pp_jstring sourcename; pp_jmember pp "Asm Ast" (fun pp prog -> pp_program pp pp_inst prog) ast; pp_jobject_end pp; - Format.pp_print_flush pp () + flush pp |