X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=main.c;h=6e55b36d053e36ad99d92c40ebd4840a29683e7f;hb=3cdead30b5c1d131d5c363188c26255514ea2fc8;hp=3f95452d291309a9c65a7b554d74a5508fa0eeda;hpb=21dcef708ec607ed6d686cb33d44e7478ee2670a;p=cparser diff --git a/main.c b/main.c index 3f95452..6e55b36 100644 --- a/main.c +++ b/main.c @@ -72,8 +72,9 @@ #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" @@ -180,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" @@ -303,10 +298,15 @@ static FILE *preprocess(const char *fname) /* 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') { @@ -503,7 +503,8 @@ typedef enum compile_mode_t { LexTest, PrintAst, PrintFluffy, - PrintCaml + PrintCaml, + PrintJna } compile_mode_t; static void usage(const char *argv0) @@ -511,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"); } @@ -822,6 +826,9 @@ 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 { @@ -832,19 +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, "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, "syntax-only")) { - mode = truth_value ? ParseOnly : CompileAssembleLink; - } else if (streq(opt, "omit-frame-pointer")) { - set_be_option(truth_value ? "omitfp" : "omitfp=no"); + } 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") || @@ -1011,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")) { @@ -1031,6 +1038,8 @@ 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); @@ -1120,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(); @@ -1150,6 +1163,7 @@ int main(int argc, char **argv) case PrintAst: case PrintFluffy: case PrintCaml: + case PrintJna: case LexTest: case PreprocessOnly: case ParseOnly: @@ -1303,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); @@ -1341,6 +1356,9 @@ do_parsing: } 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);