Make diagnosticvf() slightly more efficient by using fwrite() instead of printing...
[cparser] / main.c
diff --git a/main.c b/main.c
index 462258e..6b1a473 100644 (file)
--- a/main.c
+++ b/main.c
@@ -70,7 +70,6 @@
 #include "diagnostic.h"
 #include "lang_features.h"
 #include "driver/firm_opt.h"
-#include "driver/firm_cmdline.h"
 #include "driver/firm_timing.h"
 #include "driver/firm_machine.h"
 #include "adt/error.h"
@@ -79,6 +78,7 @@
 #include "wrappergen/write_jna.h"
 #include "revision.h"
 #include "warning.h"
+#include "help.h"
 #include "mangle.h"
 #include "printer.h"
 
 #define ASSEMBLER "gcc -c -xassembler"
 #endif
 
-unsigned int       c_mode                    = _C89 | _ANSI | _C99 | _GNUC;
-unsigned int       machine_size              = 32;
-bool               byte_order_big_endian     = false;
-bool               char_is_signed            = true;
-bool               strict_mode               = false;
-bool               use_builtins              = false;
-atomic_type_kind_t wchar_atomic_kind         = ATOMIC_TYPE_INT;
-unsigned           force_long_double_size    = 0;
-bool               enable_main_collect2_hack = false;
-bool               freestanding              = false;
+unsigned int        c_mode                    = _C89 | _ANSI | _C99 | _GNUC;
+bool                byte_order_big_endian     = false;
+bool                strict_mode               = false;
+bool                enable_main_collect2_hack = false;
+bool                freestanding              = false;
+unsigned            architecture_modulo_shift = 0;
 
-/* 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 bool               char_is_signed      = true;
+static atomic_type_kind_t wchar_atomic_kind   = ATOMIC_TYPE_INT;
 
 static machine_triple_t *target_machine;
 static const char       *target_triple;
@@ -124,10 +117,10 @@ static struct obstack    asflags_obst;
 static char              dep_target[1024];
 static const char       *outname;
 static bool              define_intmax_types;
+static const char       *input_encoding;
 
 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 */
@@ -137,8 +130,6 @@ typedef enum lang_standard_t {
        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 {
@@ -185,33 +176,30 @@ static void get_output_name(char *buf, size_t buflen, const char *inputname,
                panic("filename too long");
 }
 
-#include "gen_builtins.h"
-
 static translation_unit_t *do_parsing(FILE *const in, const char *const input_name)
 {
        start_parsing();
 
-       if (use_builtins) {
-               lexer_open_buffer(builtins, sizeof(builtins)-1, "<builtin>");
-               parse();
-       }
-
-       lexer_open_stream(in, input_name);
+       input_t *input = input_from_stream(in, input_encoding);
+       lexer_switch_input(input, input_name);
        parse();
-
        translation_unit_t *unit = finish_parsing();
+       input_free(input);
+
        return unit;
 }
 
 static void lextest(FILE *in, const char *fname)
 {
-       lexer_open_stream(in, fname);
+       input_t *input = input_from_stream(in, input_encoding);
+       lexer_switch_input(input, fname);
 
        do {
                lexer_next_preprocessing_token();
                print_token(stdout, &lexer_token);
                putchar('\n');
-       } while (lexer_token.type != T_EOF);
+       } while (lexer_token.kind != T_EOF);
+       input_free(input);
 }
 
 static void add_flag(struct obstack *obst, const char *format, ...)
@@ -267,7 +255,8 @@ static const char *type_to_string(type_t *type)
        return get_atomic_kind_name(type->atomic.akind);
 }
 
-static FILE *preprocess(const char *fname, filetype_t filetype)
+static FILE *preprocess(const char *fname, filetype_t filetype,
+                        lang_standard_t standard)
 {
        static const char *common_flags = NULL;
 
@@ -311,20 +300,30 @@ static FILE *preprocess(const char *fname, filetype_t filetype)
                obstack_printf(&cppflags_obst, PREPROCESSOR);
        }
 
+       char const *lang;
        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;
+       case FILETYPE_C:         lang = "c";                  break;
+       case FILETYPE_CXX:       lang = "c++";                break;
+       case FILETYPE_ASSEMBLER: lang = "assembler-with-cpp"; break;
+       default:                 lang = NULL;                 break;
        }
+       if (lang)
+               add_flag(&cppflags_obst, "-x%s", lang);
+
+       char const *std = NULL;
+       switch (standard) {
+       case STANDARD_C89:     std = "-std=c89";            break;
+       case STANDARD_C90:     std = "-std=iso9899:199409"; break;
+       case STANDARD_C99:     std = "-std=c99";            break;
+       case STANDARD_GNU89:   std = "-std=gnu89";          break;
+       case STANDARD_GNU99:   std = "-std=gnu99";          break;
+       case STANDARD_CXX98:   std = "-std=c++98";          break;
+       case STANDARD_GNUXX98: std = "-std=gnu++98";        break;
+       case STANDARD_DEFAULT: panic("invalid standard");
+       }
+       if (std)
+           add_flag(&cppflags_obst, std);
+
        obstack_printf(&cppflags_obst, "%s", common_flags);
 
        /* handle dependency generation */
@@ -332,8 +331,8 @@ static FILE *preprocess(const char *fname, filetype_t filetype)
                add_flag(&cppflags_obst, "-MF");
                add_flag(&cppflags_obst, dep_target);
                if (outname != NULL) {
-                               add_flag(&cppflags_obst, "-MQ");
-                               add_flag(&cppflags_obst, outname);
+                       add_flag(&cppflags_obst, "-MQ");
+                       add_flag(&cppflags_obst, outname);
                }
        }
        add_flag(&cppflags_obst, fname);
@@ -348,7 +347,7 @@ static FILE *preprocess(const char *fname, filetype_t filetype)
                fprintf(stderr, "invoking preprocessor failed\n");
                exit(EXIT_FAILURE);
        }
-       /* we don't really need that anymore */
+       /* we do not really need that anymore */
        obstack_free(&cppflags_obst, commandline);
 
        return f;
