Use the correct format specifier for the return value of strlen().
[cparser] / main.c
diff --git a/main.c b/main.c
index 82baf22..b3a9065 100644 (file)
--- a/main.c
+++ b/main.c
 #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 <unistd.h>
 #define HAVE_MKSTEMP
 #endif
 
-#ifndef WITH_LIBCORE
-#define WITH_LIBCORE
-#endif
-
 #include <libfirm/firm.h>
 #include <libfirm/be.h>
 
@@ -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"
 #include "write_caml.h"
 #include "revision.h"
 #include "warning.h"
+#include "mangle.h"
 
 #ifndef PREPROCESSOR
-#define PREPROCESSOR "cpp -std=c99 -U__WCHAR_TYPE__ -D__WCHAR_TYPE__=int -U__SIZE_TYPE__ -D__SIZE_TYPE__=__SIZE_TYPE__ -m32 -U__STRICT_ANSI__"
+#ifdef __APPLE__
+#define PREPROCESSOR "gcc -E -std=c99 -m32 -U__STRICT_ANSI__"
+#else
+#define PREPROCESSOR "cpp -std=c99 -m32 -U__STRICT_ANSI__"
+#endif
 #endif
 
 #ifndef LINKER
 #endif
 
 #ifndef ASSEMBLER
+#ifdef __APPLE__
+#define ASSEMBLER "gcc -c -xassembler"
+#else
 #define ASSEMBLER "as --32"
 #endif
+#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;
@@ -106,14 +113,21 @@ 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;
 
 /* to switch on printing of parenthesis to indicate operator precedence */
 extern bool print_parenthesis;
 
-static int            verbose;
-static struct obstack cppflags_obst, ldflags_obst;
+static int             verbose;
+static struct obstack  cppflags_obst, ldflags_obst;
+static char            dep_target[1024];
+static const char     *outname;
 
 typedef struct file_list_entry_t file_list_entry_t;
 
@@ -121,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,
@@ -128,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.
@@ -251,13 +269,42 @@ static void add_flag(struct obstack *obst, const char *format, ...)
        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)
 {
-       char buf[4096];
        obstack_1grow(&cppflags_obst, '\0');
        const char *flags = obstack_finish(&cppflags_obst);
 
-       snprintf(buf, sizeof(buf), PREPROCESSOR " %s %s", flags, fname);
+       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);
+               if (outname != NULL) {
+                               add_flag(&cppflags_obst, "-MQ");
+                               add_flag(&cppflags_obst, "%s", outname);
+               }
+       }
+       if (flags[0] != '\0') {
+               obstack_printf(&cppflags_obst, " %s", flags);
+       }
+       add_flag(&cppflags_obst, "%s", fname);
+
+       obstack_1grow(&cppflags_obst, '\0');
+       const char *buf = obstack_finish(&cppflags_obst);
        if(verbose) {
                puts(buf);
        }
@@ -267,6 +314,7 @@ static FILE *preprocess(const char *fname)
                fprintf(stderr, "invoking preprocessor failed\n");
                exit(1);
        }
+
        return f;
 }
 
@@ -358,9 +406,34 @@ static FILE *make_temp_file(char *buffer, size_t buflen, const char *prefix)
                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.
  */
@@ -438,9 +511,23 @@ static void copy_file(FILE *dest, FILE *input)
        }
 }
 
