Corrent whitespace inconsistencies when printing type qualifiers.
[cparser] / main.c
diff --git a/main.c b/main.c
index 9e6e551..d39b27f 100644 (file)
--- a/main.c
+++ b/main.c
 #include "driver/firm_opt.h"
 #include "driver/firm_cmdline.h"
 #include "driver/firm_timing.h"
+#include "driver/firm_machine.h"
 #include "adt/error.h"
+#include "adt/strutil.h"
 #include "wrappergen/write_fluffy.h"
-#include "wrappergen/write_caml.h"
 #include "wrappergen/write_jna.h"
 #include "revision.h"
 #include "warning.h"
 
 #ifndef PREPROCESSOR
 #ifndef __WIN32__
-#define PREPROCESSOR "gcc -E -m32 -U__STRICT_ANSI__"
+#define PREPROCESSOR "gcc -E -U__STRICT_ANSI__"
 #else
-#define PREPROCESSOR "cpp -m32 -U__STRICT_ANSI__"
+#define PREPROCESSOR "cpp -U__STRICT_ANSI__"
 #endif
 #endif
 
 #ifndef LINKER
-#define LINKER    "gcc -m32"
+#define LINKER    "gcc"
 #endif
 
 #ifndef ASSEMBLER
-#ifdef __APPLE__
-#define ASSEMBLER "gcc -m32 -c -xassembler"
-#else
-#define ASSEMBLER "as --32"
-#endif
+#define ASSEMBLER "gcc -c -xassembler"
 #endif
 
 unsigned int       c_mode                    = _C89 | _ANSI | _C99 | _GNUC;
@@ -107,7 +104,6 @@ bool               byte_order_big_endian     = false;
 bool               char_is_signed            = true;
 bool               strict_mode               = false;
 bool               use_builtins              = false;
-bool               have_const_functions      = false;
 atomic_type_kind_t wchar_atomic_kind         = ATOMIC_TYPE_INT;
 unsigned           force_long_double_size    = 0;
 bool               enable_main_collect2_hack = false;
@@ -119,11 +115,15 @@ extern bool print_implicit_casts;
 /* to switch on printing of parenthesis to indicate operator precedence */
 extern bool print_parenthesis;
 
