get_unbox_trampoline (MonoMethod *m, gpointer addr)
{
guint8 *code, *start;
- int this_pos = 4;
+ int this_pos = 4, reg;
if (!m->signature->ret->byref && MONO_TYPE_ISSTRUCT (m->signature->ret))
this_pos = 8;
- start = code = g_malloc (32);
+ start = code = g_malloc (36);
/* This executes in the context of the caller, hence o0 */
sparc_add_imm (code, 0, sparc_o0, sizeof (MonoObject), sparc_o0);
- sparc_set (code, addr, sparc_g1);
- sparc_jmpl (code, sparc_g1, sparc_g0, sparc_g0);
+#ifdef SPARCV9
+ reg = sparc_g4;
+#else
+ reg = sparc_g1;
+#endif
+ sparc_set (code, addr, reg);
+ sparc_jmpl (code, reg, sparc_g0, sparc_g0);
sparc_nop (code);
- g_assert ((code - start) <= 32);
+ g_assert ((code - start) <= 36);
mono_arch_flush_icache (start, code - start);
}
else {
/* Patch calling code */
- if (sparc_inst_op (*code) == 0x1)
- sparc_call_simple (code, (guint8*)addr - (guint8*)code);
+ if (sparc_inst_op (*code) == 0x1) {
+ MonoJitInfo *ji =
+ mono_jit_info_table_find (mono_domain_get (), code);
+ MonoJitInfo *target_ji =
+ mono_jit_info_table_find (mono_domain_get (), addr);
+
+ if (mono_method_same_domain (ji, target_ji)) {
+ sparc_call_simple (code, (guint8*)addr - (guint8*)code);
+ }
+ }
}
return addr;
sparc_nop (code);
}
+#define ALIGN_TO(val,align) (((val) + ((align) - 1)) & ~((align) - 1))
+
static guchar*
create_trampoline_code (MonoTrampolineType tramp_type)
{
guint8 *buf, *code, *tramp_addr;
- guint32 lmf_offset;
+ guint32 lmf_offset, method_reg, i;
static guint8* generic_jump_trampoline = NULL;
static guint8 *generic_class_init_trampoline = NULL;
break;
}
- code = buf = g_malloc (256);
+ code = buf = g_malloc (512);
+
+ sparc_save_imm (code, sparc_sp, -608, sparc_sp);
- /* FIXME: save lmf etc */
+#ifdef SPARCV9
+ method_reg = sparc_g4;
+#else
+ method_reg = sparc_g1;
+#endif
- sparc_save_imm (code, sparc_sp, -200, sparc_sp);
+#ifdef SPARCV9
+ /* Save fp regs since they are not preserved by calls */
+ for (i = 0; i < 16; i ++)
+ sparc_stdf_imm (code, sparc_f0 + (i * 2), sparc_sp, MONO_SPARC_STACK_BIAS + 320 + (i * 8));
+#endif
/* We receive the method address in %r1, so save it here */
- sparc_st_imm (code, sparc_g1, sparc_sp, 128);
+ sparc_sti_imm (code, method_reg, sparc_sp, MONO_SPARC_STACK_BIAS + 200);
/* Save lmf since compilation can raise exceptions */
- lmf_offset = - sizeof (MonoLMF);
+ lmf_offset = MONO_SPARC_STACK_BIAS - sizeof (MonoLMF);
/* Save the data for the parent (managed) frame */
/* Save ip */
- sparc_st_imm (code, sparc_i7, sparc_fp, lmf_offset + G_STRUCT_OFFSET (MonoLMF, ip));
+ sparc_sti_imm (code, sparc_i7, sparc_fp, lmf_offset + G_STRUCT_OFFSET (MonoLMF, ip));
/* Save sp */
- sparc_st_imm (code, sparc_fp, sparc_fp, lmf_offset + G_STRUCT_OFFSET (MonoLMF, sp));
+ sparc_sti_imm (code, sparc_fp, sparc_fp, lmf_offset + G_STRUCT_OFFSET (MonoLMF, sp));
/* Save fp */
/* Load previous fp from the saved register window */
sparc_flushw (code);
- sparc_ld_imm (code, sparc_fp, (sparc_i6 - 16) * 4, sparc_o7);
- sparc_st_imm (code, sparc_o7, sparc_fp, lmf_offset + G_STRUCT_OFFSET (MonoLMF, ebp));
+ sparc_ldi_imm (code, sparc_fp, MONO_SPARC_STACK_BIAS + (sparc_i6 - 16) * sizeof (gpointer), sparc_o7);
+ sparc_sti_imm (code, sparc_o7, sparc_fp, lmf_offset + G_STRUCT_OFFSET (MonoLMF, ebp));
/* Save method */
- sparc_st_imm (code, sparc_g1, sparc_fp, lmf_offset + G_STRUCT_OFFSET (MonoLMF, method));
+ sparc_sti_imm (code, method_reg, sparc_fp, lmf_offset + G_STRUCT_OFFSET (MonoLMF, method));
- sparc_call_simple (code, (guint8*)mono_get_lmf_addr - (guint8*)code);
+ sparc_set (code, mono_get_lmf_addr, sparc_o7);
+ sparc_jmpl (code, sparc_o7, sparc_g0, sparc_o7);
sparc_nop (code);
code = mono_sparc_emit_save_lmf (code, lmf_offset);
tramp_addr = &sparc_class_init_trampoline;
else
tramp_addr = &sparc_magic_trampoline;
- sparc_ld_imm (code, sparc_sp, 128, sparc_o0);
+ sparc_ldi_imm (code, sparc_sp, MONO_SPARC_STACK_BIAS + 200, sparc_o0);
/* pass parent frame address as third argument */
sparc_mov_reg_reg (code, sparc_fp, sparc_o2);
- sparc_call_simple (code, tramp_addr - code);
- /* set %o1 to caller address in delay slot */
+ sparc_set (code, tramp_addr, sparc_o7);
+ /* set %o1 to caller address */
sparc_mov_reg_reg (code, sparc_i7, sparc_o1);
+ sparc_jmpl (code, sparc_o7, sparc_g0, sparc_o7);
+ sparc_nop (code);
/* Save result */
- sparc_st_imm (code, sparc_o0, sparc_sp, 128);
+ sparc_sti_imm (code, sparc_o0, sparc_sp, MONO_SPARC_STACK_BIAS + 304);
/* Restore lmf */
code = mono_sparc_emit_restore_lmf (code, lmf_offset);
/* Reload result */
- sparc_ld_imm (code, sparc_sp, 128, sparc_o0);
+ sparc_ldi_imm (code, sparc_sp, MONO_SPARC_STACK_BIAS + 304, sparc_o0);
+
+#ifdef SPARCV9
+ /* Reload fp regs */
+ for (i = 0; i < 16; i ++)
+ sparc_lddf_imm (code, sparc_sp, MONO_SPARC_STACK_BIAS + 320 + (i * 8), sparc_f0 + (i * 2));
+#endif
if (tramp_type == MONO_TRAMPOLINE_CLASS_INIT)
sparc_ret (code);
/* restore previous frame in delay slot */
sparc_restore_simple (code);
- g_assert ((code - buf) <= 256);
+/*
+{
+ gpointer addr;
+
+ sparc_save_imm (code, sparc_sp, -608, sparc_sp);
+ addr = code;
+ sparc_call_simple (code, 16);
+ sparc_nop (code);
+ sparc_rett_simple (code);
+ sparc_nop (code);
+
+ sparc_save_imm (code, sparc_sp, -608, sparc_sp);
+ sparc_ta (code, 1);
+ tramp_addr = &sparc_magic_trampoline;
+ sparc_call_simple (code, tramp_addr - code);
+ sparc_nop (code);
+ sparc_rett_simple (code);
+ sparc_nop (code);
+}
+*/
+
+ g_assert ((code - buf) <= 512);
switch (tramp_type) {
case MONO_TRAMPOLINE_GENERIC:
#define TRAMPOLINE_SIZE (((SPARC_SET_MAX_SIZE >> 2) * 2) + 2)
static MonoJitInfo*
-create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_type)
+create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_type, MonoDomain *domain)
{
MonoJitInfo *ji;
guint32 *code, *buf, *tramp;
tramp = create_trampoline_code (tramp_type);
- code = buf = g_malloc (TRAMPOLINE_SIZE * 4);
+ mono_domain_lock (domain);
+ code = buf = mono_code_manager_reserve (domain->code_mp, TRAMPOLINE_SIZE * 4);
+ mono_domain_unlock (domain);
/* We have to use g5 here because there is no other free register */
sparc_set (code, tramp, sparc_g5);
- sparc_set (code, arg1, sparc_r1);
+#ifdef SPARCV9
+ sparc_set (code, arg1, sparc_g4);
+#else
+ sparc_set (code, arg1, sparc_g1);
+#endif
sparc_jmpl (code, sparc_g5, sparc_g0, sparc_g0);
sparc_nop (code);
MonoJitInfo*
mono_arch_create_jump_trampoline (MonoMethod *method)
{
- MonoJitInfo *ji = create_specific_trampoline (method, MONO_TRAMPOLINE_JUMP);
+ MonoJitInfo *ji = create_specific_trampoline (method, MONO_TRAMPOLINE_JUMP, mono_domain_get ());
ji->method = method;
return ji;
mono_arch_create_jit_trampoline (MonoMethod *method)
{
MonoJitInfo *ji;
+ gpointer code_start;
- /* previously created trampoline code */
- if (method->info)
- return method->info;
-
- if (method->iflags & METHOD_IMPL_ATTRIBUTE_SYNCHRONIZED)
- return mono_arch_create_jit_trampoline (mono_marshal_get_synchronized_wrapper (method));
-
- ji = create_specific_trampoline (method, MONO_TRAMPOLINE_GENERIC);
- method->info = ji->code_start;
+ ji = create_specific_trampoline (method, MONO_TRAMPOLINE_GENERIC, mono_domain_get ());
+ code_start = ji->code_start;
g_free (ji);
- return method->info;
+ return code_start;
}
/**
MonoJitInfo *ji;
gpointer code;
- ji = create_specific_trampoline (vtable, MONO_TRAMPOLINE_CLASS_INIT);
+ ji = create_specific_trampoline (vtable, MONO_TRAMPOLINE_CLASS_INIT, vtable->domain);
code = ji->code_start;
g_free (ji);
guint8 *ptr, *buf;
ptr = buf = g_malloc0 (16);
- //x86_breakpoint (buf);
if (notification_address)
*notification_address = buf;
- //x86_ret (buf);
+
+ g_assert_not_reached ();
return ptr;
}
projects / mono.git / blobdiff