X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=57ef4615915911fad2deb5f5a074175fa73bc980;hb=bb0b3e3a3b5a6fdc78b9b36317b0a99e7a109d84;hp=d6cba01b0c4a72575113797fdd5966e793d18769;hpb=2483f50686dc6f85a5d6c92b3faff0e9d5cb366e;p=cparser diff --git a/main.c b/main.c index d6cba01..57ef461 100644 --- a/main.c +++ b/main.c @@ -1,6 +1,6 @@ /* * This file is part of cparser. - * Copyright (C) 2007-2008 Matthias Braun + * Copyright (C) 2007-2009 Matthias Braun * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -71,6 +71,7 @@ #include "lang_features.h" #include "driver/firm_opt.h" #include "driver/firm_cmdline.h" +#include "driver/firm_timing.h" #include "adt/error.h" #include "wrappergen/write_fluffy.h" #include "wrappergen/write_caml.h" @@ -78,12 +79,13 @@ #include "revision.h" #include "warning.h" #include "mangle.h" +#include "printer.h" #ifndef PREPROCESSOR #ifndef __WIN32__ -#define PREPROCESSOR "gcc -E -std=c99 -m32 -U__STRICT_ANSI__" +#define PREPROCESSOR "gcc -E -m32 -U__STRICT_ANSI__" #else -#define PREPROCESSOR "cpp -std=c99 -m32 -U__STRICT_ANSI__" +#define PREPROCESSOR "cpp -m32 -U__STRICT_ANSI__" #endif #endif @@ -93,7 +95,7 @@ #ifndef ASSEMBLER #ifdef __APPLE__ -#define ASSEMBLER "gcc -c -xassembler" +#define ASSEMBLER "gcc -m32 -c -xassembler" #else #define ASSEMBLER "as --32" #endif @@ -130,6 +132,20 @@ static struct obstack cppflags_obst, ldflags_obst; static char dep_target[1024]; static const char *outname; +typedef enum lang_standard_t { + STANDARD_DEFAULT, /* gnu99 (for C, GCC does gnu89) or gnu++98 (for C++) */ + STANDARD_ANSI, /* c89 (for C) or c++98 (for C++) */ + STANDARD_C89, /* ISO C90 (sic) */ + STANDARD_C90, /* ISO C90 as modified in amendment 1 */ + STANDARD_C99, /* ISO C99 */ + STANDARD_GNU89, /* ISO C90 plus GNU extensions (including some C99) */ + STANDARD_GNU99, /* ISO C99 plus GNU extensions */ + STANDARD_CXX98, /* ISO C++ 1998 plus amendments */ + STANDARD_GNUXX98 /* ISO C++ 1998 plus amendments and GNU extensions */ +} lang_standard_t; + +static lang_standard_t standard; + typedef struct file_list_entry_t file_list_entry_t; typedef enum filetype_t { @@ -141,6 +157,7 @@ typedef enum filetype_t { FILETYPE_ASSEMBLER, FILETYPE_PREPROCESSED_ASSEMBLER, FILETYPE_OBJECT, + FILETYPE_IR, FILETYPE_UNKNOWN } filetype_t; @@ -152,30 +169,9 @@ struct file_list_entry_t { static file_list_entry_t *temp_files; -#if defined(_DEBUG) || defined(FIRM_DEBUG) -/** - * Debug printf implementation. - * - * @param fmt printf style format parameter - */ -void dbg_printf(const char *fmt, ...) -{ - va_list list; - - if (firm_dump.debug_print) { - va_start(list, fmt); - vprintf(fmt, list); - va_end(list); - } /* if */ -} -#endif /* defined(_DEBUG) || defined(FIRM_DEBUG) */ - static void initialize_firm(void) { firm_early_init(); - - dump_consts_local(1); - dump_keepalive_edges(1); } static void get_output_name(char *buf, size_t buflen, const char *inputname, @@ -201,7 +197,7 @@ static void get_output_name(char *buf, size_t buflen, const char *inputname, panic("filename too long"); } -#include "builtins.h" +#include "gen_builtins.h" static translation_unit_t *do_parsing(FILE *const in, const char *const input_name) { @@ -232,7 +228,7 @@ static void lextest(FILE *in, const char *fname) static void add_flag(struct obstack *obst, const char *format, ...) { - char buf[4096]; + char buf[65536]; va_list ap; va_start(ap, format); @@ -283,30 +279,54 @@ static const char *type_to_string(type_t *type) return get_atomic_kind_name(type->atomic.akind); } -static FILE *preprocess(const char *fname) +static FILE *preprocess(const char *fname, filetype_t filetype) { - obstack_1grow(&cppflags_obst, '\0'); - const char *flags = obstack_finish(&cppflags_obst); - - obstack_printf(&cppflags_obst, "%s", PREPROCESSOR); - - /* setup default defines */ - add_flag(&cppflags_obst, "-U__WCHAR_TYPE__"); - add_flag(&cppflags_obst, "-D__WCHAR_TYPE__=%s", type_to_string(type_wchar_t)); - add_flag(&cppflags_obst, "-U__SIZE_TYPE__"); - add_flag(&cppflags_obst, "-D__SIZE_TYPE__=%s", type_to_string(type_size_t)); - - /* TODO hack... */ - add_flag(&cppflags_obst, "-D__builtin_abort=abort"); - add_flag(&cppflags_obst, "-D__builtin_abs=abs"); - add_flag(&cppflags_obst, "-D__builtin_exit=exit"); - add_flag(&cppflags_obst, "-D__builtin_malloc=malloc"); - add_flag(&cppflags_obst, "-D__builtin_memcmp=memcmp"); - add_flag(&cppflags_obst, "-D__builtin_memcpy=memcpy"); - add_flag(&cppflags_obst, "-D__builtin_memset=memset"); - add_flag(&cppflags_obst, "-D__builtin_strlen=strlen"); - add_flag(&cppflags_obst, "-D__builtin_strcmp=strcmp"); - add_flag(&cppflags_obst, "-D__builtin_strcpy=strcpy"); + static const char *common_flags = NULL; + + if (common_flags == NULL) { + obstack_1grow(&cppflags_obst, '\0'); + const char *flags = obstack_finish(&cppflags_obst); + + /* setup default defines */ + add_flag(&cppflags_obst, "-U__WCHAR_TYPE__"); + add_flag(&cppflags_obst, "-D__WCHAR_TYPE__=%s", type_to_string(type_wchar_t)); + add_flag(&cppflags_obst, "-U__SIZE_TYPE__"); + add_flag(&cppflags_obst, "-D__SIZE_TYPE__=%s", type_to_string(type_size_t)); + + add_flag(&cppflags_obst, "-U__VERSION__"); + add_flag(&cppflags_obst, "-D__VERSION__=\"%s\"", cparser_REVISION); + + if (flags[0] != '\0') { + size_t len = strlen(flags); + obstack_1grow(&cppflags_obst, ' '); + obstack_grow(&cppflags_obst, flags, len); + } + obstack_1grow(&cppflags_obst, '\0'); + common_flags = obstack_finish(&cppflags_obst); + } + + assert(obstack_object_size(&cppflags_obst) == 0); + + const char *preprocessor = getenv("CPARSER_PP"); + if (preprocessor == NULL) + preprocessor = PREPROCESSOR; + + obstack_printf(&cppflags_obst, "%s ", preprocessor); + switch (filetype) { + case FILETYPE_C: + add_flag(&cppflags_obst, "-std=c99"); + break; + case FILETYPE_CXX: + add_flag(&cppflags_obst, "-std=c++98"); + break; + case FILETYPE_ASSEMBLER: + add_flag(&cppflags_obst, "-x"); + add_flag(&cppflags_obst, "assembler-with-cpp"); + break; + default: + break; + } + obstack_printf(&cppflags_obst, "%s", common_flags); /* handle dependency generation */ if (dep_target[0] != '\0') { @@ -317,13 +337,10 @@ static FILE *preprocess(const char *fname) add_flag(&cppflags_obst, outname); } } - if (flags[0] != '\0') { - obstack_printf(&cppflags_obst, " %s", flags); - } add_flag(&cppflags_obst, fname); obstack_1grow(&cppflags_obst, '\0'); - const char *buf = obstack_finish(&cppflags_obst); + char *buf = obstack_finish(&cppflags_obst); if (verbose) { puts(buf); } @@ -334,14 +351,21 @@ static FILE *preprocess(const char *fname) exit(1); } + /* we don't really need that anymore */ + obstack_free(&cppflags_obst, buf); + return f; } static void assemble(const char *out, const char *in) { - char buf[4096]; + char buf[65536]; - snprintf(buf, sizeof(buf), "%s %s -o %s", ASSEMBLER, in, out); + const char *assembler = getenv("CPARSER_AS"); + if (assembler == NULL) + assembler = ASSEMBLER; + + snprintf(buf, sizeof(buf), "%s %s -o %s", assembler, in, out); if (verbose) { puts(buf); } @@ -361,7 +385,10 @@ static void print_file_name(const char *file) const char *flags = obstack_finish(&ldflags_obst); /* construct commandline */ - obstack_printf(&ldflags_obst, "%s ", LINKER); + const char *linker = getenv("CPARSER_LINK"); + if (linker == NULL) + linker = LINKER; + obstack_printf(&ldflags_obst, "%s ", linker); obstack_printf(&ldflags_obst, "%s", flags); obstack_1grow(&ldflags_obst, '\0'); @@ -498,6 +525,7 @@ typedef enum compile_mode_t { ParseOnly, Compile, CompileDump, + CompileExportIR, CompileAssemble, CompileAssembleLink, LexTest, @@ -509,10 +537,11 @@ typedef enum compile_mode_t { static void usage(const char *argv0) { - fprintf(stderr, "Usage %s input [-o output] [-c]\n", argv0); + fprintf(stderr, "Usage %s [options] input [-o output]\n", argv0); } -static void print_cparser_version(void) { +static void print_cparser_version(void) +{ printf("cparser (%s) using libFirm (%u.%u", cparser_REVISION, ir_get_version_major(), ir_get_version_minor()); @@ -528,12 +557,23 @@ static void print_cparser_version(void) { putchar(' '); fputs(build, stdout); } - puts(")\n"); + puts(")"); + puts("This is free software; see the source for copying conditions. There is NO\n" + "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); +} + +static void print_help(const char *argv0) +{ + usage(argv0); + puts(""); + puts("\t-fhelp Display help about firm optimisation options"); + puts("\t-bhelp Display help about firm backend options"); + puts("A big number of gcc flags is also supported"); } static void set_be_option(const char *arg) { - int res = firm_be_option(arg); + int res = be_parse_arg(arg); (void) res; assert(res); } @@ -622,18 +662,6 @@ static void init_os_support(void) } } -typedef enum lang_standard_t { - STANDARD_DEFAULT, /* gnu99 (for C, GCC does gnu89) or gnu++98 (for C++) */ - STANDARD_ANSI, /* c89 (for C) or c++98 (for C++) */ - STANDARD_C89, /* ISO C90 (sic) */ - STANDARD_C90, /* ISO C90 as modified in amendment 1 */ - STANDARD_C99, /* ISO C99 */ - STANDARD_GNU89, /* ISO C90 plus GNU extensions (including some C99) */ - STANDARD_GNU99, /* ISO C99 plus GNU extensions */ - STANDARD_CXX98, /* ISO C++ 1998 plus amendments */ - STANDARD_GNUXX98 /* ISO C++ 1998 plus amendments and GNU extensions */ -} lang_standard_t; - int main(int argc, char **argv) { initialize_firm(); @@ -647,6 +675,7 @@ int main(int argc, char **argv) file_list_entry_t *files = NULL; file_list_entry_t *last_file = NULL; bool construct_dep_target = false; + bool do_timing = false; struct obstack file_obst; atexit(free_temp_files); @@ -712,14 +741,14 @@ int main(int argc, char **argv) break; default: case 4: - set_option("strict-aliasing"); /* use_builtins = true; */ /* fallthrough */ case 3: - set_option("cond-eval"); - set_option("if-conv"); + set_option("thread-jumps"); + set_option("if-conversion"); /* fallthrough */ case 2: + set_option("strict-aliasing"); set_option("inline"); set_option("deconv"); set_be_option("omitfp"); @@ -727,7 +756,7 @@ int main(int argc, char **argv) } /* parse rest of options */ - lang_standard_t standard = STANDARD_DEFAULT; + standard = STANDARD_DEFAULT; unsigned features_on = 0; unsigned features_off = 0; filetype_t forced_filetype = FILETYPE_AUTODETECT; @@ -821,11 +850,7 @@ int main(int argc, char **argv) char const *orig_opt; GET_ARG_AFTER(orig_opt, "-f"); - if (strstart(orig_opt, "align-loops=") || - strstart(orig_opt, "align-jumps=") || - strstart(orig_opt, "align-functions=")) { - fprintf(stderr, "ignoring gcc option '-f%s'\n", orig_opt); - } else if (strstart(orig_opt, "input-charset=")) { + if (strstart(orig_opt, "input-charset=")) { char const* const encoding = strchr(orig_opt, '=') + 1; select_input_encoding(encoding); } else if (streq(orig_opt, "verbose-asm")) { @@ -838,28 +863,42 @@ int main(int argc, char **argv) opt += 3; } - if (streq(opt, "dollars-in-identifiers")) { - allow_dollar_in_symbol = truth_value; - } if (streq(opt, "builtins")) { + if (streq(opt, "builtins")) { use_builtins = truth_value; + } else if (streq(opt, "dollars-in-identifiers")) { + allow_dollar_in_symbol = truth_value; + } else if (streq(opt, "omit-frame-pointer")) { + set_be_option(truth_value ? "omitfp" : "omitfp=no"); } else if (streq(opt, "short-wchar")) { wchar_atomic_kind = truth_value ? ATOMIC_TYPE_USHORT : ATOMIC_TYPE_INT; - } else if (streq(opt, "syntax-only")) { - mode = truth_value ? ParseOnly : CompileAssembleLink; - } else if (streq(opt, "omit-frame-pointer")) { - set_be_option(truth_value ? "omitfp" : "omitfp=no"); + } else if (streq(opt, "signed-char")) { + char_is_signed = truth_value; } else if (streq(opt, "strength-reduce")) { firm_option(truth_value ? "strength-red" : "no-strength-red"); + } else if (streq(opt, "syntax-only")) { + mode = truth_value ? ParseOnly : CompileAssembleLink; + } else if (streq(opt, "unsigned-char")) { + char_is_signed = !truth_value; + } else if (truth_value == false && + streq(opt, "asynchronous-unwind-tables")) { + /* nothing todo, a gcc feature which we don't support + * anyway was deactivated */ + } else if (strstart(orig_opt, "align-loops=") || + strstart(orig_opt, "align-jumps=") || + strstart(orig_opt, "align-functions=")) { + fprintf(stderr, "ignoring gcc option '-f%s'\n", orig_opt); + } else if (strstart(orig_opt, "message-length=")) { + /* ignore: would only affect error message format */ } else if (streq(opt, "fast-math") || streq(opt, "jump-tables") || - streq(opt, "unroll-loops") || streq(opt, "expensive-optimizations") || streq(opt, "common") || - streq(opt, "PIC") || + streq(opt, "optimize-sibling-calls") || streq(opt, "align-loops") || streq(opt, "align-jumps") || - streq(opt, "align-functions")) { + streq(opt, "align-functions") || + streq(opt, "PIC")) { fprintf(stderr, "ignoring gcc option '-f%s'\n", orig_opt); } else { int res = firm_option(orig_opt); @@ -876,7 +915,7 @@ int main(int argc, char **argv) } else if (option[0] == 'b') { const char *opt; GET_ARG_AFTER(opt, "-b"); - int res = firm_be_option(opt); + int res = be_parse_arg(opt); if (res == 0) { fprintf(stderr, "error: unknown Firm backend option '-b %s'\n", opt); @@ -887,7 +926,9 @@ int main(int argc, char **argv) strncpy(cpu_arch, opt, sizeof(cpu_arch)); } } else if (option[0] == 'W') { - if (strstart(option + 1, "p,")) { + if (option[1] == '\0') { + /* ignore -W, out defaults are already quiet verbose */ + } else if (strstart(option + 1, "p,")) { // pass options directly to the preprocessor const char *opt; GET_ARG_AFTER(opt, "-Wp,"); @@ -912,25 +953,26 @@ int main(int argc, char **argv) if (strstart(opt, "arch=")) { GET_ARG_AFTER(opt, "-march="); snprintf(arch_opt, sizeof(arch_opt), "%s-arch=%s", cpu_arch, opt); - int res = firm_be_option(arch_opt); - if (res == 0) + int res = be_parse_arg(arch_opt); + if (res == 0) { + fprintf(stderr, "Unknown architecture '%s'\n", arch_opt); argument_errors = true; - else { + } else { snprintf(arch_opt, sizeof(arch_opt), "%s-opt=%s", cpu_arch, opt); - int res = firm_be_option(arch_opt); + int res = be_parse_arg(arch_opt); if (res == 0) argument_errors = true; } } else if (strstart(opt, "tune=")) { GET_ARG_AFTER(opt, "-mtune="); snprintf(arch_opt, sizeof(arch_opt), "%s-opt=%s", cpu_arch, opt); - int res = firm_be_option(arch_opt); + int res = be_parse_arg(arch_opt); if (res == 0) argument_errors = true; } else if (strstart(opt, "cpu=")) { GET_ARG_AFTER(opt, "-mcpu="); snprintf(arch_opt, sizeof(arch_opt), "%s-arch=%s", cpu_arch, opt); - int res = firm_be_option(arch_opt); + int res = be_parse_arg(arch_opt); if (res == 0) argument_errors = true; } else if (strstart(opt, "fpmath=")) { @@ -945,20 +987,28 @@ int main(int argc, char **argv) } if (!argument_errors) { snprintf(arch_opt, sizeof(arch_opt), "%s-fpunit=%s", cpu_arch, opt); - int res = firm_be_option(arch_opt); + int res = be_parse_arg(arch_opt); if (res == 0) argument_errors = true; } } else if (strstart(opt, "preferred-stack-boundary=")) { GET_ARG_AFTER(opt, "-mpreferred-stack-boundary="); snprintf(arch_opt, sizeof(arch_opt), "%s-stackalign=%s", cpu_arch, opt); - int res = firm_be_option(arch_opt); + int res = be_parse_arg(arch_opt); if (res == 0) argument_errors = true; } else if (streq(opt, "omit-leaf-frame-pointer")) { set_be_option("omitleaffp=1"); } else if (streq(opt, "no-omit-leaf-frame-pointer")) { set_be_option("omitleaffp=0"); + } else if (streq(opt, "rtd")) { + default_calling_convention = CC_STDCALL; + } else if (strstart(opt, "regparm=")) { + fprintf(stderr, "error: regparm convention not supported yet\n"); + argument_errors = true; + } else if (streq(opt, "soft-float")) { + fprintf(stderr, "error: software floatingpoint not supported yet\n"); + argument_errors = true; } else { char *endptr; long int value = strtol(opt, &endptr, 10); @@ -1017,10 +1067,6 @@ int main(int argc, char **argv) } else if (streq(option, "no-ms")) { features_on &= ~_MS; features_off |= _MS; - } else if (streq(option, "signed-chars")) { - char_is_signed = true; - } else if (streq(option, "unsigned-chars")) { - char_is_signed = false; } else if (streq(option, "strict")) { strict_mode = true; } else if (streq(option, "lextest")) { @@ -1039,9 +1085,14 @@ int main(int argc, char **argv) mode = PrintCaml; } else if (streq(option, "print-jna")) { mode = PrintJna; + } else if (streq(option, "time")) { + do_timing = true; } else if (streq(option, "version")) { print_cparser_version(); exit(EXIT_SUCCESS); + } else if (streq(option, "help")) { + print_help(argv[0]); + help_displayed = true; } else if (streq(option, "dump-function")) { ++i; if (i >= argc) { @@ -1052,6 +1103,8 @@ int main(int argc, char **argv) } dumpfunction = argv[i]; mode = CompileDump; + } else if (streq(option, "export-ir")) { + mode = CompileExportIR; } else { fprintf(stderr, "error: unknown argument '%s'\n", arg); argument_errors = true; @@ -1079,6 +1132,7 @@ int main(int argc, char **argv) streq(suffix, "cpp") ? FILETYPE_CXX : streq(suffix, "cxx") ? FILETYPE_CXX : streq(suffix, "h") ? FILETYPE_C : + streq(suffix, "ir") ? FILETYPE_IR : streq(suffix, "o") ? FILETYPE_OBJECT : streq(suffix, "s") ? FILETYPE_PREPROCESSED_ASSEMBLER : streq(suffix, "so") ? FILETYPE_OBJECT : @@ -1107,19 +1161,19 @@ int main(int argc, char **argv) } } + if (help_displayed) { + return !argument_errors; + } + if (print_file_name_file != NULL) { print_file_name(print_file_name_file); return 0; } - if (files == NULL) { fprintf(stderr, "error: no input files specified\n"); argument_errors = true; } - if (help_displayed) { - return !argument_errors; - } if (argument_errors) { usage(argv[0]); return 1; @@ -1128,6 +1182,10 @@ int main(int argc, char **argv) /* we do the lowering in ast2firm */ firm_opt.lower_bitfields = FALSE; + /* set the c_mode here, types depends on it */ + c_mode |= features_on; + c_mode &= ~features_off; + gen_firm_init(); init_symbol_table(); init_types(); @@ -1139,6 +1197,9 @@ int main(int argc, char **argv) init_ast2firm(); init_mangle(); + if (do_timing) + timer_init(); + if (construct_dep_target) { if (outname != 0 && strlen(outname) >= 2) { get_output_name(dep_target, sizeof(dep_target), outname, ".d"); @@ -1177,6 +1238,10 @@ int main(int argc, char **argv) ".vcg"); outname = outnamebuf; break; + case CompileExportIR: + get_output_name(outnamebuf, sizeof(outnamebuf), filename, ".ir"); + outname = outnamebuf; + break; case CompileAssembleLink: #ifdef _WIN32 outname = "a.exe"; @@ -1202,6 +1267,7 @@ int main(int argc, char **argv) } file_list_entry_t *file; + bool already_constructed_firm = false; for (file = files; file != NULL; file = file->next) { char asm_tempfile[1024]; const char *filename = file->name; @@ -1220,24 +1286,23 @@ int main(int argc, char **argv) } FILE *preprocessed_in = NULL; + filetype_t next_filetype = filetype; switch (filetype) { case FILETYPE_C: - filetype = FILETYPE_PREPROCESSED_C; + next_filetype = FILETYPE_PREPROCESSED_C; goto preprocess; case FILETYPE_CXX: - filetype = FILETYPE_PREPROCESSED_CXX; + next_filetype = FILETYPE_PREPROCESSED_CXX; goto preprocess; case FILETYPE_ASSEMBLER: - filetype = FILETYPE_PREPROCESSED_ASSEMBLER; - add_flag(&cppflags_obst, "-x"); - add_flag(&cppflags_obst, "assembler-with-cpp"); + next_filetype = FILETYPE_PREPROCESSED_ASSEMBLER; goto preprocess; preprocess: /* no support for input on FILE* yet */ if (in != NULL) panic("internal compiler error: in for preprocessor != NULL"); - preprocessed_in = preprocess(filename); + preprocessed_in = preprocess(filename, filetype); if (mode == PreprocessOnly) { copy_file(out, preprocessed_in); int result = pclose(preprocessed_in); @@ -1250,6 +1315,7 @@ preprocess: } in = preprocessed_in; + filetype = next_filetype; break; default: @@ -1272,7 +1338,7 @@ preprocess: switch (standard) { case STANDARD_ANSI: case STANDARD_C89: c_mode = _C89; break; - /* TODO ^v determine difference between these two */ + /* TODO determine difference between these two */ case STANDARD_C90: c_mode = _C89; break; case STANDARD_C99: c_mode = _C89 | _C99; break; case STANDARD_GNU89: c_mode = _C89 | _GNUC; break; @@ -1312,13 +1378,18 @@ default_cxx_warn: do_parsing: c_mode |= features_on; c_mode &= ~features_off; + + /* do the actual parsing */ + ir_timer_t *t_parsing = ir_timer_new(); + timer_register(t_parsing, "Frontend: Parsing"); + timer_push(t_parsing); init_tokens(); translation_unit_t *const unit = do_parsing(in, filename); + timer_pop(t_parsing); /* prints the AST even if errors occurred */ if (mode == PrintAst) { - type_set_output(out); - ast_set_output(out); + print_to_file(out); print_ast(unit); } @@ -1355,8 +1426,18 @@ do_parsing: continue; } + /* build the firm graph */ + ir_timer_t *t_construct = ir_timer_new(); + timer_register(t_construct, "Frontend: Graph construction"); + timer_push(t_construct); + if (already_constructed_firm) { + panic("compiling multiple files/translation units not possible"); + } translation_unit_to_firm(unit); + already_constructed_firm = true; + timer_pop(t_construct); +graph_built: if (mode == ParseOnly) { continue; } @@ -1381,16 +1462,25 @@ do_parsing: exit(1); } - dump_ir_block_graph_file(irg, out); + dump_ir_graph_file(out, irg); fclose(out); exit(0); } - gen_firm_finish(asm_out, filename, /*c_mode=*/1, - have_const_functions); + if (mode == CompileExportIR) { + fclose(out); + ir_export(outname); + exit(0); + } + + gen_firm_finish(asm_out, filename, have_const_functions); if (asm_out != out) { fclose(asm_out); } + } else if (filetype == FILETYPE_IR) { + fclose(in); + ir_import(filename); + goto graph_built; } else if (filetype == FILETYPE_PREPROCESSED_ASSEMBLER) { copy_file(asm_out, in); if (in == preprocessed_in) { @@ -1451,7 +1541,10 @@ do_parsing: const char *flags = obstack_finish(&ldflags_obst); /* construct commandline */ - obstack_printf(&file_obst, "%s", LINKER); + const char *linker = getenv("CPARSER_LINK"); + if (linker == NULL) + linker = LINKER; + obstack_printf(&file_obst, "%s", linker); for (file_list_entry_t *entry = files; entry != NULL; entry = entry->next) { if (entry->type != FILETYPE_OBJECT) @@ -1477,6 +1570,9 @@ do_parsing: } } + if (do_timing) + timer_term(stderr); + obstack_free(&cppflags_obst, NULL); obstack_free(&ldflags_obst, NULL); obstack_free(&file_obst, NULL);