-static const char     *target_triple;
-static int             verbose;
-static struct obstack  cppflags_obst, ldflags_obst;
-static char            dep_target[1024];
-static const char     *outname;
+static machine_triple_t *target_machine;
+static const char       *target_triple;
+static int               verbose;
+static struct obstack    cppflags_obst;
+static struct obstack    ldflags_obst;
+static struct obstack    asflags_obst;
+static char              dep_target[1024];
+static const char       *outname;
+static bool              define_intmax_types;
 
 typedef enum lang_standard_t {
        STANDARD_DEFAULT, /* gnu99 (for C, GCC does gnu89) or gnu++98 (for C++) */
@@ -162,11 +162,6 @@ struct file_list_entry_t {
 
 static file_list_entry_t *temp_files;
 
-static void initialize_firm(void)
-{
-       firm_early_init();
-}
-
 static void get_output_name(char *buf, size_t buflen, const char *inputname,
                             const char *newext)
 {
@@ -289,6 +284,13 @@ static FILE *preprocess(const char *fname, filetype_t filetype)
                add_flag(&cppflags_obst, "-U__VERSION__");
                add_flag(&cppflags_obst, "-D__VERSION__=\"%s\"", cparser_REVISION);
 
+               if (define_intmax_types) {
+                       add_flag(&cppflags_obst, "-U__INTMAX_TYPE__");
+                       add_flag(&cppflags_obst, "-D__INTMAX_TYPE__=%s", type_to_string(type_intmax_t));
+                       add_flag(&cppflags_obst, "-U__UINTMAX_TYPE__");
+                       add_flag(&cppflags_obst, "-D__UINTMAX_TYPE__=%s", type_to_string(type_uintmax_t));
+               }
+
                if (flags[0] != '\0') {
                        size_t len = strlen(flags);
                        obstack_1grow(&cppflags_obst, ' ');
@@ -335,56 +337,52 @@ static FILE *preprocess(const char *fname, filetype_t filetype)
                }
        }
        add_flag(&cppflags_obst, fname);
-
        obstack_1grow(&cppflags_obst, '\0');
-       char *buf = obstack_finish(&cppflags_obst);
+
+       char *commandline = obstack_finish(&cppflags_obst);
        if (verbose) {
-               puts(buf);
+               puts(commandline);
        }
-
-       FILE *f = popen(buf, "r");
+       FILE *f = popen(commandline, "r");
        if (f == NULL) {
                fprintf(stderr, "invoking preprocessor failed\n");
                exit(EXIT_FAILURE);
        }
-
        /* we don't really need that anymore */
-       obstack_free(&cppflags_obst, buf);
+       obstack_free(&cppflags_obst, commandline);
 
        return f;
 }
 
 static void assemble(const char *out, const char *in)
 {
-       struct obstack asflags_obst;
-       char *buf;
-
-       obstack_init(&asflags_obst);
+       obstack_1grow(&asflags_obst, '\0');
+       const char *flags = obstack_finish(&asflags_obst);
 
        const char *assembler = getenv("CPARSER_AS");
        if (assembler != NULL) {
-               obstack_printf(&asflags_obst, "%s ", assembler);
+               obstack_printf(&asflags_obst, "%s", assembler);
        } else {
                if (target_triple != NULL)
                        obstack_printf(&asflags_obst, "%s-", target_triple);
-               obstack_printf(&asflags_obst, "%s ", ASSEMBLER);
+               obstack_printf(&asflags_obst, "%s", ASSEMBLER);
        }
+       if (flags[0] != '\0')
+               obstack_printf(&asflags_obst, " %s", flags);
 
-       obstack_printf(&asflags_obst, "%s -o %s", in, out);
+       obstack_printf(&asflags_obst, " %s -o %s", in, out);
        obstack_1grow(&asflags_obst, '\0');
-       buf = obstack_finish(&asflags_obst);
 
+       char *commandline = obstack_finish(&asflags_obst);
        if (verbose) {
-               puts(buf);
+               puts(commandline);
        }
-
-       int err = system(buf);
-       if (err != 0) {
+       int err = system(commandline);
+       if (err != EXIT_SUCCESS) {
                fprintf(stderr, "assembler reported an error\n");
                exit(EXIT_FAILURE);
        }
-
-       obstack_free(&asflags_obst, NULL);
+       obstack_free(&asflags_obst, commandline);
 }
 
 static void print_file_name(const char *file)
@@ -408,7 +406,6 @@ static void print_file_name(const char *file)
        obstack_1grow(&ldflags_obst, '\0');
 
        char *commandline = obstack_finish(&ldflags_obst);
-
        if (verbose) {
                puts(commandline);
        }
@@ -417,6 +414,7 @@ static void print_file_name(const char *file)
                fprintf(stderr, "linker reported an error\n");
                exit(EXIT_FAILURE);
        }
+       obstack_free(&ldflags_obst, commandline);
 }
 
 static const char *try_dir(const char *dir)
@@ -519,21 +517,6 @@ static void free_temp_files(void)
        temp_files = NULL;
 }
 
-/**
- * Do the necessary lowering for compound parameters.
- */
-void lower_compound_params(void)
-{
-       lower_params_t params;
-
-       params.def_ptr_alignment    = 4;
-       params.flags                = LF_COMPOUND_RETURN | LF_RETURN_HIDDEN;
-       params.hidden_params        = ADD_HIDDEN_ALWAYS_IN_FRONT;
-       params.find_pointer_type    = NULL;
-       params.ret_compound_in_regs = NULL;
-       lower_calls_with_compounds(&params);
-}
-
 typedef enum compile_mode_t {
        BenchmarkParser,
        PreprocessOnly,
@@ -546,7 +529,6 @@ typedef enum compile_mode_t {
        LexTest,
        PrintAst,
        PrintFluffy,
-       PrintCaml,
        PrintJna
 } compile_mode_t;
 
@@ -593,13 +575,6 @@ static void set_be_option(const char *arg)
        assert(res);
 }
 
