[mono-api-html] Output nested type correctly (was missing the declaring type name)

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

diff --git a/mono/mini/tramp-sparc.c b/mono/mini/tramp-sparc.c
index ac205fe9018c9473b675bde2836dedaf0cdb98b8..a1f5afd4576133a3587fef8681aff92673c94c6a 100644 (file)
--- a/mono/mini/tramp-sparc.c
+++ b/mono/mini/tramp-sparc.c
@@ -32,11 +32,8 @@ gpointer
 mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr)
 {
        guint8 *code, *start;
-       int this_pos = 4, reg;
+       int reg;
 
-       if (!mono_method_signature (m)->ret->byref && MONO_TYPE_ISSTRUCT (mono_method_signature (m)->ret))
-               this_pos = 8;
-           
        start = code = mono_global_codeman_reserve (36);
 
        /* This executes in the context of the caller, hence o0 */
@@ -58,7 +55,7 @@ mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr)
 }
 
 void
-mono_arch_patch_callsite (guint8 *code, guint8 *addr)
+mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr)
 {
        if (sparc_inst_op (*(guint32*)code) == 0x1) {
                sparc_call_simple (code, (guint8*)addr - (guint8*)code);
@@ -66,20 +63,20 @@ mono_arch_patch_callsite (guint8 *code, guint8 *addr)
 }
 
 void
-mono_arch_patch_plt_entry (guint8 *code, guint8 *addr)
+mono_arch_patch_plt_entry (guint8 *code, gpointer *got, mgreg_t *regs, guint8 *addr)
 {
        g_assert_not_reached ();
 }
 
 void
-mono_arch_nullify_class_init_trampoline (guint8 *code, gssize *regs)
+mono_arch_nullify_class_init_trampoline (guint8 *code, mgreg_t *regs)
 {
        /* Patch calling code */
        sparc_nop (code);
 }
 
 void
-mono_arch_nullify_plt_entry (guint8 *code)
+mono_arch_nullify_plt_entry (guint8 *code, mgreg_t *regs)
 {
        g_assert_not_reached ();
 }
@@ -87,12 +84,16 @@ mono_arch_nullify_plt_entry (guint8 *code)
 #define ALIGN_TO(val,align) (((val) + ((align) - 1)) & ~((align) - 1))
 
 guchar*
-mono_arch_create_trampoline_code (MonoTrampolineType tramp_type)
+mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInfo **info, gboolean aot)
 {
        guint8 *buf, *code, *tramp_addr;
        guint32 lmf_offset, regs_offset, method_reg, i;
        gboolean has_caller;
 
+       g_assert (!aot);
+       if (info)
+               *info = NULL;
+
        if (tramp_type == MONO_TRAMPOLINE_JUMP)
                has_caller = FALSE;
        else
@@ -180,6 +181,11 @@ mono_arch_create_trampoline_code (MonoTrampolineType tramp_type)
        /* Save result */
        sparc_sti_imm (code, sparc_o0, sparc_sp, MONO_SPARC_STACK_BIAS + 304);
 
+       /* Check for thread interruption */
+       sparc_set (code, (guint8*)mono_thread_force_interruption_checkpoint, sparc_o7);
+       sparc_jmpl (code, sparc_o7, sparc_g0, sparc_o7);
+       sparc_nop (code);
+
        /* Restore lmf */
        code = mono_sparc_emit_restore_lmf (code, lmf_offset);
 
@@ -237,9 +243,7 @@ mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_ty
 
        tramp = mono_get_trampoline_code (tramp_type);
 
-       mono_domain_lock (domain);
-       code = buf = mono_code_manager_reserve (domain->code_mp, TRAMPOLINE_SIZE * 4);
-       mono_domain_unlock (domain);
+       code = buf = mono_domain_code_reserve (domain, TRAMPOLINE_SIZE * 4);
 
        /* We have to use g5 here because there is no other free register */
        sparc_set (code, tramp, sparc_g5);
@@ -257,24 +261,15 @@ mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_ty
        if (code_len)
                *code_len = (code - buf) * 4;
 
-       mono_jit_stats.method_trampolines++;
-
        mono_arch_flush_icache ((guint8*)buf, (code - buf) * 4);
 
        return buf;
 }      
 
-/*
- * This method is only called when running in the Mono Debugger.
- */
 gpointer
-mono_debugger_create_notification_function (void)
+mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info, gboolean aot)
 {
-       guint8 *ptr, *buf;
-
-       ptr = buf = mono_global_codeman_reserve (16);
-
+       /* FIXME: implement! */
        g_assert_not_reached ();
-
-       return ptr;
+       return NULL;
 }