/*
* mono_arch_get_unbox_trampoline:
+ * @gsctx: the generic sharing context
* @m: method pointer
* @addr: pointer to native code for @m
*
* unboxing before calling the method
*/
gpointer
-mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr)
+mono_arch_get_unbox_trampoline (MonoGenericSharingContext *gsctx, MonoMethod *m, gpointer addr)
{
guint8 *code, *start;
int this_pos = 4;
MonoDomain *domain = mono_domain_get ();
- if (!mono_method_signature (m)->ret->byref && MONO_TYPE_ISSTRUCT (mono_method_signature (m)->ret))
+ if (MONO_TYPE_ISSTRUCT (mono_method_signature (m)->ret))
this_pos = 8;
mono_domain_lock (domain);
}
void
-mono_arch_patch_callsite (guint8 *orig_code, guint8 *addr)
+mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr)
{
guint8 *code;
guint8 buf [8];
- gboolean can_write = mono_breakpoint_clean_code (orig_code - 8, buf, sizeof (buf));
+ gboolean can_write = mono_breakpoint_clean_code (method_start, orig_code, 8, buf, sizeof (buf));
code = buf + 8;
if (mono_running_on_valgrind ())
void
mono_arch_nullify_class_init_trampoline (guint8 *code, gssize *regs)
{
+ guint8 buf [16];
+ gboolean can_write = mono_breakpoint_clean_code (NULL, code, 6, buf, sizeof (buf));
+
+ if (!can_write)
+ return;
+
code -= 5;
if (code [0] == 0xe8) {
if (!mono_running_on_valgrind ()) {
/* Check for thread interruption */
/* This is not perf critical code so no need to check the interrupt flag */
x86_push_reg (buf, X86_EAX);
- x86_call_code (buf, (guint8*)mono_thread_interruption_checkpoint);
+ x86_call_code (buf, (guint8*)mono_thread_force_interruption_checkpoint);
x86_pop_reg (buf, X86_EAX);
/* Restore LMF */
}
gpointer
-mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 encoded_offset)
+mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot)
{
guint8 *tramp = mono_get_trampoline_code (MONO_TRAMPOLINE_RGCTX_LAZY_FETCH);
- gboolean indirect = MONO_RGCTX_OFFSET_IS_INDIRECT (encoded_offset);
- int offset = indirect ? MONO_RGCTX_OFFSET_INDIRECT_OFFSET (encoded_offset) :
- MONO_RGCTX_OFFSET_DIRECT_OFFSET (encoded_offset);
- guint8 *code, *buf, *jump;
- guint8 *dummy;
+ guint8 *code, *buf;
+ guint8 **rgctx_null_jumps;
+ int tramp_size;
+ int depth, index;
+ int i;
+ gboolean mrgctx;
g_assert (tramp);
- if (indirect)
- g_assert (MONO_RGCTX_OFFSET_INDIRECT_SLOT (encoded_offset) == 0);
- code = buf = mono_global_codeman_reserve (32);
+ mrgctx = MONO_RGCTX_SLOT_IS_MRGCTX (slot);
+ index = MONO_RGCTX_SLOT_INDEX (slot);
+ if (mrgctx)
+ index += sizeof (MonoMethodRuntimeGenericContext) / sizeof (gpointer);
+ for (depth = 0; ; ++depth) {
+ int size = mono_class_rgctx_get_array_size (depth, mrgctx);
+
+ if (index < size - 1)
+ break;
+ index -= size - 1;
+ }
+
+ tramp_size = 36 + 6 * depth;
+
+ code = buf = mono_global_codeman_reserve (tramp_size);
- /* load rgctx ptr */
+ rgctx_null_jumps = g_malloc (sizeof (guint8*) * (depth + 2));
+
+ /* load vtable/mrgctx ptr */
x86_mov_reg_membase (buf, X86_EAX, X86_ESP, 4, 4);
- if (indirect) {
- /* if indirect, load extra_other_infos ptr */
- x86_mov_reg_membase (buf, X86_EAX, X86_EAX, G_STRUCT_OFFSET (MonoRuntimeGenericContext, extra_other_infos), 4);
+ if (!mrgctx) {
+ /* load rgctx ptr from vtable */
+ x86_mov_reg_membase (buf, X86_EAX, X86_EAX, G_STRUCT_OFFSET (MonoVTable, runtime_generic_context), 4);
+ /* is the rgctx ptr null? */
+ x86_test_reg_reg (buf, X86_EAX, X86_EAX);
+ /* if yes, jump to actual trampoline */
+ rgctx_null_jumps [0] = buf;
+ x86_branch8 (buf, X86_CC_Z, -1, 1);
}
- /* fetch slot */
- x86_mov_reg_membase (buf, X86_EAX, X86_EAX, offset, 4);
- dummy = buf;
+ for (i = 0; i < depth; ++i) {
+ /* load ptr to next array */
+ if (mrgctx && i == 0)
+ x86_mov_reg_membase (buf, X86_EAX, X86_EAX, sizeof (MonoMethodRuntimeGenericContext), 4);
+ else
+ x86_mov_reg_membase (buf, X86_EAX, X86_EAX, 0, 4);
+ /* is the ptr null? */
+ x86_test_reg_reg (buf, X86_EAX, X86_EAX);
+ /* if yes, jump to actual trampoline */
+ rgctx_null_jumps [i + 1] = buf;
+ x86_branch8 (buf, X86_CC_Z, -1, 1);
+ }
- /* is slot null? */
+ /* fetch slot */
+ x86_mov_reg_membase (buf, X86_EAX, X86_EAX, sizeof (gpointer) * (index + 1), 4);
+ /* is the slot null? */
x86_test_reg_reg (buf, X86_EAX, X86_EAX);
- jump = buf;
/* if yes, jump to actual trampoline */
+ rgctx_null_jumps [depth + 1] = buf;
x86_branch8 (buf, X86_CC_Z, -1, 1);
-
- /* if no, just return */
+ /* otherwise return */
x86_ret (buf);
+ for (i = mrgctx ? 1 : 0; i <= depth + 1; ++i)
+ x86_patch (rgctx_null_jumps [i], buf);
+
+ g_free (rgctx_null_jumps);
+
/*
* our stack looks like this (tos on top):
*
- * | ret addr |
- * | rgctx ptr |
- * | ... |
+ * | ret addr |
+ * | vtable ptr |
+ * | ... |
*
* the trampoline code expects it to look like this:
*
- * | rgctx ptr |
- * | ret addr |
- * | ... |
+ * | vtable ptr |
+ * | ret addr |
+ * | ... |
*
* whereas our caller expects to still have one argument on
* the stack when we return, so we transform the stack into
* this:
*
- * | rgctx ptr |
- * | ret addr |
- * | dummy |
- * | ... |
+ * | vtable ptr |
+ * | ret addr |
+ * | dummy |
+ * | ... |
*
- * which actually only requires us to push the rgctx ptr, and
- * the "old" rgctx ptr becomes the dummy.
+ * which actually only requires us to push the vtable ptr, and
+ * the "old" vtable ptr becomes the dummy.
*/
- x86_patch (jump, buf);
x86_push_membase (buf, X86_ESP, 4);
- x86_mov_reg_imm (buf, X86_EAX, encoded_offset);
+ x86_mov_reg_imm (buf, X86_EAX, slot);
x86_jump_code (buf, tramp);
mono_arch_flush_icache (code, buf - code);
- g_assert (buf - code <= 32);
+ g_assert (buf - code <= tramp_size);
return code;
}
x86_push_imm (code, func_arg);
x86_call_code (code, (guint8*)func);
}
-
-/*
- * This method is only called when running in the Mono Debugger.
- */
-gpointer
-mono_debugger_create_notification_function (void)
-{
- guint8 *buf, *code;
-
- code = buf = mono_global_codeman_reserve (2);
- x86_breakpoint (buf);
- x86_ret (buf);
- return code;
-}
projects / mono.git / blobdiff