@@ -479,13 +478,13 @@ static FILE *make_temp_file(char *buffer, size_t buflen, const char *prefix)
 
        int fd = mkstemp(buffer);
        if (fd == -1) {
-               fprintf(stderr, "couldn't create temporary file: %s\n",
+               fprintf(stderr, "could not create temporary file: %s\n",
                        strerror(errno));
                exit(EXIT_FAILURE);
        }
        FILE *out = fdopen(fd, "w");
        if (out == NULL) {
-               fprintf(stderr, "couldn't create temporary file FILE*\n");
+               fprintf(stderr, "could not create temporary file FILE*\n");
                exit(EXIT_FAILURE);
        }
 
@@ -545,7 +544,7 @@ static void print_cparser_version(void)
 
        const char *revision = ir_get_version_revision();
        if (revision[0] != 0) {
-               putchar(' ');
+               putchar('-');
                fputs(revision, stdout);
        }
 
@@ -559,13 +558,218 @@ static void print_cparser_version(void)
             "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n");
 }
 
-static void print_help(const char *argv0)
+static void print_cparser_version_short(void)
+{
+       puts(cparser_REVISION);
+}
+
+static void print_help_basic(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");
+       put_help("--help",                   "Display this information");
+       put_help("--version",                "Display compiler version");
+       put_help("--help-parser",            "Display information about parser options");
+       put_help("--help-warnings",          "Display information about warning options");
+       put_help("--help-codegen",           "Display information about code-generation options");
+       put_help("--help-optimization",      "Display information about optimization options");
+       put_help("--help-linker",            "Display information about linker options");
+       put_help("--help-language-tools",    "Display information about language tools options");
+       put_help("--help-debug",             "Display information about compiler debugging options");
+       put_help("--help-firm",              "Display information about direct firm options");
+       put_help("--help-all",               "Display information about all options");
+       put_help("-c",                       "Compile and assemble but do not link");
+       put_help("-E",                       "Preprocess only");
+       put_help("-S",                       "Compile but do not assembler or link");
+       put_help("-o",                       "Specify output file");
+       put_help("-v",                       "Verbose output (show invocation of sub-processes)");
+       put_help("-x",                       "Force input language:");
+       put_choice("c",                      "C");
+       put_choice("c++",                    "C++");
+       put_choice("assembler",              "Assembler (no preprocessing)");
+       put_choice("assembler-with-cpp",     "Assembler with preprocessing");
+       put_choice("none",                   "Autodetection");
+       put_help("-pipe",                    "Ignored (gcc compatibility)");
+}
+
+static void print_help_preprocessor(void)
+{
+       put_help("-nostdinc",                "Do not search standard system include directories");
+       put_help("-trigraphs",               "Support ISO C trigraphs");
+       put_help("-isystem",                 "");
+       put_help("-include",                 "");
+       put_help("-I PATH",                  "");
+       put_help("-D SYMBOL[=value]",        "");
+       put_help("-U SYMBOL",                "");
+       put_help("-Wp,OPTION",               "Pass option directly to preprocessor");
+       put_help("-M",                       "");
+       put_help("-MD",                      "");
+       put_help("-MMD",                     "");
+       put_help("-MM",                      "");
+       put_help("-MP",                      "");
+       put_help("-MT",                      "");
+       put_help("-MQ",                      "");
+       put_help("-MF",                      "");
+}
+
+static void print_help_parser(void)
+{
+       put_help("-finput-charset=CHARSET",  "Select encoding of input files");
+       put_help("-fmessage-length=LEN",     "Ignored (gcc compatibility)");
+       put_help("-fshort-wchar",            "Type \"wchar_t\" is unsigned short instead of int");
+       put_help("-fshow-column",            "Show the column number in diagnostic messages");
+       put_help("-fsigned-char",            "Type \"char\" is a signed type");
+       put_help("-funsigned-char",          "Type \"char\" is an unsigned type");
+       put_help("--ms",                     "Enable msvc extensions");
+       put_help("--no-ms",                  "Disable msvc extensions");
+       put_help("--gcc",                    "Enable gcc extensions");
+       put_help("--no-gcc",                 "Disable gcc extensions");
+       put_help("-std=STANDARD",            "Specify language standard:");
+       put_choice("c99",                    "ISO C99 standard");
+       put_choice("c89",                    "ISO C89 standard");
+       put_choice("c9x",                    "Deprecated");
+       put_choice("c++",                    "ISO C++ 98");
+       put_choice("c++98",                  "ISO C++ 98");
+       put_choice("gnu99",                  "ISO C99 + GNU extensions (default)");
+       put_choice("gnu89",                  "ISO C89 + GNU extensions");
+       put_choice("gnu9x",                  "Deprecated");
+       put_choice("iso9899:1990",           "ISO C89");
+       put_choice("iso9899:199409",         "ISO C90");
+       put_choice("iso9899:1999",           "ISO C99");
+       put_choice("iso9899:199x",           "Deprecated");
+       put_help("-pedantic",                "Ignored (gcc compatibility)");
+       put_help("-ansi",                    "Ignored (gcc compatibility)");
+       put_help("--strict",                 "Enable strict conformance checking");
+}
+
+static void print_help_warnings(void)
+{
+       put_help("-f[no-]diagnostics-show-option", "Show the switch, which controls a warning, after each warning");
+       put_help("-w",                             "Disable all warnings");
+       put_help("-Wno-trigraphs",                 "Warn if input contains trigraphs");
+       put_help("-Wundef",                        "Warn if an undefined macro is used in an #if");
+       put_help("-Wmissing-include-dirs",         "Warn about missing user-specified include directories");
+       put_help("-Wendif-labels",                 "Warn about stray text after #elif and #endif");
+       put_help("-Winit-self",                    "Ignored (gcc compatibility)");
+       put_help("-Wformat-y2k",                   "Ignored (gcc compatibility)");
+       put_help("-Wformat-security",              "Ignored (gcc compatibility)");
+       put_help("-Wold-style-declaration",        "Ignored (gcc compatibility)");
+       put_help("-Wtype-limits",                  "Ignored (gcc compatibility)");
+       print_warning_opt_help();
+}
+
+static void print_help_optimization(void)
+{
+       put_help("-O LEVEL",                 "Select optimization level (0-4)");
+       firm_option_help(put_help);
+       put_help("-fexpensive-optimizations","Ignored (gcc compatibility)");
+}
+
+static void print_help_codegeneration(void)
+{
+       put_help("-g",                       "Generate debug information");
+       put_help("-pg",                      "Instrument code for gnu gprof");
+       put_help("-fomit-frame-pointer",     "Produce code without frame pointer where possible");
+       put_help("-ffreestanding",           "Compile in freestanding mode (see ISO C standard)");
+       put_help("-fhosted",                 "Compile in hosted (not freestanding) mode");
+       put_help("-fprofile-generate",       "Generate instrumented code to collect profile information");
+       put_help("-fprofile-use",            "Use profile information generated by instrumented binaries");
+       put_help("-ffp-precise",             "Precise floating point model");
+       put_help("-ffp-fast",                "Imprecise floating point model");
+       put_help("-ffp-strict",              "Strict floating point model");
+       put_help("-pthread",                 "Use pthread threading library");
+       put_help("-mtarget=TARGET",          "Specify target architecture as CPU-manufacturer-OS triple");
+       put_help("-mtriple=TARGET",          "Alias for -mtarget (clang compatibility)");
+       put_help("-march=ARCH",              "");
+       put_help("-mtune=ARCH",              "");
+       put_help("-mcpu=CPU",                "");
+       put_help("-mfpmath=",                "");
+       put_help("-mpreferred-stack-boundary=", "");
+       put_help("-mrtd",                    "");
+       put_help("-mregparm=",               "Not supported yet");
+       put_help("-msoft-float",             "Not supported yet");
+       put_help("-m32",                     "Generate 32bit code");
+       put_help("-m64",                     "Generate 64bit code");
+       put_help("-fverbose-asm",            "Ignored (gcc compatibility)");
+       put_help("-fjump-tables",            "Ignored (gcc compatibility)");
+       put_help("-fcommon",                 "Ignored (gcc compatibility)");
+       put_help("-foptimize-sibling-calls", "Ignored (gcc compatibility)");
+       put_help("-falign-loops",            "Ignored (gcc compatibility)");
+       put_help("-falign-jumps",            "Ignored (gcc compatibility)");
+       put_help("-falign-functions",        "Ignored (gcc compatibility)");
+       put_help("-fPIC",                    "Ignored (gcc compatibility)");
+       put_help("-ffast-math",              "Same as -ffp-fast (gcc compatibility)");
+       puts("");
+       puts("\tMost of these options can be used with a no- prefix to disable them");
+       puts("\te.g. -fno-omit-frame-pointer");
+}
+
+static void print_help_linker(void)
+{
+       put_help("-l LIBRARY",               "");
+       put_help("-L PATH",                  "");
+       put_help("-s",                       "Do not produce symbol table and relocation information");
+       put_help("-shared",                  "Produce a shared library");
+       put_help("-static",                  "Produce statically linked binary");
+       put_help("-Wl,OPTION",               "Pass option directly to linker");
+}
+
+static void print_help_debug(void)
+{
+       put_help("--lextest",                "Preprocess and tokenize only");
+       put_help("--print-ast",              "Preprocess, parse and print AST");
+       put_help("--print-implicit-cast",    "");
+       put_help("--print-parenthesis",      "");
+       put_help("--benchmark",              "Preprocess and parse, produces no output");
+       put_help("--time",                   "Measure time of compiler passes");
+       put_help("--dump-function func",     "Preprocess, parse and output vcg graph of func");
+       put_help("--export-ir",              "Preprocess, parse and output compiler intermediate representation");
+}
+
+static void print_help_language_tools(void)
+{
+       put_help("--print-fluffy",           "Preprocess, parse and generate declarations for the fluffy language");
+       put_help("--print-jna",              "Preprocess, parse and generate declarations for JNA");
+       put_help("--jna-limit filename",     "");
+       put_help("--jna-libname name",       "");
+}
+
+static void print_help_firm(void)
+{
+       put_help("-bOPTION",                 "Directly pass option to libFirm backend");
+       int res = be_parse_arg("help");
+       (void) res;
+       assert(res);
+}
+
+typedef enum {
+       HELP_NONE          = 0,
+       HELP_BASIC         = 1 << 0,
+       HELP_PREPROCESSOR  = 1 << 1,
+       HELP_PARSER        = 1 << 2,
+       HELP_WARNINGS      = 1 << 3,
+       HELP_OPTIMIZATION  = 1 << 4,
+       HELP_CODEGEN       = 1 << 5,
+       HELP_LINKER        = 1 << 6,
+       HELP_LANGUAGETOOLS = 1 << 7,
+       HELP_DEBUG         = 1 << 8,
+       HELP_FIRM          = 1 << 9,
+
+       HELP_ALL           = -1
+} help_sections_t;
+
+static void print_help(const char *argv0, help_sections_t sections)
+{
+       if (sections & HELP_BASIC)         print_help_basic(argv0);
+       if (sections & HELP_PREPROCESSOR)  print_help_preprocessor();
+       if (sections & HELP_PARSER)        print_help_parser();
+       if (sections & HELP_WARNINGS)      print_help_warnings();
+       if (sections & HELP_OPTIMIZATION)  print_help_optimization();
+       if (sections & HELP_CODEGEN)       print_help_codegeneration();
+       if (sections & HELP_LINKER)        print_help_linker();
+       if (sections & HELP_LANGUAGETOOLS) print_help_language_tools();
+       if (sections & HELP_DEBUG)         print_help_debug();
+       if (sections & HELP_FIRM)          print_help_firm();
 }
 
 static void set_be_option(const char *arg)
