diff --git a/sledge/sledge-help.txt b/sledge/sledge-help.txt index 8534e0b5e..3d4b2473a 100644 --- a/sledge/sledge-help.txt +++ b/sledge/sledge-help.txt @@ -49,6 +49,7 @@ Analyze code in a buck target. This is a convenience wrapper for the sequence `s [-function-summaries] use function summaries (in development) [-fuzzer] add a harness for libFuzzer targets [-llair-output ] write generated LLAIR to + [-margin ] wrap debug tracing at columns [-modules ] write list of bitcode files to , or to standard output if is `-` [-skip-throw] do not explore past throwing an exception @@ -67,6 +68,7 @@ Build a buck target and report the included bitcode files. === flags === + [-margin ] wrap debug tracing at columns [-modules ] write list of bitcode files to , or to standard output if is `-` [-trace ] enable debug tracing @@ -86,6 +88,7 @@ Link code in a buck target to a single LLVM bitcode module. This also internaliz -bitcode-output write linked bitcode to [-fuzzer] add a harness for libFuzzer targets + [-margin ] wrap debug tracing at columns [-modules ] write list of bitcode files to , or to standard output if is `-` [-trace ] enable debug tracing @@ -122,6 +125,7 @@ Analyze code in one or more LLVM bitcode files. This is a convenience wrapper fo [-function-summaries] use function summaries (in development) [-fuzzer] add a harness for libFuzzer targets [-llair-output ] write generated LLAIR to + [-margin ] wrap debug tracing at columns [-skip-throw] do not explore past throwing an exception [-trace ] enable debug tracing [-help] print this help text and exit @@ -140,6 +144,7 @@ Translate one or more LLVM bitcode files to LLAIR. Each filename may be [-fuzzer] add a harness for libFuzzer targets [-llair-output ] write generated LLAIR to + [-margin ] wrap debug tracing at columns [-trace ] enable debug tracing [-help] print this help text and exit (alias: -?) @@ -157,6 +162,7 @@ The file must be binary LLAIR, such as produced by `sledge translate`. [-bound ] stop execution exploration at depth [-function-summaries] use function summaries (in development) + [-margin ] wrap debug tracing at columns [-skip-throw] do not explore past throwing an exception [-trace ] enable debug tracing [-help] print this help text and exit @@ -173,11 +179,12 @@ The file must be LLAIR code, as produced by `sledge llvm translate`. === flags === - [-llair ] write generated textual LLAIR to , or to standard - output if omitted - [-trace ] enable debug tracing - [-help] print this help text and exit - (alias: -?) + [-llair ] write generated textual LLAIR to , or to standard + output if omitted + [-margin ] wrap debug tracing at columns + [-trace ] enable debug tracing + [-help] print this help text and exit + (alias: -?) ====== sledge version ====== diff --git a/sledge/src/sledge.ml b/sledge/src/sledge.ml index dbc03782e..029580f2d 100644 --- a/sledge/src/sledge.ml +++ b/sledge/src/sledge.ml @@ -23,12 +23,16 @@ let ( >*> ) : ('a -> 'b) param -> ('b -> 'c) param -> ('a -> 'c) param = (* define a command, with trace flag, and with action wrapped in reporting *) let command ~summary ?readme param = - let trace_flag = - let open Command.Param in - flag "trace" ~doc:" enable debug tracing" - (optional_with_default Trace.none - (Arg_type.create (fun s -> Trace.parse s |> Result.ok_exn))) - >>| fun config -> Trace.init ~config () + let trace = + let%map_open config = + flag "trace" ~doc:" enable debug tracing" + (optional_with_default Trace.none + (Arg_type.create (fun s -> Trace.parse s |> Result.ok_exn))) + and margin = + flag "margin" ~doc:" wrap debug tracing at columns" + (optional int) + in + Trace.init ?margin ~config () in let wrap main () = try @@ -49,7 +53,7 @@ let command ~summary ?readme param = (Caml.Printexc.to_string exn) ) ; Caml.Printexc.raise_with_backtrace exn bt in - Command.basic ~summary ?readme (trace_flag *> param >>| wrap) + Command.basic ~summary ?readme (trace *> param >>| wrap) let marshal program file = Out_channel.with_file file ~f:(fun oc ->