diff options
| author | Cyril SIX <cyril.six@kalray.eu> | 2021-06-01 14:58:05 +0200 |
|---|---|---|
| committer | Cyril SIX <cyril.six@kalray.eu> | 2021-06-01 14:58:05 +0200 |
| commit | 75a2885f610e1d6e91df8e2386a4a4559b615bb9 (patch) | |
| tree | 4456fa4a9876bc73d3d08b6dad1ad8f2f836578c /driver | |
| parent | 22504b61be43e5d4a97db621ce3c1785618bbaf0 (diff) | |
| parent | c44fc24eb6111c177d1d6fc973a366ebf646202b (diff) | |
| download | compcert-kvx-75a2885f610e1d6e91df8e2386a4a4559b615bb9.tar.gz compcert-kvx-75a2885f610e1d6e91df8e2386a4a4559b615bb9.zip | |
Merge remote-tracking branch 'origin/kvx-work' into merge_master_8.13.1
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/Clflags.ml | 3 | ||||
| -rw-r--r-- | driver/Configuration.ml | 1 | ||||
| -rw-r--r-- | driver/Configuration.mli | 3 | ||||
| -rw-r--r-- | driver/Driver.ml | 1 | ||||
| -rw-r--r-- | driver/Frontend.ml | 5 |
5 files changed, 11 insertions, 2 deletions
diff --git a/driver/Clflags.ml b/driver/Clflags.ml index 4cff3f28..fa17c2d9 100644 --- a/driver/Clflags.ml +++ b/driver/Clflags.ml @@ -105,7 +105,8 @@ let option_fmadd = ref true let option_div_i32 = ref "stsud" let option_div_i64 = ref "stsud" let option_fcoalesce_mem = ref true -let option_fexpanse_rtlcond = ref true +let option_fexpanse_rtlcond = ref false +let option_fexpanse_others = ref false let option_fforward_moves = ref false let option_fmove_loop_invariants = ref false let option_fnontrap_loads = ref true diff --git a/driver/Configuration.ml b/driver/Configuration.ml index 3c9aff5e..deca85f2 100644 --- a/driver/Configuration.ml +++ b/driver/Configuration.ml @@ -126,6 +126,7 @@ let arch = | "powerpc"|"arm"|"x86"|"riscV"|"kvx"|"aarch64" as a -> a | v -> bad_config "arch" [v] let model = get_config_string "model" +let os = get_config_string "os" let abi = get_config_string "abi" let is_big_endian = match get_config_string "endianness" with diff --git a/driver/Configuration.mli b/driver/Configuration.mli index a71da72d..75e547ff 100644 --- a/driver/Configuration.mli +++ b/driver/Configuration.mli @@ -19,6 +19,9 @@ val model: string val abi: string (** ABI to use *) +val os: string + (** ABI to use *) + val is_big_endian: bool (** Endianness to use *) diff --git a/driver/Driver.ml b/driver/Driver.ml index 0c5d9cb4..7192ba4b 100644 --- a/driver/Driver.ml +++ b/driver/Driver.ml @@ -445,6 +445,7 @@ let cmdline_actions = @ f_opt "nontrap-loads" option_fnontrap_loads @ f_opt "coalesce-mem" option_fcoalesce_mem @ f_opt "expanse-rtlcond" option_fexpanse_rtlcond + @ f_opt "expanse-others" option_fexpanse_others @ f_opt "all-loads-nontrap" option_all_loads_nontrap @ f_opt "forward-moves" option_fforward_moves (* Code generation options *) diff --git a/driver/Frontend.ml b/driver/Frontend.ml index 9dec32fa..0d0ff26c 100644 --- a/driver/Frontend.ml +++ b/driver/Frontend.ml @@ -117,7 +117,10 @@ let init () = | "riscV" -> if Configuration.model = "64" then Machine.rv64 else Machine.rv32 - | "kvx" -> Machine.kvx + | "kvx" -> if Configuration.os = "cos" then Machine.kvxcos + else if Configuration.os = "mbr" then Machine.kvxmbr + else (Printf.eprintf "Configuration OS = %s\n" Configuration.os; + failwith "Wrong OS configuration for KVX") | "aarch64" -> if Configuration.abi = "apple" then Machine.aarch64_apple else Machine.aarch64 |