@@ -582,7 +786,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) {
-                       perror("couldn't write output");
+                       perror("could not write output");
                }
        }
 }
@@ -595,7 +799,7 @@ static FILE *open_file(const char *filename)
 
        FILE *in = fopen(filename, "r");
        if (in == NULL) {
-               fprintf(stderr, "Couldn't open '%s': %s\n", filename,
+               fprintf(stderr, "Could not open '%s': %s\n", filename,
                                strerror(errno));
                exit(EXIT_FAILURE);
        }
@@ -621,20 +825,16 @@ static filetype_t get_filetype_from_string(const char *string)
 
 static bool init_os_support(void)
 {
-       const char *os = target_machine->operating_system;
        wchar_atomic_kind         = ATOMIC_TYPE_INT;
-       force_long_double_size    = 0;
        enable_main_collect2_hack = false;
        define_intmax_types       = false;
 
-       if (strstr(os, "linux") != NULL || strstr(os, "bsd") != NULL
-                       || streq(os, "solaris")) {
+       if (firm_is_unixish_os(target_machine)) {
                set_create_ld_ident(create_name_linux_elf);
-       } else if (streq(os, "darwin")) {
-               force_long_double_size = 16;
+       } else if (firm_is_darwin_os(target_machine)) {
                set_create_ld_ident(create_name_macho);
                define_intmax_types = true;
-       } else if (strstr(os, "mingw") != NULL || streq(os, "win32")) {
+       } else if (firm_is_windows_os(target_machine)) {
                wchar_atomic_kind         = ATOMIC_TYPE_USHORT;
                enable_main_collect2_hack = true;
                set_create_ld_ident(create_name_win32);
@@ -656,17 +856,190 @@ static bool parse_target_triple(const char *arg)
        return true;
 }
 
-static void setup_target_machine(void)
+static unsigned decide_modulo_shift(unsigned type_size)
+{
+       if (architecture_modulo_shift == 0)
+               return 0;
+       if (type_size < architecture_modulo_shift)
+               return architecture_modulo_shift;
+       return type_size;
+}
+
+static bool is_ia32_cpu(const char *architecture)
+{
+       return streq(architecture, "i386")
+           || streq(architecture, "i486")
+           || streq(architecture, "i586")
+           || streq(architecture, "i686")
+           || streq(architecture, "i786");
+}
+
+static const char *setup_isa_from_tripel(const machine_triple_t *machine)
+{
+       const char *cpu = machine->cpu_type;
+
+       if (is_ia32_cpu(cpu)) {
+               return "ia32";
+       } else if (streq(cpu, "x86_64")) {
+               return "amd64";
+       } else if (streq(cpu, "sparc")) {
+               return "sparc";
+       } else if (streq(cpu, "arm")) {
+               return "arm";
+       } else {
+               fprintf(stderr, "Unknown cpu '%s' in target-triple\n", cpu);
+               return NULL;
+       }
+}
+
+static const char *setup_target_machine(void)
 {
        if (!setup_firm_for_machine(target_machine))
                exit(1);
+
+       const char *isa = setup_isa_from_tripel(target_machine);
+
+       if (isa == NULL)
+               exit(1);
+
        init_os_support();
+
+       return isa;
 }
 
-int main(int argc, char **argv)
+/**
+ * initialize cparser type properties based on a firm type
+ */
+static void set_typeprops_type(atomic_type_properties_t* props, ir_type *type)
 {
-       firm_early_init();
+       props->size             = get_type_size_bytes(type);
+       props->alignment        = get_type_alignment_bytes(type);
+       props->struct_alignment = props->alignment;
+}
 
+/**
+ * Copy atomic type properties except the integer conversion rank
+ */
+static void copy_typeprops(atomic_type_properties_t *dest,
+                           const atomic_type_properties_t *src)
+{
+       dest->size             = src->size;
+       dest->alignment        = src->alignment;
+       dest->struct_alignment = src->struct_alignment;
+       dest->flags            = src->flags;
+}
+
+static void init_types_and_adjust(void)
+{
+       const backend_params *be_params = be_get_backend_param();
+       unsigned machine_size = be_params->machine_size;
+       init_types(machine_size);
+
+       atomic_type_properties_t *props = atomic_type_properties;
+
+       /* adjust types as requested by target architecture */
+       ir_type *type_long_double = be_params->type_long_double;
+       if (type_long_double != NULL) {
+               set_typeprops_type(&props[ATOMIC_TYPE_LONG_DOUBLE], type_long_double);
+               atomic_modes[ATOMIC_TYPE_LONG_DOUBLE] = get_type_mode(type_long_double);
+       }
+
+       ir_type *type_long_long = be_params->type_long_long;
+       if (type_long_long != NULL)
+               set_typeprops_type(&props[ATOMIC_TYPE_LONGLONG], type_long_long);
+
+       ir_type *type_unsigned_long_long = be_params->type_unsigned_long_long;
+       if (type_unsigned_long_long != NULL)
+               set_typeprops_type(&props[ATOMIC_TYPE_ULONGLONG], type_unsigned_long_long);
+
+       /* operating system ABI specifics */
+       if (firm_is_darwin_os(target_machine)) {
+               if (machine_size == 32) {
+                       props[ATOMIC_TYPE_LONGLONG].struct_alignment    =  4;
+                       props[ATOMIC_TYPE_ULONGLONG].struct_alignment   =  4;
+                       props[ATOMIC_TYPE_DOUBLE].struct_alignment      =  4;
+                       props[ATOMIC_TYPE_LONG_DOUBLE].size             = 16;
+                       props[ATOMIC_TYPE_LONG_DOUBLE].alignment        = 16;
+                       props[ATOMIC_TYPE_LONG_DOUBLE].struct_alignment = 16;
+               }
+       } else if (firm_is_windows_os(target_machine)) {
+               if (machine_size == 64) {
+                       /* to ease porting of old c-code microsoft decided to use 32bits
+                        * even for long */
+                       props[ATOMIC_TYPE_LONG]  = props[ATOMIC_TYPE_INT];
+                       props[ATOMIC_TYPE_ULONG] = props[ATOMIC_TYPE_UINT];
+               }
+
+               /* on windows long double is not supported */
+               props[ATOMIC_TYPE_LONG_DOUBLE] = props[ATOMIC_TYPE_DOUBLE];
+       } else if (firm_is_unixish_os(target_machine)) {
+               if (is_ia32_cpu(target_machine->cpu_type)) {
+                       /* System V has a broken alignment for double so we have to add
+                        * a hack here */
+                       props[ATOMIC_TYPE_DOUBLE].struct_alignment    = 4;
+                       props[ATOMIC_TYPE_LONGLONG].struct_alignment  = 4;
+                       props[ATOMIC_TYPE_ULONGLONG].struct_alignment = 4;
+               }
+       }
+
+       /* stuff decided after processing operating system specifics and
+        * commandline flags */
+       if (char_is_signed) {
+               props[ATOMIC_TYPE_CHAR].flags |= ATOMIC_TYPE_FLAG_SIGNED;
+       } else {
+               props[ATOMIC_TYPE_CHAR].flags &= ~ATOMIC_TYPE_FLAG_SIGNED;
+       }
+       /* copy over wchar_t properties (including rank) */
+       props[ATOMIC_TYPE_WCHAR_T] = props[wchar_atomic_kind];
+
+       /* initialize defaults for unsupported types */
+       if (type_long_long == NULL) {
+               copy_typeprops(&props[ATOMIC_TYPE_LONGLONG], &props[ATOMIC_TYPE_LONG]);
+       }
+       if (type_unsigned_long_long == NULL) {
+               copy_typeprops(&props[ATOMIC_TYPE_ULONGLONG],
+                              &props[ATOMIC_TYPE_ULONG]);
+       }
+       if (type_long_double == NULL) {
+               copy_typeprops(&props[ATOMIC_TYPE_LONG_DOUBLE],
+                              &props[ATOMIC_TYPE_DOUBLE]);
+       }
+
+       /* initialize firm pointer modes */
+       char               name[64];
+       unsigned           bit_size     = machine_size;
+       unsigned           modulo_shift = decide_modulo_shift(bit_size);
+
+       snprintf(name, sizeof(name), "p%u", machine_size);
+       ir_mode *ptr_mode = new_reference_mode(name, irma_twos_complement, bit_size, modulo_shift);
+
+       if (machine_size == 16) {
+               set_reference_mode_signed_eq(ptr_mode, mode_Hs);
+               set_reference_mode_unsigned_eq(ptr_mode, mode_Hu);
+       } else if (machine_size == 32) {
+               set_reference_mode_signed_eq(ptr_mode, mode_Is);
+               set_reference_mode_unsigned_eq(ptr_mode, mode_Iu);
+       } else if (machine_size == 64) {
+               set_reference_mode_signed_eq(ptr_mode, mode_Ls);
+               set_reference_mode_unsigned_eq(ptr_mode, mode_Lu);
+       } else {
+               panic("strange machine_size when determining pointer modes");
+       }
+
+       /* Hmm, pointers should be machine size */
+       set_modeP_data(ptr_mode);
+       set_modeP_code(ptr_mode);
+
+       byte_order_big_endian = be_params->byte_order_big_endian;
+       if (be_params->modulo_shift_efficient) {
+               architecture_modulo_shift = machine_size;
+       } else {
+               architecture_modulo_shift = 0;
+       }
+}
+
+int main(int argc, char **argv)
+{
        const char        *dumpfunction         = NULL;
        const char        *print_file_name_file = NULL;
        compile_mode_t     mode                 = CompileAssembleLink;
@@ -695,25 +1068,30 @@ int main(int argc, char **argv)
        obstack_init(&file_obst);
 
 #define GET_ARG_AFTER(def, args)                                             \
+       do {                                                                     \
        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;                                                        \
                }                                                                    \
-       }
+       }                                                                        \
+       } while (0)
 
 #define SINGLE_OPTION(ch) (option[0] == (ch) && option[1] == '\0')
 
-       /* early options parsing (find out optimisation level and OS) */
+       /* initialize this early because it has to parse options */
+       gen_firm_init();
+
+       /* early options parsing (find out optimization level and OS) */
        for (int i = 1; i < argc; ++i) {
                const char *arg = argv[i];
                if (arg[0] != '-')
@@ -725,9 +1103,6 @@ int main(int argc, char **argv)
                }
        }
 
