X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=b9b62e1e77d2a2395f41e99aed641cebb38d0f6d;hb=5415928cc4c29c1754b6562bad26ab7d7f23882d;hp=d75333dc58e82816b652d93accb9feff4187770e;hpb=100bc872dbd1c12c1f02e911225807e94d91d425;p=cparser diff --git a/main.c b/main.c index d75333d..b9b62e1 100644 --- a/main.c +++ b/main.c @@ -50,16 +50,13 @@ #define fdopen(fd, mode) _fdopen(fd, mode) #define popen(cmd, mode) _popen(cmd, mode) #define pclose(file) _pclose(file) +#define unlink(filename) _unlink(filename) #else #include #define HAVE_MKSTEMP #endif -#ifndef WITH_LIBCORE -#define WITH_LIBCORE -#endif - #include #include @@ -68,6 +65,7 @@ #include "types.h" #include "type_hash.h" #include "parser.h" +#include "type_t.h" #include "ast2firm.h" #include "diagnostic.h" #include "lang_features.h" @@ -78,12 +76,13 @@ #include "write_caml.h" #include "revision.h" #include "warning.h" +#include "mangle.h" #ifndef PREPROCESSOR #ifdef __APPLE__ -#define PREPROCESSOR "gcc -E -std=c99 -U__WCHAR_TYPE__ -D__WCHAR_TYPE__=int -U__SIZE_TYPE__ -D__SIZE_TYPE__=unsigned\\ long -m32 -U__STRICT_ANSI__" +#define PREPROCESSOR "gcc -E -std=c99 -m32 -U__STRICT_ANSI__" #else -#define PREPROCESSOR "cpp -std=c99 -U__WCHAR_TYPE__ -D__WCHAR_TYPE__=int -U__SIZE_TYPE__ -D__SIZE_TYPE__=unsigned\\ long -m32 -U__STRICT_ANSI__" +#define PREPROCESSOR "cpp -std=c99 -m32 -U__STRICT_ANSI__" #endif #endif @@ -100,7 +99,7 @@ #endif /** The current c mode/dialect. */ -unsigned int c_mode = _C89|_C99|_GNUC; +unsigned int c_mode = _C89 | _ANSI | _C99 | _GNUC; /** The 'machine size', 16, 32 or 64 bit, 32bit is the default. */ unsigned int machine_size = 32; @@ -114,6 +113,11 @@ bool strict_mode = false; /** use builtins for some libc functions */ bool use_builtins = false; +/** we have extern function with const attribute. */ +bool have_const_functions = false; + +atomic_type_kind_t wchar_atomic_kind = ATOMIC_TYPE_INT; + /* to switch on printing of implicit casts */ extern bool print_implicit_casts; @@ -131,6 +135,8 @@ typedef enum filetype_t { FILETYPE_AUTODETECT, FILETYPE_C, FILETYPE_PREPROCESSED_C, + FILETYPE_CXX, + FILETYPE_PREPROCESSED_CXX, FILETYPE_ASSEMBLER, FILETYPE_PREPROCESSED_ASSEMBLER, FILETYPE_OBJECT, @@ -138,11 +144,13 @@ typedef enum filetype_t { } filetype_t; struct file_list_entry_t { - const char *name; /**< filename or NULL for stdin */ - filetype_t type; + const char *name; /**< filename or NULL for stdin */ + filetype_t type; file_list_entry_t *next; }; +static file_list_entry_t *temp_files; + #if defined(_DEBUG) || defined(FIRM_DEBUG) /** * Debug printf implementation. @@ -175,25 +183,25 @@ static void get_output_name(char *buf, size_t buflen, const char *inputname, size_t last_dot = 0xffffffff; size_t i = 0; - if(inputname == NULL) { + if (inputname == NULL) { snprintf(buf, buflen, "a%s", newext); return; } - for(const char *c = inputname; *c != 0; ++c) { - if(*c == '.') + for (const char *c = inputname; *c != 0; ++c) { + if (*c == '.') last_dot = i; ++i; } - if(last_dot == 0xffffffff) + if (last_dot == 0xffffffff) last_dot = i; - if(last_dot >= buflen) + if (last_dot >= buflen) panic("filename too long"); memcpy(buf, inputname, last_dot); size_t extlen = strlen(newext) + 1; - if(extlen + last_dot >= buflen) + if (extlen + last_dot >= buflen) panic("filename too long"); memcpy(buf+last_dot, newext, extlen); } @@ -223,20 +231,29 @@ static void lextest(FILE *in, const char *fname) do { lexer_next_preprocessing_token(); print_token(stdout, &lexer_token); - puts(""); - } while(lexer_token.type != T_EOF); + putchar('\n'); + } while (lexer_token.type != T_EOF); } static void add_flag(struct obstack *obst, const char *format, ...) { + char buf[4096]; va_list ap; - va_start(ap, format); - char buf[4096]; - vsnprintf(buf, sizeof(buf), format, ap); + va_start(ap, format); +#ifdef _WIN32 + int len = +#endif + vsnprintf(buf, sizeof(buf), format, ap); + va_end(ap); - /* escape stuff... */ obstack_1grow(obst, ' '); +#ifdef _WIN32 + obstack_1grow(obst, '"'); + obstack_grow(obst, buf, len); + obstack_1grow(obst, '"'); +#else + /* escape stuff... */ for (char *c = buf; *c != '\0'; ++c) { switch(*c) { case '"': @@ -251,14 +268,19 @@ static void add_flag(struct obstack *obst, const char *format, ...) case '(': case ')': obstack_1grow(obst, '\\'); - /* fallthrough */ + /* FALLTHROUGH */ default: obstack_1grow(obst, *c); break; } } +#endif +} - va_end(ap); +static const char *type_to_string(type_t *type) +{ + assert(type->kind == TYPE_ATOMIC); + return get_atomic_kind_name(type->atomic.akind); } static FILE *preprocess(const char *fname) @@ -267,27 +289,35 @@ static FILE *preprocess(const char *fname) 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)); + + /* handle dependency generation */ if (dep_target[0] != '\0') { add_flag(&cppflags_obst, "-MF"); - add_flag(&cppflags_obst, "%s", dep_target); + add_flag(&cppflags_obst, dep_target); if (outname != NULL) { add_flag(&cppflags_obst, "-MQ"); - add_flag(&cppflags_obst, "%s", outname); + add_flag(&cppflags_obst, outname); } } if (flags[0] != '\0') { obstack_printf(&cppflags_obst, " %s", flags); } - add_flag(&cppflags_obst, "%s", fname); + add_flag(&cppflags_obst, fname); obstack_1grow(&cppflags_obst, '\0'); const char *buf = obstack_finish(&cppflags_obst); - if(verbose) { + if (verbose) { puts(buf); } FILE *f = popen(buf, "r"); - if(f == NULL) { + if (f == NULL) { fprintf(stderr, "invoking preprocessor failed\n"); exit(1); } @@ -300,12 +330,12 @@ static void assemble(const char *out, const char *in) char buf[4096]; snprintf(buf, sizeof(buf), "%s %s -o %s", ASSEMBLER, in, out); - if(verbose) { + if (verbose) { puts(buf); } int err = system(buf); - if(err != 0) { + if (err != 0) { fprintf(stderr, "assembler reported an error\n"); exit(1); } @@ -313,9 +343,9 @@ static void assemble(const char *out, const char *in) static const char *try_dir(const char *dir) { - if(dir == NULL) + if (dir == NULL) return dir; - if(access(dir, R_OK | W_OK | X_OK) == 0) + if (access(dir, R_OK | W_OK | X_OK) == 0) return dir; return NULL; } @@ -324,29 +354,29 @@ static const char *get_tempdir(void) { static const char *tmpdir = NULL; - if(tmpdir != NULL) + if (tmpdir != NULL) return tmpdir; - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = try_dir(getenv("TMPDIR")); - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = try_dir(getenv("TMP")); - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = try_dir(getenv("TEMP")); #ifdef P_tmpdir - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = try_dir(P_tmpdir); #endif - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = try_dir("/var/tmp"); - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = try_dir("/usr/tmp"); - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = try_dir("/tmp"); - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = "."; return tmpdir; @@ -372,20 +402,45 @@ static FILE *make_temp_file(char *buffer, size_t buflen, const char *prefix) snprintf(buffer, buflen, "%s/%sXXXXXX", tempdir, prefix); int fd = mkstemp(buffer); - if(fd == -1) { + if (fd == -1) { fprintf(stderr, "couldn't create temporary file: %s\n", strerror(errno)); exit(1); } FILE *out = fdopen(fd, "w"); - if(out == NULL) { + if (out == NULL) { fprintf(stderr, "couldn't create temporary file FILE*\n"); exit(1); } + file_list_entry_t *entry = xmalloc(sizeof(*entry)); + memset(entry, 0, sizeof(*entry)); + + size_t name_len = strlen(buffer) + 1; + char *name = malloc(name_len); + memcpy(name, buffer, name_len); + entry->name = name; + + entry->next = temp_files; + temp_files = entry; + return out; } +static void free_temp_files(void) +{ + file_list_entry_t *entry = temp_files; + file_list_entry_t *next; + for ( ; entry != NULL; entry = next) { + next = entry->next; + + unlink(entry->name); + free((char*) entry->name); + free(entry); + } + temp_files = NULL; +} + /** * Do the necessary lowering for compound parameters. */ @@ -426,11 +481,11 @@ static void print_cparser_version(void) { printf("cparser (%s) using libFirm (%u.%u", cparser_REVISION, ver.major, ver.minor); - if(ver.revision[0] != 0) { + if (ver.revision[0] != 0) { putchar(' '); fputs(ver.revision, stdout); } - if(ver.build[0] != 0) { + if (ver.build[0] != 0) { putchar(' '); fputs(ver.build, stdout); } @@ -457,7 +512,7 @@ static void copy_file(FILE *dest, FILE *input) while (!feof(input) && !ferror(dest)) { size_t read = fread(buf, 1, sizeof(buf), input); - if(fwrite(buf, 1, read, dest) != read) { + if (fwrite(buf, 1, read, dest) != read) { perror("couldn't write output"); } } @@ -484,7 +539,7 @@ static FILE *open_file(const char *filename) } FILE *in = fopen(filename, "r"); - if(in == NULL) { + if (in == NULL) { fprintf(stderr, "Couldn't open '%s': %s\n", filename, strerror(errno)); exit(1); @@ -497,6 +552,8 @@ static filetype_t get_filetype_from_string(const char *string) { if (streq(string, "c") || streq(string, "c-header")) return FILETYPE_C; + if (streq(string, "c++") || streq(string, "c++-header")) + return FILETYPE_CXX; if (streq(string, "assembler")) return FILETYPE_PREPROCESSED_ASSEMBLER; if (streq(string, "assembler-with-cpp")) @@ -507,6 +564,37 @@ static filetype_t get_filetype_from_string(const char *string) return FILETYPE_UNKNOWN; } +static void init_os_support(void) +{ + /* OS option must be set to the backend */ + switch (firm_opt.os_support) { + case OS_SUPPORT_MINGW: + set_be_option("ia32-gasmode=mingw"); + wchar_atomic_kind = ATOMIC_TYPE_USHORT; + break; + case OS_SUPPORT_LINUX: + set_be_option("ia32-gasmode=elf"); + break; + case OS_SUPPORT_MACHO: + set_be_option("ia32-gasmode=macho"); + set_be_option("ia32-stackalign=4"); + set_be_option("pic"); + break; + } +} + +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(); @@ -521,21 +609,29 @@ int main(int argc, char **argv) bool construct_dep_target = false; struct obstack file_obst; + atexit(free_temp_files); + + /* hack for now... */ + if (strstr(argv[0], "pptest") != NULL) { + extern int pptest_main(int argc, char **argv); + return pptest_main(argc, argv); + } + obstack_init(&cppflags_obst); obstack_init(&ldflags_obst); obstack_init(&file_obst); #define GET_ARG_AFTER(def, args) \ def = &arg[sizeof(args)-1]; \ - if(def[0] == '\0') { \ + if (def[0] == '\0') { \ ++i; \ - if(i >= argc) { \ + if (i >= argc) { \ fprintf(stderr, "error: expected argument after '" args "'\n"); \ argument_errors = true; \ break; \ } \ def = argv[i]; \ - if(def[0] == '-' && def[1] != '\0') { \ + if (def[0] == '-' && def[1] != '\0') { \ fprintf(stderr, "error: expected argument after '" args "'\n"); \ argument_errors = true; \ continue; \ @@ -544,18 +640,28 @@ int main(int argc, char **argv) #define SINGLE_OPTION(ch) (option[0] == (ch) && option[1] == '\0') - /* early options parsing (find out optimisation level) */ - for(int i = 1; i < argc; ++i) { + /* early options parsing (find out optimisation level and OS) */ + for (int i = 1; i < argc; ++i) { const char *arg = argv[i]; - if(arg[0] != '-') + if (arg[0] != '-') continue; const char *option = &arg[1]; - if(option[0] == 'O') { + if (option[0] == 'O') { sscanf(&option[1], "%d", &opt_level); } + if (strcmp(arg, "-fwin32") == 0) { + firm_opt.os_support = OS_SUPPORT_MINGW; + } else if (strcmp(arg, "-fmac") == 0) { + firm_opt.os_support = OS_SUPPORT_MACHO; + } else if (strcmp(arg, "-flinux") == 0) { + firm_opt.os_support = OS_SUPPORT_LINUX; + } } + /* set target/os specific stuff */ + init_os_support(); + /* apply optimisation level */ switch(opt_level) { case 0: @@ -580,59 +686,57 @@ int main(int argc, char **argv) break; } -#ifdef __APPLE__ - /* Darwin expects the stack to be aligned to 16byte boundary */ - firm_be_option("ia32-stackalign=4"); -#endif - /* parse rest of options */ - filetype_t forced_filetype = FILETYPE_AUTODETECT; - bool help_displayed = false; - bool argument_errors = false; - for(int i = 1; i < argc; ++i) { + lang_standard_t standard = STANDARD_DEFAULT; + unsigned features_on = 0; + unsigned features_off = 0; + filetype_t forced_filetype = FILETYPE_AUTODETECT; + bool help_displayed = false; + bool argument_errors = false; + for (int i = 1; i < argc; ++i) { const char *arg = argv[i]; - if(arg[0] == '-' && arg[1] != 0) { + if (arg[0] == '-' && arg[1] != '\0') { /* an option */ const char *option = &arg[1]; - if(option[0] == 'o') { + if (option[0] == 'o') { GET_ARG_AFTER(outname, "-o"); - } else if(option[0] == 'g') { + } else if (option[0] == 'g') { set_be_option("debuginfo=stabs"); set_be_option("omitfp=no"); set_be_option("ia32-nooptcc=yes"); - } else if(SINGLE_OPTION('c')) { + } else if (SINGLE_OPTION('c')) { mode = CompileAssemble; - } else if(SINGLE_OPTION('E')) { + } else if (SINGLE_OPTION('E')) { mode = PreprocessOnly; - } else if(SINGLE_OPTION('S')) { + } else if (SINGLE_OPTION('S')) { mode = Compile; - } else if(option[0] == 'O') { + } else if (option[0] == 'O') { continue; - } else if(option[0] == 'I') { + } else if (option[0] == 'I') { const char *opt; GET_ARG_AFTER(opt, "-I"); add_flag(&cppflags_obst, "-I%s", opt); - } else if(option[0] == 'D') { + } else if (option[0] == 'D') { const char *opt; GET_ARG_AFTER(opt, "-D"); add_flag(&cppflags_obst, "-D%s", opt); - } else if(option[0] == 'U') { + } else if (option[0] == 'U') { const char *opt; GET_ARG_AFTER(opt, "-U"); add_flag(&cppflags_obst, "-U%s", opt); - } else if(option[0] == 'l') { + } else if (option[0] == 'l') { const char *opt; GET_ARG_AFTER(opt, "-l"); add_flag(&ldflags_obst, "-l%s", opt); - } else if(option[0] == 'L') { + } else if (option[0] == 'L') { const char *opt; GET_ARG_AFTER(opt, "-L"); add_flag(&ldflags_obst, "-L%s", opt); - } else if(SINGLE_OPTION('v')) { + } else if (SINGLE_OPTION('v')) { verbose = 1; - } else if(SINGLE_OPTION('w')) { - inhibit_all_warnings = true; - } else if(option[0] == 'x') { + } else if (SINGLE_OPTION('w')) { + memset(&warning, 0, sizeof(warning)); + } else if (option[0] == 'x') { const char *opt; GET_ARG_AFTER(opt, "-x"); forced_filetype = get_filetype_from_string(opt); @@ -647,7 +751,7 @@ int main(int argc, char **argv) streq(option, "MD")) { construct_dep_target = true; add_flag(&cppflags_obst, "-%s", option); - } else if(streq(option, "MM") || + } else if (streq(option, "MM") || streq(option, "MP")) { add_flag(&cppflags_obst, "-%s", option); } else if (streq(option, "MT") || @@ -680,7 +784,8 @@ int main(int argc, char **argv) } if (streq(opt, "builtins")) { use_builtins = truth_value; } else if (streq(opt, "short-wchar")) { - opt_short_wchar_t = truth_value; + 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")) { @@ -730,7 +835,7 @@ int main(int argc, char **argv) add_flag(&ldflags_obst, "-Wl,%s", opt); } else set_warning_opt(&option[1]); - } else if(option[0] == 'm') { + } else if (option[0] == 'm') { /* -m options */ const char *opt; char arch_opt[64]; @@ -770,7 +875,7 @@ int main(int argc, char **argv) fprintf(stderr, "error: option -mfpumath supports only 387 or sse\n"); argument_errors = true; } - if(!argument_errors) { + if (!argument_errors) { snprintf(arch_opt, sizeof(arch_opt), "%s-fpunit=%s", cpu_arch, opt); int res = firm_be_option(arch_opt); if (res == 0) @@ -809,29 +914,39 @@ int main(int argc, char **argv) } else if (streq(option, "shared")) { add_flag(&ldflags_obst, "-shared"); } else if (strstart(option, "std=")) { - if (streq(&option[4], "c99")) { - c_mode = _C89|_C99; - } else if (streq(&option[4], "c89")) { - c_mode = _C89; - } else if (streq(&option[4], "gnu99")) { - c_mode = _C89|_C99|_GNUC; - } else if (streq(&option[4], "microsoft")) { - c_mode = _C89|_C99|_MS; - } else - fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg); + const char *const o = &option[4]; + standard = + streq(o, "c++") ? STANDARD_CXX98 : + streq(o, "c++98") ? STANDARD_CXX98 : + streq(o, "c89") ? STANDARD_C89 : + streq(o, "c99") ? STANDARD_C99 : + streq(o, "c9x") ? STANDARD_C99 : // deprecated + streq(o, "gnu++98") ? STANDARD_GNUXX98 : + streq(o, "gnu89") ? STANDARD_GNU89 : + streq(o, "gnu99") ? STANDARD_GNU99 : + streq(o, "gnu9x") ? STANDARD_GNU99 : // deprecated + streq(o, "iso9899:1990") ? STANDARD_C89 : + streq(o, "iso9899:199409") ? STANDARD_C90 : + streq(o, "iso9899:1999") ? STANDARD_C99 : + streq(o, "iso9899:199x") ? STANDARD_C99 : // deprecated + (fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg), standard); } else if (streq(option, "version")) { print_cparser_version(); } else if (option[0] == '-') { /* double dash option */ ++option; if (streq(option, "gcc")) { - c_mode |= _GNUC; + features_on |= _GNUC; + features_off &= ~_GNUC; } else if (streq(option, "no-gcc")) { - c_mode &= ~_GNUC; + features_on &= ~_GNUC; + features_off |= _GNUC; } else if (streq(option, "ms")) { - c_mode |= _MS; + features_on |= _MS; + features_off &= ~_MS; } else if (streq(option, "no-ms")) { - c_mode &= ~_MS; + features_on &= ~_MS; + features_off |= _MS; } else if (streq(option, "signed-chars")) { char_is_signed = true; } else if (streq(option, "unsigned-chars")) { @@ -857,7 +972,7 @@ int main(int argc, char **argv) exit(EXIT_SUCCESS); } else if (streq(option, "dump-function")) { ++i; - if(i >= argc) { + if (i >= argc) { fprintf(stderr, "error: " "expected argument after '--dump-function'\n"); argument_errors = true; @@ -874,27 +989,28 @@ int main(int argc, char **argv) argument_errors = true; } } else { - filetype_t type = forced_filetype; - const char *filename = arg; + filetype_t type = forced_filetype; if (type == FILETYPE_AUTODETECT) { - size_t const len = strlen(arg); - if (len < 2 && arg[0] == '-') { + if (streq(arg, "-")) { /* - implicitly means C source file */ - type = FILETYPE_C; - filename = NULL; - } else if (len > 2 && arg[len - 2] == '.') { - switch (arg[len - 1]) { - case 'c': type = FILETYPE_C; break; - case 'h': type = FILETYPE_C; break; - case 's': type = FILETYPE_PREPROCESSED_ASSEMBLER; break; - case 'S': type = FILETYPE_ASSEMBLER; break; - - case 'a': - case 'o': type = FILETYPE_OBJECT; break; - } - } else if (len > 3 && arg[len - 3] == '.') { - if (streq(arg + len - 2, "so")) { - type = FILETYPE_OBJECT; + type = FILETYPE_C; + } else { + const char *suffix = strrchr(arg, '.'); + /* Ensure there is at least one char before the suffix */ + if (suffix != NULL && suffix != arg) { + ++suffix; + type = + streq(suffix, "S") ? FILETYPE_ASSEMBLER : + streq(suffix, "a") ? FILETYPE_OBJECT : + streq(suffix, "c") ? FILETYPE_C : + streq(suffix, "cc") ? FILETYPE_CXX : + streq(suffix, "cpp") ? FILETYPE_CXX : + streq(suffix, "cxx") ? FILETYPE_CXX : + streq(suffix, "h") ? FILETYPE_C : + streq(suffix, "o") ? FILETYPE_OBJECT : + streq(suffix, "s") ? FILETYPE_PREPROCESSED_ASSEMBLER : + streq(suffix, "so") ? FILETYPE_OBJECT : + FILETYPE_AUTODETECT; } } @@ -937,7 +1053,6 @@ int main(int argc, char **argv) gen_firm_init(); init_symbol_table(); - init_tokens(); init_types(); init_typehash(); init_basic_types(); @@ -945,6 +1060,7 @@ int main(int argc, char **argv) init_ast(); init_parser(); init_ast2firm(); + init_mangle(); if (construct_dep_target) { if (outname != 0 && strlen(outname) >= 2) { @@ -967,9 +1083,8 @@ int main(int argc, char **argv) case PrintCaml: case LexTest: case PreprocessOnly: - outname = "-"; - break; case ParseOnly: + outname = "-"; break; case Compile: get_output_name(outnamebuf, sizeof(outnamebuf), filename, ".s"); @@ -1001,7 +1116,7 @@ int main(int argc, char **argv) out = stdout; } else { out = fopen(outname, "w"); - if(out == NULL) { + if (out == NULL) { fprintf(stderr, "Couldn't open '%s' for writing: %s\n", outname, strerror(errno)); return 1; @@ -1014,7 +1129,7 @@ int main(int argc, char **argv) const char *filename = file->name; filetype_t filetype = file->type; - if (file->type == FILETYPE_OBJECT) + if (filetype == FILETYPE_OBJECT) continue; FILE *in = NULL; @@ -1027,36 +1142,35 @@ int main(int argc, char **argv) } FILE *preprocessed_in = NULL; - if (filetype == FILETYPE_C || filetype == FILETYPE_ASSEMBLER) { - /* no support for input on FILE* yet */ - if (in != NULL) - panic("internal compiler error: in for preprocessor != NULL"); - - preprocessed_in = preprocess(filename); - if (mode == PreprocessOnly) { - copy_file(out, preprocessed_in); - int result = pclose(preprocessed_in); - fclose(out); - return result; - } + switch (filetype) { + case FILETYPE_C: filetype = FILETYPE_PREPROCESSED_C; goto preprocess; + case FILETYPE_CXX: filetype = FILETYPE_PREPROCESSED_CXX; goto preprocess; + case FILETYPE_ASSEMBLER: 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); + if (mode == PreprocessOnly) { + copy_file(out, preprocessed_in); + int result = pclose(preprocessed_in); + fclose(out); + return result; + } - if (filetype == FILETYPE_C) { - filetype = FILETYPE_PREPROCESSED_C; - } else if (filetype == FILETYPE_ASSEMBLER) { - filetype = FILETYPE_PREPROCESSED_ASSEMBLER; - } else { - panic("internal compiler error: unknown filetype at preproc"); - } + in = preprocessed_in; + break; - in = preprocessed_in; + default: + break; } FILE *asm_out; - if(mode == Compile) { + if (mode == Compile) { asm_out = out; } else { - asm_out = make_temp_file(asm_tempfile, sizeof(asm_tempfile), - "ccs"); + asm_out = make_temp_file(asm_tempfile, sizeof(asm_tempfile), "ccs"); } if (in == NULL) @@ -1064,14 +1178,53 @@ int main(int argc, char **argv) /* preprocess and compile */ if (filetype == FILETYPE_PREPROCESSED_C) { - translation_unit_t *const unit = do_parsing(in, filename); - if (in == preprocessed_in) { - int pp_result = pclose(preprocessed_in); - if (pp_result != EXIT_SUCCESS) { - exit(EXIT_FAILURE); - } + char const* invalid_mode; + switch (standard) { + case STANDARD_ANSI: + case STANDARD_C89: c_mode = _C89; break; + /* TODO ^v 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; + +default_c_warn: + fprintf(stderr, + "warning: command line option \"-std=%s\" is not valid for C\n", + invalid_mode); + /* FALLTHROUGH */ + case STANDARD_DEFAULT: + case STANDARD_GNU99: c_mode = _C89 | _C99 | _GNUC; break; + + case STANDARD_CXX98: invalid_mode = "c++98"; goto default_c_warn; + case STANDARD_GNUXX98: invalid_mode = "gnu98"; goto default_c_warn; + } + goto do_parsing; + } else if (filetype == FILETYPE_PREPROCESSED_CXX) { + char const* invalid_mode; + switch (standard) { + case STANDARD_C89: invalid_mode = "c89"; goto default_cxx_warn; + case STANDARD_C90: invalid_mode = "c90"; goto default_cxx_warn; + case STANDARD_C99: invalid_mode = "c99"; goto default_cxx_warn; + case STANDARD_GNU89: invalid_mode = "gnu89"; goto default_cxx_warn; + case STANDARD_GNU99: invalid_mode = "gnu99"; goto default_cxx_warn; + + case STANDARD_ANSI: + case STANDARD_CXX98: c_mode = _CXX; break; + +default_cxx_warn: + fprintf(stderr, + "warning: command line option \"-std=%s\" is not valid for C++\n", + invalid_mode); + case STANDARD_DEFAULT: + case STANDARD_GNUXX98: c_mode = _CXX | _GNUC; break; } +do_parsing: + c_mode |= features_on; + c_mode &= ~features_off; + init_tokens(); + translation_unit_t *const unit = do_parsing(in, filename); + /* prints the AST even if errors occurred */ if (mode == PrintAst) { type_set_output(out); @@ -1079,19 +1232,26 @@ int main(int argc, char **argv) print_ast(unit); } - if(error_count > 0) { + if (error_count > 0) { /* parsing failed because of errors */ fprintf(stderr, "%u error(s), %u warning(s)\n", error_count, warning_count); result = EXIT_FAILURE; continue; - } else if(warning_count > 0) { + } else if (warning_count > 0) { fprintf(stderr, "%u warning(s)\n", warning_count); } - if(mode == BenchmarkParser) { + if (in == preprocessed_in) { + int pp_result = pclose(preprocessed_in); + if (pp_result != EXIT_SUCCESS) { + exit(EXIT_FAILURE); + } + } + + if (mode == BenchmarkParser) { return result; - } else if(mode == PrintFluffy) { + } else if (mode == PrintFluffy) { write_fluffy_decls(out, unit); continue; } else if (mode == PrintCaml) { @@ -1110,16 +1270,16 @@ int main(int argc, char **argv) ident *id = new_id_from_str(dumpfunction); ir_graph *irg = NULL; int n_irgs = get_irp_n_irgs(); - for(int i = 0; i < n_irgs; ++i) { + for (int i = 0; i < n_irgs; ++i) { ir_graph *tirg = get_irp_irg(i); ident *irg_id = get_entity_ident(get_irg_entity(tirg)); - if(irg_id == id) { + if (irg_id == id) { irg = tirg; break; } } - if(irg == NULL) { + if (irg == NULL) { fprintf(stderr, "No graph for function '%s' found\n", dumpfunction); exit(1); @@ -1131,11 +1291,10 @@ int main(int argc, char **argv) } gen_firm_finish(asm_out, filename, /*c_mode=*/1, - /*firm_const_exists=*/0); + have_const_functions); if (asm_out != out) { fclose(asm_out); } - } else if (filetype == FILETYPE_PREPROCESSED_ASSEMBLER) { copy_file(asm_out, in); if (in == preprocessed_in) { @@ -1144,7 +1303,7 @@ int main(int argc, char **argv) return pp_result; } } - if(asm_out != out) { + if (asm_out != out) { fclose(asm_out); } } @@ -1160,7 +1319,7 @@ int main(int argc, char **argv) if (filetype == FILETYPE_PREPROCESSED_ASSEMBLER) { char temp[1024]; const char *filename_o; - if(mode == CompileAssemble) { + if (mode == CompileAssemble) { fclose(out); filename_o = outname; } else { @@ -1185,7 +1344,7 @@ int main(int argc, char **argv) return result; /* link program file */ - if(mode == CompileAssembleLink) { + if (mode == CompileAssembleLink) { obstack_1grow(&ldflags_obst, '\0'); const char *flags = obstack_finish(&ldflags_obst); @@ -1206,11 +1365,11 @@ int main(int argc, char **argv) char *commandline = obstack_finish(&file_obst); - if(verbose) { + if (verbose) { puts(commandline); } int err = system(commandline); - if(err != EXIT_SUCCESS) { + if (err != EXIT_SUCCESS) { fprintf(stderr, "linker reported an error\n"); exit(1); } @@ -1220,6 +1379,7 @@ int main(int argc, char **argv) obstack_free(&ldflags_obst, NULL); obstack_free(&file_obst, NULL); + exit_mangle(); exit_ast2firm(); exit_parser(); exit_ast();