+static inline bool streq(char const* a, char const* b)
+{
+       return strcmp(a, b) == 0;
+}
+
+static inline bool strstart(char const* str, char const* start)
+{
+       do {
+               if (*start == '\0')
+                       return true;
+       } while (*str++ == *start++);
+       return false;
+}
+
 static FILE *open_file(const char *filename)
 {
-       if (strcmp(filename, "-") == 0) {
+       if (streq(filename, "-")) {
                return stdin;
        }
 
@@ -456,32 +543,73 @@ static FILE *open_file(const char *filename)
 
 static filetype_t get_filetype_from_string(const char *string)
 {
-       if (strcmp(string, "c") == 0 || strcmp(string, "c-header") == 0)
+       if (streq(string, "c") || streq(string, "c-header"))
                return FILETYPE_C;
-       if (strcmp(string, "assembler") == 0)
+       if (streq(string, "c++") || streq(string, "c++-header"))
+               return FILETYPE_CXX;
+       if (streq(string, "assembler"))
                return FILETYPE_PREPROCESSED_ASSEMBLER;
-       if (strcmp(string, "assembler-with-cpp") == 0)
+       if (streq(string, "assembler-with-cpp"))
                return FILETYPE_ASSEMBLER;
-       if (strcmp(string, "none") == 0)
+       if (streq(string, "none"))
                return FILETYPE_AUTODETECT;
 
        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();
 
-       const char        *outname      = NULL;
-       const char        *dumpfunction = NULL;
-       compile_mode_t     mode         = CompileAssembleLink;
-       int                opt_level    = 1;
-       int                result       = EXIT_SUCCESS;
-       char               cpu_arch[16] = "ia32";
-       file_list_entry_t *files        = NULL;
-       file_list_entry_t *last_file    = NULL;
+       const char        *dumpfunction         = NULL;
+       compile_mode_t     mode                 = CompileAssembleLink;
+       int                opt_level            = 1;
+       int                result               = EXIT_SUCCESS;
+       char               cpu_arch[16]         = "ia32";
+       file_list_entry_t *files                = NULL;
+       file_list_entry_t *last_file            = NULL;
+       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);
@@ -505,18 +633,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] != '-')
                        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:
@@ -528,11 +666,11 @@ int main(int argc, char **argv)
        default:
        case 4:
                set_option("strict-aliasing");
+               /* use_builtins = true; */
                /* fallthrough */
        case 3:
                set_option("cond-eval");
                set_option("if-conv");
-               use_builtins = true;
                /* fallthrough */
        case 2:
                set_option("inline");
@@ -542,12 +680,15 @@ int main(int argc, char **argv)
        }
 
        /* parse rest of options */
-       filetype_t  forced_filetype = FILETYPE_AUTODETECT;
-       bool        help_displayed  = false;
-       bool        argument_errors = false;
+       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') {
@@ -587,7 +728,7 @@ int main(int argc, char **argv)
                        } else if(SINGLE_OPTION('v')) {
                                verbose = 1;
                        } else if(SINGLE_OPTION('w')) {
-                               inhibit_all_warnings = true;
+                               memset(&warning, 0, sizeof(warning));
                        } else if(option[0] == 'x') {
                                const char *opt;
                                GET_ARG_AFTER(opt, "-x");
@@ -596,60 +737,77 @@ int main(int argc, char **argv)
                                        fprintf(stderr, "Unknown language '%s'\n", opt);
                                        argument_errors = true;
                                }
