2003-09-04 Sebastien Pouliot <spouliot@videotron.ca>

[mono.git] / mono / mini / driver.c

diff --git a/mono/mini/driver.c b/mono/mini/driver.c
index 74437bb2090a93d8ac5eed54ba3c88c34b19477c..047af60aa51983329272c130ebc4fc366db179ed 100644 (file)
--- a/mono/mini/driver.c
+++ b/mono/mini/driver.c
@@ -307,7 +307,7 @@ mini_regression (MonoImage *image, int verbose, int *total_run) {
                                        if (verbose >= 2)
                                                g_print ("Running '%s' ...\n", method->name);
 #ifdef MONO_USE_AOT_COMPILER
-                                       if (!(func = mono_aot_get_method (method)))
+                                       if (!(func = mono_aot_get_method (mono_root_domain, method)))
 #endif
                                                func = (TestMethod)cfg->native_code;
                                        result = func ();
@@ -478,12 +478,12 @@ mini_usage (void)
                "    --break METHOD         Inserts a breakpoint at METHOD entry\n"
                "    --debug                Enable debugging support\n"
            "    --stats                Print statistics about the JIT operations\n"
+           "    --no-aot               Disable loading of AOT code\n"
                "\n"
                "Development:\n"
                "    --statfile FILE        Sets the stat file to FILE\n"
                "    --aot                  Compiles the assembly to native code\n"
                "    --profile[=profiler]   Runs in profiling mode with the specified profiler module\n"
-               "    --with-valgrind        Disable features which prevent mono from running under valgrind\n"
                "    --graph[=TYPE] METHOD  Draws a graph of the specified method:\n");
        
        for (i = 0; i < G_N_ELEMENTS (graph_names); ++i) {
@@ -560,6 +560,8 @@ mono_main (int argc, char* argv[]) {
                        mono_print_vtable = TRUE;
                } else if (strcmp (argv [i], "--stats") == 0) {
                        mono_jit_stats.enabled = TRUE;
+               } else if (strcmp (argv [i], "--no-aot") == 0) {
+                       mono_no_aot = TRUE;
                } else if (strcmp (argv [i], "--aot") == 0) {
                        mono_compile_aot = TRUE;
                } else if (strcmp (argv [i], "--compile-all") == 0) {
@@ -581,8 +583,6 @@ mono_main (int argc, char* argv[]) {
                        action = DO_DRAW;
                } else if (strcmp (argv [i], "--debug") == 0) {
                        enable_debugging = TRUE;
-               } else if (strcmp (argv [i], "--with-valgrind") == 0) {
-                       mono_with_valgrind = TRUE;
                } else {
                        fprintf (stderr, "Unknown command line option: '%s'\n", argv [i]);
                        return 1;