projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2008-08-29 Geoff Norton <gnorton@novell.com>
[mono.git]
/
mono
/
mini
/
mini.c
diff --git
a/mono/mini/mini.c
b/mono/mini/mini.c
index 9341ab6a6987767c6898475024721f00e4b0142d..ce23ded4aa5a8bde7b43886e687416bad25f983d 100644
(file)
--- a/
mono/mini/mini.c
+++ b/
mono/mini/mini.c
@@
-174,9
+174,7
@@
static __thread gpointer mono_jit_tls MONO_TLS_FAST;
MonoTraceSpec *mono_jit_trace_calls = NULL;
gboolean mono_break_on_exc = FALSE;
MonoTraceSpec *mono_jit_trace_calls = NULL;
gboolean mono_break_on_exc = FALSE;
-#ifndef DISABLE_AOT
gboolean mono_compile_aot = FALSE;
gboolean mono_compile_aot = FALSE;
-#endif
/* If this is set, no code is generated dynamically, everything is taken from AOT files */
gboolean mono_aot_only = FALSE;
/* Whenever to use IMT */
/* If this is set, no code is generated dynamically, everything is taken from AOT files */
gboolean mono_aot_only = FALSE;
/* Whenever to use IMT */
@@
-11187,7
+11185,7
@@
mono_create_tls_get (MonoCompile *cfg, int offset)
return NULL;
MONO_INST_NEW (cfg, ins, OP_TLS_GET);
return NULL;
MONO_INST_NEW (cfg, ins, OP_TLS_GET);
- ins->dreg = mono_regstate_next_int (cfg->rs);
+ ins->dreg =
cfg->new_ir ? mono_alloc_preg (cfg) :
mono_regstate_next_int (cfg->rs);
ins->inst_offset = offset;
return ins;
#else
ins->inst_offset = offset;
return ins;
#else
@@
-14587,16
+14585,22
@@
mini_init (const char *filename, const char *runtime_version)
register_icall (mono_array_new_2, "mono_array_new_2", "object ptr int int", FALSE);
#endif
register_icall (mono_array_new_2, "mono_array_new_2", "object ptr int int", FALSE);
#endif
+ mono_generic_sharing_init ();
+
+ if (mono_compile_aot)
+ /*
+ * Avoid running managed code when AOT compiling, since the platform
+ * might only support aot-only execution.
+ */
+ mono_runtime_set_no_exec (TRUE);
+
#define JIT_RUNTIME_WORKS
#ifdef JIT_RUNTIME_WORKS
mono_install_runtime_cleanup ((MonoDomainFunc)mini_cleanup);
mono_runtime_init (domain, mono_thread_start_cb, mono_thread_attach_cb);
#define JIT_RUNTIME_WORKS
#ifdef JIT_RUNTIME_WORKS
mono_install_runtime_cleanup ((MonoDomainFunc)mini_cleanup);
mono_runtime_init (domain, mono_thread_start_cb, mono_thread_attach_cb);
+ mono_thread_attach (domain);
#endif
#endif
- mono_generic_sharing_init ();
-
- mono_thread_attach (domain);
-
mono_profiler_runtime_initialized ();
MONO_PROBE_VES_INIT_END ();
mono_profiler_runtime_initialized ();
MONO_PROBE_VES_INIT_END ();