2010-03-24 Mark Probst <mark.probst@gmail.com>
[mono.git] / mono / mini / mini.c
index 1342187acd0cbad51ed1c986facedab2532ed3ad..7676119f29cdac89778542704ca838da393804d3 100644 (file)
@@ -21,9 +21,7 @@
 #include <sys/time.h>
 #endif
 
-#ifdef HAVE_VALGRIND_MEMCHECK_H
-#include <valgrind/memcheck.h>
-#endif
+#include <mono/utils/memcheck.h>
 
 #include <mono/metadata/assembly.h>
 #include <mono/metadata/loader.h>
@@ -50,7 +48,7 @@
 #include <mono/utils/mono-math.h>
 #include <mono/utils/mono-compiler.h>
 #include <mono/utils/mono-counters.h>
-#include <mono/utils/mono-logger.h>
+#include <mono/utils/mono-logger-internal.h>
 #include <mono/utils/mono-mmap.h>
 #include <mono/utils/dtrace.h>
 
@@ -65,6 +63,7 @@
 
 #include "debug-mini.h"
 #include "mini-gc.h"
+#include "debugger-agent.h"
 
 static gpointer mono_jit_compile_method_with_opt (MonoMethod *method, guint32 opt, MonoException **ex);
 
@@ -75,6 +74,7 @@ MonoMethodSignature *helper_sig_domain_get = NULL;
 MonoMethodSignature *helper_sig_generic_class_init_trampoline = NULL;
 MonoMethodSignature *helper_sig_rgctx_lazy_fetch_trampoline = NULL;
 MonoMethodSignature *helper_sig_monitor_enter_exit_trampoline = NULL;
+MonoMethodSignature *helper_sig_monitor_enter_exit_trampoline_llvm = NULL;
 
 static guint32 default_opt = 0;
 static gboolean default_opt_set = FALSE;
@@ -111,14 +111,29 @@ static int mini_verbose = 0;
 static int methods_with_llvm, methods_without_llvm;
 #endif
 
+/*
+ * This flag controls whenever the runtime uses LLVM compiled code.
+ * Enabling this causes different/slower code paths to be used, which is why it
+ * defaults to FALSE if ENABLE_LLVM is not defined, i.e. the runtime is only capable of
+ * running AOT code compiled by LLVM.
+ * Changes when this flag is set include:
+ * - a per method vtable trampoline is used to handle virtual calls, instead of only
+ *   one trampoline.
+ * - fast generic virtual calls are not supported.
+ */
+#ifdef ENABLE_LLVM
+gboolean mono_use_llvm = TRUE;
+#else
+gboolean mono_use_llvm = FALSE;
+#endif
+
 #define mono_jit_lock() EnterCriticalSection (&jit_mutex)
 #define mono_jit_unlock() LeaveCriticalSection (&jit_mutex)
 static CRITICAL_SECTION jit_mutex;
 
 static MonoCodeManager *global_codeman = NULL;
 
-/* FIXME: Make this static again */
-GHashTable *jit_icall_name_hash = NULL;
+static GHashTable *jit_icall_name_hash = NULL;
 
 static MonoDebugOptions debug_options;
 
@@ -145,19 +160,21 @@ gboolean mono_dont_free_global_codeman;
 gboolean
 mono_running_on_valgrind (void)
 {
-#ifdef HAVE_VALGRIND_MEMCHECK_H
-               if (RUNNING_ON_VALGRIND){
+       if (RUNNING_ON_VALGRIND){
 #ifdef VALGRIND_JIT_REGISTER_MAP
-                       valgrind_register = TRUE;
+               valgrind_register = TRUE;
 #endif
-                       return TRUE;
-               } else
-                       return FALSE;
-#else
+               return TRUE;
+       } else
                return FALSE;
-#endif
 }
 
