From a6038ae9bae41526224c2416332c719f26261812 Mon Sep 17 00:00:00 2001 From: Bernhard Schommer Date: Thu, 11 Jan 2018 15:15:43 +0100 Subject: Move machine initialization to Frontend.init function. (#49) The initialization of Machine.config, as well as the calls to various initialization functions for the C front-end, are now performed by the new `Frontend.init` function. This avoids code duplication in driver/Driver.ml and exportclight/Clightgen.ml. --- exportclight/Clightgen.ml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'exportclight') diff --git a/exportclight/Clightgen.ml b/exportclight/Clightgen.ml index 9bac7a60..432346a5 100644 --- a/exportclight/Clightgen.ml +++ b/exportclight/Clightgen.ml @@ -206,26 +206,7 @@ let _ = Gc.major_heap_increment = 4194304 (* 4M *) }; Printexc.record_backtrace true; - Machine.config := - begin match Configuration.arch with - | "powerpc" -> Machine.ppc_32_bigendian - | "arm" -> if Configuration.is_big_endian - then Machine.arm_bigendian - else Machine.arm_littleendian - | "x86" -> if Configuration.model = "64" then - Machine.x86_64 - else - if Configuration.abi = "macosx" - then Machine.x86_32_macosx - else Machine.x86_32 - | "riscV" -> if Configuration.model = "64" - then Machine.rv64 - else Machine.rv32 - | _ -> assert false - end; - Builtins.set C2C.builtins; - Cutil.declare_attributes C2C.attributes; - CPragmas.initialize(); + Frontend.init (); parse_cmdline cmdline_actions; if !option_o <> None && !num_input_files >= 2 then begin eprintf "Ambiguous '-o' option (multiple source files)\n"; -- cgit