Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adaptations to preprocessing #585

Merged
merged 9 commits into from
Feb 17, 2022
Merged

Adaptations to preprocessing #585

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4709d78
fix makefile generation
stilscher Dec 14, 2021
3b12445
do not require the -o option being set in commands of compilation dat…
stilscher Jan 25, 2022
99c8d22
correct length of list checking
stilscher Feb 2, 2022
dfda270
fix duplicate arguments
stilscher Feb 7, 2022
615f4a8
add -o handling also for command case
stilscher Feb 7, 2022
384b25c
fix preprocess command composition
stilscher Feb 8, 2022
75cfe4c
Fix all_cppflags special case in MakefileUtil
sim642 Feb 17, 2022
a14b93f
Merge branch 'master' into preprocessing-adaptations
sim642 Feb 17, 2022
c44bcd6
Reformat compilation database arguments case
sim642 Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/incremental/makefileUtil.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ let run_cilly (path: string) ~all_cppflags =
remove_comb_files path;
(* Combine source files with make using cilly as compiler *)
let gcc_path = GobConfig.get_string "exp.gcc_path" in
let (exit_code, output) = exec_command ~path ("make CC=\"cilly --gcc=" ^ gcc_path ^ " --merge --keepmerged\" CFLAGS+=" ^ String.join " " (List.map Filename.quote all_cppflags) ^ " " ^
let cflags = if all_cppflags = [] then " CFLAGS+=" ^ Filename.quote (String.join " " all_cppflags) else "" in
let (exit_code, output) = exec_command ~path ("make CC=\"cilly --gcc=" ^ gcc_path ^ " --merge --keepmerged\"" ^cflags ^ " " ^
"LD=\"cilly --gcc=" ^ gcc_path ^ " --merge --keepmerged\"") in
print_string output;
(* fail if make failed *)
Expand All @@ -80,9 +81,9 @@ let generate_and_combine makefile ~all_cppflags =
let generate_makefile_with (name, command, file) = if Sys.file_exists file then (
print_endline ("Trying to run " ^ name ^ " to generate Makefile");
let exit_code, output = exec_command ~path command in
print_endline (command ^ GobUnix.string_of_process_status exit_code ^ ". Output: " ^ output);
print_endline (command ^ " " ^ GobUnix.string_of_process_status exit_code ^ ". Output: " ^ output);
if not (Sys.file_exists makefile) then raise MakefileNotGenerated
); raise MakefileNotGenerated in
) else raise MakefileNotGenerated in
try generate_makefile_with configure
with MakefileNotGenerated ->
try generate_makefile_with autogen
Expand Down
41 changes: 24 additions & 17 deletions src/util/compilationDatabase.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,25 +61,32 @@ let load_and_preprocess ~all_cppflags filename =
(* TODO: extract o_file *)
let command = reroot command in
let preprocess_command = Str.replace_first command_program_regexp ("\\1 " ^ String.join " " (List.map Filename.quote all_cppflags) ^ " -E -MMD -MT " ^ file) command in
let preprocess_command = Str.replace_first command_o_regexp ("-o " ^ preprocessed_file) preprocess_command in
if preprocess_command = command then (* easier way to check if match was found (and replaced) *)
failwith "CompilationDatabase.preprocess: no -o argument found for " ^ file
failwith "CompilationDatabase.preprocess: no program found for " ^ file
else
preprocess_command
let preprocess_command_o = Str.replace_first command_o_regexp ("-o " ^ preprocessed_file) preprocess_command in
if preprocess_command_o = preprocess_command then (* easier way to check if match was found (and replaced) *)
preprocess_command ^ " -o " ^ preprocessed_file
else
preprocess_command_o
| None, Some arguments ->
let arguments = List.map reroot arguments in
begin match List.findi (fun i e -> e = "-o") arguments with
| (o_i, _) ->
begin match List.split_at o_i arguments with
| (arguments_program :: arguments_init, _ :: o_file :: arguments_tl) ->
let preprocess_arguments = all_cppflags @ "-E" :: "-MMD" :: "-MT" :: file :: arguments_init @ "-o" :: preprocessed_file :: arguments_tl in
Filename.quote_command arguments_program preprocess_arguments
| _ ->
failwith "CompilationDatabase.preprocess: no -o argument value found for " ^ file
end
| exception Not_found ->
failwith "CompilationDatabase.preprocess: no -o argument found for " ^ file
end
let arguments_program, arguments =
begin match List.map reroot arguments with
| arguments_program::arguments -> arguments_program, arguments
| _ -> failwith ("CompilationDatabase.preprocess: no program found for " ^ file)
end in
let preprocess_arguments =
let suf =
begin match List.findi (fun i e -> e = "-o") arguments with
| (o_i, _) ->
begin match List.split_at o_i arguments with
| (arguments_init, _ :: o_file :: arguments_tl) -> arguments_init @ "-o" :: preprocessed_file :: arguments_tl
| _ -> failwith ("CompilationDatabase.preprocess: no argument found for -o option for " ^ file)
end
| exception Not_found -> arguments @ "-o" :: [preprocessed_file]
end in
all_cppflags @ "-E" :: "-MMD" :: "-MT" :: file :: suf in
Filename.quote_command arguments_program preprocess_arguments
| Some _, Some _ ->
failwith "CompilationDatabase.preprocess: both command and arguments specified for " ^ file
| None, None ->
Expand All @@ -91,6 +98,6 @@ let load_and_preprocess ~all_cppflags filename =
system ~cwd preprocess_command; (* command/arguments might have paths relative to directory *)
Preprocessor.parse_makefile_deps deps_file;
Some preprocessed_file
in
in
parse_file filename
|> BatList.filter_map preprocess