-                       } else if(strcmp(option, "M") == 0) {
+                       } else if (streq(option, "M")) {
                                mode = PreprocessOnly;
                                add_flag(&cppflags_obst, "-M");
-                       } else if (strcmp(option, "MMD") == 0 ||
-                                  strcmp(option, "MD")  == 0 ||
-                                  strcmp(option, "MM")  == 0 ||
-                                  strcmp(option, "MP")  == 0) {
+                       } else if (streq(option, "MMD") ||
+                                  streq(option, "MD")) {
+                           construct_dep_target = true;
+                               add_flag(&cppflags_obst, "-%s", option);
+                       } else if(streq(option, "MM")  ||
+                                  streq(option, "MP")) {
                                add_flag(&cppflags_obst, "-%s", option);
-                       } else if(strcmp(option, "MT") == 0
-                                       || strcmp(option, "MQ") == 0
-                                       || strcmp(option, "MF") == 0) {
+                       } else if (streq(option, "MT") ||
+                                  streq(option, "MQ") ||
+                                  streq(option, "MF")) {
                                const char *opt;
                                GET_ARG_AFTER(opt, "-MT");
                                add_flag(&cppflags_obst, "-%s", option);
                                add_flag(&cppflags_obst, "%s", opt);
-                       } else if(strcmp(option, "pipe") == 0) {
+                       } else if (streq(option, "pipe")) {
                                /* here for gcc compatibility */
-                       } else if(option[0] == 'f') {
-                               const char *opt;
-                               GET_ARG_AFTER(opt, "-f");
-
-                               if (strcmp(opt, "dollars-in-identifiers") == 0) {
-                                       allow_dollar_in_symbol = true;
-                               } else if (strcmp(opt, "no-dollars-in-identifiers") == 0) {
-                                       allow_dollar_in_symbol = false;
-                               } else if (strcmp(opt, "syntax-only") == 0) {
-                                       mode = ParseOnly;
-                               } else if(strcmp(opt, "omit-frame-pointer") == 0) {
-                                       set_be_option("omitfp");
-                               } else if(strcmp(opt, "no-omit-frame-pointer") == 0) {
-                                       set_be_option("omitfp=no");
-                               } else if(strcmp(opt, "strength-reduce") == 0) {
-                                       firm_option("strength-red");
-                               } else if(strcmp(opt, "fast-math") == 0
-                                               || strcmp(opt, "unroll-loops") == 0
-                                               || strcmp(opt, "expensive-optimizations") == 0
-                                               || strcmp(opt, "no-common") == 0
-                                               || strcmp(opt, "PIC") == 0
-                                               || strncmp(opt, "align-loops=", sizeof("align-loops=")-1) == 0
-                                               || strncmp(opt, "align-jumps=", sizeof("align-jumps=")-1) == 0
-                                               || strncmp(opt, "align-functions=", sizeof("align-functions=")-1) == 0) {
-                                       fprintf(stderr, "ignoring gcc option '-f %s'\n", opt);
+                       } else if (option[0] == 'f') {
+                               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 {
-                                       int res = firm_option(opt);
-                                       if (res == 0) {
-                                               fprintf(stderr, "error: unknown Firm option '-f %s'\n",
-                                                       opt);
-                                               argument_errors = true;
-                                               continue;
-                                       } else if (res == -1) {
-                                               help_displayed = true;
+                                       char const *opt         = orig_opt;
+                                       bool        truth_value = true;
+                                       if (opt[0] == 'n' && opt[1] == 'o' && opt[2] == '-') {
+                                               truth_value = false;
+                                               opt += 3;
+                                       }
+
+                                       if (streq(opt, "dollars-in-identifiers")) {
+                                               allow_dollar_in_symbol = truth_value;
+                                       } if (streq(opt, "builtins")) {
+                                               use_builtins = truth_value;
+                                       } 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, "strength-reduce")) {
+                                               firm_option(truth_value ? "strength-red" : "no-strength-red");
+                                       } 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, "align-loops")             ||
+                                                  streq(opt, "align-jumps")             ||
+                                                  streq(opt, "align-functions")) {
+                                               fprintf(stderr, "ignoring gcc option '-f%s'\n", orig_opt);
+                                       } else {
+                                               int res = firm_option(orig_opt);
+                                               if (res == 0) {
+                                                       fprintf(stderr, "error: unknown Firm option '-f%s'\n",
+                                                               orig_opt);
+                                                       argument_errors = true;
+                                                       continue;
+                                               } else if (res == -1) {
+                                                       help_displayed = true;
+                                               }
                                        }
                                }
-                       } else if(option[0] == 'b') {
+                       } else if (option[0] == 'b') {
                                const char *opt;
                                GET_ARG_AFTER(opt, "-b");
                                int res = firm_be_option(opt);
@@ -659,12 +817,11 @@ int main(int argc, char **argv)
                                        argument_errors = true;
                                } else if (res == -1) {
                                        help_displayed = true;
-                               } else {
-                                       if (strncmp(opt, "isa=", 4) == 0)
-                                               strncpy(cpu_arch, opt, sizeof(cpu_arch));
+                               } else if (strstart(opt, "isa=")) {
+                                       strncpy(cpu_arch, opt, sizeof(cpu_arch));
                                }
