diff --git a/asmcomp/printmach.ml b/asmcomp/printmach.ml index 52d411166..64662e33e 100644 --- a/asmcomp/printmach.ml +++ b/asmcomp/printmach.ml @@ -113,8 +113,6 @@ let test tst ppf arg = | Ieventest -> fprintf ppf "%a & 1 == 0" reg arg.(0) | Ioddtest -> fprintf ppf "%a & 1 == 1" reg arg.(0) -let print_live = ref false - let operation op arg ppf res = if Array.length res > 0 then fprintf ppf "%a := " regs res; match op with @@ -169,7 +167,7 @@ let operation op arg ppf res = Arch.print_specific_operation reg op ppf arg let rec instr ppf i = - if !print_live then begin + if !Clflags.dump_live then begin fprintf ppf "@[<1>{%a" regsetaddr i.live; if Array.length i.arg > 0 then fprintf ppf "@ +@ %a" regs i.arg; fprintf ppf "}@]@,"; diff --git a/asmcomp/printmach.mli b/asmcomp/printmach.mli index 13a794647..0cad07766 100644 --- a/asmcomp/printmach.mli +++ b/asmcomp/printmach.mli @@ -29,5 +29,3 @@ val phase: string -> formatter -> Mach.fundecl -> unit val interferences: formatter -> unit -> unit val intervals: formatter -> unit -> unit val preferences: formatter -> unit -> unit - -val print_live: bool ref diff --git a/driver/optmain.ml b/driver/optmain.ml index 604496f86..2f7e5afa1 100644 --- a/driver/optmain.ml +++ b/driver/optmain.ml @@ -236,7 +236,7 @@ module Options = Main_args.Make_optcomp_options (struct let _dsel = set dump_selection let _dcombine = set dump_combine let _dcse = set dump_cse - let _dlive () = dump_live := true; Printmach.print_live := true + let _dlive () = dump_live := true let _davail () = dump_avail := true let _drunavail () = debug_runavail := true let _dspill = set dump_spill diff --git a/testsuite/tools/codegen_main.ml b/testsuite/tools/codegen_main.ml index a6163f579..d0b3d4043 100644 --- a/testsuite/tools/codegen_main.ml +++ b/testsuite/tools/codegen_main.ml @@ -62,8 +62,7 @@ let main() = "-dcmm", Arg.Set dump_cmm, ""; "-dcse", Arg.Set dump_cse, ""; "-dsel", Arg.Set dump_selection, ""; - "-dlive", Arg.Unit(fun () -> dump_live := true; - Printmach.print_live := true), ""; + "-dlive", Arg.Unit(fun () -> dump_live := true ), ""; "-dspill", Arg.Set dump_spill, ""; "-dsplit", Arg.Set dump_split, ""; "-dinterf", Arg.Set dump_interf, ""; diff --git a/toplevel/opttopmain.ml b/toplevel/opttopmain.ml index 8f459c59d..d26c47be1 100644 --- a/toplevel/opttopmain.ml +++ b/toplevel/opttopmain.ml @@ -226,7 +226,7 @@ module Options = Main_args.Make_opttop_options (struct let _dsel = set dump_selection let _dcombine = set dump_combine let _dcse = set dump_cse - let _dlive () = dump_live := true; Printmach.print_live := true + let _dlive () = dump_live := true let _davail () = dump_avail := true let _drunavail () = debug_runavail := true let _dspill = set dump_spill