+typedef struct {
+       MonoExceptionClause *clause;
+       MonoBasicBlock *basic_block;
+       int start_offset;
+} TryBlockHole;
+
 typedef struct {
        void *ip;
        MonoMethod *method;
@@ -247,9 +264,10 @@ mono_print_method_from_ip (void *ip)
        char *method;
        MonoDebugSourceLocation *source;
        MonoDomain *domain = mono_domain_get ();
+       MonoDomain *target_domain = mono_domain_get ();
        FindTrampUserData user_data;
        
-       ji = mono_jit_info_table_find (domain, ip);
+       ji = mini_jit_info_table_find (domain, ip, &target_domain);
        if (!ji) {
                user_data.ip = ip;
                user_data.method = NULL;
@@ -266,9 +284,9 @@ mono_print_method_from_ip (void *ip)
                return;
        }
        method = mono_method_full_name (ji->method, TRUE);
-       source = mono_debug_lookup_source_location (ji->method, (guint32)((guint8*)ip - (guint8*)ji->code_start), domain);
+       source = mono_debug_lookup_source_location (ji->method, (guint32)((guint8*)ip - (guint8*)ji->code_start), target_domain);
 
-       g_print ("IP %p at offset 0x%x of method %s (%p %p)[domain %p - %s]\n", ip, (int)((char*)ip - (char*)ji->code_start), method, ji->code_start, (char*)ji->code_start + ji->code_size, domain, domain->friendly_name);
+       g_print ("IP %p at offset 0x%x of method %s (%p %p)[domain %p - %s]\n", ip, (int)((char*)ip - (char*)ji->code_start), method, ji->code_start, (char*)ji->code_start + ji->code_size, target_domain, target_domain->friendly_name);
 
        if (source)
                g_print ("%s:%d\n", source->source_file, source->row);
@@ -458,8 +476,7 @@ mono_bblocks_linked (MonoBasicBlock *bb1, MonoBasicBlock *bb2)
 static int
 mono_find_block_region_notry (MonoCompile *cfg, int offset)
 {
-       MonoMethod *method = cfg->method;
-       MonoMethodHeader *header = mono_method_get_header (method);
+       MonoMethodHeader *header = cfg->header;
        MonoExceptionClause *clause;
        int i;
 
@@ -482,11 +499,17 @@ mono_find_block_region_notry (MonoCompile *cfg, int offset)
        return -1;
 }
 
-MonoInst *
-mono_find_spvar_for_region (MonoCompile *cfg, int region)
+/*
+ * mono_get_block_region_notry:
+ *
+ *   Return the region corresponding to REGION, ignoring try clauses nested inside
+ * finally clauses.
+ */
+int
+mono_get_block_region_notry (MonoCompile *cfg, int region)
 {
        if ((region & (0xf << 4)) == MONO_REGION_TRY) {
-               MonoMethodHeader *header = mono_method_get_header (cfg->method);
+               MonoMethodHeader *header = cfg->header;
                
                /*
                 * This can happen if a try clause is nested inside a finally clause.
@@ -497,13 +520,15 @@ mono_find_spvar_for_region (MonoCompile *cfg, int region)
                region = mono_find_block_region_notry (cfg, header->clauses [clause_index].try_offset);
        }
 
-       return g_hash_table_lookup (cfg->spvars, GINT_TO_POINTER (region));
+       return region;
 }
 
-static MonoInst *
-mono_find_exvar_for_offset (MonoCompile *cfg, int offset)
+MonoInst *
+mono_find_spvar_for_region (MonoCompile *cfg, int region)
 {
-       return g_hash_table_lookup (cfg->exvars, GINT_TO_POINTER (offset));
+       region = mono_get_block_region_notry (cfg, region);
+
+       return g_hash_table_lookup (cfg->spvars, GINT_TO_POINTER (region));
 }
 
 static void
@@ -628,7 +653,9 @@ mono_type_to_load_membase (MonoCompile *cfg, MonoType *type)
        if (type->byref)
                return OP_LOAD_MEMBASE;
 
-       switch (mono_type_get_underlying_type (type)->type) {
+       type = mono_type_get_underlying_type (type);
+
+       switch (type->type) {
        case MONO_TYPE_I1:
                return OP_LOADI1_MEMBASE;
        case MONO_TYPE_U1:
@@ -739,6 +766,18 @@ mono_op_imm_to_op (int opcode)
                return OP_IAND;
 #else
                return OP_LAND;
+#endif
+       case OP_OR_IMM:
+#if SIZEOF_REGISTER == 4
+               return OP_IOR;
+#else
+               return OP_LOR;
+#endif
+       case OP_XOR_IMM:
+#if SIZEOF_REGISTER == 4
+               return OP_IXOR;
+#else
+               return OP_LXOR;
 #endif
        case OP_IAND_IMM:
                return OP_IAND;
@@ -983,7 +1022,6 @@ mono_compile_create_var (MonoCompile *cfg, MonoType *type, int opcode)
 void
 mono_compile_make_var_load (MonoCompile *cfg, MonoInst *dest, gssize var_index) {
        memset (dest, 0, sizeof (MonoInst));
-       dest->ssa_op = MONO_SSA_LOAD;
        dest->inst_i0 = cfg->varinfo [var_index];
        dest->opcode = mini_type_to_ldind (cfg, dest->inst_i0->inst_vtype);
        type_to_eval_stack_type (cfg, dest->inst_i0->inst_vtype, dest);
@@ -1135,7 +1173,7 @@ mono_get_array_new_va_signature (int arity)
        res->call_convention = MONO_CALL_VARARG;
 #endif
 
-#ifdef PLATFORM_WIN32
+#ifdef TARGET_WIN32
        res->call_convention = MONO_CALL_C;
 #endif
 
@@ -1185,18 +1223,6 @@ mini_class_is_system_array (MonoClass *klass)
                return FALSE;
 }
 
-static MonoJitICallInfo **emul_opcode_map = NULL;
-
-MonoJitICallInfo *
-mono_find_jit_opcode_emulation (int opcode)
-{
-       g_assert (opcode >= 0 && opcode <= OP_LAST);
-       if  (emul_opcode_map)
-               return emul_opcode_map [opcode];
-       else
-               return NULL;
-}
-
 gboolean
 mini_assembly_can_skip_verification (MonoDomain *domain, MonoMethod *method)
 {
@@ -1245,15 +1271,19 @@ mini_method_verify (MonoCompile *cfg, MonoMethod *method)
                for (tmp = res; tmp; tmp = tmp->next) {
                        MonoVerifyInfoExtended *info = (MonoVerifyInfoExtended *)tmp->data;
                        if (info->info.status == MONO_VERIFY_ERROR) {
+                               char *method_name = mono_method_full_name (method, TRUE);
                                cfg->exception_type = info->exception_type;
-                               cfg->exception_message = g_strdup (info->info.message);
+                               cfg->exception_message = g_strdup_printf ("Error verifying %s: %s", method_name, info->info.message);
                                mono_free_verify_list (res);
+                               g_free (method_name);
                                return TRUE;
                        }
                        if (info->info.status == MONO_VERIFY_NOT_VERIFIABLE && (!is_fulltrust || info->exception_type == MONO_EXCEPTION_METHOD_ACCESS || info->exception_type == MONO_EXCEPTION_FIELD_ACCESS)) {
+                               char *method_name = mono_method_full_name (method, TRUE);
                                cfg->exception_type = info->exception_type;
-                               cfg->exception_message = g_strdup (info->info.message);
+                               cfg->exception_message = g_strdup_printf ("Error verifying %s: %s", method_name, info->info.message);
                                mono_free_verify_list (res);
+                               g_free (method_name);
                                return TRUE;
                        }
                }
@@ -1263,6 +1293,23 @@ mini_method_verify (MonoCompile *cfg, MonoMethod *method)
        return FALSE;
 }
 
+/*Returns true is something went wrong*/
+static gboolean
+mono_compile_is_broken (MonoCompile *cfg)
+{
+       MonoMethod *method = cfg->method;
+       MonoMethod *method_definition = method;
+       gboolean dont_verify = mini_assembly_can_skip_verification (cfg->domain, method);
+       dont_verify |= method->klass->image->assembly->corlib_internal;
+
+       while (method_definition->is_inflated) {
+               MonoMethodInflated *imethod = (MonoMethodInflated *) method_definition;
+               method_definition = imethod->declaring;
+       }
+
+       return !dont_verify && mini_method_verify (cfg, method_definition);
+}
+
 static void
 create_helper_signature (void)
 {
@@ -1271,6 +1318,7 @@ create_helper_signature (void)
        helper_sig_generic_class_init_trampoline = mono_create_icall_signature ("void");
        helper_sig_rgctx_lazy_fetch_trampoline = mono_create_icall_signature ("ptr ptr");
        helper_sig_monitor_enter_exit_trampoline = mono_create_icall_signature ("void");
+       helper_sig_monitor_enter_exit_trampoline_llvm = mono_create_icall_signature ("void object");
 }
 
 static gconstpointer
@@ -1387,6 +1435,7 @@ mono_allocate_stack_slots_full2 (MonoCompile *cfg, gboolean backward, guint32 *s
        StackSlotInfo *scalar_stack_slots, *vtype_stack_slots, *slot_info;
        MonoType *t;
        int nvtypes;
+       gboolean reuse_slot;
 
        LSCAN_DEBUG (printf ("Allocate Stack Slots 2 for %s:\n", mono_method_full_name (cfg->method, TRUE)));
 
@@ -1441,8 +1490,15 @@ mono_allocate_stack_slots_full2 (MonoCompile *cfg, gboolean backward, guint32 *s
 
                        size = mono_type_size (inst->inst_vtype, &ialign);
                        align = ialign;
+
+                       if (MONO_CLASS_IS_SIMD (cfg, mono_class_from_mono_type (inst->inst_vtype)))
+                               align = 16;
                }
 
+               reuse_slot = TRUE;
+               if (cfg->disable_reuse_stack_slots)
+                       reuse_slot = FALSE;
+
                t = mono_type_get_underlying_type (inst->inst_vtype);
                switch (t->type) {
                case MONO_TYPE_GENERICINST:
@@ -1465,6 +1521,8 @@ mono_allocate_stack_slots_full2 (MonoCompile *cfg, gboolean backward, guint32 *s
                                slot_info = &vtype_stack_slots [nvtypes];
                                nvtypes ++;
                        }
+                       if (cfg->disable_reuse_ref_stack_slots)
+                               reuse_slot = FALSE;
                        break;
 
                case MONO_TYPE_PTR:
@@ -1489,6 +1547,8 @@ mono_allocate_stack_slots_full2 (MonoCompile *cfg, gboolean backward, guint32 *s
                case MONO_TYPE_STRING:
                        /* Share non-float stack slots of the same size */
                        slot_info = &scalar_stack_slots [MONO_TYPE_CLASS];
+                       if (cfg->disable_reuse_ref_stack_slots)
+                               reuse_slot = FALSE;
                        break;
 
                default:
@@ -1608,14 +1668,19 @@ mono_allocate_stack_slots_full2 (MonoCompile *cfg, gboolean backward, guint32 *s
 
                LSCAN_DEBUG (printf ("R%d %s -> 0x%x\n", inst->dreg, mono_type_full_name (t), slot));
 
+               if (!reuse_slot)
+                       slot = 0xffffff;
+
                if (slot == 0xffffff) {
                        /*
                         * Allways allocate valuetypes to sizeof (gpointer) to allow more
                         * efficient copying (and to work around the fact that OP_MEMCPY
                         * and OP_MEMSET ignores alignment).
                         */
-                       if (MONO_TYPE_ISSTRUCT (t))
-                               align = MAX (sizeof (gpointer), mono_class_min_align (mono_class_from_mono_type (t)));
+                       if (MONO_TYPE_ISSTRUCT (t)) {
+                               align = MAX (align, sizeof (gpointer));
+                               align = MAX (align, mono_class_min_align (mono_class_from_mono_type (t)));
+                       }
 
                        if (backward) {
                                offset += size;
@@ -1673,6 +1738,7 @@ mono_allocate_stack_slots_full (MonoCompile *cfg, gboolean backward, guint32 *st
        StackSlotInfo *scalar_stack_slots, *vtype_stack_slots, *slot_info;
        MonoType *t;
        int nvtypes;
+       gboolean reuse_slot;
 
        if ((cfg->num_varinfo > 0) && MONO_VARINFO (cfg, 0)->interval)
                return mono_allocate_stack_slots_full2 (cfg, backward, stack_size, stack_align);
@@ -1711,8 +1777,15 @@ mono_allocate_stack_slots_full (MonoCompile *cfg, gboolean backward, guint32 *st
 
                        size = mono_type_size (inst->inst_vtype, &ialign);
                        align = ialign;
+
+                       if (MONO_CLASS_IS_SIMD (cfg, mono_class_from_mono_type (inst->inst_vtype)))
+                               align = 16;
                }
 
+               reuse_slot = TRUE;
+               if (cfg->disable_reuse_stack_slots)
+                       reuse_slot = FALSE;
+
                t = mono_type_get_underlying_type (inst->inst_vtype);
                if (t->byref) {
                        slot_info = &scalar_stack_slots [MONO_TYPE_I];
@@ -1738,6 +1811,8 @@ mono_allocate_stack_slots_full (MonoCompile *cfg, gboolean backward, guint32 *st
                                        slot_info = &vtype_stack_slots [nvtypes];
                                        nvtypes ++;
                                }
+                               if (cfg->disable_reuse_ref_stack_slots)
+                                       reuse_slot = FALSE;
                                break;
 
                        case MONO_TYPE_PTR:
@@ -1762,6 +1837,8 @@ mono_allocate_stack_slots_full (MonoCompile *cfg, gboolean backward, guint32 *st
                        case MONO_TYPE_STRING:
                                /* Share non-float stack slots of the same size */
                                slot_info = &scalar_stack_slots [MONO_TYPE_CLASS];
+                               if (cfg->disable_reuse_ref_stack_slots)
+                                       reuse_slot = FALSE;
                                break;
 
                        default:
@@ -1820,7 +1897,7 @@ mono_allocate_stack_slots_full (MonoCompile *cfg, gboolean backward, guint32 *st
                        */
                }
 
-               if (cfg->disable_reuse_stack_slots)
+               if (!reuse_slot)
                        slot = 0xffffff;
 
                if (slot == 0xffffff) {
@@ -1830,7 +1907,8 @@ mono_allocate_stack_slots_full (MonoCompile *cfg, gboolean backward, guint32 *st
                         * and OP_MEMSET ignores alignment).
                         */
                        if (MONO_TYPE_ISSTRUCT (t)) {
-                               align = MAX (sizeof (gpointer), mono_class_min_align (mono_class_from_mono_type (t)));
+                               align = MAX (align, sizeof (gpointer));
+                               align = MAX (align, mono_class_min_align (mono_class_from_mono_type (t)));
                                /* 
                                 * Align the size too so the code generated for passing vtypes in
                                 * registers doesn't overwrite random locals.
@@ -1889,21 +1967,50 @@ mono_allocate_stack_slots (MonoCompile *m, guint32 *stack_size, guint32 *stack_a
        return mono_allocate_stack_slots_full (m, TRUE, stack_size, stack_align);
 }
 
+#define EMUL_HIT_SHIFT 3
+#define EMUL_HIT_MASK ((1 << EMUL_HIT_SHIFT) - 1)
+/* small hit bitmap cache */
+static mono_byte emul_opcode_hit_cache [(OP_LAST>>EMUL_HIT_SHIFT) + 1] = {0};
+static short emul_opcode_num = 0;
+static short emul_opcode_alloced = 0;
+static short *emul_opcode_opcodes = NULL;
+static MonoJitICallInfo **emul_opcode_map = NULL;
+
+MonoJitICallInfo *
+mono_find_jit_opcode_emulation (int opcode)
+{
+       g_assert (opcode >= 0 && opcode <= OP_LAST);
+       if (emul_opcode_hit_cache [opcode >> (EMUL_HIT_SHIFT + 3)] & (1 << (opcode & EMUL_HIT_MASK))) {
+               int i;
+               for (i = 0; i < emul_opcode_num; ++i) {
+                       if (emul_opcode_opcodes [i] == opcode)
+                               return emul_opcode_map [i];
+               }
+       }
+       return NULL;
+}
+
 void
 mono_register_opcode_emulation (int opcode, const char *name, const char *sigstr, gpointer func, gboolean no_throw)
 {
        MonoJitICallInfo *info;
        MonoMethodSignature *sig = mono_create_icall_signature (sigstr);
 
-       if (!emul_opcode_map)
-               emul_opcode_map = g_new0 (MonoJitICallInfo*, OP_LAST + 1);
-
        g_assert (!sig->hasthis);
        g_assert (sig->param_count < 3);
 
        info = mono_register_jit_icall (func, name, sig, no_throw);
 
-       emul_opcode_map [opcode] = info;
+       if (emul_opcode_num >= emul_opcode_alloced) {
+               int incr = emul_opcode_alloced? emul_opcode_alloced/2: 16;
+               emul_opcode_alloced += incr;
+               emul_opcode_map = g_realloc (emul_opcode_map, sizeof (emul_opcode_map [0]) * emul_opcode_alloced);
+               emul_opcode_opcodes = g_realloc (emul_opcode_opcodes, sizeof (emul_opcode_opcodes [0]) * emul_opcode_alloced);
+       }
+       emul_opcode_map [emul_opcode_num] = info;
+       emul_opcode_opcodes [emul_opcode_num] = opcode;
+       emul_opcode_num++;
+       emul_opcode_hit_cache [opcode >> (EMUL_HIT_SHIFT + 3)] |= (1 << (opcode & EMUL_HIT_MASK));
 }
 
 static void
@@ -2067,6 +2174,8 @@ mono_verify_cfg (MonoCompile *cfg)
 void
 mono_destroy_compile (MonoCompile *cfg)
 {
+       if (cfg->header)
+               mono_metadata_free_mh (cfg->header);
        //mono_mempool_stats (cfg->mempool);
        mono_free_loop_info (cfg);
        if (cfg->rs)
@@ -2160,6 +2269,19 @@ mono_get_lmf_addr (void)
 #else
        MonoJitTlsData *jit_tls;
 
+       if ((jit_tls = TlsGetValue (mono_jit_tls_id)))
+               return &jit_tls->lmf;
+
+       /*
+        * When resolving the call to mono_jit_thread_attach full-aot will look
+        * in the plt, which causes a call into the generic trampoline, which in turn
+        * tries to resolve the lmf_addr creating a cyclic dependency.  We cannot
+        * call mono_jit_thread_attach from the native-to-managed wrapper, without
+        * mono_get_lmf_addr, and mono_get_lmf_addr requires the thread to be attached.
+        */
+
+       mono_jit_thread_attach (NULL);
+       
        if ((jit_tls = TlsGetValue (mono_jit_tls_id)))
                return &jit_tls->lmf;
 
@@ -2168,6 +2290,16 @@ mono_get_lmf_addr (void)
 #endif
 }
 
+void
+mono_set_lmf (MonoLMF *lmf)
+{
+#if defined(HAVE_KW_THREAD) && defined(MONO_ARCH_ENABLE_MONO_LMF_VAR)
+       mono_lmf = lmf;
+#endif
+
+       (*mono_get_lmf_addr ()) = lmf;
+}
+
 /* Called by native->managed wrappers */
 void
 mono_jit_thread_attach (MonoDomain *domain)
@@ -2262,12 +2394,12 @@ setup_jit_tls_data (gpointer stack_start, gpointer abort_func)
 }
 
 static void
-mono_thread_start_cb (gsize tid, gpointer stack_start, gpointer func)
+mono_thread_start_cb (intptr_t tid, gpointer stack_start, gpointer func)
 {
-       MonoThread *thread;
+       MonoInternalThread *thread;
        void *jit_tls = setup_jit_tls_data (stack_start, mono_thread_abort);
-       thread = mono_thread_current ();
-       mono_debugger_thread_created (tid, thread, jit_tls, func);
+       thread = mono_thread_internal_current ();
+       mono_debugger_thread_created (tid, thread->root_domain_thread, jit_tls, func);
        if (thread)
                thread->jit_data = jit_tls;
 }
@@ -2284,12 +2416,12 @@ mono_thread_abort_dummy (MonoObject *obj)
 }
 
 static void
-mono_thread_attach_cb (gsize tid, gpointer stack_start)
+mono_thread_attach_cb (intptr_t tid, gpointer stack_start)
 {
-       MonoThread *thread;
+       MonoInternalThread *thread;
        void *jit_tls = setup_jit_tls_data (stack_start, mono_thread_abort_dummy);
-       thread = mono_thread_current ();
-       mono_debugger_thread_created (tid, thread, (MonoJitTlsData *) jit_tls, NULL);
+       thread = mono_thread_internal_current ();
+       mono_debugger_thread_created (tid, thread->root_domain_thread, (MonoJitTlsData *) jit_tls, NULL);
        if (thread)
                thread->jit_data = jit_tls;
        if (mono_profiler_get_events () & MONO_PROFILE_STATISTICAL)
@@ -2299,7 +2431,8 @@ mono_thread_attach_cb (gsize tid, gpointer stack_start)
 static void
 mini_thread_cleanup (MonoThread *thread)
 {
-       MonoJitTlsData *jit_tls = thread->jit_data;
+       MonoInternalThread *internal = thread->internal_thread;
+       MonoJitTlsData *jit_tls = internal->jit_data;
 
        if (jit_tls) {
                mono_debugger_thread_cleanup (jit_tls);
@@ -2308,7 +2441,7 @@ mini_thread_cleanup (MonoThread *thread)
                mono_free_altstack (jit_tls);
                g_free (jit_tls->first_lmf);
                g_free (jit_tls);
-               thread->jit_data = NULL;
+               internal->jit_data = NULL;
 
                /* We can't clean up tls information if we are on another thread, it will clean up the wrong stuff
                 * It would be nice to issue a warning when this happens outside of the shutdown sequence. but it's
@@ -2316,7 +2449,7 @@ mini_thread_cleanup (MonoThread *thread)
                 *
                 * The current offender is mono_thread_manage which cleanup threads from the outside.
                 */
-               if (thread == mono_thread_current ()) {
+               if (internal == mono_thread_internal_current ()) {
                        TlsSetValue (mono_jit_tls_id, NULL);
 
 #ifdef HAVE_KW_THREAD
@@ -2469,6 +2602,7 @@ mono_patch_info_hash (gconstpointer data)
        case MONO_PATCH_INFO_JIT_ICALL_ADDR:
        case MONO_PATCH_INFO_FIELD:
        case MONO_PATCH_INFO_SFLDA:
+       case MONO_PATCH_INFO_SEQ_POINT_INFO:
                return (ji->type << 8) | (gssize)ji->data.target;
        default:
                return (ji->type << 8);
@@ -2513,7 +2647,6 @@ mono_patch_info_equal (gconstpointer ka, gconstpointer kb)
 
                return e1->method == e2->method && e1->in_mrgctx == e2->in_mrgctx && e1->info_type == e2->info_type && mono_patch_info_equal (e1->data, e2->data);
        }
-
        default:
                if (ji1->data.target != ji2->data.target)
                        return 0;
@@ -2531,7 +2664,11 @@ mono_resolve_patch_target (MonoMethod *method, MonoDomain *domain, guint8 *code,
 
        switch (patch_info->type) {
        case MONO_PATCH_INFO_BB:
-               g_assert (patch_info->data.bb->native_offset);
+               /* 
+                * FIXME: This could be hit for methods without a prolog. Should use -1
+                * but too much code depends on a 0 initial value.
+                */
+               //g_assert (patch_info->data.bb->native_offset);
                target = patch_info->data.bb->native_offset + code;
                break;
        case MONO_PATCH_INFO_ABS:
@@ -2616,6 +2753,17 @@ mono_resolve_patch_target (MonoMethod *method, MonoDomain *domain, guint8 *code,
        case MONO_PATCH_INFO_SFLDA: {
                MonoVTable *vtable = mono_class_vtable (domain, patch_info->data.field->parent);
 
+               if (mono_class_field_is_special_static (patch_info->data.field)) {
+                       gpointer addr = NULL;
+
+                       mono_domain_lock (domain);
+                       if (domain->special_static_fields)
+                               addr = g_hash_table_lookup (domain->special_static_fields, patch_info->data.field);
+                       mono_domain_unlock (domain);
+                       g_assert (addr);
+                       return addr;
+               }
+
                g_assert (vtable);
                if (!vtable->initialized && !(vtable->klass->flags & TYPE_ATTRIBUTE_BEFORE_FIELD_INIT) && (method && mono_class_needs_cctor_run (vtable->klass, method)))
                        /* Done by the generated code */
@@ -2703,9 +2851,13 @@ mono_resolve_patch_target (MonoMethod *method, MonoDomain *domain, guint8 *code,
        case MONO_PATCH_INFO_INTERRUPTION_REQUEST_FLAG:
                target = mono_thread_interruption_request_flag ();
                break;
-       case MONO_PATCH_INFO_METHOD_RGCTX:
-               target = mono_method_lookup_rgctx (mono_class_vtable (domain, patch_info->data.method->klass), mini_method_get_context (patch_info->data.method)->method_inst);
+       case MONO_PATCH_INFO_METHOD_RGCTX: {
+               MonoVTable *vtable = mono_class_vtable (domain, patch_info->data.method->klass);
+               g_assert (vtable);
+
+               target = mono_method_lookup_rgctx (vtable, mini_method_get_context (patch_info->data.method)->method_inst);
                break;
+       }
        case MONO_PATCH_INFO_BB_OVF:
        case MONO_PATCH_INFO_EXC_OVF:
        case MONO_PATCH_INFO_GOT_OFFSET:
@@ -2743,6 +2895,23 @@ mono_resolve_patch_target (MonoMethod *method, MonoDomain *domain, guint8 *code,
        case MONO_PATCH_INFO_MONITOR_EXIT:
                target = mono_create_monitor_exit_trampoline ();
                break;
+#ifdef MONO_ARCH_SOFT_DEBUG_SUPPORTED
+       case MONO_PATCH_INFO_SEQ_POINT_INFO:
+               if (!run_cctors)
+                       /* AOT, not needed */
+                       target = NULL;
+               else
+                       target = mono_arch_get_seq_point_info (domain, code);
+               break;
+#endif
+       case MONO_PATCH_INFO_LLVM_IMT_TRAMPOLINE:
+#ifdef MONO_ARCH_LLVM_SUPPORTED
+               g_assert (mono_use_llvm);
+               target = mono_create_llvm_imt_trampoline (domain, patch_info->data.imt_tramp->method, patch_info->data.imt_tramp->vt_offset);
+#else
+               g_assert_not_reached ();
+#endif
+               break;
        default:
                g_assert_not_reached ();
        }
@@ -2750,6 +2919,17 @@ mono_resolve_patch_target (MonoMethod *method, MonoDomain *domain, guint8 *code,
        return (gpointer)target;
 }
 
+void
+mono_add_seq_point (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins, int native_offset)
+{
+       ins->inst_offset = native_offset;
+       g_ptr_array_add (cfg->seq_points, ins);
+       bb->seq_points = g_slist_prepend_mempool (cfg->mempool, bb->seq_points, ins);
+       bb->last_seq_point = ins;
+}
+
+#ifndef DISABLE_JIT
+
 static void
 mono_compile_create_vars (MonoCompile *cfg)
 {
@@ -2757,7 +2937,7 @@ mono_compile_create_vars (MonoCompile *cfg)
        MonoMethodHeader *header;
        int i;
 
-       header = mono_method_get_header (cfg->method);
+       header = cfg->header;
 
        sig = mono_method_signature (cfg->method);
        
@@ -2810,6 +2990,8 @@ mono_compile_create_vars (MonoCompile *cfg)
        mono_arch_create_vars (cfg);
 }
 
+#endif /* #ifndef DISABLE_JIT */
+
 void
 mono_print_code (MonoCompile *cfg, const char* msg)
 {
@@ -2915,6 +3097,117 @@ mono_postprocess_patches (MonoCompile *cfg)
        }
 }
 
+static void
+collect_pred_seq_points (MonoBasicBlock *bb, MonoInst *ins, GSList **next, int depth)
+{
+       int i;
+       MonoBasicBlock *in_bb;
+
+       for (i = 0; i < bb->in_count; ++i) {
+               in_bb = bb->in_bb [i];
+
+               if (in_bb->last_seq_point) {
+                       next [in_bb->last_seq_point->backend.size] = g_slist_append (next [in_bb->last_seq_point->backend.size], GUINT_TO_POINTER (ins->backend.size));
+               } else {
+                       /* Have to look at its predecessors */
+                       if (depth < 5)
+                               collect_pred_seq_points (in_bb, ins, next, depth + 1);
+               }
+       }
+}
+
+static void
+mono_save_seq_point_info (MonoCompile *cfg)
+{
+       MonoBasicBlock *bb;
+       GSList *bb_seq_points, *l;
+       MonoInst *last;
+       MonoDomain *domain = cfg->domain;
+       int i;
+       MonoSeqPointInfo *info;
+       GSList **next;
+
+       if (!cfg->seq_points)
+               return;
+
+       info = g_malloc0 (sizeof (MonoSeqPointInfo) + (cfg->seq_points->len - MONO_ZERO_LEN_ARRAY) * sizeof (SeqPoint));
+       info->len = cfg->seq_points->len;
+       for (i = 0; i < cfg->seq_points->len; ++i) {
+               SeqPoint *sp = &info->seq_points [i];
+               MonoInst *ins = g_ptr_array_index (cfg->seq_points, i);
+
+               sp->il_offset = ins->inst_imm;
+               sp->native_offset = ins->inst_offset;
+
+               /* Used below */
+               ins->backend.size = i;
+       }
+
+       /*
+        * For each sequence point, compute the list of sequence points immediately
+        * following it, this is needed to implement 'step over' in the debugger agent.
+        */ 
+       next = g_new0 (GSList*, cfg->seq_points->len);
+       for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
+               bb_seq_points = g_slist_reverse (bb->seq_points);
+               last = NULL;
+               for (l = bb_seq_points; l; l = l->next) {
+                       MonoInst *ins = l->data;
+
+                       if (!(ins->flags & MONO_INST_SINGLE_STEP_LOC))
+                               continue;
+
+                       if (last != NULL) {
+                               /* Link with the previous seq point in the same bb */
+                               next [last->backend.size] = g_slist_append (next [last->backend.size], GUINT_TO_POINTER (ins->backend.size));
+                       } else {
+                               /* Link with the last bb in the previous bblocks */
+                               collect_pred_seq_points (bb, ins, next, 0);
+                       }
+
+                       last = ins;
+               }
+       }
+
+       if (cfg->verbose_level > 2) {
+               printf ("\nSEQ POINT MAP: \n");
+       }
+
+       for (i = 0; i < cfg->seq_points->len; ++i) {
+               SeqPoint *sp = &info->seq_points [i];
+               GSList *l;
+               int j, next_index;
+
+               sp->next_len = g_slist_length (next [i]);
+               sp->next = g_new (int, sp->next_len);
+               j = 0;
+               if (cfg->verbose_level > 2 && next [i]) {
+                       printf ("\t0x%x ->", sp->il_offset);
+                       for (l = next [i]; l; l = l->next) {
+                               next_index = GPOINTER_TO_UINT (l->data);
+                               printf (" 0x%x", info->seq_points [next_index].il_offset);
+                       }
+                       printf ("\n");
+               }
+               for (l = next [i]; l; l = l->next) {
+                       next_index = GPOINTER_TO_UINT (l->data);
+                       sp->next [j ++] = next_index;
+               }
+               g_slist_free (next [i]);
+       }
+       g_free (next);
+
+       cfg->seq_point_info = info;
+
+       // FIXME: dynamic methods
+       mono_domain_lock (domain);
+       g_hash_table_insert (domain_jit_info (domain)->seq_points, cfg->method_to_register, info);
+       mono_domain_unlock (domain);
+
+       g_ptr_array_free (cfg->seq_points, TRUE);
+       cfg->seq_points = NULL;
+}
+
 void
 mono_codegen (MonoCompile *cfg)
 {
@@ -2957,6 +3250,7 @@ mono_codegen (MonoCompile *cfg)
                bb->native_offset = cfg->code_len;
                //if ((bb == cfg->bb_entry) || !(bb->region == -1 && !bb->dfn))
                        mono_arch_output_basic_block (cfg, bb);
+               bb->native_length = cfg->code_len - bb->native_offset;
 
                if (bb == cfg->bb_exit) {
                        cfg->epilog_begin = cfg->code_len;
@@ -3050,7 +3344,7 @@ if (valgrind_register){
        } else {
                mono_domain_code_commit (cfg->domain, cfg->native_code, cfg->code_size, cfg->code_len);
        }
-       mono_profiler_code_buffer_new (code, cfg->code_len, MONO_PROFILER_CODE_BUFFER_METHOD, cfg->method);
+       mono_profiler_code_buffer_new (cfg->native_code, cfg->code_len, MONO_PROFILER_CODE_BUFFER_METHOD, cfg->method);
        
        mono_arch_flush_icache (cfg->native_code, cfg->code_len);
 
@@ -3073,111 +3367,499 @@ compute_reachable (MonoBasicBlock *bb)
        }
 }
 
-/*
- * mini_method_compile:
- * @method: the method to compile
- * @opts: the optimization flags to use
- * @domain: the domain where the method will be compiled in
- * @run_cctors: whether we should run type ctors if possible
- * @compile_aot: whether this is an AOT compilation
- * @parts: debug flag
- *
- * Returns: a MonoCompile* pointer. Caller must check the exception_type
- * field in the returned struct to see if compilation succeded.
- */
-MonoCompile*
-mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gboolean run_cctors, gboolean compile_aot, int parts)
+static MonoJitInfo*
+create_jit_info (MonoCompile *cfg, MonoMethod *method_to_compile)
 {
+       GSList *tmp;
        MonoMethodHeader *header;
-       guint8 *ip;
-       MonoCompile *cfg;
        MonoJitInfo *jinfo;
-       int dfn, i, code_size_ratio;
-       gboolean deadce_has_run = FALSE;
-       gboolean try_generic_shared, try_llvm;
-       MonoMethod *method_to_compile, *method_to_register;
+       int num_clauses;
        int generic_info_size;
+       int holes_size = 0, num_holes = 0;
 
-       mono_jit_stats.methods_compiled++;
-       if (mono_profiler_get_events () & MONO_PROFILE_JIT_COMPILATION)
-               mono_profiler_method_jit (method);
-       if (MONO_PROBE_METHOD_COMPILE_BEGIN_ENABLED ())
-               MONO_PROBE_METHOD_COMPILE_BEGIN (method);
-       if (compile_aot)
-               /* We are passed the original generic method definition */
-               try_generic_shared = mono_class_generic_sharing_enabled (method->klass) &&
-                       (opts & MONO_OPT_GSHARED) && (method->is_generic || method->klass->generic_container);
+       g_assert (method_to_compile == cfg->method);
+       header = cfg->header;
+
+       if (cfg->generic_sharing_context)
+               generic_info_size = sizeof (MonoGenericJitInfo);
        else
-               try_generic_shared = mono_class_generic_sharing_enabled (method->klass) &&
-                       (opts & MONO_OPT_GSHARED) && mono_method_is_generic_sharable_impl (method, FALSE);
+               generic_info_size = 0;
 
-       if (opts & MONO_OPT_GSHARED) {
-               if (try_generic_shared)
-                       mono_stats.generics_sharable_methods++;
-               else if (mono_method_is_generic_impl (method))
-                       mono_stats.generics_unsharable_methods++;
+       if (cfg->try_block_holes) {
+               for (tmp = cfg->try_block_holes; tmp; tmp = tmp->next) {
+                       TryBlockHole *hole = tmp->data;
+                       MonoExceptionClause *ec = hole->clause;
+                       int hole_end = hole->basic_block->native_offset + hole->basic_block->native_length;
+                       MonoBasicBlock *clause_last_bb = cfg->cil_offset_to_bb [ec->try_offset + ec->try_len];
+                       g_assert (clause_last_bb);
+
+                       /* Holes at the end of a try region can be represented by simply reducing the size of the block itself.*/
+                       if (clause_last_bb->native_offset != hole_end)
+                               ++num_holes;
+               }
+               if (num_holes)
+                       holes_size = sizeof (MonoTryBlockHoleTableJitInfo) + num_holes * sizeof (MonoTryBlockHoleJitInfo);
+               if (G_UNLIKELY (cfg->verbose_level >= 4))
+                       printf ("Number of try block holes %d\n", num_holes);
        }
 
-       try_llvm = TRUE;
+       if (COMPILE_LLVM (cfg))
+               num_clauses = cfg->llvm_ex_info_len;
+       else
+               num_clauses = header->num_clauses;
 
-#ifndef ENABLE_LLVM
-       try_llvm = FALSE;
-#endif
+       if (cfg->method->dynamic) {
+               jinfo = g_malloc0 (MONO_SIZEOF_JIT_INFO + (num_clauses * sizeof (MonoJitExceptionInfo)) +
+                               generic_info_size + holes_size);
+       } else {
+               jinfo = mono_domain_alloc0 (cfg->domain, MONO_SIZEOF_JIT_INFO +
+                               (num_clauses * sizeof (MonoJitExceptionInfo)) +
+                               generic_info_size + holes_size);
+       }
 
- restart_compile:
-       if (try_generic_shared) {
-               MonoMethod *declaring_method;
-               MonoGenericContext *shared_context;
+       jinfo->method = cfg->method_to_register;
+       jinfo->code_start = cfg->native_code;
+       jinfo->code_size = cfg->code_len;
+       jinfo->used_regs = cfg->used_int_regs;
+       jinfo->domain_neutral = (cfg->opt & MONO_OPT_SHARED) != 0;
+       jinfo->cas_inited = FALSE; /* initialization delayed at the first stalk walk using this method */
+       jinfo->num_clauses = num_clauses;
+       if (COMPILE_LLVM (cfg))
+               jinfo->from_llvm = TRUE;
 
-               if (compile_aot) {
-                       declaring_method = method;
-               } else {
-                       declaring_method = mono_method_get_declaring_generic_method (method);
-                       if (method->klass->generic_class)
-                               g_assert (method->klass->generic_class->container_class == declaring_method->klass);
-                       else
-                               g_assert (method->klass == declaring_method->klass);
-               }
+       if (cfg->generic_sharing_context) {
+               MonoInst *inst;
+               MonoGenericJitInfo *gi;
 
-               if (declaring_method->is_generic)
-                       shared_context = &(mono_method_get_generic_container (declaring_method)->context);
-               else
-                       shared_context = &declaring_method->klass->generic_container->context;
+               jinfo->has_generic_jit_info = 1;
 
-               method_to_compile = mono_class_inflate_generic_method (declaring_method, shared_context);
-               g_assert (method_to_compile);
-       } else {
-               method_to_compile = method;
-       }
+               gi = mono_jit_info_get_generic_jit_info (jinfo);
+               g_assert (gi);
 
-       cfg = g_new0 (MonoCompile, 1);
-       cfg->method = method_to_compile;
-       cfg->mempool = mono_mempool_new ();
-       cfg->opt = opts;
-       cfg->prof_options = mono_profiler_get_events ();
-       cfg->run_cctors = run_cctors;
-       cfg->domain = domain;
-       cfg->verbose_level = mini_verbose;
-       cfg->compile_aot = compile_aot;
-       cfg->skip_visibility = method->skip_visibility;
-       cfg->orig_method = method;
-       if (try_generic_shared)
-               cfg->generic_sharing_context = (MonoGenericSharingContext*)&cfg->generic_sharing_context;
-       cfg->compile_llvm = try_llvm;
-       cfg->token_info_hash = g_hash_table_new (NULL, NULL);
+               gi->generic_sharing_context = cfg->generic_sharing_context;
 
-       if (cfg->compile_aot && !try_generic_shared && (method->is_generic || method->klass->generic_container)) {
+               if ((method_to_compile->flags & METHOD_ATTRIBUTE_STATIC) ||
+                               mini_method_get_context (method_to_compile)->method_inst ||
+                               method_to_compile->klass->valuetype) {
+                       g_assert (cfg->rgctx_var);
+               }
+
+               gi->has_this = 1;
+
+               if ((method_to_compile->flags & METHOD_ATTRIBUTE_STATIC) ||
+                               mini_method_get_context (method_to_compile)->method_inst ||
+                               method_to_compile->klass->valuetype) {
+                       inst = cfg->rgctx_var;
+                       g_assert (inst->opcode == OP_REGOFFSET);
+               } else {
+                       inst = cfg->args [0];
+               }
+
+               if (inst->opcode == OP_REGVAR) {
+                       gi->this_in_reg = 1;
+                       gi->this_reg = inst->dreg;
+               } else {
+                       g_assert (inst->opcode == OP_REGOFFSET);
+#ifdef TARGET_X86
+                       g_assert (inst->inst_basereg == X86_EBP);
+#elif defined(TARGET_AMD64)
+                       g_assert (inst->inst_basereg == X86_EBP || inst->inst_basereg == X86_ESP);
+#endif
+                       g_assert (inst->inst_offset >= G_MININT32 && inst->inst_offset <= G_MAXINT32);
+
+                       gi->this_in_reg = 0;
+                       gi->this_reg = inst->inst_basereg;
+                       gi->this_offset = inst->inst_offset;
+               }
+       }
+
+       if (num_holes) {
+               MonoTryBlockHoleTableJitInfo *table;
+               int i;
+
+               jinfo->has_try_block_holes = 1;
+               table = mono_jit_info_get_try_block_hole_table_info (jinfo);
+               table->num_holes = (guint16)num_holes;
+               i = 0;
+               for (tmp = cfg->try_block_holes; tmp; tmp = tmp->next) {
+                       MonoTryBlockHoleJitInfo *hole;
+                       TryBlockHole *hole_data = tmp->data;
+                       MonoExceptionClause *ec = hole_data->clause;
+                       int hole_end = hole_data->basic_block->native_offset + hole_data->basic_block->native_length;
+                       MonoBasicBlock *clause_last_bb = cfg->cil_offset_to_bb [ec->try_offset + ec->try_len];
+                       g_assert (clause_last_bb);
+
+                       /* Holes at the end of a try region can be represented by simply reducing the size of the block itself.*/
+                       if (clause_last_bb->native_offset == hole_end)
+                               continue;
+
+                       hole = &table->holes [i++];
+                       hole->clause = hole_data->clause - &header->clauses [0];
+                       hole->offset = (guint32)hole_data->start_offset;
+                       hole->length = (guint16)(hole_data->basic_block->native_length - hole_data->start_offset);
+               }
+               g_assert (i == num_holes);
+       }
+
+       if (G_UNLIKELY (header->num_clauses && cfg->verbose_level >= 4)) {
+               GSList *tmp;
+               int i;
+               printf ("\nException Handling Data\n");
+               for (i = 0; i < header->num_clauses; i++) {
+                       MonoExceptionClause *ec = &header->clauses [i];
+                       int try_start = cfg->cil_offset_to_bb [ec->try_offset]->native_offset;
+                       int try_end  = cfg->cil_offset_to_bb [ec->try_offset + ec->try_len]->native_offset;
+                       int handler_start = cfg->cil_offset_to_bb [ec->handler_offset]->native_offset;
+                       int handler_end;
+                       if (ec->handler_offset + ec->handler_len < header->code_size)
+                               handler_end =  cfg->cil_offset_to_bb [ec->handler_offset + ec->handler_len]->native_offset;
+                       else
+                               handler_end = cfg->epilog_begin;
+
+                       printf ("EH clause %d flags %x try IL %x-%x NATIVE %x-%x handler IL %x-%x NATIVE %x-%x\n",
+                               i, ec->flags,
+                               ec->try_offset, ec->try_offset + ec->try_len, try_start, try_end,
+                               ec->handler_offset, ec->handler_offset + ec->handler_len, handler_start, handler_end);
+               }
+               for (tmp = cfg->try_block_holes; tmp; tmp = tmp->next) {
+                       TryBlockHole *hole = tmp->data;
+                       int block = hole->clause - &header->clauses [0];
+                       printf ("try block hole at eh clause %d range %x-%x\n",
+                               block, hole->start_offset, hole->basic_block->native_offset + hole->basic_block->native_length);
+               }
+       }
+
+       if (COMPILE_LLVM (cfg)) {
+               if (num_clauses)
+                       memcpy (&jinfo->clauses [0], &cfg->llvm_ex_info [0], num_clauses * sizeof (MonoJitExceptionInfo));
+       } else if (header->num_clauses) {
+               int i;
+
+               for (i = 0; i < header->num_clauses; i++) {
+                       MonoExceptionClause *ec = &header->clauses [i];
+                       MonoJitExceptionInfo *ei = &jinfo->clauses [i];
+                       MonoBasicBlock *tblock;
+                       MonoInst *exvar;
+
+                       ei->flags = ec->flags;
+
+                       exvar = mono_find_exvar_for_offset (cfg, ec->handler_offset);
+                       ei->exvar_offset = exvar ? exvar->inst_offset : 0;
+
+                       if (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER) {
+                               tblock = cfg->cil_offset_to_bb [ec->data.filter_offset];
+                               g_assert (tblock);
+                               ei->data.filter = cfg->native_code + tblock->native_offset;
+                       } else {
+                               ei->data.catch_class = ec->data.catch_class;
+                       }
+
+                       tblock = cfg->cil_offset_to_bb [ec->try_offset];
+                       g_assert (tblock);
+                       ei->try_start = cfg->native_code + tblock->native_offset;
+                       g_assert (tblock->native_offset);
+                       tblock = cfg->cil_offset_to_bb [ec->try_offset + ec->try_len];
+                       g_assert (tblock);
+                       ei->try_end = cfg->native_code + tblock->native_offset;
+                       g_assert (tblock->native_offset);
+                       tblock = cfg->cil_offset_to_bb [ec->handler_offset];
+                       g_assert (tblock);
+                       ei->handler_start = cfg->native_code + tblock->native_offset;
+
+                       for (tmp = cfg->try_block_holes; tmp; tmp = tmp->next) {
+                               TryBlockHole *hole = tmp->data;
+                               gpointer hole_end = cfg->native_code + (hole->basic_block->native_offset + hole->basic_block->native_length);
+                               if (hole->clause == ec && hole_end == ei->try_end) {
+                                       if (G_UNLIKELY (cfg->verbose_level >= 4))
+                                               printf ("\tShortening try block %d from %p to %p\n", i, ei->try_end, cfg->native_code + hole->start_offset);
+                                       ei->try_end = cfg->native_code + hole->start_offset;
+                                       break;
+                               }
+                       }
+               }
+
+               if (G_UNLIKELY (cfg->verbose_level >= 4)) {
+                       for (i = 0; i < jinfo->num_clauses; i++) {
+                               MonoJitExceptionInfo *ei = &jinfo->clauses [i];
+                               printf ("JitInfo EH clause %d flags %x try %p-%p handler %p\n", i, ei->flags, ei->try_start, ei->try_end, ei->handler_start);
+                       }
+               }
+
+       }
+
+       /* 
+        * Its possible to generate dwarf unwind info for xdebug etc, but not actually
+        * using it during runtime, hence the define.
+        */
+#ifdef MONO_ARCH_HAVE_XP_UNWIND
+       if (cfg->encoded_unwind_ops) {
+               jinfo->used_regs = mono_cache_unwind_info (cfg->encoded_unwind_ops, cfg->encoded_unwind_ops_len);
+               g_free (cfg->encoded_unwind_ops);
+       } else if (cfg->unwind_ops) {
+               guint32 info_len;
+               guint8 *unwind_info = mono_unwind_ops_encode (cfg->unwind_ops, &info_len);
+
+               jinfo->used_regs = mono_cache_unwind_info (unwind_info, info_len);
+               g_free (unwind_info);
+       }
+#endif
+
+       return jinfo;
+}
+
+/*
+ * mini_get_shared_method:
+ *
+ *   Return the method which is actually compiled/registered when doing generic sharing.
+ */
+MonoMethod*
+mini_get_shared_method (MonoMethod *method)
+{
+       MonoGenericContext shared_context;
+       MonoMethod *declaring_method, *res;
+       int i;
+       gboolean partial = FALSE;
+
+       if (method->is_generic || method->klass->generic_container)
+               declaring_method = method;
+       else
+               declaring_method = mono_method_get_declaring_generic_method (method);
+
+       if (declaring_method->is_generic)
+               shared_context = mono_method_get_generic_container (declaring_method)->context;
+       else
+               shared_context = declaring_method->klass->generic_container->context;
+
+       /* Handle partial sharing */
+       if (method != declaring_method && method->is_inflated && !mono_method_is_generic_sharable_impl_full (method, FALSE, FALSE)) {
+               MonoGenericContext *context = mono_method_get_context (method);
+               MonoGenericInst *inst;
+               MonoType **type_argv;
+
+               /* 
+                * Create the shared context by replacing the ref type arguments with
+                * type parameters, and keeping the rest.
+                */
+               partial = TRUE;
+               inst = context->class_inst;
+               if (inst) {
+                       type_argv = g_new0 (MonoType*, inst->type_argc);
+                       for (i = 0; i < inst->type_argc; ++i) {
+                               if (MONO_TYPE_IS_REFERENCE (inst->type_argv [i]) || inst->type_argv [i]->type == MONO_TYPE_VAR || inst->type_argv [i]->type == MONO_TYPE_MVAR)
+                                       type_argv [i] = shared_context.class_inst->type_argv [i];
+                               else
+                                       type_argv [i] = inst->type_argv [i];
+                       }
+
+                       shared_context.class_inst = mono_metadata_get_generic_inst (inst->type_argc, type_argv);
+                       g_free (type_argv);
+               }
+
+               inst = context->method_inst;
+               if (inst) {
+                       type_argv = g_new0 (MonoType*, inst->type_argc);
+                       for (i = 0; i < inst->type_argc; ++i) {
+                               if (MONO_TYPE_IS_REFERENCE (inst->type_argv [i]) || inst->type_argv [i]->type == MONO_TYPE_VAR || inst->type_argv [i]->type == MONO_TYPE_MVAR)
+                                       type_argv [i] = shared_context.method_inst->type_argv [i];
+                               else
+                                       type_argv [i] = inst->type_argv [i];
+                       }
+
+                       shared_context.method_inst = mono_metadata_get_generic_inst (inst->type_argc, type_argv);
+                       g_free (type_argv);
+               }
+       }
+
+    res = mono_class_inflate_generic_method (declaring_method, &shared_context);
+       if (!partial) {
+               /* The result should be an inflated method whose parent is not inflated */
+               g_assert (!res->klass->is_inflated);
+       }
+       return res;
+}
+
+/*
+ * mini_method_compile:
+ * @method: the method to compile
+ * @opts: the optimization flags to use
+ * @domain: the domain where the method will be compiled in
+ * @run_cctors: whether we should run type ctors if possible
+ * @compile_aot: whether this is an AOT compilation
+ * @parts: debug flag
+ *
+ * Returns: a MonoCompile* pointer. Caller must check the exception_type
+ * field in the returned struct to see if compilation succeded.
+ */
+MonoCompile*
+mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gboolean run_cctors, gboolean compile_aot, int parts)
+{
+       MonoMethodHeader *header;
+       MonoMethodSignature *sig;
+       MonoError err;
+       guint8 *ip;
+       MonoCompile *cfg;
+       int dfn, i, code_size_ratio;
+       gboolean deadce_has_run = FALSE;
+       gboolean try_generic_shared, try_llvm;
+       MonoMethod *method_to_compile, *method_to_register;
+
+       mono_jit_stats.methods_compiled++;
+       if (mono_profiler_get_events () & MONO_PROFILE_JIT_COMPILATION)
+               mono_profiler_method_jit (method);
+       if (MONO_PROBE_METHOD_COMPILE_BEGIN_ENABLED ())
+               MONO_PROBE_METHOD_COMPILE_BEGIN (method);
+       if (compile_aot)
+               /* 
+                * We might get passed the original generic method definition or
+                * instances with type parameters.
+                * FIXME: Remove the method->klass->generic_class limitation.
+                */
+               try_generic_shared = mono_class_generic_sharing_enabled (method->klass) &&
+                       (opts & MONO_OPT_GSHARED) && ((method->is_generic || method->klass->generic_container) || (!method->klass->generic_class && mono_method_is_generic_sharable_impl (method, TRUE)));
+       else
+               try_generic_shared = mono_class_generic_sharing_enabled (method->klass) &&
+                       (opts & MONO_OPT_GSHARED) && mono_method_is_generic_sharable_impl (method, FALSE);
+
+       if (opts & MONO_OPT_GSHARED) {
+               if (try_generic_shared)
+                       mono_stats.generics_sharable_methods++;
+               else if (mono_method_is_generic_impl (method))
+                       mono_stats.generics_unsharable_methods++;
+       }
+
+       try_llvm = TRUE;
+
+#ifndef ENABLE_LLVM
+       try_llvm = FALSE;
+#endif
+
+ restart_compile:
+       if (try_generic_shared) {
+               method_to_compile = mini_get_shared_method (method);
+               g_assert (method_to_compile);
+       } else {
+               method_to_compile = method;
+       }
+
+       cfg = g_new0 (MonoCompile, 1);
+       cfg->method = method_to_compile;
+       cfg->header = mono_method_get_header (cfg->method);
+       cfg->mempool = mono_mempool_new ();
+       cfg->opt = opts;
+       cfg->prof_options = mono_profiler_get_events ();
+       cfg->run_cctors = run_cctors;
+       cfg->domain = domain;
+       cfg->verbose_level = mini_verbose;
+       cfg->compile_aot = compile_aot;
+       cfg->skip_visibility = method->skip_visibility;
+       cfg->orig_method = method;
+       cfg->gen_seq_points = debug_options.gen_seq_points;
+       cfg->explicit_null_checks = debug_options.explicit_null_checks;
+       if (try_generic_shared)
+               cfg->generic_sharing_context = (MonoGenericSharingContext*)&cfg->generic_sharing_context;
+       cfg->compile_llvm = try_llvm;
+       cfg->token_info_hash = g_hash_table_new (NULL, NULL);
+
+       if (cfg->gen_seq_points)
+               cfg->seq_points = g_ptr_array_new ();
+
+       if (cfg->compile_aot && !try_generic_shared && (method->is_generic || method->klass->generic_container)) {
                cfg->exception_type = MONO_EXCEPTION_GENERIC_SHARING_FAILED;
                return cfg;
        }
 
-       /* No way to obtain the location info for 'this' */
-       if (try_generic_shared) {
-               cfg->exception_message = g_strdup ("gshared");
+       if (cfg->generic_sharing_context) {
+               method_to_register = method_to_compile;
+       } else {
+               g_assert (method == method_to_compile);
+               method_to_register = method;
+       }
+       cfg->method_to_register = method_to_register;
+
+       if (cfg->compile_llvm) {
+               /* No way to obtain the location info for 'this' */
+               if (try_generic_shared) {
+                       cfg->exception_message = g_strdup ("gshared");
+                       cfg->disable_llvm = TRUE;
+               }
+
+               if (cfg->method->save_lmf) {
+                       cfg->exception_message = g_strdup ("lmf");
+                       cfg->disable_llvm = TRUE;
+               }
+
+               /* FIXME: */
+               if (cfg->method->dynamic) {
+                       cfg->exception_message = g_strdup ("dynamic.");
+                       cfg->disable_llvm = TRUE;
+               }
+       }
+
+       mono_error_init (&err);
+       sig = mono_method_signature_checked (cfg->method, &err);        
+       if (!sig) {
+               cfg->exception_type = MONO_EXCEPTION_TYPE_LOAD;
+               cfg->exception_message = g_strdup (mono_error_get_message (&err));
+               mono_error_cleanup (&err);
+               return cfg;
+               if (MONO_PROBE_METHOD_COMPILE_END_ENABLED ())
+                       MONO_PROBE_METHOD_COMPILE_END (method, FALSE);
+       }
+
+       header = cfg->header;
+       if (!header) {
+               MonoLoaderError *error;
+
+               if ((error = mono_loader_get_last_error ())) {
+                       cfg->exception_type = error->exception_type;
+               } else {
+                       cfg->exception_type = MONO_EXCEPTION_INVALID_PROGRAM;
+                       cfg->exception_message = g_strdup_printf ("Missing or incorrect header for method %s", cfg->method->name);
+               }
+               if (MONO_PROBE_METHOD_COMPILE_END_ENABLED ())
+                       MONO_PROBE_METHOD_COMPILE_END (method, FALSE);
+               return cfg;
+       }
+
+       if (FALSE && header->clauses) {
+               /* 
+                * Cannot be enabled until LLVM supports implicit exceptions, or we use
+                * explicit checks, or we disable this for methods which might throw implicit
+                * exceptions inside clauses.
+                */
+               cfg->exception_message = g_strdup ("clauses");
                cfg->disable_llvm = TRUE;
        }
 
+#ifdef ENABLE_LLVM
+       {
+               static gboolean inited;
+
+               if (!inited) {
+                       mono_counters_register ("Methods JITted using LLVM", MONO_COUNTER_JIT | MONO_COUNTER_INT, &methods_with_llvm);  
+                       mono_counters_register ("Methods JITted using mono JIT", MONO_COUNTER_JIT | MONO_COUNTER_INT, &methods_without_llvm);
+                       inited = TRUE;
+               }
+       
+               /* 
+                * Check for methods which cannot be compiled by LLVM early, to avoid
+                * the extra compilation pass.
+                */
+               if (COMPILE_LLVM (cfg) && cfg->disable_llvm) {
+                       if (cfg->verbose_level >= 1) {
+                               //nm = mono_method_full_name (cfg->method, TRUE);
+                               printf ("LLVM failed for '%s': %s\n", method->name, cfg->exception_message);
+                               //g_free (nm);
+                       }
+                       InterlockedIncrement (&methods_without_llvm);
+                       mono_destroy_compile (cfg);
+                       try_llvm = FALSE;
+                       goto restart_compile;
+               }
+       }
+#endif
+
        /* The debugger has no liveness information, so avoid sharing registers/stack slots */
        if (mono_debug_using_mono_debugger () || debug_options.mdb_optimizations) {
                cfg->disable_reuse_registers = TRUE;
@@ -3188,6 +3870,8 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
                 */
                cfg->disable_initlocals_opt = TRUE;
 
+               cfg->extend_live_ranges = TRUE;
+
                /* Temporarily disable this when running in the debugger until we have support
                 * for this in the debugger. */
                cfg->disable_omit_fp = TRUE;
@@ -3205,6 +3889,9 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
                cfg->opt &= ~MONO_OPT_COPYPROP;
                cfg->opt &= ~MONO_OPT_CONSPROP;
                cfg->opt &= ~MONO_OPT_GSHARED;
+
+               /* This is needed for the soft debugger, which doesn't like code after the epilog */
+               cfg->disable_out_of_line_bblocks = TRUE;
        }
 
        if (mono_using_xdebug) {
@@ -3216,32 +3903,30 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
                cfg->disable_reuse_registers = TRUE;
                cfg->disable_reuse_stack_slots = TRUE;
                cfg->extend_live_ranges = TRUE;
+               cfg->compute_precise_live_ranges = TRUE;
        }
 
+       mini_gc_init_gc_map (cfg);
+
        if (COMPILE_LLVM (cfg)) {
                cfg->opt |= MONO_OPT_ABCREM;
        }
 
-       header = mono_method_get_header (method_to_compile);
-       if (!header) {
-               MonoLoaderError *error;
+       if (getenv ("MONO_VERBOSE_METHOD")) {
+               char *name = getenv ("MONO_VERBOSE_METHOD");
 
-               if ((error = mono_loader_get_last_error ())) {
-                       cfg->exception_type = error->exception_type;
+               if ((strchr (name, '.') > name) || strchr (name, ':')) {
+                       MonoMethodDesc *desc;
+                       
+                       desc = mono_method_desc_new (name, TRUE);
+                       if (mono_method_desc_full_match (desc, cfg->method)) {
+                               cfg->verbose_level = 4;
+                       }
+                       mono_method_desc_free (desc);
                } else {
-                       cfg->exception_type = MONO_EXCEPTION_INVALID_PROGRAM;
-                       cfg->exception_message = g_strdup_printf ("Missing or incorrect header for method %s", cfg->method->name);
+                       if (strcmp (cfg->method->name, getenv ("MONO_VERBOSE_METHOD")) == 0)
+                               cfg->verbose_level = 4;
                }
-               if (MONO_PROBE_METHOD_COMPILE_END_ENABLED ())
-                       MONO_PROBE_METHOD_COMPILE_END (method, FALSE);
-               if (cfg->prof_options & MONO_PROFILE_JIT_COMPILATION)
-                       mono_profiler_method_end_jit (method, NULL, MONO_PROFILE_FAILED);
-               return cfg;
-       }
-
-       if (getenv ("MONO_VERBOSE_METHOD")) {
-               if (strcmp (cfg->method->name, getenv ("MONO_VERBOSE_METHOD")) == 0)
-                       cfg->verbose_level = 4;
        }
 
        ip = (guint8 *)header->code;
@@ -3252,7 +3937,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
                if (COMPILE_LLVM (cfg))
                        g_print ("converting llvm method %s\n", mono_method_full_name (method, TRUE));
                else if (cfg->generic_sharing_context)
-                       g_print ("converting shared method %s\n", mono_method_full_name (method, TRUE));
+                       g_print ("converting shared method %s\n", mono_method_full_name (method_to_compile, TRUE));
                else
                        g_print ("converting method %s\n", mono_method_full_name (method, TRUE));
        }
@@ -3322,6 +4007,10 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
         */
        //cfg->enable_extended_bblocks = TRUE;
 
+       /*We must verify the method before doing any IR generation as mono_compile_create_vars can assert.*/
+       if (mono_compile_is_broken (cfg))
+               return cfg;
+
        /*
         * create MonoInst* which represents arguments and local variables
         */
@@ -3347,8 +4036,6 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
 
                if (MONO_PROBE_METHOD_COMPILE_END_ENABLED ())
                        MONO_PROBE_METHOD_COMPILE_END (method, FALSE);
-               if (cfg->prof_options & MONO_PROFILE_JIT_COMPILATION)
-                       mono_profiler_method_end_jit (method, NULL, MONO_PROFILE_FAILED);
                /* cfg contains the details of the failure, so let the caller cleanup */
                return cfg;
        }
@@ -3380,6 +4067,22 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
                cfg->opt &= ~MONO_OPT_BRANCH;
        }
 
+       /* todo: remove code when we have verified that the liveness for try/catch blocks
+        * works perfectly 
+        */
+       /* 
+        * Currently, this can't be commented out since exception blocks are not
+        * processed during liveness analysis.
+        * It is also needed, because otherwise the local optimization passes would
+        * delete assignments in cases like this:
+        * r1 <- 1
+        * <something which throws>
+        * r1 <- 2
+        * This also allows SSA to be run on methods containing exception clauses, since
+        * SSA will ignore variables marked VOLATILE.
+        */
+       mono_liveness_handle_exception_clauses (cfg);
+
        /*g_print ("numblocks = %d\n", cfg->num_bblocks);*/
 
        if (!COMPILE_LLVM (cfg))
@@ -3406,6 +4109,8 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
        /* Depth-first ordering on basic blocks */
        cfg->bblocks = mono_mempool_alloc (cfg->mempool, sizeof (MonoBasicBlock*) * (cfg->num_bblocks + 1));
 
+       cfg->max_block_num = cfg->num_bblocks;
+
        dfn = 0;
        df_visit (cfg->bb_entry, &dfn, cfg->bblocks);
        if (cfg->num_bblocks != dfn + 1) {
@@ -3426,6 +4131,8 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
                                if (cfg->verbose_level > 1)
                                        g_print ("found unreachable code in BB%d\n", bb->block_num);
                                bb->code = bb->last_ins = NULL;
+                               while (bb->out_count)
+                                       mono_unlink_bblock (cfg, bb, bb->out_bb [0]);
                        }
                }
                for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
@@ -3454,11 +4161,16 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
                return cfg;
        }
 
+       /*
+         if (header->num_clauses)
+         cfg->disable_ssa = TRUE;
+       */
+
 //#define DEBUGSSA "logic_run"
 #define DEBUGSSA_CLASS "Tests"
 #ifdef DEBUGSSA
 
-       if (!header->num_clauses && !cfg->disable_ssa) {
+       if (!cfg->disable_ssa) {
                mono_local_cprop (cfg);
 
 #ifndef DISABLE_SSA
@@ -3467,7 +4179,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
        }
 #else 
        if (cfg->opt & MONO_OPT_SSA) {
-               if (!(cfg->comp_done & MONO_COMP_SSA) && !header->num_clauses && !cfg->disable_ssa) {
+               if (!(cfg->comp_done & MONO_COMP_SSA) && !cfg->disable_ssa) {
 #ifndef DISABLE_SSA
                        mono_ssa_compute (cfg);
 #endif
@@ -3553,7 +4265,8 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
        }
 
 #ifdef MONO_ARCH_SOFT_FLOAT
-       mono_decompose_soft_float (cfg);
+       if (!COMPILE_LLVM (cfg))
+               mono_decompose_soft_float (cfg);
 #endif
        if (!COMPILE_LLVM (cfg))
                mono_decompose_vtype_opts (cfg);
@@ -3581,12 +4294,8 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
                g_list_free (regs);
        }
 
-       /* todo: remove code when we have verified that the liveness for try/catch blocks
-        * works perfectly 
-        */
-       /* 
-        * Currently, this can't be commented out since exception blocks are not
-        * processed during liveness analysis.
+       /*
+        * Have to call this again to process variables added since the first call.
         */
        mono_liveness_handle_exception_clauses (cfg);
 
@@ -3621,8 +4330,11 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
     //print_dfn (cfg);
        
        /* variables are allocated after decompose, since decompose could create temps */
-       if (!cfg->globalra && !COMPILE_LLVM (cfg))
+       if (!cfg->globalra && !COMPILE_LLVM (cfg)) {
                mono_arch_allocate_vars (cfg);
+               if (cfg->exception_type)
+                       return cfg;
+       }
 
        {
                MonoBasicBlock *bb;
@@ -3664,214 +4376,69 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
                if (cfg->verbose_level >= 4 && !cfg->globalra) {
                        for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
                                MonoInst *tree = bb->code;      
-                               g_print ("DUMP BLOCK %d:\n", bb->block_num);
-                               if (!tree)
-                                       continue;
-                               for (; tree; tree = tree->next) {
-                                       mono_print_ins_index (-1, tree);
-                               }
-                       }
-               }
-
-               /* FIXME: */
-               for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
-                       bb->max_vreg = cfg->next_vreg;
-               }
-       }
-
-       if (COMPILE_LLVM (cfg)) {
-#ifdef ENABLE_LLVM
-               char *nm;
-               static gboolean inited;
-
-               if (!inited) {
-                       mono_counters_register ("Methods JITted using LLVM", MONO_COUNTER_JIT | MONO_COUNTER_INT, &methods_with_llvm);  
-                       mono_counters_register ("Methods JITted without using LLVM", MONO_COUNTER_JIT | MONO_COUNTER_INT, &methods_without_llvm);
-                       inited = TRUE;
-               }
-
-               /* The IR has to be in SSA form for LLVM */
-               if (!(cfg->comp_done & MONO_COMP_SSA)) {
-                       cfg->exception_message = g_strdup ("SSA disabled.");
-                       cfg->disable_llvm = TRUE;
-               }
-
-               /* FIXME: */
-               if (cfg->method->dynamic) {
-                       cfg->exception_message = g_strdup ("dynamic.");
-                       cfg->disable_llvm = TRUE;
-               }
-
-               if (cfg->flags & MONO_CFG_HAS_ARRAY_ACCESS)
-                       mono_decompose_array_access_opts (cfg);
-
-               if (!cfg->disable_llvm)
-                       mono_llvm_emit_method (cfg);
-               if (cfg->disable_llvm) {
-                       if (cfg->verbose_level >= 2) {
-                               //nm = mono_method_full_name (cfg->method, TRUE);
-                               printf ("LLVM failed for '%s': %s\n", method->name, cfg->exception_message);
-                               //g_free (nm);
-                       }
-                       InterlockedIncrement (&methods_without_llvm);
-                       mono_destroy_compile (cfg);
-                       try_llvm = FALSE;
-                       goto restart_compile;
-               }
-
-               InterlockedIncrement (&methods_with_llvm);
-
-               if (cfg->verbose_level > 0) {
-                       nm = mono_method_full_name (cfg->method, TRUE);
-                       g_print ("LLVM Method %s emitted at %p to %p (code length %d) [%s]\n", 
-                                        nm, 
-                                        cfg->native_code, cfg->native_code + cfg->code_len, cfg->code_len, cfg->domain->friendly_name);
-                       g_free (nm);
-               }
-#endif
-       } else {
-               mono_codegen (cfg);
-       }
-
-       if (cfg->verbose_level >= 2) {
-               char *id =  mono_method_full_name (cfg->method, FALSE);
-               mono_disassemble_code (cfg, cfg->native_code, cfg->code_len, id + 3);
-               g_free (id);
-       }
-
-       if (cfg->generic_sharing_context)
-               generic_info_size = sizeof (MonoGenericJitInfo);
-       else
-               generic_info_size = 0;
-
-       if (cfg->method->dynamic) {
-               jinfo = g_malloc0 (MONO_SIZEOF_JIT_INFO + (header->num_clauses * sizeof (MonoJitExceptionInfo)) +
-                               generic_info_size);
-       } else {
-               jinfo = mono_domain_alloc0 (cfg->domain, MONO_SIZEOF_JIT_INFO +
-                               (header->num_clauses * sizeof (MonoJitExceptionInfo)) +
-                               generic_info_size);
-       }
-
-       if (cfg->generic_sharing_context) {
-               MonoGenericContext object_context = mono_method_construct_object_context (method_to_compile);
-
-               method_to_register = mono_class_inflate_generic_method (method_to_compile, &object_context);
-       } else {
-               g_assert (method == method_to_compile);
-               method_to_register = method;
-       }
-
-       jinfo->method = method_to_register;
-       jinfo->code_start = cfg->native_code;
-       jinfo->code_size = cfg->code_len;
-       jinfo->used_regs = cfg->used_int_regs;
-       jinfo->domain_neutral = (cfg->opt & MONO_OPT_SHARED) != 0;
-       jinfo->cas_inited = FALSE; /* initialization delayed at the first stalk walk using this method */
-       jinfo->num_clauses = header->num_clauses;
-       if (COMPILE_LLVM (cfg))
-               jinfo->from_llvm = TRUE;
-
-       if (cfg->generic_sharing_context) {
-               MonoInst *inst;
-               MonoGenericJitInfo *gi;
-
-               jinfo->has_generic_jit_info = 1;
-
-               gi = mono_jit_info_get_generic_jit_info (jinfo);
-               g_assert (gi);
-
-               gi->generic_sharing_context = cfg->generic_sharing_context;
-
-               if ((method_to_compile->flags & METHOD_ATTRIBUTE_STATIC) ||
-                               mini_method_get_context (method_to_compile)->method_inst ||
-                               method_to_compile->klass->valuetype) {
-                       g_assert (cfg->rgctx_var);
-               }
-
-               gi->has_this = 1;
-
-               if ((method_to_compile->flags & METHOD_ATTRIBUTE_STATIC) ||
-                               mini_method_get_context (method_to_compile)->method_inst ||
-                               method_to_compile->klass->valuetype) {
-                       inst = cfg->rgctx_var;
-                       g_assert (inst->opcode == OP_REGOFFSET);
-               } else {
-                       inst = cfg->args [0];
+                               g_print ("DUMP BLOCK %d:\n", bb->block_num);
+                               if (!tree)
+                                       continue;
+                               for (; tree; tree = tree->next) {
+                                       mono_print_ins_index (-1, tree);
+                               }
+                       }
                }
 
-               if (inst->opcode == OP_REGVAR) {
-                       gi->this_in_reg = 1;
-                       gi->this_reg = inst->dreg;
-               } else {
-                       g_assert (inst->opcode == OP_REGOFFSET);
-#ifdef TARGET_X86
-                       g_assert (inst->inst_basereg == X86_EBP);
-#elif defined(TARGET_AMD64)
-                       g_assert (inst->inst_basereg == X86_EBP || inst->inst_basereg == X86_ESP);
-#endif
-                       g_assert (inst->inst_offset >= G_MININT32 && inst->inst_offset <= G_MAXINT32);
-
-                       gi->this_in_reg = 0;
-                       gi->this_reg = inst->inst_basereg;
-                       gi->this_offset = inst->inst_offset;
+               /* FIXME: */
+               for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
+                       bb->max_vreg = cfg->next_vreg;
                }
        }
 
-       if (header->num_clauses) {
-               int i;
-
-               for (i = 0; i < header->num_clauses; i++) {
-                       MonoExceptionClause *ec = &header->clauses [i];
-                       MonoJitExceptionInfo *ei = &jinfo->clauses [i];
-                       MonoBasicBlock *tblock;
-                       MonoInst *exvar;
+       if (COMPILE_LLVM (cfg)) {
+#ifdef ENABLE_LLVM
+               char *nm;
 
-                       ei->flags = ec->flags;
+               /* The IR has to be in SSA form for LLVM */
+               if (!(cfg->comp_done & MONO_COMP_SSA)) {
+                       cfg->exception_message = g_strdup ("SSA disabled.");
+                       cfg->disable_llvm = TRUE;
+               }
 
-                       exvar = mono_find_exvar_for_offset (cfg, ec->handler_offset);
-                       ei->exvar_offset = exvar ? exvar->inst_offset : 0;
+               if (cfg->flags & MONO_CFG_HAS_ARRAY_ACCESS)
+                       mono_decompose_array_access_opts (cfg);
 
-                       if (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER) {
-                               tblock = cfg->cil_offset_to_bb [ec->data.filter_offset];
-                               g_assert (tblock);
-                               ei->data.filter = cfg->native_code + tblock->native_offset;
-                       } else {
-                               ei->data.catch_class = ec->data.catch_class;
+               if (!cfg->disable_llvm)
+                       mono_llvm_emit_method (cfg);
+               if (cfg->disable_llvm) {
+                       if (cfg->verbose_level >= 1) {
+                               //nm = mono_method_full_name (cfg->method, TRUE);
+                               printf ("LLVM failed for '%s': %s\n", method->name, cfg->exception_message);
+                               //g_free (nm);
                        }
+                       InterlockedIncrement (&methods_without_llvm);
+                       mono_destroy_compile (cfg);
+                       try_llvm = FALSE;
+                       goto restart_compile;
+               }
 
-                       tblock = cfg->cil_offset_to_bb [ec->try_offset];
-                       g_assert (tblock);
-                       ei->try_start = cfg->native_code + tblock->native_offset;
-                       g_assert (tblock->native_offset);
-                       tblock = cfg->cil_offset_to_bb [ec->try_offset + ec->try_len];
-                       g_assert (tblock);
-                       ei->try_end = cfg->native_code + tblock->native_offset;
-                       g_assert (tblock->native_offset);
-                       tblock = cfg->cil_offset_to_bb [ec->handler_offset];
-                       g_assert (tblock);
-                       ei->handler_start = cfg->native_code + tblock->native_offset;
+               InterlockedIncrement (&methods_with_llvm);
+
+               if (cfg->verbose_level > 0 && !cfg->compile_aot) {
+                       nm = mono_method_full_name (cfg->method, TRUE);
+                       g_print ("LLVM Method %s emitted at %p to %p (code length %d) [%s]\n", 
+                                        nm, 
+                                        cfg->native_code, cfg->native_code + cfg->code_len, cfg->code_len, cfg->domain->friendly_name);
+                       g_free (nm);
                }
+#endif
+       } else {
+               mono_codegen (cfg);
        }
 
-       /* 
-        * Its possible to generate dwarf unwind info for xdebug etc, but not actually
-        * using it during runtime, hence the define.
-        */
-#ifdef MONO_ARCH_HAVE_XP_UNWIND
-       if (cfg->encoded_unwind_ops) {
-               jinfo->used_regs = mono_cache_unwind_info (cfg->encoded_unwind_ops, cfg->encoded_unwind_ops_len);
-               g_free (cfg->encoded_unwind_ops);
-       } else if (cfg->unwind_ops) {
-               guint32 info_len;
-               guint8 *unwind_info = mono_unwind_ops_encode (cfg->unwind_ops, &info_len);
-
-               jinfo->used_regs = mono_cache_unwind_info (unwind_info, info_len);
-               g_free (unwind_info);
+       if (cfg->verbose_level >= 2) {
+               char *id =  mono_method_full_name (cfg->method, FALSE);
+               mono_disassemble_code (cfg, cfg->native_code, cfg->code_len, id + 3);
+               g_free (id);
        }
-#endif
 
-       cfg->jit_info = jinfo;
+       cfg->jit_info = create_jit_info (cfg, method_to_compile);
 
 #ifdef MONO_ARCH_HAVE_LIVERANGE_OPS
        if (cfg->extend_live_ranges) {
@@ -3884,13 +4451,15 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
        mono_save_xdebug_info (cfg);
 
        mini_gc_create_gc_map (cfg);
+       mono_save_seq_point_info (cfg);
 
        if (!cfg->compile_aot) {
                mono_domain_lock (cfg->domain);
-               mono_jit_info_table_add (cfg->domain, jinfo);
+               mono_jit_info_table_add (cfg->domain, cfg->jit_info);
 
                if (cfg->method->dynamic)
-                       mono_dynamic_code_hash_lookup (cfg->domain, cfg->method)->ji = jinfo;
+                       mono_dynamic_code_hash_lookup (cfg->domain, cfg->method)->ji = cfg->jit_info;
                mono_domain_unlock (cfg->domain);
        }
 
@@ -3904,7 +4473,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
                g_free (mono_jit_stats.biggest_method);
                mono_jit_stats.biggest_method = g_strdup_printf ("%s::%s)", method->klass->name, method->name);
        }
-       code_size_ratio = (code_size_ratio * 100) / mono_method_get_header (method)->code_size;
+       code_size_ratio = (code_size_ratio * 100) / header->code_size;
        if (code_size_ratio > mono_jit_stats.max_code_size_ratio && mono_jit_stats.enabled) {
                mono_jit_stats.max_code_size_ratio = code_size_ratio;
                g_free (mono_jit_stats.max_ratio_method);
@@ -3914,8 +4483,6 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
 
        if (MONO_PROBE_METHOD_COMPILE_END_ENABLED ())
                MONO_PROBE_METHOD_COMPILE_END (method, TRUE);
-       if (cfg->prof_options & MONO_PROFILE_JIT_COMPILATION)
-               mono_profiler_method_end_jit (method, jinfo, MONO_PROFILE_OK);
 
        return cfg;
 }
@@ -3931,17 +4498,29 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
 
 #endif /* DISABLE_JIT */
 
-static MonoJitInfo*
-lookup_generic_method (MonoDomain *domain, MonoMethod *method)
+MonoJitInfo*
+mono_domain_lookup_shared_generic (MonoDomain *domain, MonoMethod *method)
 {
-       MonoMethod *open_method;
+       static gboolean inited = FALSE;
+       static int lookups = 0;
+       static int failed_lookups = 0;
+       MonoJitInfo *ji;
 
-       if (!mono_method_is_generic_sharable_impl (method, FALSE))
-               return NULL;
+       ji = mono_internal_hash_table_lookup (&domain->jit_code_hash, mini_get_shared_method (method));
+       if (ji && !ji->has_generic_jit_info)
+               ji = NULL;
+
+       if (!inited) {
+               mono_counters_register ("Shared generic lookups", MONO_COUNTER_INT|MONO_COUNTER_GENERICS, &lookups);
+               mono_counters_register ("Failed shared generic lookups", MONO_COUNTER_INT|MONO_COUNTER_GENERICS, &failed_lookups);
+               inited = TRUE;
+       }
 
-       open_method = mono_method_get_declaring_generic_method (method);
+       ++lookups;
+       if (!ji)
+               ++failed_lookups;
 
-       return mono_domain_lookup_shared_generic (domain, open_method);
+       return ji;
 }
 
 /*
@@ -3955,7 +4534,9 @@ lookup_method_inner (MonoDomain *domain, MonoMethod *method)
        if (ji)
                return ji;
 
-       return lookup_generic_method (domain, method);
+       if (!mono_method_is_generic_sharable_impl (method, FALSE))
+               return NULL;
+       return mono_domain_lookup_shared_generic (domain, method);
 }
 
 static MonoJitInfo*
@@ -3972,17 +4553,50 @@ lookup_method (MonoDomain *domain, MonoMethod *method)
        return info;
 }
 
+#if ENABLE_JIT_MAP
+static FILE* perf_map_file = NULL;
+
+void
+mono_enable_jit_map (void)
+{
+       if (!perf_map_file) {
+               char name [64];
+               g_snprintf (name, sizeof (name), "/tmp/perf-%d.map", getpid ());
+               unlink (name);
+               perf_map_file = fopen (name, "w");
+       }
+}
+
+void
+mono_emit_jit_tramp (void *start, int size, const char *desc)
+{
+       if (perf_map_file)
+               fprintf (perf_map_file, "%llx %x %s\n", (long long unsigned int)(gsize)start, size, desc);
+}
+
+void
+mono_emit_jit_map (MonoJitInfo *jinfo)
+{
+       if (perf_map_file) {
+               char *name = mono_method_full_name (jinfo->method, TRUE);
+               mono_emit_jit_tramp (jinfo->code_start, jinfo->code_size, name);
+               g_free (name);
+       }
+}
+#endif
+
 static gpointer
 mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, int opt, MonoException **jit_ex)
 {
        MonoCompile *cfg;
        gpointer code = NULL;
-       MonoJitInfo *info;
+       MonoJitInfo *jinfo, *info;
        MonoVTable *vtable;
        MonoException *ex = NULL;
+       guint32 prof_options;
 
 #ifdef MONO_USE_AOT_COMPILER
-       if ((opt & MONO_OPT_AOT) && !(mono_profiler_get_events () & MONO_PROFILE_JIT_COMPILATION)) {
+       if (opt & MONO_OPT_AOT) {
                MonoDomain *domain = mono_domain_get ();
 
                mono_class_init (method->klass);
@@ -3991,6 +4605,7 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
                        vtable = mono_class_vtable (domain, method->klass);
                        g_assert (vtable);
                        mono_runtime_class_init (vtable);
+
                        return code;
                }
        }
@@ -4005,7 +4620,7 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
                        if (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL)
                                piinfo->addr = mono_lookup_internal_call (method);
                        else if (method->iflags & METHOD_IMPL_ATTRIBUTE_NATIVE)
-#ifdef PLATFORM_WIN32
+#ifdef HOST_WIN32
                                g_warning ("Method '%s' in assembly '%s' contains native code that cannot be executed by Mono in modules loaded from byte arrays. The assembly was probably created using C++/CLI.\n", mono_method_full_name (method, TRUE), method->klass->image->name);
 #else
                                g_warning ("Method '%s' in assembly '%s' contains native code that cannot be executed by Mono on this platform. The assembly was probably created using C++/CLI.\n", mono_method_full_name (method, TRUE), method->klass->image->name);
@@ -4138,8 +4753,12 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
        }
 
        if (ex) {
+               if (cfg->prof_options & MONO_PROFILE_JIT_COMPILATION)
+                       mono_profiler_method_end_jit (method, NULL, MONO_PROFILE_FAILED);
+
                mono_destroy_compile (cfg);
                *jit_ex = ex;
+
                return NULL;
        }
 
@@ -4171,6 +4790,10 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
                mono_domain_jit_code_hash_unlock (target_domain);
        }
 
+       jinfo = cfg->jit_info;
+
+       prof_options = cfg->prof_options;
+
        mono_destroy_compile (cfg);
 
        if (domain_jit_info (target_domain)->jump_target_hash) {
@@ -4189,6 +4812,7 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
                g_slist_free (list);
        }
 
+       mono_emit_jit_map (jinfo);
        mono_domain_unlock (target_domain);
        mono_loader_unlock ();
 
@@ -4199,6 +4823,15 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
                g_assert (exc);
                mono_raise_exception (exc);
        }
+
+       if (prof_options & MONO_PROFILE_JIT_COMPILATION) {
+               if (method->wrapper_type == MONO_WRAPPER_MANAGED_TO_NATIVE)
+                       /* The profiler doesn't know about wrappers, so pass the original icall method */
+                       mono_profiler_method_end_jit (mono_marshal_method_from_wrapper (method), jinfo, MONO_PROFILE_OK);
+               else
+                       mono_profiler_method_end_jit (method, jinfo, MONO_PROFILE_OK);
+       }
+
        mono_runtime_class_init (vtable);
        return code;
 }
@@ -4240,6 +4873,7 @@ mono_jit_compile_method_with_opt (MonoMethod *method, guint32 opt, MonoException
 
                        mono_jit_stats.methods_lookups++;
                        vtable = mono_class_vtable (domain, method->klass);
+                       g_assert (vtable);
                        mono_runtime_class_init (vtable);
                        return mono_create_ftnptr (target_domain, info->code_start);
                }
@@ -4380,6 +5014,8 @@ typedef struct {
        gpointer compiled_method;
        gpointer runtime_invoke;
        MonoVTable *vtable;
+       MonoDynCallInfo *dyn_call_info;
+       MonoClass *ret_box_class;
 } RuntimeInvokeInfo;
 
 /**
@@ -4410,20 +5046,25 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
        mono_domain_unlock (domain);            
 
        if (!info) {
-               mono_class_setup_vtable (method->klass);
-               if (method->klass->exception_type != MONO_EXCEPTION_NONE) {
-                       if (exc)
-                               *exc = (MonoObject*)mono_class_get_exception_for_failure (method->klass);
-                       else
-                               mono_raise_exception (mono_class_get_exception_for_failure (method->klass));
-                       return NULL;
+               if (mono_security_get_mode () == MONO_SECURITY_MODE_CORE_CLR) {
+                       /* 
+                        * This might be redundant since mono_class_vtable () already does this,
+                        * but keep it just in case for moonlight.
+                        */
+                       mono_class_setup_vtable (method->klass);
+                       if (method->klass->exception_type != MONO_EXCEPTION_NONE) {
+                               if (exc)
+                                       *exc = (MonoObject*)mono_class_get_exception_for_failure (method->klass);
+                               else
+                                       mono_raise_exception (mono_class_get_exception_for_failure (method->klass));
+                               return NULL;
+                       }
                }
 
                info = g_new0 (RuntimeInvokeInfo, 1);
 
                invoke = mono_marshal_get_runtime_invoke (method, FALSE);
-               info->runtime_invoke = mono_jit_compile_method (invoke);
-               info->vtable = mono_class_vtable (domain, method->klass);
+               info->vtable = mono_class_vtable_full (domain, method->klass, TRUE);
                g_assert (info->vtable);
 
                if (method->klass->rank && (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) &&
@@ -4452,6 +5093,80 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
                                info->compiled_method = mono_create_static_rgctx_trampoline (method, info->compiled_method);
                }
 
+               /*
+                * We want to avoid AOTing 1000s of runtime-invoke wrappers when running
+                * in full-aot mode, so we use a slower, but more generic wrapper if
+                * possible, built on top of the OP_DYN_CALL opcode provided by the JIT.
+                */
+#ifdef MONO_ARCH_DYN_CALL_SUPPORTED
+               if (mono_aot_only || debug_options.dyn_runtime_invoke) {
+                       MonoMethodSignature *sig = mono_method_signature (method);
+                       gboolean supported = TRUE;
+                       int i;
+
+                       if (method->string_ctor)
+                               sig = mono_marshal_get_string_ctor_signature (method);
+
+                       for (i = 0; i < sig->param_count; ++i) {
+                               MonoType *t = sig->params [i];
+
+                               if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type (t)))
+                                       supported = FALSE;
+                       }
+
+                       if (method->klass->contextbound || !info->compiled_method)
+                               supported = FALSE;
+
+                       if (supported)
+                               info->dyn_call_info = mono_arch_dyn_call_prepare (sig);
+
+                       if (info->dyn_call_info) {
+                               switch (sig->ret->type) {
+                               case MONO_TYPE_VOID:
+                                       break;
+                               case MONO_TYPE_I1:
+                               case MONO_TYPE_U1:
+                               case MONO_TYPE_I2:
+                               case MONO_TYPE_U2:
+                               case MONO_TYPE_I4:
+                               case MONO_TYPE_U4:
+                               case MONO_TYPE_I:
+                               case MONO_TYPE_U:
+                               case MONO_TYPE_I8:
+                               case MONO_TYPE_U8:
+                               case MONO_TYPE_BOOLEAN:
+                               case MONO_TYPE_CHAR:
+                               case MONO_TYPE_R4:
+                               case MONO_TYPE_R8:
+                                       info->ret_box_class = mono_class_from_mono_type (sig->ret);
+                                       break;
+                               case MONO_TYPE_PTR:
+                                       info->ret_box_class = mono_defaults.int_class;
+                                       break;
+                               case MONO_TYPE_STRING:
+                               case MONO_TYPE_CLASS:  
+                               case MONO_TYPE_ARRAY:
+                               case MONO_TYPE_SZARRAY:
+                               case MONO_TYPE_OBJECT:
+                                       break;
+                               case MONO_TYPE_GENERICINST:
+                                       if (!MONO_TYPE_IS_REFERENCE (sig->ret))
+                                               info->ret_box_class = mono_class_from_mono_type (sig->ret);
+                                       break;
+                               case MONO_TYPE_VALUETYPE:
+                                       info->ret_box_class = mono_class_from_mono_type (sig->ret);
+                                       break;
+                               default:
+                                       g_assert_not_reached ();
+                                       break;
+                               }
+                       }
+               }
+#endif
+
+               if (!info->dyn_call_info)
+                       info->runtime_invoke = mono_jit_compile_method (invoke);
+
                mono_domain_lock (domain);
                info2 = g_hash_table_lookup (domain_info->runtime_invoke_hash, method);
                if (info2) {
@@ -4460,7 +5175,7 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
                } else {
                        g_hash_table_insert (domain_info->runtime_invoke_hash, method, info);
                }
-               mono_domain_unlock (domain);            
+               mono_domain_unlock (domain);
        }
 
        runtime_invoke = info->runtime_invoke;
@@ -4471,6 +5186,52 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
         */
        mono_runtime_class_init (info->vtable);
 
+#ifdef MONO_ARCH_DYN_CALL_SUPPORTED
+       if (info->dyn_call_info) {
+               MonoMethodSignature *sig = mono_method_signature (method);
+               gpointer *args;
+               static RuntimeInvokeDynamicFunction dyn_runtime_invoke;
+               int i, pindex;
+               guint8 buf [128];
+               guint8 retval [128];
+
+               if (!dyn_runtime_invoke) {
+                       invoke = mono_marshal_get_runtime_invoke_dynamic ();
+                       dyn_runtime_invoke = mono_jit_compile_method (invoke);
+               }
+
+               /* Convert the arguments to the format expected by start_dyn_call () */
+               args = g_alloca ((sig->param_count + sig->hasthis) * sizeof (gpointer));
+               pindex = 0;
+               if (sig->hasthis)
+                       args [pindex ++] = &obj;
+               for (i = 0; i < sig->param_count; ++i) {
+                       MonoType *t = sig->params [i];
+
+                       if (t->byref) {
+                               args [pindex ++] = &params [i];
+                       } else if (MONO_TYPE_IS_REFERENCE (t) || t->type == MONO_TYPE_PTR) {
+                               args [pindex ++] = &params [i];
+                       } else {
+                               args [pindex ++] = params [i];
+                       }
+               }
+
+               //printf ("M: %s\n", mono_method_full_name (method, TRUE));
+
+               mono_arch_start_dyn_call (info->dyn_call_info, (gpointer**)args, retval, buf, sizeof (buf));
+
+               dyn_runtime_invoke (buf, exc, info->compiled_method);
+
+               mono_arch_finish_dyn_call (info->dyn_call_info, buf);
+
+               if (info->ret_box_class)
+                       return mono_value_box (domain, info->ret_box_class, retval);
+               else
+                       return *(MonoObject**)retval;
+       }
+#endif
+
        return runtime_invoke (obj, params, exc, info->compiled_method);
 }
 
@@ -4479,7 +5240,7 @@ SIG_HANDLER_SIGNATURE (mono_sigfpe_signal_handler)
 {
        MonoException *exc = NULL;
        MonoJitInfo *ji;
-#ifndef MONO_ARCH_USE_SIGACTION
+#if !(defined(MONO_ARCH_USE_SIGACTION) || defined(HOST_WIN32))
        void *info = NULL;
 #endif
        GET_CONTEXT;
@@ -4516,17 +5277,35 @@ SIG_HANDLER_SIGNATURE (mono_sigill_signal_handler)
        mono_arch_handle_exception (ctx, exc, FALSE);
 }
 
+#if defined(MONO_ARCH_USE_SIGACTION) || defined(HOST_WIN32)
+#define HAVE_SIG_INFO
+#endif
+
 void
 SIG_HANDLER_SIGNATURE (mono_sigsegv_signal_handler)
 {
-#ifndef MONO_ARCH_SIGSEGV_ON_ALTSTACK
-       MonoException *exc = NULL;
-#endif
        MonoJitInfo *ji;
        MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
 
        GET_CONTEXT;
 
+#if defined(MONO_ARCH_SOFT_DEBUG_SUPPORTED) && defined(HAVE_SIG_INFO)
+       if (mono_arch_is_single_step_event (info, ctx)) {
+               mono_debugger_agent_single_step_event (ctx);
+               return;
+       } else if (mono_arch_is_breakpoint_event (info, ctx)) {
+               mono_debugger_agent_breakpoint_hit (ctx);
+               return;
+       }
+#endif
+
+#if !defined(HOST_WIN32) && defined(HAVE_SIG_INFO)
+       if (mono_aot_is_pagefault (info->si_addr)) {
+               mono_aot_handle_pagefault (info->si_addr);
+               return;
+       }
+#endif
+
        /* The thread might no be registered with the runtime */
        if (!mono_domain_get () || !jit_tls) {
                if (mono_chain_signal (SIG_HANDLER_PARAMS))
@@ -4570,7 +5349,7 @@ SIG_HANDLER_SIGNATURE (mono_sigsegv_signal_handler)
                mono_handle_native_sigsegv (SIGSEGV, ctx);
        }
                        
-       mono_arch_handle_exception (ctx, exc, FALSE);
+       mono_arch_handle_exception (ctx, NULL, FALSE);
 #endif
 }
 
@@ -4600,7 +5379,7 @@ mono_jit_create_remoting_trampoline (MonoDomain *domain, MonoMethod *method, Mon
        guint8 *addr = NULL;
 
        if ((method->flags & METHOD_ATTRIBUTE_VIRTUAL) && mono_method_signature (method)->generic_param_count) {
-               return mono_arch_create_specific_trampoline (method, MONO_TRAMPOLINE_GENERIC_VIRTUAL_REMOTING,
+               return mono_create_specific_trampoline (method, MONO_TRAMPOLINE_GENERIC_VIRTUAL_REMOTING,
                        domain, NULL);
        }
 
@@ -4615,7 +5394,7 @@ mono_jit_create_remoting_trampoline (MonoDomain *domain, MonoMethod *method, Mon
 }
 
 #ifdef MONO_ARCH_HAVE_IMT
-static gpointer
+static G_GNUC_UNUSED gpointer
 mini_get_imt_trampoline (void)
 {
        static gpointer tramp = NULL;
@@ -4626,9 +5405,10 @@ mini_get_imt_trampoline (void)
 #endif
 
 gpointer
-mini_get_vtable_trampoline (void)
+mini_get_vtable_trampoline (int slot_index)
 {
        static gpointer tramp = NULL;
+
        if (!tramp)
                tramp = mono_create_specific_trampoline (MONO_FAKE_VTABLE_METHOD, MONO_TRAMPOLINE_JIT, mono_get_root_domain (), NULL);
        return tramp;
@@ -4662,9 +5442,19 @@ mini_parse_debug_options (void)
                        debug_options.suspend_on_sigsegv = TRUE;
                else if (!strcmp (arg, "dont-free-domains"))
                        mono_dont_free_domains = TRUE;
+               else if (!strcmp (arg, "dyn-runtime-invoke"))
+                       debug_options.dyn_runtime_invoke = TRUE;
+               else if (!strcmp (arg, "gdb"))
+                       debug_options.gdb = TRUE;
+               else if (!strcmp (arg, "explicit-null-checks"))
+                       debug_options.explicit_null_checks = TRUE;
+               else if (!strcmp (arg, "gen-seq-points"))
+                       debug_options.gen_seq_points = TRUE;
+               else if (!strcmp (arg, "init-stacks"))
+                       debug_options.init_stacks = TRUE;
                else {
                        fprintf (stderr, "Invalid option for the MONO_DEBUG env variable: %s\n", arg);
-                       fprintf (stderr, "Available options: 'handle-sigint', 'keep-delegates', 'collect-pagefault-stats', 'break-on-unverified', 'no-gdb-backtrace', 'dont-free-domains', 'suspend-on-sigsegv'\n");
+                       fprintf (stderr, "Available options: 'handle-sigint', 'keep-delegates', 'collect-pagefault-stats', 'break-on-unverified', 'no-gdb-backtrace', 'dont-free-domains', 'suspend-on-sigsegv', 'dyn-runtime-invoke', 'gdb', 'explicit-null-checks', 'init-stacks'\n");
                        exit (1);
                }
        }
@@ -4714,6 +5504,8 @@ mini_get_addr_from_ftnptr (gpointer descr)
        return descr;
 #endif
 }      
+
+static void runtime_invoke_info_free (gpointer value);
  
 static void
 mini_create_jit_domain_info (MonoDomain *domain)
@@ -4724,9 +5516,10 @@ mini_create_jit_domain_info (MonoDomain *domain)
        info->jump_trampoline_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
        info->jit_trampoline_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
        info->delegate_trampoline_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
-       info->static_rgctx_trampoline_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
        info->llvm_vcall_trampoline_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
-       info->runtime_invoke_hash = g_hash_table_new_full (mono_aligned_addr_hash, NULL, NULL, g_free);
+       info->runtime_invoke_hash = g_hash_table_new_full (mono_aligned_addr_hash, NULL, NULL, runtime_invoke_info_free);
+       info->seq_points = g_hash_table_new_full (mono_aligned_addr_hash, NULL, NULL, g_free);
+       info->arch_seq_points = g_hash_table_new (mono_aligned_addr_hash, NULL);
 
        domain->runtime_info = info;
 }
@@ -4745,6 +5538,18 @@ dynamic_method_info_free (gpointer key, gpointer value, gpointer user_data)
        g_free (di);
 }
 
+static void
+runtime_invoke_info_free (gpointer value)
+{
+       RuntimeInvokeInfo *info = (RuntimeInvokeInfo*)value;
+
+#ifdef MONO_ARCH_DYN_CALL_SUPPORTED
+       if (info->dyn_call_info)
+               mono_arch_dyn_call_free (info->dyn_call_info);
+#endif
+       g_free (info);
+}
+
 static void
 mini_free_jit_domain_info (MonoDomain *domain)
 {
@@ -4768,9 +5573,15 @@ mini_free_jit_domain_info (MonoDomain *domain)
        g_hash_table_destroy (info->jump_trampoline_hash);
        g_hash_table_destroy (info->jit_trampoline_hash);
        g_hash_table_destroy (info->delegate_trampoline_hash);
-       g_hash_table_destroy (info->static_rgctx_trampoline_hash);
+       if (info->static_rgctx_trampoline_hash)
+               g_hash_table_destroy (info->static_rgctx_trampoline_hash);
        g_hash_table_destroy (info->llvm_vcall_trampoline_hash);
        g_hash_table_destroy (info->runtime_invoke_hash);
+       g_hash_table_destroy (info->seq_points);
+       g_hash_table_destroy (info->arch_seq_points);
+
+       if (info->agent_info)
+               mono_debugger_agent_free_domain_info (domain);
 
        g_free (domain->runtime_info);
        domain->runtime_info = NULL;
@@ -4803,7 +5614,7 @@ mini_init (const char *filename, const char *runtime_version)
 #endif
 
 #ifdef MONO_ARCH_HAVE_TLS_GET
-       mono_runtime_set_has_tls_get (TRUE);
+       mono_runtime_set_has_tls_get (MONO_ARCH_HAVE_TLS_GET);
 #else
        mono_runtime_set_has_tls_get (FALSE);
 #endif
@@ -4815,6 +5626,16 @@ mini_init (const char *filename, const char *runtime_version)
        memset (&callbacks, 0, sizeof (callbacks));
        callbacks.create_ftnptr = mini_create_ftnptr;
        callbacks.get_addr_from_ftnptr = mini_get_addr_from_ftnptr;
+       callbacks.get_runtime_build_info = mono_get_runtime_build_info;
+
+#ifdef MONO_ARCH_HAVE_IMT
+       if (mono_use_imt) {
+               if (!mono_use_llvm) {
+                       /* LLVM needs a per-method vtable trampoline */
+                       callbacks.get_vtable_trampoline = mini_get_vtable_trampoline;
+               }
+       }
+#endif
 
        mono_install_callbacks (&callbacks);
        
@@ -4826,11 +5647,19 @@ mini_init (const char *filename, const char *runtime_version)
 
        mini_gc_init ();
 
+       if (getenv ("MONO_DEBUG") != NULL)
+               mini_parse_debug_options ();
+
        if (getenv ("MONO_XDEBUG")) {
-               mono_xdebug_init ();
+               char *xdebug_opts = getenv ("MONO_XDEBUG");
+               mono_xdebug_init (xdebug_opts);
                /* So methods for multiple domains don't have the same address */
                mono_dont_free_domains = TRUE;
                mono_using_xdebug = TRUE;
+       } else if (mini_get_debug_options ()->gdb) {
+               mono_xdebug_init ((char*)"gdb");
+               mono_dont_free_domains = TRUE;
+               mono_using_xdebug = TRUE;
        }
 
 #ifdef ENABLE_LLVM
@@ -4842,9 +5671,6 @@ mini_init (const char *filename, const char *runtime_version)
        if (!g_thread_supported ())
                g_thread_init (NULL);
 
-       if (getenv ("MONO_DEBUG") != NULL)
-               mini_parse_debug_options ();
-
        mono_gc_base_init ();
 
        mono_jit_tls_id = TlsAlloc ();
@@ -4853,6 +5679,8 @@ mini_init (const char *filename, const char *runtime_version)
        if (default_opt & MONO_OPT_AOT)
                mono_aot_init ();
 
+       mono_debugger_agent_init ();
+
 #ifdef MONO_ARCH_GSHARED_SUPPORTED
        mono_set_generic_sharing_supported (TRUE);
 #endif
@@ -4876,9 +5704,12 @@ mini_init (const char *filename, const char *runtime_version)
 #ifdef JIT_TRAMPOLINES_WORK
        mono_install_compile_method (mono_jit_compile_method);
        mono_install_free_method (mono_jit_free_method);
-#ifdef ENABLE_LLVM
-       /* The runtime currently only uses this for filling out vtables */
-       mono_install_trampoline (mono_create_llvm_vcall_trampoline);
+#ifdef MONO_ARCH_LLVM_SUPPORTED
+       if (mono_use_llvm)
+               /* The runtime currently only uses this for filling out vtables */
+               mono_install_trampoline (mono_create_llvm_vcall_trampoline);
+       else
+               mono_install_trampoline (mono_create_jit_trampoline);
 #else
        mono_install_trampoline (mono_create_jit_trampoline);
 #endif
@@ -4897,6 +5728,10 @@ mini_init (const char *filename, const char *runtime_version)
        mono_install_get_class_from_name (mono_aot_get_class_from_name);
        mono_install_jit_info_find_in_aot (mono_aot_find_jit_info);
 
+       if (debug_options.collect_pagefault_stats) {
+               mono_aot_set_make_unreadable (TRUE);
+       }
+
        if (runtime_version)
                domain = mono_init_version (filename, runtime_version);
        else
@@ -4913,11 +5748,13 @@ mini_init (const char *filename, const char *runtime_version)
                        mono_install_imt_thunk_builder (mono_aot_get_imt_thunk);
                else
                        mono_install_imt_thunk_builder (mono_arch_build_imt_thunk);
-               mono_install_imt_trampoline (mini_get_imt_trampoline ());
-#ifndef ENABLE_LLVM
-               /* LLVM needs a per-method vtable trampoline */
-               mono_install_vtable_trampoline (mini_get_vtable_trampoline ());
-#endif
+               if (!mono_use_llvm) {
+                       /* 
+                        * The imt code in mono_magic_trampoline () can't handle LLVM code. By disabling
+                        * this, we force iface calls to go through the llvm vcall trampoline.
+                        */
+                       mono_install_imt_trampoline (mini_get_imt_trampoline ());
+               }
        }
 #endif
 
@@ -4959,7 +5796,9 @@ mini_init (const char *filename, const char *runtime_version)
 
        register_icall (mono_get_throw_exception (), "mono_arch_throw_exception", "void object", TRUE);
        register_icall (mono_get_rethrow_exception (), "mono_arch_rethrow_exception", "void object", TRUE);
+#ifdef MONO_ARCH_HAVE_THROW_EXCEPTION_BY_NAME
        register_icall (mono_get_throw_exception_by_name (), "mono_arch_throw_exception_by_name", "void ptr", TRUE); 
+#endif
 #if MONO_ARCH_HAVE_THROW_CORLIB_EXCEPTION
        register_icall (mono_get_throw_corlib_exception (), "mono_arch_throw_corlib_exception", 
                                 "void ptr", TRUE);
@@ -5085,6 +5924,10 @@ mini_init (const char *filename, const char *runtime_version)
        register_icall (mono_isfinite, "mono_isfinite", "uint32 double", FALSE);
 #endif
 
+#ifdef COMPRESSED_INTERFACE_BITMAP
+       register_icall (mono_class_interface_match, "mono_class_interface_match", "uint32 ptr int32", TRUE);
+#endif
+
 #if SIZEOF_REGISTER == 4
        mono_register_opcode_emulation (OP_FCONV_TO_U, "__emul_fconv_to_u", "uint32 double", mono_fconv_u4, TRUE);
 #endif
@@ -5119,6 +5962,8 @@ mini_init (const char *filename, const char *runtime_version)
        register_icall (mono_create_corlib_exception_2, "mono_create_corlib_exception_2", "object int object object", TRUE);
        register_icall (mono_array_new_1, "mono_array_new_1", "object ptr int", FALSE);
        register_icall (mono_array_new_2, "mono_array_new_2", "object ptr int int", FALSE);
+       register_icall (mono_array_new_3, "mono_array_new_3", "object ptr int int int", FALSE);
+       register_icall (mono_get_native_calli_wrapper, "mono_get_native_calli_wrapper", "ptr ptr ptr ptr", FALSE);
 #endif
 
        mono_generic_sharing_init ();
@@ -5261,12 +6106,12 @@ mini_cleanup (MonoDomain *domain)
        /* This accesses metadata so needs to be called before runtime shutdown */
        print_jit_stats ();
 
+       mono_profiler_shutdown ();
+
 #ifndef MONO_CROSS_COMPILE
        mono_runtime_cleanup (domain);
 #endif
 
-       mono_profiler_shutdown ();
-
        mono_icall_cleanup ();
 
        mono_runtime_cleanup_handlers ();
@@ -5287,6 +6132,7 @@ mini_cleanup (MonoDomain *domain)
                mono_code_manager_destroy (global_codeman);
        g_hash_table_destroy (jit_icall_name_hash);
        g_free (emul_opcode_map);
+       g_free (emul_opcode_opcodes);
 
        mono_arch_cleanup ();
 
@@ -5314,6 +6160,12 @@ mono_set_defaults (int verbose_level, guint32 opts)
        default_opt_set = TRUE;
 }
 
+void
+mono_disable_optimizations (guint32 opts)
+{
+       default_opt &= ~opts;
+}
+
 /*
  * mono_get_runtime_build_info:
  *
@@ -5324,9 +6176,9 @@ char*
 mono_get_runtime_build_info (void)
 {
        if (mono_build_date)
-               return g_strdup_printf ("%s %s", FULL_VERSION, mono_build_date);
+               return g_strdup_printf ("%s (%s %s)", VERSION, FULL_VERSION, mono_build_date);
        else
-               return g_strdup_printf ("%s", FULL_VERSION);
+               return g_strdup_printf ("%s (%s)", VERSION, FULL_VERSION);
 }
 
 static void
@@ -5384,7 +6236,22 @@ void mono_precompile_assemblies ()
        g_hash_table_destroy (assemblies);
 }
 
+#ifndef DISABLE_JIT
+
 void*
 mono_arch_instrument_epilog (MonoCompile *cfg, void *func, void *p, gboolean enable_arguments) {
        return mono_arch_instrument_epilog_full (cfg, func, p, enable_arguments, FALSE);
 }
+
+void
+mono_cfg_add_try_hole (MonoCompile *cfg, MonoExceptionClause *clause, guint8 *start, MonoBasicBlock *bb)
+{
+       TryBlockHole *hole = mono_mempool_alloc (cfg->mempool, sizeof (TryBlockHole));
+       hole->clause = clause;
+       hole->start_offset = start - cfg->native_code;
+       hole->basic_block = bb;
+
+       cfg->try_block_holes = g_slist_append_mempool (cfg->mempool, cfg->try_block_holes, hole);
+}
+
+#endif