X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=7f3a0871cc45d7cab14cff58b99d47d8b3bc12af;hb=5866ab8dadbcc09bd0965a2b94e35a483439ee24;hp=2d1cd9c57a522f35b266a39ea9f78017cc881891;hpb=4db6e89a662ecb5f3a30cac95d758a3059af24b0;p=cparser diff --git a/main.c b/main.c index 2d1cd9c..7f3a087 100644 --- a/main.c +++ b/main.c @@ -74,7 +74,6 @@ #include "driver/firm_timing.h" #include "adt/error.h" #include "wrappergen/write_fluffy.h" -#include "wrappergen/write_caml.h" #include "wrappergen/write_jna.h" #include "revision.h" #include "warning.h" @@ -83,43 +82,34 @@ #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" +#define ASSEMBLER "gcc -c -xassembler" #else -#define ASSEMBLER "as --32" +#define ASSEMBLER "as" #endif #endif -/** The current c mode/dialect. */ -unsigned int c_mode = _C89 | _ANSI | _C99 | _GNUC; - -/** The 'machine size', 16, 32 or 64 bit, 32bit is the default. */ -unsigned int machine_size = 32; - -/** true if the char type is signed. */ -bool char_is_signed = true; - -/** true for strict language checking. */ -bool strict_mode = false; - -/** use builtins for some libc functions */ -bool use_builtins = false; - -/** we have extern function with const attribute. */ -bool have_const_functions = false; - -atomic_type_kind_t wchar_atomic_kind = ATOMIC_TYPE_INT; +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; /* to switch on printing of implicit casts */ extern bool print_implicit_casts; @@ -127,8 +117,11 @@ 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 struct obstack cppflags_obst; +static struct obstack ldflags_obst; +static struct obstack asflags_obst; static char dep_target[1024]; static const char *outname; @@ -169,30 +162,9 @@ struct file_list_entry_t { static file_list_entry_t *temp_files; -#if defined(_DEBUG) || defined(FIRM_DEBUG) -/** - * Debug printf implementation. - * - * @param fmt printf style format parameter - */ -void dbg_printf(const char *fmt, ...) -{ - va_list list; - - if (firm_dump.debug_print) { - va_start(list, fmt); - vprintf(fmt, list); - va_end(list); - } /* if */ -} -#endif /* defined(_DEBUG) || defined(FIRM_DEBUG) */ - static void initialize_firm(void) { firm_early_init(); - - dump_consts_local(1); - dump_keepalive_edges(1); } static void get_output_name(char *buf, size_t buflen, const char *inputname, @@ -329,10 +301,14 @@ static FILE *preprocess(const char *fname, filetype_t filetype) assert(obstack_object_size(&cppflags_obst) == 0); const char *preprocessor = getenv("CPARSER_PP"); - if (preprocessor == NULL) - preprocessor = PREPROCESSOR; + if (preprocessor != NULL) { + obstack_printf(&cppflags_obst, "%s ", preprocessor); + } else { + if (target_triple != NULL) + obstack_printf(&cppflags_obst, "%s-", target_triple); + obstack_printf(&cppflags_obst, PREPROCESSOR); + } - obstack_printf(&cppflags_obst, "%s ", preprocessor); switch (filetype) { case FILETYPE_C: add_flag(&cppflags_obst, "-std=c99"); @@ -359,43 +335,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(1); + 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) { - char buf[65536]; + obstack_1grow(&asflags_obst, '\0'); + const char *flags = obstack_finish(&asflags_obst); const char *assembler = getenv("CPARSER_AS"); - if (assembler == NULL) - assembler = ASSEMBLER; + if (assembler != NULL) { + obstack_printf(&asflags_obst, "%s", assembler); + } else { + if (target_triple != NULL) + obstack_printf(&asflags_obst, "%s-", target_triple); + 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_1grow(&asflags_obst, '\0'); - snprintf(buf, sizeof(buf), "%s %s -o %s", assembler, in, out); + 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(1); + exit(EXIT_FAILURE); } + obstack_free(&asflags_obst, commandline); } static void print_file_name(const char *file) @@ -407,22 +392,27 @@ static void print_file_name(const char *file) /* construct commandline */ const char *linker = getenv("CPARSER_LINK"); - if (linker == NULL) - linker = LINKER; + if (linker != NULL) { + obstack_printf(&ldflags_obst, "%s ", linker); + } else { + if (target_triple != NULL) + obstack_printf(&ldflags_obst, "%s-", target_triple); + obstack_printf(&ldflags_obst, "%s ", LINKER); + } obstack_printf(&ldflags_obst, "%s ", linker); obstack_printf(&ldflags_obst, "%s", flags); obstack_1grow(&ldflags_obst, '\0'); char *commandline = obstack_finish(&ldflags_obst); - if (verbose) { puts(commandline); } int err = system(commandline); if (err != EXIT_SUCCESS) { fprintf(stderr, "linker reported an error\n"); - exit(1); + exit(EXIT_FAILURE); } + obstack_free(&ldflags_obst, commandline); } static const char *try_dir(const char *dir) @@ -489,12 +479,12 @@ static FILE *make_temp_file(char *buffer, size_t buflen, const char *prefix) if (fd == -1) { fprintf(stderr, "couldn't create temporary file: %s\n", strerror(errno)); - exit(1); + exit(EXIT_FAILURE); } FILE *out = fdopen(fd, "w"); if (out == NULL) { fprintf(stderr, "couldn't create temporary file FILE*\n"); - exit(1); + exit(EXIT_FAILURE); } file_list_entry_t *entry = xmalloc(sizeof(*entry)); @@ -525,21 +515,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(¶ms); -} - typedef enum compile_mode_t { BenchmarkParser, PreprocessOnly, @@ -552,13 +527,12 @@ typedef enum compile_mode_t { LexTest, PrintAst, PrintFluffy, - PrintCaml, PrintJna } compile_mode_t; static void usage(const char *argv0) { - fprintf(stderr, "Usage %s input [-o output] [-c]\n", argv0); + fprintf(stderr, "Usage %s [options] input [-o output]\n", argv0); } static void print_cparser_version(void) @@ -583,9 +557,18 @@ 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) +{ + 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"); +} + static void set_be_option(const char *arg) { - int res = firm_be_option(arg); + int res = be_parse_arg(arg); (void) res; assert(res); } @@ -633,7 +616,7 @@ static FILE *open_file(const char *filename) if (in == NULL) { fprintf(stderr, "Couldn't open '%s': %s\n", filename, strerror(errno)); - exit(1); + exit(EXIT_FAILURE); } return in; @@ -655,23 +638,99 @@ static filetype_t get_filetype_from_string(const char *string) return FILETYPE_UNKNOWN; } -static void init_os_support(void) +/** + * 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) { - /* OS option must be set to the backend */ - switch (firm_opt.os_support) { - case OS_SUPPORT_MINGW: - set_be_option("ia32-gasmode=mingw"); - wchar_atomic_kind = ATOMIC_TYPE_USHORT; - break; - case OS_SUPPORT_LINUX: + wchar_atomic_kind = ATOMIC_TYPE_INT; + force_long_double_size = 0; + enable_main_collect2_hack = false; + + if (strstr(os, "linux") != NULL || strstr(os, "bsd") != NULL + || streq(os, "solaris")) { set_be_option("ia32-gasmode=elf"); - break; - case OS_SUPPORT_MACHO: + 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"); - break; + set_be_option("pic=true"); + set_create_ld_ident(create_name_macho); + } 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; + } + + return true; +} + +static bool parse_target_triple(const char *arg) +{ + const char *manufacturer = strchr(arg, '-'); + if (manufacturer == 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; + return true; } int main(int argc, char **argv) @@ -700,6 +759,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) \ @@ -731,17 +791,16 @@ int main(int argc, char **argv) if (option[0] == 'O') { sscanf(&option[1], "%d", &opt_level); } - if (strcmp(arg, "-fwin32") == 0) { - firm_opt.os_support = OS_SUPPORT_MINGW; - } else if (strcmp(arg, "-fmac") == 0) { - firm_opt.os_support = OS_SUPPORT_MACHO; - } else if (strcmp(arg, "-flinux") == 0) { - firm_opt.os_support = OS_SUPPORT_LINUX; - } } - /* set target/os specific stuff */ - init_os_support(); + /* 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) { @@ -767,13 +826,17 @@ int main(int argc, char **argv) break; } + const char *target = getenv("TARGET"); + if (target != NULL) + parse_target_triple(target); + /* 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; + standard = STANDARD_DEFAULT; + unsigned features_on = 0; + unsigned features_off = 0; + filetype_t forced_filetype = FILETYPE_AUTODETECT; + bool help_displayed = false; + bool argument_errors = false; for (int i = 1; i < argc; ++i) { const char *arg = argv[i]; if (arg[0] == '-' && arg[1] != '\0') { @@ -852,12 +915,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"); @@ -892,6 +966,10 @@ int main(int argc, char **argv) mode = truth_value ? ParseOnly : CompileAssembleLink; } else if (streq(opt, "unsigned-char")) { char_is_signed = !truth_value; + } else if (streq(opt, "freestanding")) { + freestanding = true; + } else if (streq(opt, "hosted")) { + freestanding = false; } else if (truth_value == false && streq(opt, "asynchronous-unwind-tables")) { /* nothing todo, a gcc feature which we don't support @@ -900,6 +978,8 @@ int main(int argc, char **argv) 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(opt, "fast-math") || streq(opt, "jump-tables") || streq(opt, "expensive-optimizations") || @@ -907,7 +987,8 @@ int main(int argc, char **argv) streq(opt, "optimize-sibling-calls") || streq(opt, "align-loops") || streq(opt, "align-jumps") || - streq(opt, "align-functions")) { + streq(opt, "align-functions") || + streq(opt, "PIC")) { fprintf(stderr, "ignoring gcc option '-f%s'\n", orig_opt); } else { int res = firm_option(orig_opt); @@ -924,7 +1005,7 @@ int main(int argc, char **argv) } else if (option[0] == 'b') { const char *opt; GET_ARG_AFTER(opt, "-b"); - int res = firm_be_option(opt); + int res = be_parse_arg(opt); if (res == 0) { fprintf(stderr, "error: unknown Firm backend option '-b %s'\n", opt); @@ -936,7 +1017,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; @@ -959,29 +1040,37 @@ int main(int argc, char **argv) char arch_opt[64]; GET_ARG_AFTER(opt, "-m"); - if (strstart(opt, "arch=")) { + if (strstart(opt, "target=")) { + GET_ARG_AFTER(opt, "-mtarget="); + if (!parse_target_triple(opt)) + argument_errors = true; + } else if (strstart(opt, "triple=")) { + GET_ARG_AFTER(opt, "-mtriple="); + if (!parse_target_triple(opt)) + argument_errors = true; + } else if (strstart(opt, "arch=")) { GET_ARG_AFTER(opt, "-march="); snprintf(arch_opt, sizeof(arch_opt), "%s-arch=%s", cpu_arch, opt); - int res = firm_be_option(arch_opt); + int 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 = firm_be_option(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="); snprintf(arch_opt, sizeof(arch_opt), "%s-opt=%s", cpu_arch, opt); - int res = firm_be_option(arch_opt); + int res = be_parse_arg(arch_opt); if (res == 0) argument_errors = true; } else if (strstart(opt, "cpu=")) { GET_ARG_AFTER(opt, "-mcpu="); snprintf(arch_opt, sizeof(arch_opt), "%s-arch=%s", cpu_arch, opt); - int res = firm_be_option(arch_opt); + int res = be_parse_arg(arch_opt); if (res == 0) argument_errors = true; } else if (strstart(opt, "fpmath=")) { @@ -996,14 +1085,14 @@ int main(int argc, char **argv) } if (!argument_errors) { snprintf(arch_opt, sizeof(arch_opt), "%s-fpunit=%s", cpu_arch, opt); - int res = firm_be_option(arch_opt); + int res = be_parse_arg(arch_opt); if (res == 0) argument_errors = true; } } else if (strstart(opt, "preferred-stack-boundary=")) { GET_ARG_AFTER(opt, "-mpreferred-stack-boundary="); snprintf(arch_opt, sizeof(arch_opt), "%s-stackalign=%s", cpu_arch, opt); - int res = firm_be_option(arch_opt); + int res = be_parse_arg(arch_opt); if (res == 0) argument_errors = true; } else if (streq(opt, "omit-leaf-frame-pointer")) { @@ -1019,17 +1108,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, "--%u", machine_size); + add_flag(&ldflags_obst, "-m%u", machine_size); } } } else if (streq(option, "pg")) { @@ -1090,15 +1179,34 @@ 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")) { + ++i; + if (i >= argc) { + fprintf(stderr, "error: " + "expected argument after '--jna-limit'\n"); + argument_errors = true; + break; + } + jna_limit_output(argv[i]); + } else if (streq(option, "jna-libname")) { + ++i; + if (i >= argc) { + fprintf(stderr, "error: " + "expected argument after '--jna-libname'\n"); + argument_errors = true; + break; + } + jna_set_libname(argv[i]); } else if (streq(option, "time")) { do_timing = true; } else if (streq(option, "version")) { print_cparser_version(); - exit(EXIT_SUCCESS); + return EXIT_SUCCESS; + } else if (streq(option, "help")) { + print_help(argv[0]); + help_displayed = true; } else if (streq(option, "dump-function")) { ++i; if (i >= argc) { @@ -1134,22 +1242,22 @@ int main(int argc, char **argv) streq(suffix, "S") ? FILETYPE_ASSEMBLER : streq(suffix, "a") ? FILETYPE_OBJECT : streq(suffix, "c") ? FILETYPE_C : + streq(suffix, "C") ? FILETYPE_CXX : streq(suffix, "cc") ? FILETYPE_CXX : + streq(suffix, "cp") ? FILETYPE_CXX : streq(suffix, "cpp") ? FILETYPE_CXX : + streq(suffix, "CPP") ? FILETYPE_CXX : streq(suffix, "cxx") ? FILETYPE_CXX : + streq(suffix, "c++") ? FILETYPE_CXX : + streq(suffix, "ii") ? FILETYPE_CXX : streq(suffix, "h") ? FILETYPE_C : streq(suffix, "ir") ? FILETYPE_IR : streq(suffix, "o") ? FILETYPE_OBJECT : streq(suffix, "s") ? FILETYPE_PREPROCESSED_ASSEMBLER : streq(suffix, "so") ? FILETYPE_OBJECT : - FILETYPE_AUTODETECT; + FILETYPE_OBJECT; /* gcc behavior: unknown file extension means object file */ } } - - if (type == FILETYPE_AUTODETECT) { - fprintf(stderr, "'%s': file format not recognized\n", arg); - continue; - } } file_list_entry_t *entry @@ -1167,32 +1275,30 @@ int main(int argc, char **argv) } } + if (help_displayed) { + return !argument_errors; + } + if (print_file_name_file != NULL) { print_file_name(print_file_name_file); - return 0; + return EXIT_SUCCESS; } - if (files == NULL) { fprintf(stderr, "error: no input files specified\n"); argument_errors = true; } - if (help_displayed) { - return !argument_errors; - } if (argument_errors) { usage(argv[0]); - return 1; + return EXIT_FAILURE; } - /* we do the lowering in ast2firm */ - firm_opt.lower_bitfields = FALSE; - /* set the c_mode here, types depends on it */ c_mode |= features_on; c_mode &= ~features_off; gen_firm_init(); + byte_order_big_endian = be_get_backend_param()->byte_order_big_endian; init_symbol_table(); init_types(); init_typehash(); @@ -1224,7 +1330,6 @@ int main(int argc, char **argv) case BenchmarkParser: case PrintAst: case PrintFluffy: - case PrintCaml: case PrintJna: case LexTest: case PreprocessOnly: @@ -1268,7 +1373,7 @@ int main(int argc, char **argv) if (out == NULL) { fprintf(stderr, "Couldn't open '%s' for writing: %s\n", outname, strerror(errno)); - return 1; + return EXIT_FAILURE; } } @@ -1288,7 +1393,7 @@ int main(int argc, char **argv) in = open_file(filename); lextest(in, filename); fclose(in); - exit(EXIT_SUCCESS); + return EXIT_SUCCESS; } FILE *preprocessed_in = NULL; @@ -1415,7 +1520,7 @@ do_parsing: /* remove output file */ if (out != stdout) unlink(outname); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } } @@ -1424,9 +1529,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; @@ -1465,22 +1567,21 @@ graph_built: if (irg == NULL) { fprintf(stderr, "No graph for function '%s' found\n", dumpfunction); - exit(1); + return EXIT_FAILURE; } - dump_ir_block_graph_file(irg, out); + dump_ir_graph_file(out, irg); fclose(out); - exit(0); + return EXIT_SUCCESS; } if (mode == CompileExportIR) { fclose(out); ir_export(outname); - exit(0); + return EXIT_SUCCESS; } - gen_firm_finish(asm_out, filename, /*c_mode=*/1, - have_const_functions); + gen_firm_finish(asm_out, filename); if (asm_out != out) { fclose(asm_out); } @@ -1549,9 +1650,14 @@ graph_built: /* construct commandline */ const char *linker = getenv("CPARSER_LINK"); - if (linker == NULL) - linker = LINKER; - obstack_printf(&file_obst, "%s", linker); + if (linker != NULL) { + obstack_printf(&file_obst, "%s ", linker); + } else { + if (target_triple != NULL) + obstack_printf(&file_obst, "%s-", target_triple); + obstack_printf(&file_obst, "%s ", LINKER); + } + for (file_list_entry_t *entry = files; entry != NULL; entry = entry->next) { if (entry->type != FILETYPE_OBJECT) @@ -1573,7 +1679,7 @@ graph_built: int err = system(commandline); if (err != EXIT_SUCCESS) { fprintf(stderr, "linker reported an error\n"); - exit(1); + return EXIT_FAILURE; } } @@ -1582,6 +1688,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(); @@ -1593,5 +1700,5 @@ graph_built: exit_types(); exit_tokens(); exit_symbol_table(); - return 0; + return EXIT_SUCCESS; }