-static void set_option(const char *arg)
-{
-       int res = firm_option(arg);
-       (void) res;
-       assert(res);
-}
-
 static void copy_file(FILE *dest, FILE *input)
 {
        char buf[16384];
@@ -612,20 +587,6 @@ 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 (streq(filename, "-")) {
@@ -658,29 +619,24 @@ static filetype_t get_filetype_from_string(const char *string)
        return FILETYPE_UNKNOWN;
 }
 
-/**
- * Initialize firm codegeneration for a specific operating system.
- * The argument is the operating system part of a target-triple */
-static bool set_os_support(const char *os)
+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")) {
-               set_be_option("ia32-gasmode=elf");
                set_create_ld_ident(create_name_linux_elf);
        } else if (streq(os, "darwin")) {
                force_long_double_size = 16;
-               set_be_option("ia32-gasmode=macho");
-               set_be_option("ia32-stackalign=4");
-               set_be_option("pic=true");
                set_create_ld_ident(create_name_macho);
+               define_intmax_types = true;
        } else if (strstr(os, "mingw") != NULL || streq(os, "win32")) {
                wchar_atomic_kind         = ATOMIC_TYPE_USHORT;
                enable_main_collect2_hack = true;
-               set_be_option("ia32-gasmode=mingw");
                set_create_ld_ident(create_name_win32);
        } else {
                return false;
@@ -691,71 +647,25 @@ static bool set_os_support(const char *os)
 
 static bool parse_target_triple(const char *arg)
 {
-       const char *manufacturer = strchr(arg, '-');
-       if (manufacturer == NULL) {
+       machine_triple_t *triple = firm_parse_machine_triple(arg);
+       if (triple == NULL) {
                fprintf(stderr, "Target-triple is not in the form 'cpu_type-manufacturer-operating_system'\n");
                return false;
        }
-       manufacturer += 1;
-
-       const char *os = strchr(manufacturer, '-');
-       if (os == NULL) {
-               fprintf(stderr, "Target-triple is not in the form 'cpu_type-manufacturer-operating_system'\n");
-               return false;
-       }
-       os += 1;
-
-       /* Note: Triples are more or less defined by what the config.guess and
-        * config.sub scripts from GNU autoconf emit. We have to lookup there what
-        * triples are possible */
-
-       /* process cpu type */
-       if (strstart(arg, "i386-")) {
-               be_parse_arg("isa=ia32");
-               be_parse_arg("ia32-arch=i386");
-       } else if (strstart(arg, "i486-")) {
-               be_parse_arg("isa=ia32");
-               be_parse_arg("ia32-arch=i486");
-       } else if (strstart(arg, "i586-")) {
-               be_parse_arg("isa=ia32");
-               be_parse_arg("ia32-arch=i586");
-       } else if (strstart(arg, "i686-")) {
-               be_parse_arg("isa=ia32");
-               be_parse_arg("ia32-arch=i686");
-       } else if (strstart(arg, "i786-")) {
-               be_parse_arg("isa=ia32");
-               be_parse_arg("ia32-arch=pentium4");
-       } else if (strstart(arg, "x86_64")) {
-               be_parse_arg("isa=amd64");
-       } else if (strstart(arg, "sparc-")) {
-               be_parse_arg("isa=sparc");
-       } else if (strstart(arg, "arm-")) {
-               be_parse_arg("isa=arm");
-       } else {
-               fprintf(stderr, "Unknown cpu in triple '%s'\n", arg);
-               return false;
-       }
-
-       /* process manufacturer, alot of people incorrectly leave out the
-        * manufacturer instead of using unknown- */
-       if (strstart(manufacturer, "linux")) {
-               os = manufacturer;
-               manufacturer = "unknown-";
-       }
-
-       /* process operating system */
-       if (!set_os_support(os)) {
-               fprintf(stderr, "Unknown operating system '%s' in triple '%s'\n", os, arg);
-               return false;
-       }
-
-       target_triple = arg;
+       target_machine = triple;
        return true;
 }
 
+static void setup_target_machine(void)
+{
+       if (!setup_firm_for_machine(target_machine))
+               exit(1);
+       init_os_support();
+}
+
 int main(int argc, char **argv)
 {
-       initialize_firm();
+       firm_early_init();
 
        const char        *dumpfunction         = NULL;
        const char        *print_file_name_file = NULL;
@@ -767,6 +677,8 @@ int main(int argc, char **argv)
        file_list_entry_t *last_file            = NULL;
        bool               construct_dep_target = false;
        bool               do_timing            = false;
+       bool               profile_generate     = false;
+       bool               profile_use          = false;
        struct obstack     file_obst;
 
        atexit(free_temp_files);
@@ -779,6 +691,7 @@ int main(int argc, char **argv)
 
        obstack_init(&cppflags_obst);
        obstack_init(&ldflags_obst);
+       obstack_init(&asflags_obst);
        obstack_init(&file_obst);
 
 #define GET_ARG_AFTER(def, args)                                             \
@@ -812,42 +725,14 @@ int main(int argc, char **argv)
                }
        }
 
-       /* Guess host OS */
-#if defined(_WIN32) || defined(__CYGWIN__)
-       set_os_support("win32");
-#elif defined(__APPLE__)
-       set_os_support("darwin");
-#else
-       set_os_support("linux");
-#endif
-
-       /* apply optimisation level */
-       switch(opt_level) {
-       case 0:
-               set_option("no-opt");
-               break;
-       case 1:
-               set_option("no-inline");
-               break;
-       default:
-       case 4:
-               /* use_builtins = true; */
-               /* fallthrough */
-       case 3:
-               set_option("thread-jumps");
-               set_option("if-conversion");
-               /* fallthrough */
-       case 2:
-               set_option("strict-aliasing");
-               set_option("inline");
-               set_option("deconv");
-               set_be_option("omitfp");
-               break;
-       }
-
        const char *target = getenv("TARGET");
        if (target != NULL)
                parse_target_triple(target);
+       if (target_machine == NULL) {
+               target_machine = firm_get_host_machine();
+       }
+       choose_optimization_pack(opt_level);
+       setup_target_machine();
 
        /* parse rest of options */
        standard                   = STANDARD_DEFAULT;
@@ -934,12 +819,23 @@ int main(int argc, char **argv)
                                GET_ARG_AFTER(opt, "-isystem");
                                add_flag(&cppflags_obst, "-isystem");
                                add_flag(&cppflags_obst, "%s", opt);
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__CYGWIN__)
+                       } else if (streq(option, "pthread")) {
+                               /* set flags for the preprocessor */
+                               add_flag(&cppflags_obst, "-D_REENTRANT");
+                               /* set flags for the linker */
+                               add_flag(&ldflags_obst, "-lpthread");
+#endif
                        } else if (streq(option, "nostdinc")
                                        || streq(option, "trigraphs")) {
                                /* pass these through to the preprocessor */
                                add_flag(&cppflags_obst, "%s", arg);
                        } else if (streq(option, "pipe")) {
                                /* here for gcc compatibility */
+                       } else if (streq(option, "static")) {
+                               add_flag(&ldflags_obst, "-static");
+                       } else if (streq(option, "shared")) {
+                               add_flag(&ldflags_obst, "-shared");
                        } else if (option[0] == 'f') {
                                char const *orig_opt;
                                GET_ARG_AFTER(orig_opt, "-f");
@@ -947,9 +843,14 @@ int main(int argc, char **argv)
                                if (strstart(orig_opt, "input-charset=")) {
                                        char const* const encoding = strchr(orig_opt, '=') + 1;
                                        select_input_encoding(encoding);
-                               } else if (streq(orig_opt, "verbose-asm")) {
-                                       /* ignore: we always print verbose assembler */
+                               } else if (strstart(orig_opt, "align-loops=") ||
+                                          strstart(orig_opt, "align-jumps=") ||
+                                          strstart(orig_opt, "align-functions=")) {
+                                       fprintf(stderr, "ignoring gcc option '-f%s'\n", orig_opt);
+                               } else if (strstart(orig_opt, "message-length=")) {
+                                       /* ignore: would only affect error message format */
                                } else {
+                                       /* -f options which have an -fno- variant */
                                        char const *opt         = orig_opt;
                                        bool        truth_value = true;
                                        if (opt[0] == 'n' && opt[1] == 'o' && opt[2] == '-') {
@@ -975,19 +876,19 @@ int main(int argc, char **argv)
                                        } else if (streq(opt, "unsigned-char")) {
                                                char_is_signed = !truth_value;
                                        } else if (streq(opt, "freestanding")) {
-                                               freestanding = true;
+                                               freestanding = truth_value;
                                        } else if (streq(opt, "hosted")) {
-                                               freestanding = false;
-                                       } else if (truth_value == false &&
+                                               freestanding = !truth_value;
+                                       } else if (streq(opt, "profile-generate")) {
+                                               profile_generate = truth_value;
+                                       } else if (streq(opt, "profile-use")) {
+                                               profile_use = truth_value;
+                                       } else if (!truth_value &&
                                                   streq(opt, "asynchronous-unwind-tables")) {
                                            /* nothing todo, a gcc feature which we don't support
                                             * anyway was deactivated */
-                                       } else if (strstart(orig_opt, "align-loops=") ||
-                                                       strstart(orig_opt, "align-jumps=") ||
-                                                       strstart(orig_opt, "align-functions=")) {
-                                               fprintf(stderr, "ignoring gcc option '-f%s'\n", orig_opt);
-                                       } else if (strstart(orig_opt, "message-length=")) {
-                                                       /* ignore: would only affect error message format */
+                                       } else if (streq(orig_opt, "verbose-asm")) {
+                                               /* ignore: we always print verbose assembler */
                                        } else if (streq(opt, "fast-math")               ||
                                                   streq(opt, "jump-tables")             ||
                                                   streq(opt, "expensive-optimizations") ||
@@ -1025,7 +926,7 @@ int main(int argc, char **argv)
                                }
                        } else if (option[0] == 'W') {
                                if (option[1] == '\0') {
-                                       /* ignore -W, out defaults are already quiet verbose */
+                                       /* ignore -W, our defaults are already quite verbose */
                                } else if (strstart(option + 1, "p,")) {
                                        // pass options directly to the preprocessor
                                        const char *opt;
@@ -1050,12 +951,20 @@ int main(int argc, char **argv)
                                GET_ARG_AFTER(opt, "-m");
                                if (strstart(opt, "target=")) {
                                        GET_ARG_AFTER(opt, "-mtarget=");
-                                       if (!parse_target_triple(opt))
+                                       if (!parse_target_triple(opt)) {
                                                argument_errors = true;
+                                       } else {
+                                               setup_target_machine();
+                                               target_triple = opt;
+                                       }
                                } else if (strstart(opt, "triple=")) {
                                        GET_ARG_AFTER(opt, "-mtriple=");
-                                       if (!parse_target_triple(opt))
+                                       if (!parse_target_triple(opt)) {
                                                argument_errors = true;
+                                       } else {
+                                               setup_target_machine();
+                                               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);
@@ -1116,17 +1025,17 @@ int main(int argc, char **argv)
                                        fprintf(stderr, "error: software floatingpoint not supported yet\n");
                                        argument_errors = true;
                                } else {
-                                       char *endptr;
-                                       long int value = strtol(opt, &endptr, 10);
-                                       if (*endptr != '\0') {
+                                       long int value = strtol(opt, NULL, 10);
+                                       if (value == 0) {
                                                fprintf(stderr, "error: wrong option '-m %s'\n",  opt);
                                                argument_errors = true;
-                                       }
-                                       if (value != 16 && value != 32 && value != 64) {
+                                       } else if (value != 16 && value != 32 && value != 64) {
                                                fprintf(stderr, "error: option -m supports only 16, 32 or 64\n");
                                                argument_errors = true;
                                        } else {
                                                machine_size = (unsigned int)value;
+                                               add_flag(&asflags_obst, "-m%u", machine_size);
+                                               add_flag(&ldflags_obst, "-m%u", machine_size);
                                        }
                                }
                        } else if (streq(option, "pg")) {
@@ -1187,8 +1096,6 @@ int main(int argc, char **argv)
                                        print_parenthesis = true;
                                } else if (streq(option, "print-fluffy")) {
                                        mode = PrintFluffy;
-                               } else if (streq(option, "print-caml")) {
-                                       mode = PrintCaml;
                                } else if (streq(option, "print-jna")) {
                                        mode = PrintJna;
                                } else if (streq(option, "jna-limit")) {
@@ -1252,6 +1159,7 @@ int main(int argc, char **argv)
                                                        streq(suffix, "S")   ? FILETYPE_ASSEMBLER              :
                                                        streq(suffix, "a")   ? FILETYPE_OBJECT                 :
                                                        streq(suffix, "c")   ? FILETYPE_C                      :
+                                                       streq(suffix, "i")   ? FILETYPE_PREPROCESSED_C         :
                                                        streq(suffix, "C")   ? FILETYPE_CXX                    :
                                                        streq(suffix, "cc")  ? FILETYPE_CXX                    :
                                                        streq(suffix, "cp")  ? FILETYPE_CXX                    :
@@ -1259,7 +1167,7 @@ int main(int argc, char **argv)
                                                        streq(suffix, "CPP") ? FILETYPE_CXX                    :
                                                        streq(suffix, "cxx") ? FILETYPE_CXX                    :
                                                        streq(suffix, "c++") ? FILETYPE_CXX                    :
-                                                       streq(suffix, "ii")  ? FILETYPE_CXX                    :
+                                                       streq(suffix, "ii")  ? FILETYPE_PREPROCESSED_CXX       :
                                                        streq(suffix, "h")   ? FILETYPE_C                      :
                                                        streq(suffix, "ir")  ? FILETYPE_IR                     :
                                                        streq(suffix, "o")   ? FILETYPE_OBJECT                 :
@@ -1303,12 +1211,16 @@ int main(int argc, char **argv)
                return EXIT_FAILURE;
        }
 
-       /* we do the lowering in ast2firm */
-       firm_opt.lower_bitfields = FALSE;
-
-       /* set the c_mode here, types depends on it */
+       /* apply some effects from switches */
        c_mode |= features_on;
        c_mode &= ~features_off;
+       if (profile_generate) {
+               add_flag(&ldflags_obst, "-lfirmprof");
+               set_be_option("profilegenerate");
+       }
+       if (profile_use) {
+               set_be_option("profileuse");
+       }
 
        gen_firm_init();
        byte_order_big_endian = be_get_backend_param()->byte_order_big_endian;
@@ -1343,7 +1255,6 @@ int main(int argc, char **argv)
                case BenchmarkParser:
                case PrintAst:
                case PrintFluffy:
-               case PrintCaml:
                case PrintJna:
                case LexTest:
                case PreprocessOnly:
@@ -1543,9 +1454,6 @@ do_parsing:
                        } else if (mode == PrintFluffy) {
                                write_fluffy_decls(out, unit);
                                continue;
-                       } else if (mode == PrintCaml) {
-                               write_caml_decls(out, unit);
-                               continue;
                        } else if (mode == PrintJna) {
                                write_jna_decls(out, unit);
                                continue;
@@ -1598,7 +1506,7 @@ graph_built:
                                return EXIT_SUCCESS;
                        }
 
-                       gen_firm_finish(asm_out, filename, have_const_functions);
+                       gen_firm_finish(asm_out, filename);
                        if (asm_out != out) {
                                fclose(asm_out);
                        }
@@ -1705,6 +1613,7 @@ graph_built:
 
        obstack_free(&cppflags_obst, NULL);
        obstack_free(&ldflags_obst, NULL);
+       obstack_free(&asflags_obst, NULL);
        obstack_free(&file_obst, NULL);
 
        exit_mangle();