static void mini_usage (void);
+/* This turns off command line globbing under win32 */
+#ifdef PLATFORM_WIN32
+int _CRT_glob = 0;
+#endif
+
typedef void (*OptFunc) (const char *p);
/* keep in sync with enum in mini.h */
static const OptName
opt_names [] = {
- {"peephole", "Peephole postpass"},
- {"branch", "Branch optimizations"},
- {"inline", "Inline method calls"},
- {"cfold", "Constant folding"},
- {"consprop", "Constant propagation"},
- {"copyprop", "Copy propagation"},
- {"deadce", "Dead code elimination"},
- {"linears", "Linear scan global reg allocation"},
- {"cmov", "Conditional moves"},
- {"shared", "Emit per-domain code"},
- {"sched", "Instruction scheduling"},
- {"intrins", "Intrinsic method implementations"},
- {"tailc", "Tail recursion and tail calls"},
- {"loop", "Loop related optimizations"},
- {"fcmov", "Fast x86 FP compares"},
- {"leaf", "Leaf procedures optimizations"},
- {"aot", "Usage of Ahead Of Time compiled code"},
- {"precomp", "Precompile all methods before executing Main"},
- {"abcrem", "Array bound checks removal"},
- {"ssapre", "SSA based Partial Redundancy Elimination"}
+ {"peephole", "Peephole postpass"},
+ {"branch", "Branch optimizations"},
+ {"inline", "Inline method calls"},
+ {"cfold", "Constant folding"},
+ {"consprop", "Constant propagation"},
+ {"copyprop", "Copy propagation"},
+ {"deadce", "Dead code elimination"},
+ {"linears", "Linear scan global reg allocation"},
+ {"cmov", "Conditional moves"},
+ {"shared", "Emit per-domain code"},
+ {"sched", "Instruction scheduling"},
+ {"intrins", "Intrinsic method implementations"},
+ {"tailc", "Tail recursion and tail calls"},
+ {"loop", "Loop related optimizations"},
+ {"fcmov", "Fast x86 FP compares"},
+ {"leaf", "Leaf procedures optimizations"},
+ {"aot", "Usage of Ahead Of Time compiled code"},
+ {"precomp", "Precompile all methods before executing Main"},
+ {"abcrem", "Array bound checks removal"},
+ {"ssapre", "SSA based Partial Redundancy Elimination"},
+ {"exception", "Optimize exception catch blocks"},
+ {"ssa", "Build and use SSA form"}
};
#define DEFAULT_OPTIMIZATIONS ( \
MONO_OPT_LINEARS | \
MONO_OPT_INTRINS | \
MONO_OPT_LOOP | \
+ MONO_OPT_EXCEPTION | \
MONO_OPT_AOT)
-/* SSAPRE does not work correctly on non x86 platforms (bug #70637) */
#define EXCLUDED_FROM_ALL (MONO_OPT_SHARED | MONO_OPT_PRECOMP)
static guint32
MONO_OPT_BRANCH | MONO_OPT_PEEPHOLE | MONO_OPT_LINEARS | MONO_OPT_CFOLD,
MONO_OPT_BRANCH | MONO_OPT_PEEPHOLE | MONO_OPT_LINEARS | MONO_OPT_COPYPROP | MONO_OPT_CONSPROP | MONO_OPT_DEADCE,
MONO_OPT_BRANCH | MONO_OPT_PEEPHOLE | MONO_OPT_LINEARS | MONO_OPT_COPYPROP | MONO_OPT_CONSPROP | MONO_OPT_DEADCE | MONO_OPT_LOOP | MONO_OPT_INLINE | MONO_OPT_INTRINS,
+ MONO_OPT_BRANCH | MONO_OPT_PEEPHOLE | MONO_OPT_LINEARS | MONO_OPT_COPYPROP | MONO_OPT_CONSPROP | MONO_OPT_DEADCE | MONO_OPT_LOOP | MONO_OPT_INLINE | MONO_OPT_INTRINS | MONO_OPT_SSA,
+ MONO_OPT_BRANCH | MONO_OPT_PEEPHOLE | MONO_OPT_LINEARS | MONO_OPT_COPYPROP | MONO_OPT_CONSPROP | MONO_OPT_DEADCE | MONO_OPT_LOOP | MONO_OPT_INLINE | MONO_OPT_INTRINS | MONO_OPT_EXCEPTION,
+ MONO_OPT_BRANCH | MONO_OPT_PEEPHOLE | MONO_OPT_LINEARS | MONO_OPT_COPYPROP | MONO_OPT_CONSPROP | MONO_OPT_DEADCE | MONO_OPT_LOOP | MONO_OPT_INLINE | MONO_OPT_INTRINS | MONO_OPT_EXCEPTION | MONO_OPT_ABCREM,
+ MONO_OPT_BRANCH | MONO_OPT_PEEPHOLE | MONO_OPT_LINEARS | MONO_OPT_COPYPROP | MONO_OPT_CONSPROP | MONO_OPT_DEADCE | MONO_OPT_LOOP | MONO_OPT_INLINE | MONO_OPT_INTRINS | MONO_OPT_EXCEPTION | MONO_OPT_ABCREM | MONO_OPT_SSAPRE,
MONO_OPT_BRANCH | MONO_OPT_PEEPHOLE | MONO_OPT_LINEARS | MONO_OPT_COPYPROP | MONO_OPT_CONSPROP | MONO_OPT_DEADCE | MONO_OPT_LOOP | MONO_OPT_INLINE | MONO_OPT_INTRINS | MONO_OPT_ABCREM,
MONO_OPT_BRANCH | MONO_OPT_PEEPHOLE | MONO_OPT_LINEARS | MONO_OPT_COPYPROP | MONO_OPT_CONSPROP | MONO_OPT_DEADCE | MONO_OPT_LOOP | MONO_OPT_INLINE | MONO_OPT_INTRINS | MONO_OPT_SSAPRE,
MONO_OPT_BRANCH | MONO_OPT_PEEPHOLE | MONO_OPT_LINEARS | MONO_OPT_COPYPROP | MONO_OPT_CONSPROP | MONO_OPT_DEADCE | MONO_OPT_LOOP | MONO_OPT_INLINE | MONO_OPT_INTRINS | MONO_OPT_ABCREM | MONO_OPT_SHARED
comp_time = elapsed = 0.0;
/* fixme: ugly hack - delete all previously compiled methods */
- for (i = 0; i < mono_image_get_table_rows (image, MONO_TABLE_METHOD); ++i) {
- method = mono_get_method (image, MONO_TOKEN_METHOD_DEF | (i + 1), NULL);
- method->info = NULL;
- }
+ g_hash_table_destroy (mono_domain_get ()->jit_trampoline_hash);
+ mono_domain_get ()->jit_trampoline_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
+ g_hash_table_destroy (mono_domain_get ()->jit_code_hash);
+ mono_domain_get ()->jit_code_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
g_timer_start (timer);
if (mini_stats_fd)
func = jinfo->code_start;
else
#endif
- func = (TestMethod)cfg->native_code;
+ func = (TestMethod)(gpointer)cfg->native_code;
+ func = (TestMethod)mono_create_ftnptr (mono_get_root_domain (), func);
result = func ();
if (result != expected) {
failed++;
- if (verbose)
- g_print ("Test '%s' failed result (got %d, expected %d).\n", method->name, result, expected);
+ g_print ("Test '%s' failed result (got %d, expected %d).\n", method->name, result, expected);
}
code_size += cfg->code_len;
mono_destroy_compile (cfg);
typedef struct CompileAllThreadArgs {
MonoAssembly *ass;
int verbose;
+ guint32 opts;
} CompileAllThreadArgs;
static void
g_print ("Compiling %d %s\n", count, desc);
g_free (desc);
}
- cfg = mini_method_compile (method, DEFAULT_OPTIMIZATIONS, mono_get_root_domain (), FALSE, FALSE, 0);
+ cfg = mini_method_compile (method, args->opts, mono_get_root_domain (), FALSE, FALSE, 0);
mono_destroy_compile (cfg);
}
}
static void
-compile_all_methods (MonoAssembly *ass, int verbose)
+compile_all_methods (MonoAssembly *ass, int verbose, guint32 opts)
{
CompileAllThreadArgs args;
args.ass = ass;
args.verbose = verbose;
+ args.opts = opts;
/*
* Need to create a mono thread since compilation might trigger
" N:Namespace Specifies a namespace\n"
" T:Type Specifies a type\n"
" +EXPR Includes expression\n"
- " -EXPR Excludes expression\n");
+ " -EXPR Excludes expression\n"
+ " disabled Don't print any output until toggled via SIGUSR2\n");
}
static const char *info = ""
#else
"\tSIGSEGV : normal\n"
#endif
-#ifdef HAVE_ICU
- "\tGlobalization: ICU\n"
-#else
- "\tGlobalization: none\n"
-#endif /* HAVE_ICU */
"";
int
} else if (strcmp (argv [i], "--verbose") == 0 || strcmp (argv [i], "-v") == 0) {
mini_verbose++;
} else if (strcmp (argv [i], "--version") == 0 || strcmp (argv [i], "-V") == 0) {
- g_print ("Mono JIT compiler version %s, (C) 2002-2004 Novell, Inc and Contributors. www.go-mono.com\n", VERSION);
+ g_print ("Mono JIT compiler version %s, (C) 2002-2005 Novell, Inc and Contributors. www.mono-project.com\n", VERSION);
g_print (info);
if (mini_verbose) {
- const guchar *cerror;
- const guchar *clibpath;
+ const char *cerror;
+ const char *clibpath;
mono_init ("mono");
cerror = mono_check_corlib_version ();
clibpath = mono_defaults.corlib? mono_image_get_filename (mono_defaults.corlib): "unknown";
mini_usage_list_opt ();
return 0;
} else if (strncmp (argv [i], "--statfile", 10) == 0) {
+ if (i + 1 >= argc){
+ fprintf (stderr, "error: --statfile requires a filename argument\n");
+ return 1;
+ }
mini_stats_fd = fopen (argv [++i], "w+");
} else if (strncmp (argv [i], "--optimize=", 11) == 0) {
opt = parse_optimizations (argv [i] + 11);
} else if (strncmp (argv [i], "-O=", 3) == 0) {
opt = parse_optimizations (argv [i] + 3);
} else if (strcmp (argv [i], "--config") == 0) {
+ if (i +1 >= argc){
+ fprintf (stderr, "error: --config requires a filename argument\n");
+ return 1;
+ }
config_file = argv [++i];
} else if (strcmp (argv [i], "--ncompile") == 0) {
+ if (i + 1 >= argc){
+ fprintf (stderr, "error: --ncompile requires an argument\n");
+ return 1;
+ }
count = atoi (argv [++i]);
action = DO_BENCH;
} else if (strcmp (argv [i], "--trace") == 0) {
} else if (strcmp (argv [i], "--breakonex") == 0) {
mono_break_on_exc = TRUE;
} else if (strcmp (argv [i], "--break") == 0) {
+ if (i+1 >= argc){
+ fprintf (stderr, "Missing method name in --break command line option\n");
+ return 1;
+ }
+
if (!mono_debugger_insert_breakpoint (argv [++i], FALSE))
- g_error ("Invalid method name '%s'", argv [i]);
+ fprintf (stderr, "Error: invalid method name '%s'\n", argv [i]);
} else if (strcmp (argv [i], "--print-vtable") == 0) {
mono_print_vtable = TRUE;
} else if (strcmp (argv [i], "--stats") == 0) {
enable_profile = TRUE;
profile_options = argv [i] + 10;
} else if (strcmp (argv [i], "--compile") == 0) {
+ if (i + 1 >= argc){
+ fprintf (stderr, "error: --compile option requires a method name argument\n");
+ return 1;
+ }
+
mname = argv [++i];
action = DO_BENCH;
} else if (strncmp (argv [i], "--graph=", 8) == 0) {
+ if (i + 1 >= argc){
+ fprintf (stderr, "error: --graph option requires a method name argument\n");
+ return 1;
+ }
+
mono_graph_options = mono_parse_graph_options (argv [i] + 8);
mname = argv [++i];
action = DO_DRAW;
} else if (strcmp (argv [i], "--graph") == 0) {
+ if (i + 1 >= argc){
+ fprintf (stderr, "error: --graph option requires a method name argument\n");
+ return 1;
+ }
+
mname = argv [++i];
mono_graph_options = MONO_GRAPH_CFG;
action = DO_DRAW;
} else if (strcmp (argv [i], "--security") == 0) {
mono_use_security_manager = TRUE;
mono_activate_security_manager ();
+ } else if (strcmp (argv [i], "--desktop") == 0) {
+ GC_dont_expand = 1;
+ /* Put desktop-specific optimizations here */
+ } else if (strcmp (argv [i], "--server") == 0){
+ /* Put server-specific optimizations here */
} else {
fprintf (stderr, "Unknown command line option: '%s'\n", argv [i]);
return 1;
mono_debug_init_2 (assembly);
if (mono_compile_aot || action == DO_EXEC) {
- const guchar *error;
+ const char *error;
//mono_set_rootdir ();
exit (1);
}
+#ifdef PLATFORM_WIN32
+ /* Detach console when executing IMAGE_SUBSYSTEM_WINDOWS_GUI on win32 */
+ if (!mono_compile_aot && ((MonoCLIImageInfo*)(mono_assembly_get_image (assembly)->image_info))->cli_header.nt.pe_subsys_required == IMAGE_SUBSYSTEM_WINDOWS_GUI)
+ FreeConsole ();
+#endif
+
main_args.domain = domain;
main_args.file = aname;
main_args.argc = argc - i;
i = mono_environment_exitcode_get ();
return i;
} else if (action == DO_COMPILE) {
- compile_all_methods (assembly, mini_verbose);
+ compile_all_methods (assembly, mini_verbose, opt);
mini_cleanup (domain);
return 0;
}
projects / mono.git / blobdiff