-                       } else if(option[0] == 'W') {
-                               if(strncmp(option + 1, "l,", 2) == 0)   // a gcc-style linker option
+                       } else if (option[0] == 'W') {
+                               if (strstart(option + 1, "l,")) // a gcc-style linker option
                                {
                                        const char *opt;
                                        GET_ARG_AFTER(opt, "-Wl,");
@@ -677,7 +834,7 @@ int main(int argc, char **argv)
                                char arch_opt[64];
 
                                GET_ARG_AFTER(opt, "-m");
-                               if(strncmp(opt, "arch=", 5) == 0) {
+                               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);
@@ -689,23 +846,23 @@ int main(int argc, char **argv)
                                                if (res == 0)
                                                        argument_errors = true;
                                        }
-                               } else if(strncmp(opt, "tune=", 5) == 0) {
+                               } 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);
                                        if (res == 0)
                                                argument_errors = true;
-                               } else if(strncmp(opt, "cpu=", 4) == 0) {
+                               } 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);
                                        if (res == 0)
                                                argument_errors = true;
-                               } else if(strncmp(opt, "fpmath=", 7) == 0) {
+                               } else if (strstart(opt, "fpmath=")) {
                                        GET_ARG_AFTER(opt, "-mfpmath=");
-                                       if(strcmp(opt, "387") == 0)
+                                       if (streq(opt, "387"))
                                                opt = "x87";
-                                       else if(strcmp(opt, "sse") == 0)
+                                       else if (streq(opt, "sse"))
                                                opt = "sse2";
                                        else {
                                                fprintf(stderr, "error: option -mfpumath supports only 387 or sse\n");
@@ -717,15 +874,15 @@ int main(int argc, char **argv)
                                                if (res == 0)
                                                        argument_errors = true;
                                        }
-                               } else if(strncmp(opt, "preferred-stack-boundary=", 25) == 0) {
+                               } 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);
                                        if (res == 0)
                                                argument_errors = true;
-                               } else if(strcmp(opt, "omit-leaf-frame-pointer") == 0) {
+                               } else if (streq(opt, "omit-leaf-frame-pointer")) {
                                        set_be_option("omitleaffp=1");
-                               } else if(strcmp(opt, "no-omit-leaf-frame-pointer") == 0) {
+                               } else if (streq(opt, "no-omit-leaf-frame-pointer")) {
                                        set_be_option("omitleaffp=0");
                                } else {
                                        char *endptr;
@@ -741,62 +898,72 @@ int main(int argc, char **argv)
                                                machine_size = (unsigned int)value;
                                        }
                                }
-                       } else if(strcmp(option, "pg") == 0) {
+                       } else if (streq(option, "pg")) {
                                set_be_option("gprof");
                                add_flag(&ldflags_obst, "-pg");
-                       } else if(strcmp(option, "pedantic") == 0
-                                       || strcmp(option, "ansi") == 0) {
+                       } else if (streq(option, "pedantic") ||
+                                  streq(option, "ansi")) {
                                fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg);
