X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=d94549a2b224a4b3f3068f86ce51af4b19a55215;hb=73b92d8d3495b12f38de4bbaf705cbb4fce49708;hp=b07e08f62c83c93841a8de22e79752967c0be906;hpb=f6e16c9262337d408d1d4d21a106fcfff6d88d6b;p=cparser diff --git a/main.c b/main.c index b07e08f..d94549a 100644 --- a/main.c +++ b/main.c @@ -111,6 +111,13 @@ extern bool print_parenthesis; static int verbose; static struct obstack cppflags_obst, ldflags_obst; +typedef struct file_list_entry_t file_list_entry_t; + +struct file_list_entry_t { + const char *filename; + file_list_entry_t *next; +}; + #if defined(_DEBUG) || defined(FIRM_DEBUG) /** * Debug printf implementation. @@ -201,8 +208,8 @@ static FILE *preprocess(FILE *in, const char *fname, bool to_stdout) puts(buf); } if(to_stdout) { - system(buf); - exit(0); + int res = system(buf); + exit(res); } else { FILE *f = popen(buf, "r"); if(f == NULL) { @@ -351,7 +358,8 @@ typedef enum compile_mode_t { CompileAssembleLink, LexTest, PrintAst, - PrintFluffy + PrintFluffy, + Link } compile_mode_t; static void usage(const char *argv0) @@ -359,20 +367,42 @@ static void usage(const char *argv0) fprintf(stderr, "Usage %s input [-o output] [-c]\n", argv0); } +static void print_cparser_version(void) { + firm_version_t ver; + firm_get_version(&ver); + + printf("cparser (%s) using libFirm (%u.%u", + cparser_REVISION, ver.major, ver.minor); + if(ver.revision[0] != 0) { + putchar(' '); + fputs(ver.revision, stdout); + } + if(ver.build[0] != 0) { + putchar(' '); + fputs(ver.build, stdout); + } + puts(")\n"); +} + int main(int argc, char **argv) { initialize_firm(); - const char *input = NULL; - const char *outname = NULL; - const char *dumpfunction = NULL; - compile_mode_t mode = CompileAssembleLink; - int opt_level = 1; - int result = EXIT_SUCCESS; - char cpu_arch[16] = "ia32"; + const char *input = NULL; + const char *outname = NULL; + const char *dumpfunction = NULL; + compile_mode_t mode = CompileAssembleLink; + int opt_level = 1; + int result = EXIT_SUCCESS; + char cpu_arch[16] = "ia32"; + file_list_entry_t *c_files = NULL; + file_list_entry_t *s_files = NULL; + file_list_entry_t *o_files = NULL; + struct obstack file_obst; obstack_init(&cppflags_obst); obstack_init(&ldflags_obst); + obstack_init(&file_obst); #define GET_ARG_AFTER(def, args) \ def = &arg[sizeof(args)-1]; \ @@ -512,6 +542,7 @@ int main(int argc, char **argv) } else if(option[0] == 'W') { set_warning_opt(&option[1]); } else if(option[0] == 'm') { + /* -m options */ const char *opt; char arch_opt[64]; @@ -540,12 +571,36 @@ int main(int argc, char **argv) int res = firm_be_option(arch_opt); if (res == 0) argument_errors = true; - } else if(strncmp(opt, "fpu=", 4) == 0) { - GET_ARG_AFTER(opt, "-mfpu="); - snprintf(arch_opt, sizeof(arch_opt), "%s-fpunit=%s", cpu_arch, opt); + } else if(strncmp(opt, "fpmath=", 7) == 0) { + GET_ARG_AFTER(opt, "-mfpmath="); + if(strcmp(opt, "387") == 0) + opt = "x87"; + else if(strcmp(opt, "sse") == 0) + opt = "sse2"; + else { + fprintf(stderr, "error: option -mfpumath supports only 387 or sse\n"); + argument_errors = true; + } + if(!argument_errors) { + snprintf(arch_opt, sizeof(arch_opt), "%s-fpunit=%s", cpu_arch, opt); + int res = firm_be_option(arch_opt); + if (res == 0) + argument_errors = true; + } + } else if(strncmp(opt, "preferred-stack-boundary=", 25) == 0) { + GET_ARG_AFTER(opt, "-mpreferred-stack-boundary="); + snprintf(arch_opt, sizeof(arch_opt), "%s-stackalign=%s", cpu_arch, opt); int res = firm_be_option(arch_opt); if (res == 0) argument_errors = true; + } else if(strcmp(opt, "omit-leaf-frame-pointer") == 0) { + int res = firm_be_option("omitleaffp=1"); + if (res == 0) + argument_errors = true; + } else if(strcmp(opt, "no-omit-leaf-frame-pointer") == 0) { + int res = firm_be_option("omitleaffp=0"); + if (res == 0) + argument_errors = true; } else { char *endptr; long int value = strtol(opt, &endptr, 10); @@ -583,6 +638,8 @@ int main(int argc, char **argv) c_mode = _C89|_C99|_MS; } else fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg); + } else if(strcmp(option, "version") == 0) { + print_cparser_version(); } else if (option[0] == '-') { /* double dash option */ ++option; @@ -613,19 +670,7 @@ int main(int argc, char **argv) } else if(strcmp(option, "print-fluffy") == 0) { mode = PrintFluffy; } else if(strcmp(option, "version") == 0) { - firm_version_t ver; - firm_get_version(&ver); - printf("cparser (%s) using libFirm (%u.%u", - cparser_REVISION, ver.major, ver.minor); - if(ver.revision[0] != 0) { - putchar(' '); - fputs(ver.revision, stdout); - } - if(ver.build[0] != 0) { - putchar(' '); - fputs(ver.build, stdout); - } - puts(")\n"); + print_cparser_version(); exit(EXIT_SUCCESS); } else if(strcmp(option, "dump-function") == 0) { ++i; @@ -646,22 +691,47 @@ int main(int argc, char **argv) argument_errors = true; } } else { - if(input != NULL) { - fprintf(stderr, "error: multiple input files specified\n"); - argument_errors = true; + + size_t len = strlen(arg); + if (len < 2) { + fprintf(stderr, "'%s': file format not recognized\n", input); + continue; + } + + file_list_entry_t *entry + = obstack_alloc(&file_obst, sizeof(entry[0])); + entry->filename = arg; + if (strcmp(arg+len-2, ".c") == 0) { + entry->next = c_files; + c_files = entry; + } else if (strcmp(arg+len-2, ".s") == 0) { + entry->next = s_files; + s_files = entry; + } else if (strcmp(arg+len-2, ".o") == 0) { + entry->next = o_files; + o_files = entry; } else { - input = arg; + fprintf(stderr, "'%s': file format not recognized\n", input); } } } + if (c_files == NULL && s_files == NULL && o_files != NULL) { + mode = Link; + } else if (c_files != NULL && c_files->next == NULL) { + input = c_files->filename; + } else { + fprintf(stderr, "error: multiple input files specified\n"); + argument_errors = true; + } + /* we do the lowering in ast2firm */ firm_opt.lower_bitfields = FALSE; - if(help_displayed) { + if (help_displayed) { return !argument_errors; } - if(argument_errors) { + if (argument_errors) { usage(argv[0]); return 1; } @@ -705,6 +775,7 @@ int main(int argc, char **argv) ".vcg"); outname = outnamebuf; break; + case Link: case CompileAssembleLink: #ifdef _WIN32 /* Windows compiler typically derive the output name from @@ -718,6 +789,29 @@ int main(int argc, char **argv) } } + if (mode == Link) { + obstack_1grow(&ldflags_obst, '\0'); + const char *flags = obstack_finish(&ldflags_obst); + + obstack_printf(&file_obst, LINKER " %s -o %s", flags, outname); + + for (file_list_entry_t *entry = o_files; entry != NULL; + entry = entry->next) { + obstack_printf(&file_obst, " %s", entry->filename); + } + char *buf = obstack_finish(&file_obst); + + if(verbose) { + puts(buf); + } + int err = system(buf); + if(err != 0) { + fprintf(stderr, "linker reported an error\n"); + exit(1); + } + return 0; + } + if(outname != NULL) { if(strcmp(outname, "-") == 0) { out = stdout; @@ -858,6 +952,7 @@ int main(int argc, char **argv) obstack_free(&cppflags_obst, NULL); obstack_free(&ldflags_obst, NULL); + obstack_free(&file_obst, NULL); exit_ast2firm(); exit_parser();