-       const char *target = getenv("TARGET");
-       if (target != NULL)
-               parse_target_triple(target);
        if (target_machine == NULL) {
                target_machine = firm_get_host_machine();
        }
@@ -735,12 +1110,12 @@ int main(int argc, char **argv)
        setup_target_machine();
 
        /* parse rest of options */
-       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;
+       lang_standard_t standard        = STANDARD_DEFAULT;
+       unsigned        features_on     = 0;
+       unsigned        features_off    = 0;
+       filetype_t      forced_filetype = FILETYPE_AUTODETECT;
+       help_sections_t help            = HELP_NONE;
+       bool            argument_errors = false;
        for (int i = 1; i < argc; ++i) {
                const char *arg = argv[i];
                if (arg[0] == '-' && arg[1] != '\0') {
@@ -749,13 +1124,15 @@ int main(int argc, char **argv)
                        if (option[0] == 'o') {
                                GET_ARG_AFTER(outname, "-o");
                        } else if (option[0] == 'g') {
-                               set_be_option("debuginfo=stabs");
-                               set_be_option("omitfp=no");
+                               /* TODO: parse -gX with 0<=x<=3... */
+                               set_be_option("debug=frameinfo");
                                set_be_option("ia32-nooptcc=yes");
                        } else if (SINGLE_OPTION('c')) {
                                mode = CompileAssemble;
                        } else if (SINGLE_OPTION('E')) {
                                mode = PreprocessOnly;
+                       } else if (SINGLE_OPTION('s')) {
+                               add_flag(&ldflags_obst, "-s");
                        } else if (SINGLE_OPTION('S')) {
                                mode = Compile;
                        } else if (option[0] == 'O') {
@@ -783,7 +1160,8 @@ int main(int argc, char **argv)
                        } else if (SINGLE_OPTION('v')) {
                                verbose = 1;
                        } else if (SINGLE_OPTION('w')) {
-                               memset(&warning, 0, sizeof(warning));
+                               add_flag(&cppflags_obst, "-w");
+                               disable_all_warnings();
                        } else if (option[0] == 'x') {
                                const char *opt;
                                GET_ARG_AFTER(opt, "-x");
@@ -842,13 +1220,34 @@ int main(int argc, char **argv)
 
                                if (strstart(orig_opt, "input-charset=")) {
                                        char const* const encoding = strchr(orig_opt, '=') + 1;
-                                       select_input_encoding(encoding);
+                                       input_encoding = encoding;
                                } 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, "visibility=")) {
+                                       const char *val = strchr(orig_opt, '=')+1;
+                                       elf_visibility_tag_t visibility
+                                               = get_elf_visibility_from_string(val);
+                                       if (visibility == ELF_VISIBILITY_ERROR) {
+                                               fprintf(stderr, "invalid visibility '%s' specified\n",
+                                                       val);
+                                               argument_errors = true;
+                                       } else {
+                                               set_default_visibility(visibility);
+                                       }
                                } else if (strstart(orig_opt, "message-length=")) {
                                        /* ignore: would only affect error message format */
+                               } else if (streq(orig_opt, "fast-math") ||
+                                          streq(orig_opt, "fp-fast")) {
+                                       firm_fp_model = fp_model_fast;
+                               } else if (streq(orig_opt, "fp-precise")) {
+                                       firm_fp_model = fp_model_precise;
+                               } else if (streq(orig_opt, "fp-strict")) {
+                                       firm_fp_model = fp_model_strict;
+                               } else if (streq(orig_opt, "help")) {
+                                       fprintf(stderr, "warning: -fhelp is deprecated\n");
+                                       help |= HELP_OPTIMIZATION;
                                } else {
                                        /* -f options which have an -fno- variant */
                                        char const *opt         = orig_opt;
@@ -858,8 +1257,8 @@ int main(int argc, char **argv)
                                                opt += 3;
                                        }
 
-                                       if (streq(opt, "builtins")) {
-                                               use_builtins = truth_value;
+                                       if (streq(opt, "diagnostics-show-option")) {
+                                               diagnostics_show_option = truth_value;
                                        } else if (streq(opt, "dollars-in-identifiers")) {
                                                allow_dollar_in_symbol = truth_value;
                                        } else if (streq(opt, "omit-frame-pointer")) {
@@ -867,10 +1266,13 @@ int main(int argc, char **argv)
                                        } else if (streq(opt, "short-wchar")) {
                                                wchar_atomic_kind = truth_value ? ATOMIC_TYPE_USHORT
                                                        : ATOMIC_TYPE_INT;
+                                       } else if (streq(opt, "show-column")) {
+                                               show_column = truth_value;
                                        } 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");
+                                               /* does nothing, for gcc compatibility (even gcc does
+                                                * nothing for this switch anymore) */
                                        } else if (streq(opt, "syntax-only")) {
                                                mode = truth_value ? ParseOnly : CompileAssembleLink;
                                        } else if (streq(opt, "unsigned-char")) {
@@ -885,19 +1287,21 @@ int main(int argc, char **argv)
                                                profile_use = truth_value;
                                        } else if (!truth_value &&
                                                   streq(opt, "asynchronous-unwind-tables")) {
-                                           /* nothing todo, a gcc feature which we don't support
+                                           /* nothing todo, a gcc feature which we do not support
                                             * anyway was deactivated */
-                                       } else if (streq(orig_opt, "verbose-asm")) {
+                                       } else if (streq(opt, "verbose-asm")) {
                                                /* ignore: we always print verbose assembler */
-                                       } else if (streq(opt, "fast-math")               ||
-                                                  streq(opt, "jump-tables")             ||
+                                       } else if (streq(opt, "jump-tables")             ||
                                                   streq(opt, "expensive-optimizations") ||
                                                   streq(opt, "common")                  ||
                                                   streq(opt, "optimize-sibling-calls")  ||
                                                   streq(opt, "align-loops")             ||
                                                   streq(opt, "align-jumps")             ||
                                                   streq(opt, "align-functions")         ||
-                                                  streq(opt, "PIC")) {
+                                                  streq(opt, "unroll-loops")            ||
+                                                  streq(opt, "PIC")                     ||
+                                                  streq(opt, "stack-protector")         ||
+                                                  streq(opt, "stack-protector-all")) {
                                                fprintf(stderr, "ignoring gcc option '-f%s'\n", orig_opt);
                                        } else {
                                                int res = firm_option(orig_opt);
@@ -906,28 +1310,28 @@ int main(int argc, char **argv)
                                                                orig_opt);
                                                        argument_errors = true;
                                                        continue;
-                                               } else if (res == -1) {
-                                                       help_displayed = true;
                                                }
                                        }
                                }
                        } else if (option[0] == 'b') {
                                const char *opt;
                                GET_ARG_AFTER(opt, "-b");
-                               int res = be_parse_arg(opt);
-                               if (res == 0) {
-                                       fprintf(stderr, "error: unknown Firm backend option '-b %s'\n",
-                                               opt);
-                                       argument_errors = true;
-                               } else if (res == -1) {
-                                       help_displayed = true;
-                               } else if (strstart(opt, "isa=")) {
-                                       strncpy(cpu_arch, opt, sizeof(cpu_arch));
+
+                               if (streq(opt, "help")) {
+                                       fprintf(stderr, "warning: -bhelp is deprecated (use --help-firm)\n");
+                                       help |= HELP_FIRM;
+                               } else {
+                                       int res = be_parse_arg(opt);
+                                       if (res == 0) {
+                                               fprintf(stderr, "error: unknown Firm backend option '-b %s'\n",
+                                                               opt);
+                                               argument_errors = true;
+                                       } else if (strstart(opt, "isa=")) {
+                                               strncpy(cpu_arch, opt, sizeof(cpu_arch));
+                                       }
                                }
                        } else if (option[0] == 'W') {
-                               if (option[1] == '\0') {
-                                       /* ignore -W, our defaults are already quite verbose */
-                               } else if (strstart(option + 1, "p,")) {
+                               if (strstart(option + 1, "p,")) {
                                        // pass options directly to the preprocessor
                                        const char *opt;
                                        GET_ARG_AFTER(opt, "-Wp,");
@@ -938,8 +1342,17 @@ int main(int argc, char **argv)
                                        GET_ARG_AFTER(opt, "-Wl,");
                                        add_flag(&ldflags_obst, "-Wl,%s", opt);
                                } else if (streq(option + 1, "no-trigraphs")
-                                                       || streq(option + 1, "undef")) {
+                                                       || streq(option + 1, "undef")
+                                                       || streq(option + 1, "missing-include-dirs")
+                                                       || streq(option + 1, "endif-labels")) {
                                        add_flag(&cppflags_obst, "%s", arg);
+                               } else if (streq(option+1, "init-self")) {
+                                       /* ignored (same as gcc does) */
+                               } else if (streq(option+1, "format-y2k")
+                                          || streq(option+1, "format-security")
+                                          || streq(option+1, "old-style-declaration")
+                                          || streq(option+1, "type-limits")) {
+                                   /* ignore (gcc compatibility) */
                                } else {
                                        set_warning_opt(&option[1]);
                                }
@@ -954,7 +1367,8 @@ int main(int argc, char **argv)
                                        if (!parse_target_triple(opt)) {
                                                argument_errors = true;
                                        } else {
-                                               setup_target_machine();
+                                               const char *isa = setup_target_machine();
+                                               strncpy(cpu_arch, isa, sizeof(cpu_arch));
                                                target_triple = opt;
                                        }
                                } else if (strstart(opt, "triple=")) {
@@ -962,21 +1376,20 @@ int main(int argc, char **argv)
                                        if (!parse_target_triple(opt)) {
                                                argument_errors = true;
                                        } else {
-                                               setup_target_machine();
+                                               const char *isa = setup_target_machine();
+                                               strncpy(cpu_arch, isa, sizeof(cpu_arch));
                                                target_triple = opt;
                                        }
                                } else if (strstart(opt, "arch=")) {
                                        GET_ARG_AFTER(opt, "-march=");
                                        snprintf(arch_opt, sizeof(arch_opt), "%s-arch=%s", cpu_arch, opt);
                                        int res = be_parse_arg(arch_opt);
+                                       snprintf(arch_opt, sizeof(arch_opt), "%s-opt=%s", cpu_arch, opt);
+                                       res &= be_parse_arg(arch_opt);
+
                                        if (res == 0) {
                                                fprintf(stderr, "Unknown architecture '%s'\n", arch_opt);
                                                argument_errors = true;
-                                       } else {
-                                               snprintf(arch_opt, sizeof(arch_opt), "%s-opt=%s", cpu_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=");
@@ -997,7 +1410,7 @@ int main(int argc, char **argv)
                                        else if (streq(opt, "sse"))
                                                opt = "sse2";
                                        else {
-                                               fprintf(stderr, "error: option -mfpumath supports only 387 or sse\n");
+                                               fprintf(stderr, "error: option -mfpmath supports only 387 or sse\n");
                                                argument_errors = true;
                                        }
                                        if (!argument_errors) {
@@ -1012,18 +1425,20 @@ int main(int argc, char **argv)
                                        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;
+                                       add_flag(&ldflags_obst, "-msoft-float");
+                                       snprintf(arch_opt, sizeof(arch_opt), "%s-fpunit=softfloat", cpu_arch);
+                                       int res = be_parse_arg(arch_opt);
+                                       if (res == 0)
+                                               argument_errors = true;
+                               } else if (streq(opt, "sse2")) {
+                                       /* ignore for now, our x86 backend always uses sse when
+                                        * sse is requested */
                                } else {
                                        long int value = strtol(opt, NULL, 10);
                                        if (value == 0) {
@@ -1033,7 +1448,9 @@ int main(int argc, char **argv)
                                                fprintf(stderr, "error: option -m supports only 16, 32 or 64\n");
                                                argument_errors = true;
                                        } else {
-                                               machine_size = (unsigned int)value;
+                                               unsigned machine_size = (unsigned)value;
+                                               /* TODO: choose/change backend based on this */
+                                               add_flag(&cppflags_obst, "-m%u", machine_size);
                                                add_flag(&asflags_obst, "-m%u", machine_size);
                                                add_flag(&ldflags_obst, "-m%u", machine_size);
                                        }
@@ -1041,8 +1458,9 @@ int main(int argc, char **argv)
                        } else if (streq(option, "pg")) {
                                set_be_option("gprof");
                                add_flag(&ldflags_obst, "-pg");
-                       } else if (streq(option, "pedantic") ||
-                                  streq(option, "ansi")) {
+                       } else if (streq(option, "ansi")) {
+                               add_flag(&cppflags_obst, "-ansi");
+                       } else if (streq(option, "pedantic")) {
                                fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg);
                        } else if (strstart(option, "std=")) {
                                const char *const o = &option[4];
@@ -1063,6 +1481,11 @@ int main(int argc, char **argv)
                                        (fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg), standard);
                        } else if (streq(option, "version")) {
                                print_cparser_version();
+                               return EXIT_SUCCESS;
+                       } else if (streq(option, "dumpversion")) {
+                               /* gcc compatibility option */
+                               print_cparser_version_short();
+                               return EXIT_SUCCESS;
                        } else if (strstart(option, "print-file-name=")) {
                                GET_ARG_AFTER(print_file_name_file, "-print-file-name=");
                        } else if (option[0] == '-') {
@@ -1120,8 +1543,25 @@ int main(int argc, char **argv)
                                        print_cparser_version();
                                        return EXIT_SUCCESS;
                                } else if (streq(option, "help")) {
-                                       print_help(argv[0]);
-                                       help_displayed = true;
+                                       help |= HELP_BASIC;
+                               } else if (streq(option, "help-parser")) {
+                                       help |= HELP_PARSER;
+                               } else if (streq(option, "help-warnings")) {
+                                       help |= HELP_WARNINGS;
+                               } else if (streq(option, "help-codegen")) {
+                                       help |= HELP_CODEGEN;
+                               } else if (streq(option, "help-linker")) {
+                                       help |= HELP_LINKER;
+                               } else if (streq(option, "help-optimization")) {
+                                       help |= HELP_OPTIMIZATION;
+                               } else if (streq(option, "help-language-tools")) {
+                                       help |= HELP_LANGUAGETOOLS;
+                               } else if (streq(option, "help-debug")) {
+                                       help |= HELP_DEBUG;
+                               } else if (streq(option, "help-firm")) {
+                                       help |= HELP_FIRM;
+                               } else if (streq(option, "help-all")) {
+                                       help |= HELP_ALL;
                                } else if (streq(option, "dump-function")) {
                                        ++i;
                                        if (i >= argc) {
@@ -1134,6 +1574,8 @@ int main(int argc, char **argv)
                                        mode         = CompileDump;
                                } else if (streq(option, "export-ir")) {
                                        mode = CompileExportIR;
+                               } else if (streq(option, "unroll-loops")) {
+                                       /* ignore (gcc compatibility) */
                                } else {
                                        fprintf(stderr, "error: unknown argument '%s'\n", arg);
                                        argument_errors = true;
@@ -1191,7 +1633,8 @@ int main(int argc, char **argv)
                }
        }
 
-       if (help_displayed) {
+       if (help != HELP_NONE) {
+               print_help(argv[0], help);
                return !argument_errors;
        }
 
@@ -1220,12 +1663,16 @@ int main(int argc, char **argv)
                set_be_option("profileuse");
        }
 
-       gen_firm_init();
-       byte_order_big_endian = be_get_backend_param()->byte_order_big_endian;
        init_symbol_table();
-       init_types();
+       init_types_and_adjust();
        init_typehash();
        init_basic_types();
+       if (wchar_atomic_kind == ATOMIC_TYPE_INT)
+               init_wchar_types(type_int);
+       else if (wchar_atomic_kind == ATOMIC_TYPE_USHORT)
+               init_wchar_types(type_short);
+       else
+               panic("unexpected wchar type");
        init_lexer();
        init_ast();
        init_parser();
@@ -1294,7 +1741,7 @@ int main(int argc, char **argv)
        } else {
                out = fopen(outname, "w");
                if (out == NULL) {
-                       fprintf(stderr, "Couldn't open '%s' for writing: %s\n", outname,
+                       fprintf(stderr, "Could not open '%s' for writing: %s\n", outname,
                                        strerror(errno));
                        return EXIT_FAILURE;
                }
@@ -1303,12 +1750,27 @@ 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;
-               filetype_t  filetype = file->type;
+               char            asm_tempfile[1024];
+               const char     *filename = file->name;
+               filetype_t      filetype = file->type;
+               lang_standard_t file_standard = standard;
 
                if (filetype == FILETYPE_OBJECT)
                        continue;
+               if (file_standard == STANDARD_DEFAULT) {
+                       switch (filetype) {
+                       case FILETYPE_C:
+                       case FILETYPE_PREPROCESSED_C:
+                               file_standard = STANDARD_GNU99;
+                               break;
+                       case FILETYPE_CXX:
+                       case FILETYPE_PREPROCESSED_CXX:
+                               file_standard = STANDARD_GNUXX98;
+                               break;
+                       default:
+                               break;
+                       }
+               }
 
                FILE *in = NULL;
                if (mode == LexTest) {
@@ -1336,16 +1798,17 @@ preprocess:
                                if (in != NULL)
                                        panic("internal compiler error: in for preprocessor != NULL");
 
-                               preprocessed_in = preprocess(filename, filetype);
+                               preprocessed_in = preprocess(filename, filetype,
+                                                            file_standard);
                                if (mode == PreprocessOnly) {
                                        copy_file(out, preprocessed_in);
-                                       int result = pclose(preprocessed_in);
+                                       int pp_result = pclose(preprocessed_in);
                                        fclose(out);
                                        /* remove output file in case of error */
-                                       if (out != stdout && result != EXIT_SUCCESS) {
+                                       if (out != stdout && pp_result != EXIT_SUCCESS) {
                                                unlink(outname);
                                        }
-                                       return result;
+                                       return pp_result;
                                }
 
                                in = preprocessed_in;
@@ -1369,44 +1832,42 @@ preprocess:
                /* preprocess and compile */
                if (filetype == FILETYPE_PREPROCESSED_C) {
                        char const* invalid_mode;
-                       switch (standard) {
-                               case STANDARD_ANSI:
-                               case STANDARD_C89:   c_mode = _C89;                break;
-                               /* 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;
+                       switch (file_standard) {
+                       case STANDARD_C89:   c_mode = _C89;                break;
+                       /* 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;
 
 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;
+                               fprintf(stderr,
+                                               "warning: command line option \"-std=%s\" is not valid for C\n",
+                                               invalid_mode);
+                               /* FALLTHROUGH */
+                       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;
+                       case STANDARD_DEFAULT: panic("invalid standard");
                        }
                        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;
+                       switch (file_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;
+                       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;
+                               fprintf(stderr,
+                                               "warning: command line option \"-std=%s\" is not valid for C++\n",
+                                               invalid_mode);
+                       case STANDARD_GNUXX98: c_mode = _CXX | _GNUC; break;
+                       case STANDARD_DEFAULT: panic("invalid standard");
                        }
 
 do_parsing:
@@ -1464,6 +1925,7 @@ do_parsing:
                        if (already_constructed_firm) {
                                panic("compiling multiple files/translation units not possible");
                        }
+                       init_implicit_optimizations();
                        translation_unit_to_firm(unit);
                        already_constructed_firm = true;
                        timer_pop(t_construct);
@@ -1499,18 +1961,25 @@ graph_built:
                        }
 
                        if (mode == CompileExportIR) {
-                               fclose(out);
-                               ir_export(outname);
+                               ir_export_file(out);
+                               if (ferror(out) != 0) {
+                                       fprintf(stderr, "Error while writing to output\n");
+                                       return EXIT_FAILURE;
+                               }
                                return EXIT_SUCCESS;
                        }
 
-                       gen_firm_finish(asm_out, filename);
+                       generate_code(asm_out, filename);
                        if (asm_out != out) {
                                fclose(asm_out);
                        }
                } else if (filetype == FILETYPE_IR) {
                        fclose(in);
-                       ir_import(filename);
+                       int res = ir_import(filename);
+                       if (res != 0) {
+                               fprintf(stderr, "Firm-Program import failed\n");
+                               return EXIT_FAILURE;
+                       }
                        goto graph_built;
                } else if (filetype == FILETYPE_PREPROCESSED_ASSEMBLER) {
                        copy_file(asm_out, in);
@@ -1614,6 +2083,7 @@ graph_built:
        obstack_free(&asflags_obst, NULL);
        obstack_free(&file_obst, NULL);
 
+       gen_firm_finish();
        exit_mangle();
        exit_ast2firm();
        exit_parser();