X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=32456541def6785621cfaf8c9e2bd8975dd53ffc;hb=d9c2f28d8ca23867f292a952b0543807d35e672f;hp=6e55b36d053e36ad99d92c40ebd4840a29683e7f;hpb=70867ae5c2dc8b2e2589bae984635a9b4982e57d;p=cparser diff --git a/main.c b/main.c index 6e55b36..3245654 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" @@ -81,9 +82,9 @@ #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 @@ -130,6 +131,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 +156,7 @@ typedef enum filetype_t { FILETYPE_ASSEMBLER, FILETYPE_PREPROCESSED_ASSEMBLER, FILETYPE_OBJECT, + FILETYPE_IR, FILETYPE_UNKNOWN } filetype_t; @@ -232,7 +248,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 +299,61 @@ 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); + + /* 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"); + + 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); + 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 +364,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,12 +378,15 @@ 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); if (verbose) { @@ -498,6 +545,7 @@ typedef enum compile_mode_t { ParseOnly, Compile, CompileDump, + CompileExportIR, CompileAssemble, CompileAssembleLink, LexTest, @@ -529,7 +577,9 @@ 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 set_be_option(const char *arg) @@ -623,18 +673,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(); @@ -648,6 +686,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); @@ -713,14 +752,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("thread-jumps"); set_option("if-conv"); /* fallthrough */ case 2: + set_option("strict-aliasing"); set_option("inline"); set_option("deconv"); set_be_option("omitfp"); @@ -728,7 +767,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; @@ -918,9 +957,10 @@ int main(int argc, char **argv) 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) + 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); if (res == 0) @@ -964,6 +1004,8 @@ int main(int argc, char **argv) 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 { char *endptr; long int value = strtol(opt, &endptr, 10); @@ -1040,6 +1082,8 @@ 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); @@ -1053,6 +1097,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; @@ -1080,6 +1126,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 : @@ -1144,6 +1191,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"); @@ -1182,6 +1232,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"; @@ -1225,24 +1279,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); @@ -1255,6 +1308,7 @@ preprocess: } in = preprocessed_in; + filetype = next_filetype; break; default: @@ -1277,7 +1331,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; @@ -1318,8 +1372,10 @@ do_parsing: c_mode |= features_on; c_mode &= ~features_off; + timer_push(TV_PARSING); init_tokens(); translation_unit_t *const unit = do_parsing(in, filename); + timer_pop(); /* prints the AST even if errors occurred */ if (mode == PrintAst) { @@ -1361,8 +1417,11 @@ do_parsing: continue; } + timer_push(TV_CONSTRUCT); translation_unit_to_firm(unit); + timer_pop(); +graph_built: if (mode == ParseOnly) { continue; } @@ -1392,11 +1451,21 @@ do_parsing: exit(0); } + if (mode == CompileExportIR) { + fclose(out); + ir_export(outname); + exit(0); + } + gen_firm_finish(asm_out, filename, /*c_mode=*/1, 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) { @@ -1483,6 +1552,9 @@ do_parsing: } } + if (do_timing) + timer_term(stderr); + obstack_free(&cppflags_obst, NULL); obstack_free(&ldflags_obst, NULL); obstack_free(&file_obst, NULL);