X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=6e55b36d053e36ad99d92c40ebd4840a29683e7f;hb=ce2e13de664ebd52daf7de055790546ecfece6ff;hp=7c5a9827322e5dc1bcbe4cdbc0b66e7ce7433fa3;hpb=e7758b4be72d9453a4fd333034712295f7d1e16d;p=cparser diff --git a/main.c b/main.c index 7c5a982..6e55b36 100644 --- a/main.c +++ b/main.c @@ -50,16 +50,13 @@ #define fdopen(fd, mode) _fdopen(fd, mode) #define popen(cmd, mode) _popen(cmd, mode) #define pclose(file) _pclose(file) +#define unlink(filename) _unlink(filename) #else #include #define HAVE_MKSTEMP #endif -#ifndef WITH_LIBCORE -#define WITH_LIBCORE -#endif - #include #include @@ -68,22 +65,25 @@ #include "types.h" #include "type_hash.h" #include "parser.h" +#include "type_t.h" #include "ast2firm.h" #include "diagnostic.h" #include "lang_features.h" #include "driver/firm_opt.h" #include "driver/firm_cmdline.h" #include "adt/error.h" -#include "write_fluffy.h" -#include "write_caml.h" +#include "wrappergen/write_fluffy.h" +#include "wrappergen/write_caml.h" +#include "wrappergen/write_jna.h" #include "revision.h" #include "warning.h" +#include "mangle.h" #ifndef PREPROCESSOR -#ifdef __APPLE__ -#define PREPROCESSOR "gcc -E -std=c99 -U__WCHAR_TYPE__ -D__WCHAR_TYPE__=int -U__SIZE_TYPE__ -D__SIZE_TYPE__=unsigned\\ long -m32 -U__STRICT_ANSI__" +#ifndef __WIN32__ +#define PREPROCESSOR "gcc -E -std=c99 -m32 -U__STRICT_ANSI__" #else -#define PREPROCESSOR "cpp -std=c99 -U__WCHAR_TYPE__ -D__WCHAR_TYPE__=int -U__SIZE_TYPE__ -D__SIZE_TYPE__=unsigned\\ long -m32 -U__STRICT_ANSI__" +#define PREPROCESSOR "cpp -std=c99 -m32 -U__STRICT_ANSI__" #endif #endif @@ -100,7 +100,7 @@ #endif /** The current c mode/dialect. */ -lang_features_t c_mode; +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; @@ -117,6 +117,8 @@ bool use_builtins = false; /** we have extern function with const attribute. */ bool have_const_functions = false; +atomic_type_kind_t wchar_atomic_kind = ATOMIC_TYPE_INT; + /* to switch on printing of implicit casts */ extern bool print_implicit_casts; @@ -143,11 +145,13 @@ typedef enum filetype_t { } filetype_t; struct file_list_entry_t { - const char *name; /**< filename or NULL for stdin */ - filetype_t type; + const char *name; /**< filename or NULL for stdin */ + filetype_t type; file_list_entry_t *next; }; +static file_list_entry_t *temp_files; + #if defined(_DEBUG) || defined(FIRM_DEBUG) /** * Debug printf implementation. @@ -177,30 +181,24 @@ static void initialize_firm(void) static void get_output_name(char *buf, size_t buflen, const char *inputname, const char *newext) { - size_t last_dot = 0xffffffff; - size_t i = 0; - - if(inputname == NULL) { - snprintf(buf, buflen, "a%s", newext); - return; - } - - for(const char *c = inputname; *c != 0; ++c) { - if(*c == '.') - last_dot = i; - ++i; - } - if(last_dot == 0xffffffff) - last_dot = i; - - if(last_dot >= buflen) - panic("filename too long"); - memcpy(buf, inputname, last_dot); - - size_t extlen = strlen(newext) + 1; - if(extlen + last_dot >= buflen) + if (inputname == NULL) + inputname = "a"; + + char const *const last_slash = strrchr(inputname, '/'); + char const *const filename = + last_slash != NULL ? last_slash + 1 : inputname; + char const *const last_dot = strrchr(filename, '.'); + char const *const name_end = + last_dot != NULL ? last_dot : strchr(filename, '\0'); + + int const len = snprintf(buf, buflen, "%.*s%s", + (int)(name_end - filename), filename, newext); +#ifdef _WIN32 + if (len < 0 || buflen <= (size_t)len) +#else + if (buflen <= (size_t)len) +#endif panic("filename too long"); - memcpy(buf+last_dot, newext, extlen); } #include "builtins.h" @@ -228,42 +226,61 @@ static void lextest(FILE *in, const char *fname) do { lexer_next_preprocessing_token(); print_token(stdout, &lexer_token); - puts(""); - } while(lexer_token.type != T_EOF); + putchar('\n'); + } while (lexer_token.type != T_EOF); } static void add_flag(struct obstack *obst, const char *format, ...) { + char buf[4096]; va_list ap; - va_start(ap, format); - char buf[4096]; - vsnprintf(buf, sizeof(buf), format, ap); + va_start(ap, format); +#ifdef _WIN32 + int len = +#endif + vsnprintf(buf, sizeof(buf), format, ap); + va_end(ap); - /* escape stuff... */ obstack_1grow(obst, ' '); +#ifdef _WIN32 + obstack_1grow(obst, '"'); + obstack_grow(obst, buf, len); + obstack_1grow(obst, '"'); +#else + /* escape stuff... */ for (char *c = buf; *c != '\0'; ++c) { switch(*c) { - case '"': - case '\'': - case '`': case ' ': - case '\t': - case '\n': - case '\r': - case '\\': + case '"': case '$': + case '&': case '(': case ')': + case ';': + case '<': + case '>': + case '\'': + case '\\': + case '\n': + case '\r': + case '\t': + case '`': + case '|': obstack_1grow(obst, '\\'); - /* fallthrough */ + /* FALLTHROUGH */ default: obstack_1grow(obst, *c); break; } } +#endif +} - va_end(ap); +static const char *type_to_string(type_t *type) +{ + assert(type->kind == TYPE_ATOMIC); + return get_atomic_kind_name(type->atomic.akind); } static FILE *preprocess(const char *fname) @@ -272,27 +289,47 @@ static FILE *preprocess(const char *fname) const char *flags = obstack_finish(&cppflags_obst); obstack_printf(&cppflags_obst, "%s", PREPROCESSOR); + + /* setup default defines */ + add_flag(&cppflags_obst, "-U__WCHAR_TYPE__"); + add_flag(&cppflags_obst, "-D__WCHAR_TYPE__=%s", type_to_string(type_wchar_t)); + add_flag(&cppflags_obst, "-U__SIZE_TYPE__"); + add_flag(&cppflags_obst, "-D__SIZE_TYPE__=%s", type_to_string(type_size_t)); + + /* TODO hack... */ + add_flag(&cppflags_obst, "-D__builtin_abort=abort"); + add_flag(&cppflags_obst, "-D__builtin_abs=abs"); + add_flag(&cppflags_obst, "-D__builtin_exit=exit"); + add_flag(&cppflags_obst, "-D__builtin_malloc=malloc"); + add_flag(&cppflags_obst, "-D__builtin_memcmp=memcmp"); + add_flag(&cppflags_obst, "-D__builtin_memcpy=memcpy"); + add_flag(&cppflags_obst, "-D__builtin_memset=memset"); + add_flag(&cppflags_obst, "-D__builtin_strlen=strlen"); + add_flag(&cppflags_obst, "-D__builtin_strcmp=strcmp"); + add_flag(&cppflags_obst, "-D__builtin_strcpy=strcpy"); + + /* handle dependency generation */ if (dep_target[0] != '\0') { add_flag(&cppflags_obst, "-MF"); - add_flag(&cppflags_obst, "%s", dep_target); + add_flag(&cppflags_obst, dep_target); if (outname != NULL) { add_flag(&cppflags_obst, "-MQ"); - add_flag(&cppflags_obst, "%s", outname); + add_flag(&cppflags_obst, outname); } } if (flags[0] != '\0') { obstack_printf(&cppflags_obst, " %s", flags); } - add_flag(&cppflags_obst, "%s", fname); + add_flag(&cppflags_obst, fname); obstack_1grow(&cppflags_obst, '\0'); const char *buf = obstack_finish(&cppflags_obst); - if(verbose) { + if (verbose) { puts(buf); } FILE *f = popen(buf, "r"); - if(f == NULL) { + if (f == NULL) { fprintf(stderr, "invoking preprocessor failed\n"); exit(1); } @@ -305,22 +342,46 @@ static void assemble(const char *out, const char *in) char buf[4096]; snprintf(buf, sizeof(buf), "%s %s -o %s", ASSEMBLER, in, out); - if(verbose) { + if (verbose) { puts(buf); } int err = system(buf); - if(err != 0) { + if (err != 0) { fprintf(stderr, "assembler reported an error\n"); exit(1); } } +static void print_file_name(const char *file) +{ + add_flag(&ldflags_obst, "-print-file-name=%s", file); + + obstack_1grow(&ldflags_obst, '\0'); + const char *flags = obstack_finish(&ldflags_obst); + + /* construct commandline */ + 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); + } +} + static const char *try_dir(const char *dir) { - if(dir == NULL) + if (dir == NULL) return dir; - if(access(dir, R_OK | W_OK | X_OK) == 0) + if (access(dir, R_OK | W_OK | X_OK) == 0) return dir; return NULL; } @@ -329,29 +390,29 @@ static const char *get_tempdir(void) { static const char *tmpdir = NULL; - if(tmpdir != NULL) + if (tmpdir != NULL) return tmpdir; - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = try_dir(getenv("TMPDIR")); - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = try_dir(getenv("TMP")); - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = try_dir(getenv("TEMP")); #ifdef P_tmpdir - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = try_dir(P_tmpdir); #endif - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = try_dir("/var/tmp"); - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = try_dir("/usr/tmp"); - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = try_dir("/tmp"); - if(tmpdir == NULL) + if (tmpdir == NULL) tmpdir = "."; return tmpdir; @@ -377,20 +438,45 @@ static FILE *make_temp_file(char *buffer, size_t buflen, const char *prefix) snprintf(buffer, buflen, "%s/%sXXXXXX", tempdir, prefix); int fd = mkstemp(buffer); - if(fd == -1) { + if (fd == -1) { fprintf(stderr, "couldn't create temporary file: %s\n", strerror(errno)); exit(1); } FILE *out = fdopen(fd, "w"); - if(out == NULL) { + if (out == NULL) { fprintf(stderr, "couldn't create temporary file FILE*\n"); exit(1); } + file_list_entry_t *entry = xmalloc(sizeof(*entry)); + memset(entry, 0, sizeof(*entry)); + + size_t name_len = strlen(buffer) + 1; + char *name = malloc(name_len); + memcpy(name, buffer, name_len); + entry->name = name; + + entry->next = temp_files; + temp_files = entry; + return out; } +static void free_temp_files(void) +{ + file_list_entry_t *entry = temp_files; + file_list_entry_t *next; + for ( ; entry != NULL; entry = next) { + next = entry->next; + + unlink(entry->name); + free((char*) entry->name); + free(entry); + } + temp_files = NULL; +} + /** * Do the necessary lowering for compound parameters. */ @@ -417,7 +503,8 @@ typedef enum compile_mode_t { LexTest, PrintAst, PrintFluffy, - PrintCaml + PrintCaml, + PrintJna } compile_mode_t; static void usage(const char *argv0) @@ -425,19 +512,22 @@ 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); - +static void print_cparser_version(void) +{ printf("cparser (%s) using libFirm (%u.%u", - cparser_REVISION, ver.major, ver.minor); - if(ver.revision[0] != 0) { + cparser_REVISION, ir_get_version_major(), + ir_get_version_minor()); + + const char *revision = ir_get_version_revision(); + if (revision[0] != 0) { putchar(' '); - fputs(ver.revision, stdout); + fputs(revision, stdout); } - if(ver.build[0] != 0) { + + const char *build = ir_get_version_build(); + if (build[0] != 0) { putchar(' '); - fputs(ver.build, stdout); + fputs(build, stdout); } puts(")\n"); } @@ -462,7 +552,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) { + if (fwrite(buf, 1, read, dest) != read) { perror("couldn't write output"); } } @@ -489,7 +579,7 @@ static FILE *open_file(const char *filename) } FILE *in = fopen(filename, "r"); - if(in == NULL) { + if (in == NULL) { fprintf(stderr, "Couldn't open '%s': %s\n", filename, strerror(errno)); exit(1); @@ -514,6 +604,25 @@ static filetype_t get_filetype_from_string(const char *string) return FILETYPE_UNKNOWN; } +static void init_os_support(void) +{ + /* OS option must be set to the backend */ + switch (firm_opt.os_support) { + case OS_SUPPORT_MINGW: + set_be_option("ia32-gasmode=mingw"); + wchar_atomic_kind = ATOMIC_TYPE_USHORT; + break; + case OS_SUPPORT_LINUX: + set_be_option("ia32-gasmode=elf"); + break; + case OS_SUPPORT_MACHO: + set_be_option("ia32-gasmode=macho"); + set_be_option("ia32-stackalign=4"); + set_be_option("pic"); + break; + } +} + typedef enum lang_standard_t { STANDARD_DEFAULT, /* gnu99 (for C, GCC does gnu89) or gnu++98 (for C++) */ STANDARD_ANSI, /* c89 (for C) or c++98 (for C++) */ @@ -531,6 +640,7 @@ int main(int argc, char **argv) initialize_firm(); const char *dumpfunction = NULL; + const char *print_file_name_file = NULL; compile_mode_t mode = CompileAssembleLink; int opt_level = 1; int result = EXIT_SUCCESS; @@ -540,6 +650,8 @@ int main(int argc, char **argv) bool construct_dep_target = false; struct obstack file_obst; + atexit(free_temp_files); + /* hack for now... */ if (strstr(argv[0], "pptest") != NULL) { extern int pptest_main(int argc, char **argv); @@ -552,15 +664,15 @@ int main(int argc, char **argv) #define GET_ARG_AFTER(def, args) \ 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; \ @@ -569,18 +681,28 @@ int main(int argc, char **argv) #define SINGLE_OPTION(ch) (option[0] == (ch) && option[1] == '\0') - /* early options parsing (find out optimisation level) */ - for(int i = 1; i < argc; ++i) { + /* early options parsing (find out optimisation level and OS) */ + for (int i = 1; i < argc; ++i) { const char *arg = argv[i]; - if(arg[0] != '-') + if (arg[0] != '-') continue; const char *option = &arg[1]; - if(option[0] == 'O') { + if (option[0] == 'O') { sscanf(&option[1], "%d", &opt_level); } + if (strcmp(arg, "-fwin32") == 0) { + firm_opt.os_support = OS_SUPPORT_MINGW; + } else if (strcmp(arg, "-fmac") == 0) { + firm_opt.os_support = OS_SUPPORT_MACHO; + } else if (strcmp(arg, "-flinux") == 0) { + firm_opt.os_support = OS_SUPPORT_LINUX; + } } + /* set target/os specific stuff */ + init_os_support(); + /* apply optimisation level */ switch(opt_level) { case 0: @@ -605,62 +727,57 @@ int main(int argc, char **argv) break; } -#ifdef __APPLE__ - /* Darwin expects the stack to be aligned to 16byte boundary */ - firm_be_option("ia32-stackalign=4"); -#endif - /* parse rest of options */ lang_standard_t standard = STANDARD_DEFAULT; - lang_features_t features_on = 0; - lang_features_t features_off = 0; + 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) { + for (int i = 1; i < argc; ++i) { const char *arg = argv[i]; if (arg[0] == '-' && arg[1] != '\0') { /* an option */ const char *option = &arg[1]; - if(option[0] == 'o') { + if (option[0] == 'o') { GET_ARG_AFTER(outname, "-o"); - } else if(option[0] == 'g') { + } else if (option[0] == 'g') { set_be_option("debuginfo=stabs"); set_be_option("omitfp=no"); set_be_option("ia32-nooptcc=yes"); - } else if(SINGLE_OPTION('c')) { + } else if (SINGLE_OPTION('c')) { mode = CompileAssemble; - } else if(SINGLE_OPTION('E')) { + } else if (SINGLE_OPTION('E')) { mode = PreprocessOnly; - } else if(SINGLE_OPTION('S')) { + } else if (SINGLE_OPTION('S')) { mode = Compile; - } else if(option[0] == 'O') { + } else if (option[0] == 'O') { continue; - } else if(option[0] == 'I') { + } else if (option[0] == 'I') { const char *opt; GET_ARG_AFTER(opt, "-I"); add_flag(&cppflags_obst, "-I%s", opt); - } else if(option[0] == 'D') { + } else if (option[0] == 'D') { const char *opt; GET_ARG_AFTER(opt, "-D"); add_flag(&cppflags_obst, "-D%s", opt); - } else if(option[0] == 'U') { + } else if (option[0] == 'U') { const char *opt; GET_ARG_AFTER(opt, "-U"); add_flag(&cppflags_obst, "-U%s", opt); - } else if(option[0] == 'l') { + } else if (option[0] == 'l') { const char *opt; GET_ARG_AFTER(opt, "-l"); add_flag(&ldflags_obst, "-l%s", opt); - } else if(option[0] == 'L') { + } else if (option[0] == 'L') { const char *opt; GET_ARG_AFTER(opt, "-L"); add_flag(&ldflags_obst, "-L%s", opt); - } else if(SINGLE_OPTION('v')) { + } else if (SINGLE_OPTION('v')) { verbose = 1; - } else if(SINGLE_OPTION('w')) { + } else if (SINGLE_OPTION('w')) { memset(&warning, 0, sizeof(warning)); - } else if(option[0] == 'x') { + } else if (option[0] == 'x') { const char *opt; GET_ARG_AFTER(opt, "-x"); forced_filetype = get_filetype_from_string(opt); @@ -675,7 +792,7 @@ int main(int argc, char **argv) streq(option, "MD")) { construct_dep_target = true; add_flag(&cppflags_obst, "-%s", option); - } else if(streq(option, "MM") || + } else if (streq(option, "MM") || streq(option, "MP")) { add_flag(&cppflags_obst, "-%s", option); } else if (streq(option, "MT") || @@ -685,6 +802,20 @@ int main(int argc, char **argv) GET_ARG_AFTER(opt, "-MT"); add_flag(&cppflags_obst, "-%s", option); add_flag(&cppflags_obst, "%s", opt); + } else if (streq(option, "include")) { + const char *opt; + GET_ARG_AFTER(opt, "-include"); + add_flag(&cppflags_obst, "-include"); + add_flag(&cppflags_obst, "%s", opt); + } else if (streq(option, "isystem")) { + const char *opt; + GET_ARG_AFTER(opt, "-isystem"); + add_flag(&cppflags_obst, "-isystem"); + add_flag(&cppflags_obst, "%s", opt); + } 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 (option[0] == 'f') { @@ -695,6 +826,11 @@ 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, "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 { char const *opt = orig_opt; bool truth_value = true; @@ -703,18 +839,23 @@ int main(int argc, char **argv) opt += 3; } - if (streq(opt, "dollars-in-identifiers")) { - allow_dollar_in_symbol = truth_value; - } if (streq(opt, "builtins")) { + if (streq(opt, "builtins")) { use_builtins = truth_value; - } else if (streq(opt, "short-wchar")) { - opt_short_wchar_t = truth_value; - } else if (streq(opt, "syntax-only")) { - mode = truth_value ? ParseOnly : CompileAssembleLink; + } else if (streq(opt, "dollars-in-identifiers")) { + allow_dollar_in_symbol = truth_value; } else if (streq(opt, "omit-frame-pointer")) { set_be_option(truth_value ? "omitfp" : "omitfp=no"); + } else if (streq(opt, "short-wchar")) { + wchar_atomic_kind = truth_value ? ATOMIC_TYPE_USHORT + : ATOMIC_TYPE_INT; + } 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"); + } else if (streq(opt, "syntax-only")) { + mode = truth_value ? ParseOnly : CompileAssembleLink; + } else if (streq(opt, "unsigned-char")) { + char_is_signed = !truth_value; } else if (streq(opt, "fast-math") || streq(opt, "jump-tables") || streq(opt, "unroll-loops") || @@ -751,14 +892,23 @@ int main(int argc, char **argv) strncpy(cpu_arch, opt, sizeof(cpu_arch)); } } else if (option[0] == 'W') { - if (strstart(option + 1, "l,")) // a gcc-style linker option - { + if (strstart(option + 1, "p,")) { + // pass options directly to the preprocessor + const char *opt; + GET_ARG_AFTER(opt, "-Wp,"); + add_flag(&cppflags_obst, "-Wp,%s", opt); + } else if (strstart(option + 1, "l,")) { + // pass options directly to the linker const char *opt; GET_ARG_AFTER(opt, "-Wl,"); add_flag(&ldflags_obst, "-Wl,%s", opt); + } else if (streq(option + 1, "no-trigraphs") + || streq(option + 1, "undef")) { + add_flag(&cppflags_obst, "%s", arg); + } else { + set_warning_opt(&option[1]); } - else set_warning_opt(&option[1]); - } else if(option[0] == 'm') { + } else if (option[0] == 'm') { /* -m options */ const char *opt; char arch_opt[64]; @@ -798,7 +948,7 @@ int main(int argc, char **argv) fprintf(stderr, "error: option -mfpumath supports only 387 or sse\n"); argument_errors = true; } - if(!argument_errors) { + 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) @@ -839,6 +989,7 @@ int main(int argc, char **argv) } else if (strstart(option, "std=")) { const char *const o = &option[4]; standard = + streq(o, "c++") ? STANDARD_CXX98 : streq(o, "c++98") ? STANDARD_CXX98 : streq(o, "c89") ? STANDARD_C89 : streq(o, "c99") ? STANDARD_C99 : @@ -854,6 +1005,8 @@ int main(int argc, char **argv) (fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg), standard); } else if (streq(option, "version")) { print_cparser_version(); + } else if (strstart(option, "print-file-name=")) { + GET_ARG_AFTER(print_file_name_file, "-print-file-name="); } else if (option[0] == '-') { /* double dash option */ ++option; @@ -869,10 +1022,6 @@ int main(int argc, char **argv) } else if (streq(option, "no-ms")) { features_on &= ~_MS; features_off |= _MS; - } else if (streq(option, "signed-chars")) { - char_is_signed = true; - } else if (streq(option, "unsigned-chars")) { - char_is_signed = false; } else if (streq(option, "strict")) { strict_mode = true; } else if (streq(option, "lextest")) { @@ -889,12 +1038,14 @@ int main(int argc, char **argv) mode = PrintFluffy; } else if (streq(option, "print-caml")) { mode = PrintCaml; + } else if (streq(option, "print-jna")) { + mode = PrintJna; } else if (streq(option, "version")) { print_cparser_version(); exit(EXIT_SUCCESS); } else if (streq(option, "dump-function")) { ++i; - if(i >= argc) { + if (i >= argc) { fprintf(stderr, "error: " "expected argument after '--dump-function'\n"); argument_errors = true; @@ -957,6 +1108,11 @@ int main(int argc, char **argv) } } + if (print_file_name_file != NULL) { + print_file_name(print_file_name_file); + return 0; + } + if (files == NULL) { fprintf(stderr, "error: no input files specified\n"); argument_errors = true; @@ -973,6 +1129,10 @@ int main(int argc, char **argv) /* 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(); init_symbol_table(); init_types(); @@ -982,6 +1142,7 @@ int main(int argc, char **argv) init_ast(); init_parser(); init_ast2firm(); + init_mangle(); if (construct_dep_target) { if (outname != 0 && strlen(outname) >= 2) { @@ -1002,6 +1163,7 @@ int main(int argc, char **argv) case PrintAst: case PrintFluffy: case PrintCaml: + case PrintJna: case LexTest: case PreprocessOnly: case ParseOnly: @@ -1037,7 +1199,7 @@ int main(int argc, char **argv) out = stdout; } else { out = fopen(outname, "w"); - if(out == NULL) { + if (out == NULL) { fprintf(stderr, "Couldn't open '%s' for writing: %s\n", outname, strerror(errno)); return 1; @@ -1064,9 +1226,17 @@ int main(int argc, char **argv) FILE *preprocessed_in = NULL; switch (filetype) { - case FILETYPE_C: filetype = FILETYPE_PREPROCESSED_C; goto preprocess; - case FILETYPE_CXX: filetype = FILETYPE_PREPROCESSED_CXX; goto preprocess; - case FILETYPE_ASSEMBLER: filetype = FILETYPE_PREPROCESSED_ASSEMBLER; goto preprocess; + case FILETYPE_C: + filetype = FILETYPE_PREPROCESSED_C; + goto preprocess; + case FILETYPE_CXX: + filetype = FILETYPE_PREPROCESSED_CXX; + goto preprocess; + case FILETYPE_ASSEMBLER: + filetype = FILETYPE_PREPROCESSED_ASSEMBLER; + add_flag(&cppflags_obst, "-x"); + add_flag(&cppflags_obst, "assembler-with-cpp"); + goto preprocess; preprocess: /* no support for input on FILE* yet */ if (in != NULL) @@ -1077,6 +1247,10 @@ preprocess: copy_file(out, preprocessed_in); int result = pclose(preprocessed_in); fclose(out); + /* remove output file in case of error */ + if (out != stdout && result != EXIT_SUCCESS) { + unlink(outname); + } return result; } @@ -1088,7 +1262,7 @@ preprocess: } FILE *asm_out; - if(mode == Compile) { + if (mode == Compile) { asm_out = out; } else { asm_out = make_temp_file(asm_tempfile, sizeof(asm_tempfile), "ccs"); @@ -1143,6 +1317,7 @@ default_cxx_warn: do_parsing: c_mode |= features_on; c_mode &= ~features_off; + init_tokens(); translation_unit_t *const unit = do_parsing(in, filename); @@ -1153,31 +1328,37 @@ do_parsing: print_ast(unit); } - if(error_count > 0) { + if (error_count > 0) { /* parsing failed because of errors */ fprintf(stderr, "%u error(s), %u warning(s)\n", error_count, warning_count); result = EXIT_FAILURE; continue; - } else if(warning_count > 0) { + } else if (warning_count > 0) { fprintf(stderr, "%u warning(s)\n", warning_count); } if (in == preprocessed_in) { int pp_result = pclose(preprocessed_in); if (pp_result != EXIT_SUCCESS) { + /* remove output file */ + if (out != stdout) + unlink(outname); exit(EXIT_FAILURE); } } - if(mode == BenchmarkParser) { + if (mode == BenchmarkParser) { return result; - } else if(mode == PrintFluffy) { + } 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; } translation_unit_to_firm(unit); @@ -1191,16 +1372,16 @@ do_parsing: ident *id = new_id_from_str(dumpfunction); ir_graph *irg = NULL; int n_irgs = get_irp_n_irgs(); - for(int i = 0; i < n_irgs; ++i) { + for (int i = 0; i < n_irgs; ++i) { ir_graph *tirg = get_irp_irg(i); ident *irg_id = get_entity_ident(get_irg_entity(tirg)); - if(irg_id == id) { + if (irg_id == id) { irg = tirg; break; } } - if(irg == NULL) { + if (irg == NULL) { fprintf(stderr, "No graph for function '%s' found\n", dumpfunction); exit(1); @@ -1221,10 +1402,13 @@ do_parsing: if (in == preprocessed_in) { int pp_result = pclose(preprocessed_in); if (pp_result != EXIT_SUCCESS) { + /* remove output in error case */ + if (out != stdout) + unlink(outname); return pp_result; } } - if(asm_out != out) { + if (asm_out != out) { fclose(asm_out); } } @@ -1240,7 +1424,7 @@ do_parsing: if (filetype == FILETYPE_PREPROCESSED_ASSEMBLER) { char temp[1024]; const char *filename_o; - if(mode == CompileAssemble) { + if (mode == CompileAssemble) { fclose(out); filename_o = outname; } else { @@ -1261,11 +1445,14 @@ do_parsing: file->type = filetype; } - if (result != EXIT_SUCCESS) + if (result != EXIT_SUCCESS) { + if (out != stdout) + unlink(outname); return result; + } /* link program file */ - if(mode == CompileAssembleLink) { + if (mode == CompileAssembleLink) { obstack_1grow(&ldflags_obst, '\0'); const char *flags = obstack_finish(&ldflags_obst); @@ -1286,11 +1473,11 @@ do_parsing: char *commandline = obstack_finish(&file_obst); - if(verbose) { + if (verbose) { puts(commandline); } int err = system(commandline); - if(err != EXIT_SUCCESS) { + if (err != EXIT_SUCCESS) { fprintf(stderr, "linker reported an error\n"); exit(1); } @@ -1300,6 +1487,7 @@ do_parsing: obstack_free(&ldflags_obst, NULL); obstack_free(&file_obst, NULL); + exit_mangle(); exit_ast2firm(); exit_parser(); exit_ast();