[interp] fix using conv.u with string

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

diff --git a/mono/mini/tramp-mips.c b/mono/mini/tramp-mips.c
index bf35f84ff349c7a63835d1a305d054c73a012bae..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;
 }
 
@@ -304,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;
@@ -315,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);
@@ -324,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;
 }