Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / mini / tramp-mips.c

diff --git a/mono/mini/tramp-mips.c b/mono/mini/tramp-mips.c
index a8dbfd8fa5427027f497a16fd38f5947e4421315..bb2beef7424cbd407dc2d198653dd9322d33cea8 100644 (file)
--- a/mono/mini/tramp-mips.c
+++ b/mono/mini/tramp-mips.c
@@ -1,5 +1,6 @@
-/*
- * tramp-mips.c: JIT trampoline code for MIPS
+/**
+ * \file
+ * JIT trampoline code for MIPS
  *
  * Authors:
  *    Mark Mason (mason@broadcom.com)
@@ -53,6 +54,8 @@ mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr)
        /*g_print ("unbox trampoline at %d for %s:%s\n", this_pos, m->klass->name, m->name);
        g_print ("unbox code is at %p for method at %p\n", start, addr);*/
 
+       mono_tramp_info_register (mono_tramp_info_create (NULL, start, code - start, NULL, NULL), domain);
+
        return start;
 }
 
@@ -112,42 +115,6 @@ mono_arch_patch_plt_entry (guint8 *code, gpointer *got, mgreg_t *regs, guint8 *a
 
 #define STACK (int)(ALIGN_TO(4*IREG_SIZE + 8 + sizeof(MonoLMF) + 32, 8))
 
-void
-mono_arch_nullify_class_init_trampoline (guint8 *code, mgreg_t *regs)
-{
-       guint32 *code32 = (guint32*)code;
-
-       /* back up to the jal/jalr instruction */
-       code32 -= 2;
-
-       /* Check for jal/jalr -- and NOP it out */
-       if ((((*code32)&0xfc000000) == 0x0c000000)
-           || (((*code32)&0xfc1f003f) == 0x00000009)) {
-               mips_nop (code32);
-               mono_arch_flush_icache ((gpointer)(code32 - 1), 4);
-               return;
-       }
-       g_assert_not_reached ();
-}
-
-gpointer
-mono_arch_get_nullified_class_init_trampoline (MonoTrampInfo **info)
-{
-       guint8 *buf, *code;
-
-       code = buf = mono_global_codeman_reserve (16);
-
-       mips_jr (code, mips_ra);
-       mips_nop (code);
-
-       mono_arch_flush_icache (buf, code - buf);
-
-       if (info)
-               *info = mono_tramp_info_create ("nullified_class_init_trampoline", buf, code - buf, NULL, NULL);
-
-       return buf;
-}
-
 /*
  * Stack frame description when the generic trampoline is called.
  * caller frame
@@ -247,10 +214,7 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf
        }
 
        /* Arg 3: MonoMethod *method. */
-       if (tramp_type == MONO_TRAMPOLINE_GENERIC_CLASS_INIT)
-               mips_lw (code, mips_a2, mips_sp, lmf + G_STRUCT_OFFSET (MonoLMF, iregs [mips_a0]));
-       else
-               mips_lw (code, mips_a2, mips_sp, lmf + G_STRUCT_OFFSET (MonoLMF, method));
+       mips_lw (code, mips_a2, mips_sp, lmf + G_STRUCT_OFFSET (MonoLMF, method));
 
        /* Arg 4: Trampoline */
        mips_move (code, mips_a3, mips_zero);
@@ -343,7 +307,7 @@ mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_ty
 }
 
 gpointer
-mono_arch_get_static_rgctx_trampoline (MonoMethod *m, MonoMethodRuntimeGenericContext *mrgctx, gpointer addr)
+mono_arch_get_static_rgctx_trampoline (gpointer arg, gpointer addr)
 {
        guint8 *code, *start;
        int buf_len;
@@ -354,7 +318,7 @@ mono_arch_get_static_rgctx_trampoline (MonoMethod *m, MonoMethodRuntimeGenericCo
 
        start = code = mono_domain_code_reserve (domain, buf_len);
 
-       mips_load (code, MONO_ARCH_RGCTX_REG, mrgctx);
+       mips_load (code, MONO_ARCH_RGCTX_REG, arg);
        mips_load (code, mips_at, addr);
        mips_jr (code, mips_at);
        mips_nop (code);
@@ -363,6 +327,8 @@ mono_arch_get_static_rgctx_trampoline (MonoMethod *m, MonoMethodRuntimeGenericCo
 
        mono_arch_flush_icache (start, code - start);
 
+       mono_tramp_info_register (mono_tramp_info_create (NULL, start, code - start, NULL, NULL), domain);
+
        return start;
 }