X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=driver%2Ffirm_cmdline.c;h=bb5ee952e7cdb0c4de117cdd056fbdb802d58ae9;hb=22d24ddd2209686fa723a62ccc19b7c2eea2d172;hp=2594908d515b01447abced52099acec95c77d5c2;hpb=beeec3ddcdf3590d6e7d30ae1b2786f9c68caca2;p=cparser diff --git a/driver/firm_cmdline.c b/driver/firm_cmdline.c index 2594908..bb5ee95 100644 --- a/driver/firm_cmdline.c +++ b/driver/firm_cmdline.c @@ -12,7 +12,7 @@ #include #include -#ifdef _WIN32 +#if defined(_WIN32) || defined(__CYGWIN__) #define DEFAULT_OS OS_SUPPORT_MINGW #elif defined(__APPLE__) #define DEFAULT_OS OS_SUPPORT_MACHO @@ -45,12 +45,13 @@ struct a_firm_opt firm_opt = { /* mods = */ TRUE, /* fragile_ops = */ TRUE, /* load_store = */ TRUE, + /* load_store_pre = */ FALSE, /* modes = */ FALSE, /* precise_exc = */ FALSE, /* never needed for C */ /* use_DivMod = */ FALSE, /* remove_unused = */ TRUE, /* cloning = */ FALSE, - /* auto_sync = */ TRUE, + /* auto_sync = */ FALSE, /* alias_analysis = */ TRUE, /* strict_alias = */ FALSE, /* no_alias = */ FALSE, @@ -58,6 +59,7 @@ struct a_firm_opt firm_opt = { /* deconv = */ FALSE, /* cc_opt = */ TRUE, /* bool_opt = */ FALSE, + /* shape_blocks = */ FALSE, /* freestanding; = */ FALSE, /* fp_model = */ fp_model_precise, /* lower_ll = */ FALSE, @@ -68,9 +70,6 @@ struct a_firm_opt firm_opt = { /* honor_restrict = */ TRUE, /* lower_bitfields = */ TRUE, /* pic = */ FALSE, - /* ycomp_dbg = */ FALSE, - /* ycomp_host = */ FIRM_YCOMP_DEFAULT_HOST, - /* ycomp_port = */ FIRM_YCOMP_DEFAULT_PORT, /* clone_threshold = */ DEFAULT_CLONE_THRESHOLD, /* inline_maxsize = */ 750, /* inline_threshold= */ 0, @@ -158,16 +157,18 @@ static const struct params { { X("no-scalar-replace"), &firm_opt.scalar_replace, 0, "firm: disable scalar replacement" }, { X("confirm"), &firm_opt.confirm, 1, "firm: enable Confirm optimization" }, { X("no-confirm"), &firm_opt.confirm, 0, "firm: disable Confirm optimization" }, - { X("opt-mul"), &firm_opt.muls, 1, "firm: enable multiplication optimization" }, + { X("opt-mul"), &firm_opt.muls, 0, "firm: enable multiplication optimization" }, { X("no-opt-mul"), &firm_opt.muls, 0, "firm: disable multiplication optimization" }, - { X("opt-div"), &firm_opt.divs, 1, "firm: enable division optimization" }, + { X("opt-div"), &firm_opt.divs, 0, "firm: enable division optimization" }, { X("no-opt-div"), &firm_opt.divs, 0, "firm: disable division optimization" }, - { X("opt-mod"), &firm_opt.mods, 1, "firm: enable remainder optimization" }, + { X("opt-mod"), &firm_opt.mods, 0, "firm: enable remainder optimization" }, { X("no-opt-mod"), &firm_opt.mods, 0, "firm: disable remainder optimization" }, { X("opt-fragile-ops"), &firm_opt.fragile_ops, 1, "firm: enable fragile ops optimization" }, { X("no-opt-fragile-ops"), &firm_opt.fragile_ops, 0, "firm: disable fragile ops optimization" }, { X("opt-load-store"), &firm_opt.load_store, 1, "firm: enable load store optimization" }, { X("no-opt-load-store"), &firm_opt.load_store, 0, "firm: disable load store optimization" }, + { X("opt-load-store-pre"), &firm_opt.load_store_pre, 1, "firm: enable load store optimization and PRE" }, + { X("no-opt-load-store-pre"), &firm_opt.load_store_pre, 0, "firm: disable load store optimization and PRE" }, { X("opt-modes"), &firm_opt.modes, 1, "firm: optimize integer modes" }, { X("no-opt-modes"), &firm_opt.modes, 0, "firm: disable integer modes optimization" }, { X("sync"), &firm_opt.auto_sync, 1, "firm: automatically create Sync nodes" }, @@ -190,14 +191,16 @@ static const struct params { { X("fp-precise"), &firm_opt.fp_model, fp_model_precise, "firm: precise fp model" }, { X("fp-fast"), &firm_opt.fp_model, fp_model_fast, "firm: fast fp model" }, { X("fp-strict"), &firm_opt.fp_model, fp_model_strict, "firm: strict fp model" }, - { X("sync"), &firm_opt.sync, 1, "firm: use Syncs to remove unnecessary memory dependencies" }, - { X("no-sync"), &firm_opt.sync, 0, "firm: do not use Syncs to remove unnecessary memory dependencies" }, + { X("sync"), &firm_opt.sync, 1, "firm: use Syncs to remove unnecesary memory dependencies" }, + { X("no-sync"), &firm_opt.sync, 0, "firm: do not use Syncs to remove unnecesary memory dependencies" }, { X("deconv"), &firm_opt.deconv, 1, "firm: enable the conv node optimization" }, { X("no-deconv"), &firm_opt.deconv, 0, "firm: disable the conv node optimization" }, { X("opt-cc"), &firm_opt.cc_opt, 1, "firm: enable calling conventions optimization" }, { X("no-opt-cc"), &firm_opt.cc_opt, 0, "firm: disable calling conventions optimization" }, { X("bool"), &firm_opt.bool_opt, 1, "firm: enable bool simplification optimization" }, { X("no-bool"), &firm_opt.bool_opt, 0, "firm: disable bool simplification optimization" }, + { X("shape-blocks"), &firm_opt.shape_blocks, 1, "firm: enable block shaping" }, + { X("no-shape-blocks"), &firm_opt.shape_blocks, 0, "firm: disable block shaping" }, { X("freestanding"), &firm_opt.freestanding, 1, "firm: freestanding environment" }, { X("hosted"), &firm_opt.freestanding, 0, "firm: hosted environment" }, @@ -254,9 +257,6 @@ static const struct params { { X("win32"), &firm_opt.os_support, OS_SUPPORT_MINGW, "misc: generate MinGW Win32 code" }, { X("mac"), &firm_opt.os_support, OS_SUPPORT_MACHO, "misc: generate MacOS code" }, { X("linux"), &firm_opt.os_support, OS_SUPPORT_LINUX, "misc: generate Linux-ELF code" }, - { X("ycomp"), &firm_opt.ycomp_dbg, 1, "misc: enable yComp debugger extension" }, - { X("ycomp-host="), NULL, 0, "misc: yComp host" }, - { X("ycomp-port="), NULL, 0, "misc: yComp port" }, /* string options */ { X("dump-filter="), NULL, 0, "misc: set dumper filter" }, @@ -282,14 +282,6 @@ static void set_dump_filter(const char *filter) firm_dump.filter = StrDup(filter); } /* set_dump_filter */ -/** - * Set ycomp host - */ -static void set_ycomp_host(const char *host) -{ - firm_opt.ycomp_host = StrDup(host); -} /* set_ycomp_host */ - /** Disable all optimizations. */ static void disable_opts(void) { /* firm_opt.const_folding */ @@ -323,6 +315,7 @@ static void disable_opts(void) { firm_opt.deconv = FALSE; firm_opt.cc_opt = FALSE; firm_opt.bool_opt = FALSE; + firm_opt.shape_blocks = FALSE; firm_opt.freestanding = TRUE; } /* disable_opts */ @@ -353,15 +346,6 @@ int firm_option(const char *opt) sscanf(&opt[17], "%u", &firm_opt.inline_threshold); return 1; } - else if (strncmp("ycomp-host=", opt, 11) == 0) { - opt = &opt[11]; - set_ycomp_host(opt); - return 1; - } - else if (strncmp("ycomp-port=", opt, 11) == 0) { - sscanf(&opt[11], "%d", &firm_opt.ycomp_port); - return 1; - } else if (strcmp("no-opt", opt) == 0) { disable_opts(); return 1; @@ -418,18 +402,18 @@ int firm_be_option(const char *opt) { * prints the firm version number */ void print_firm_version(FILE *f) { - firm_version_t version; - - firm_get_version(&version); + const char *revision = ir_get_version_revision(); + const char *build = ir_get_version_build(); - fprintf(f, "Firm C-Compiler using libFirm (%u.%u", version.major, version.minor); - if (version.revision[0] != 0) { + fprintf(f, "Firm C-Compiler using libFirm (%u.%u", + ir_get_version_major(), ir_get_version_minor()); + if (revision[0] != 0) { fputc(' ', f); - fputs(version.revision, f); + fputs(revision, f); } - if(version.build[0] != 0) { + if(build[0] != 0) { fputc(' ', f); - fputs(version.build, f); + fputs(build, f); } fprintf(f, "}\n" "(C) 2005-2008 Michael Beck\n"