diff options
author | Xavier Leroy <xavier.leroy@college-de-france.fr> | 2022-09-27 12:31:07 +0200 |
---|---|---|
committer | Xavier Leroy <xavier.leroy@college-de-france.fr> | 2022-10-29 10:03:30 +0200 |
commit | a1dabb4792446538cce24eb87bcd3ccb3c09f18b (patch) | |
tree | b74523469addfab9db6afc5ced3564ce267da4d7 /cparser/Parse.ml | |
parent | dfc6b66ec21e148d29b2a6e8b5d77873a0a47511 (diff) | |
download | compcert-a1dabb4792446538cce24eb87bcd3ccb3c09f18b.tar.gz compcert-a1dabb4792446538cce24eb87bcd3ccb3c09f18b.zip |
Handle unstructured 'switch' statements such as Duff's device
- New elaboration pass: SwitchNorm
- recognizes structured 'switch' statements and puts them in a
normalized form;
- if selected, transforms unstructured 'switch' statements into a
structured switch with goto actions + the original switch body
with appropriate labels and gotos.
- C2C treatment of 'switch' statements is simplified accordingly.
- New language support option `-funstructured-switch`.
- Some tests were added (test/regression/switch3.c).
Diffstat (limited to 'cparser/Parse.ml')
-rw-r--r-- | cparser/Parse.ml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/cparser/Parse.ml b/cparser/Parse.ml index c0419301..607d8927 100644 --- a/cparser/Parse.ml +++ b/cparser/Parse.ml @@ -16,13 +16,20 @@ (* Entry point for the library: parse, elaborate, and transform *) -let transform_program ~unblock ~struct_passing ~packed_structs p = +let transform_program ~unblock ~switch_norm ~struct_passing ~packed_structs p = let run_pass pass p = let p' = pass p in Diagnostics.check_errors (); p' in let run_opt_pass pass flag p = - if flag then run_pass pass p else p in + if flag then run_pass pass p else p + and run_opt_pass3 pass flag p = + match flag with + | `Off -> p + | `Partial -> run_pass (pass false) p + | `Full -> run_pass (pass true) p in + let unblock = unblock || switch_norm <> `Off || packed_structs in p - |> run_opt_pass Unblock.program (unblock || packed_structs) + |> run_opt_pass Unblock.program unblock + |> run_opt_pass3 SwitchNorm.program switch_norm |> run_opt_pass PackedStructs.program packed_structs |> run_opt_pass StructPassing.program struct_passing |> Rename.program @@ -49,6 +56,7 @@ let parse_string name text = Diagnostics.fatal_error Diagnostics.no_loc "internal error while parsing" let preprocessed_file ?(unblock = false) + ?(switch_norm = `Off) ?(struct_passing = false) ?(packed_structs = false) name sourcefile = @@ -66,5 +74,5 @@ let preprocessed_file ?(unblock = false) |> Timing.time "Elaboration" Elab.elab_file |> check_errors |> Timing.time "Emulations" - (transform_program ~unblock ~struct_passing ~packed_structs) + (transform_program ~unblock ~switch_norm ~struct_passing ~packed_structs) |> check_errors |