-                       } else if(strcmp(option, "shared") == 0) {
+                       } else if (streq(option, "shared")) {
                                add_flag(&ldflags_obst, "-shared");
-                       } else if(strncmp(option, "std=", 4) == 0) {
-                               if(strcmp(&option[4], "c99") == 0) {
-                                       c_mode = _C89|_C99;
-                               } else if(strcmp(&option[4], "c89") == 0) {
-                                       c_mode = _C89;
-                               } else if(strcmp(&option[4], "gnu99") == 0) {
-                                       c_mode = _C89|_C99|_GNUC;
-                               } else if(strcmp(&option[4], "microsoft") == 0) {
-                                       c_mode = _C89|_C99|_MS;
-                               } else
-                                       fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg);
-                       } else if(strcmp(option, "version") == 0) {
+                       } else if (strstart(option, "std=")) {
+                               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(strcmp(option, "gcc") == 0) {
-                                       c_mode |= _GNUC;
-                               } else if(strcmp(option, "no-gcc") == 0) {
-                                       c_mode &= ~_GNUC;
-                               } else if(strcmp(option, "ms") == 0) {
-                                       c_mode |= _MS;
-                               } else if(strcmp(option, "no-ms") == 0) {
-                                       c_mode &= ~_MS;
-                               } else if(strcmp(option, "signed-chars") == 0) {
+                               if (streq(option, "gcc")) {
+                                       features_on  |=  _GNUC;
+                                       features_off &= ~_GNUC;
+                               } else if (streq(option, "no-gcc")) {
+                                       features_on  &= ~_GNUC;
+                                       features_off |=  _GNUC;
+                               } else if (streq(option, "ms")) {
+                                       features_on  |=  _MS;
+                                       features_off &= ~_MS;
+                               } else if (streq(option, "no-ms")) {
+                                       features_on  &= ~_MS;
+                                       features_off |=  _MS;
+                               } else if (streq(option, "signed-chars")) {
                                        char_is_signed = true;
-                               } else if(strcmp(option, "unsigned-chars") == 0) {
+                               } else if (streq(option, "unsigned-chars")) {
                                        char_is_signed = false;
-                               } else if(strcmp(option, "strict") == 0) {
+                               } else if (streq(option, "strict")) {
                                        strict_mode = true;
-                               } else if(strcmp(option, "lextest") == 0) {
+                               } else if (streq(option, "lextest")) {
                                        mode = LexTest;
-                               } else if(strcmp(option, "benchmark") == 0) {
+                               } else if (streq(option, "benchmark")) {
                                        mode = BenchmarkParser;
-                               } else if(strcmp(option, "print-ast") == 0) {
+                               } else if (streq(option, "print-ast")) {
                                        mode = PrintAst;
-                               } else if(strcmp(option, "print-implicit-cast") == 0) {
+                               } else if (streq(option, "print-implicit-cast")) {
                                        print_implicit_casts = true;
-                               } else if(strcmp(option, "print-parenthesis") == 0) {
+                               } else if (streq(option, "print-parenthesis")) {
                                        print_parenthesis = true;
-                               } else if(strcmp(option, "print-fluffy") == 0) {
+                               } else if (streq(option, "print-fluffy")) {
                                        mode = PrintFluffy;
-                               } else if(strcmp(option, "print-caml") == 0) {
+                               } else if (streq(option, "print-caml")) {
                                        mode = PrintCaml;
-                               } else if(strcmp(option, "version") == 0) {
+                               } else if (streq(option, "version")) {
                                        print_cparser_version();
                                        exit(EXIT_SUCCESS);
-                               } else if(strcmp(option, "dump-function") == 0) {
+                               } else if (streq(option, "dump-function")) {
                                        ++i;
                                        if(i >= argc) {
                                                fprintf(stderr, "error: "
@@ -815,27 +982,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      len      = strlen(arg);
-                               if (len < 2 && arg[0] == '-') {
-                                       /* - implicitely 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(strcmp(arg + len - 2, "so") == 0) {
-                                               type = FILETYPE_OBJECT;
+                               if (streq(arg, "-")) {
+                                       /* - implicitly means C source file */
+                                       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;
                                        }
                                }
 
@@ -878,7 +1046,6 @@ int main(int argc, char **argv)
 
        gen_firm_init();
        init_symbol_table();
-       init_tokens();
        init_types();
        init_typehash();
        init_basic_types();
@@ -886,6 +1053,17 @@ int main(int argc, char **argv)
        init_ast();
        init_parser();
        init_ast2firm();
+       init_mangle();
+
+       if (construct_dep_target) {
+               if (outname != 0 && strlen(outname) >= 2) {
+                       get_output_name(dep_target, sizeof(dep_target), outname, ".d");
+               } else {
+                       get_output_name(dep_target, sizeof(dep_target), files->name, ".d");
+               }
+       } else {
+               dep_target[0] = '\0';
+       }
 
        char outnamebuf[4096];
        if (outname == NULL) {
@@ -898,9 +1076,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");
@@ -928,7 +1105,7 @@ int main(int argc, char **argv)
        assert(outname != NULL);
 
        FILE *out;
-       if(strcmp(outname, "-") == 0) {
+       if (streq(outname, "-")) {
                out = stdout;
        } else {
                out = fopen(outname, "w");
@@ -945,7 +1122,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;
@@ -958,36 +1135,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) {
                        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)
@@ -995,13 +1171,52 @@ 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) {
@@ -1020,6 +1235,13 @@ int main(int argc, char **argv)
                                fprintf(stderr, "%u warning(s)\n", warning_count);
                        }
 
+                       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) {
@@ -1062,11 +1284,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) {
@@ -1151,6 +1372,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();