Prefix internal variables with `mono_`.

diff --git a/mono/mini/driver.c b/mono/mini/driver.c
index df7e57641752915c2a304034b438c3ead174bd21..139f96ce68300d92debe69dd192a1e641df99899 100644 (file)
--- a/mono/mini/driver.c
+++ b/mono/mini/driver.c
@@ -481,7 +481,7 @@ mini_regression (MonoImage *image, int verbose, int *total_run)
 
        total = 0;
        *total_run = 0;
-       if (do_single_method_regression) {
+       if (mono_do_single_method_regression) {
                GSList *iter;
 
                mini_regression_step (image, verbose, total_run, &total,
@@ -489,14 +489,14 @@ mini_regression (MonoImage *image, int verbose, int *total_run)
                                timer, domain);
                if (total)
                        return total;
-               g_print ("Single method regression: %d methods\n", g_slist_length (single_method_list));
+               g_print ("Single method regression: %d methods\n", g_slist_length (mono_single_method_list));
 
-               for (iter = single_method_list; iter; iter = g_slist_next (iter)) {
+               for (iter = mono_single_method_list; iter; iter = g_slist_next (iter)) {
                        char *method_name;
 
-                       current_single_method = iter->data;
+                       mono_current_single_method = iter->data;
 
-                       method_name = mono_method_full_name (current_single_method, TRUE);
+                       method_name = mono_method_full_name (mono_current_single_method, TRUE);
                        g_print ("Current single method: %s\n", method_name);
                        g_free (method_name);
 
@@ -1533,7 +1533,7 @@ mono_main (int argc, char* argv[])
                } else if (strncmp (argv [i], "--single-method=", 16) == 0) {
                        char *full_opts = g_strdup_printf ("-all,%s", argv [i] + 16);
                        action = DO_SINGLE_METHOD_REGRESSION;
-                       single_method_regression_opt = parse_optimizations (full_opts);
+                       mono_single_method_regression_opt = parse_optimizations (full_opts);
                        g_free (full_opts);
                } else if (strcmp (argv [i], "--verbose") == 0 || strcmp (argv [i], "-v") == 0) {
                        mini_verbose++;
@@ -1928,7 +1928,7 @@ mono_main (int argc, char* argv[])
        
        switch (action) {
        case DO_SINGLE_METHOD_REGRESSION:
-               do_single_method_regression = TRUE;
+               mono_do_single_method_regression = TRUE;
        case DO_REGRESSION:
                if (mini_regression_list (mini_verbose, argc -i, argv + i)) {
                        g_print ("Regression ERRORS!\n");

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index a3591842ef191fb922a42b5320e178a2c04c0501..30dd447af28c7c3b46670462ac92a5513429efcd 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -6306,30 +6306,30 @@ mono_jit_find_compiled_method_with_jit_info (MonoDomain *domain, MonoMethod *met
        return NULL;
 }
 
-gboolean do_single_method_regression = FALSE;
-guint32 single_method_regression_opt = 0;
-MonoMethod *current_single_method = NULL;
-GSList *single_method_list = NULL;
-GHashTable *single_method_hash = NULL;
+gboolean mono_do_single_method_regression = FALSE;
+guint32 mono_single_method_regression_opt = 0;
+MonoMethod *mono_current_single_method = NULL;
+GSList *mono_single_method_list = NULL;
+GHashTable *mono_single_method_hash = NULL;
 
 guint32
 mono_get_optimizations_for_method (MonoMethod *method, guint32 default_opt)
 {
        g_assert (method);
 
-       if (!do_single_method_regression)
+       if (!mono_do_single_method_regression)
                return default_opt;
-       if (!current_single_method) {
-               if (!single_method_hash)
-                       single_method_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
-               if (!g_hash_table_lookup (single_method_hash, method)) {
-                       g_hash_table_insert (single_method_hash, method, method);
-                       single_method_list = g_slist_prepend (single_method_list, method);
+       if (!mono_current_single_method) {
+               if (!mono_single_method_hash)
+                       mono_single_method_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
+               if (!g_hash_table_lookup (mono_single_method_hash, method)) {
+                       g_hash_table_insert (mono_single_method_hash, method, method);
+                       mono_single_method_list = g_slist_prepend (mono_single_method_list, method);
                }
                return default_opt;
        }
-       if (method == current_single_method)
-               return single_method_regression_opt;
+       if (method == mono_current_single_method)
+               return mono_single_method_regression_opt;
        return default_opt;
 }
 

diff --git a/mono/mini/mini.h b/mono/mini/mini.h
index 77c76edfd17b049932932ed967b33ecb62eba5a8..b9c54e93856d23f83f061893333419b69054c600 100644 (file)
--- a/mono/mini/mini.h
+++ b/mono/mini/mini.h
@@ -526,11 +526,11 @@ extern gboolean mono_do_x86_stack_align;
 extern const char *mono_build_date;
 extern gboolean mono_do_signal_chaining;
 extern gboolean mono_use_llvm;
-extern gboolean do_single_method_regression;
-extern guint32 single_method_regression_opt;
-extern MonoMethod *current_single_method;
-extern GSList *single_method_list;
-extern GHashTable *single_method_hash;
+extern gboolean mono_do_single_method_regression;
+extern guint32 mono_single_method_regression_opt;
+extern MonoMethod *mono_current_single_method;
+extern GSList *mono_single_method_list;
+extern GHashTable *mono_single_method_hash;
 
 #define INS_INFO(opcode) (&ins_info [((opcode) - OP_START - 1) * 4])