Merge pull request #2274 from esdrubal/udpclientreceive

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

diff --git a/mono/mini/tramp-x86.c b/mono/mini/tramp-x86.c
index 6e79922512c9f3b165e62ebace0af1d2de63b81f..2b4475f0a67e929629a8b46cee381cf8e911c365 100644 (file)
--- a/mono/mini/tramp-x86.c
+++ b/mono/mini/tramp-x86.c
@@ -18,7 +18,7 @@
 #include <mono/metadata/mono-debug.h>
 #include <mono/metadata/mono-debug-debugger.h>
 #include <mono/metadata/profiler-private.h>
-#include <mono/metadata/gc-internal.h>
+#include <mono/metadata/gc-internals.h>
 #include <mono/arch/x86/x86-codegen.h>
 
 #include <mono/utils/memcheck.h>
@@ -90,37 +90,6 @@ mono_arch_get_static_rgctx_trampoline (MonoMethod *m, MonoMethodRuntimeGenericCo
        return start;
 }
 
-gpointer
-mono_arch_get_llvm_imt_trampoline (MonoDomain *domain, MonoMethod *m, int vt_offset)
-{
-       guint8 *code, *start;
-       int buf_len;
-       int this_offset;
-
-       buf_len = 32;
-
-       start = code = mono_domain_code_reserve (domain, buf_len);
-
-       this_offset = mono_x86_get_this_arg_offset (mono_method_signature (m));
-
-       /* Set imt arg */
-       x86_mov_reg_imm (code, MONO_ARCH_IMT_REG, m);
-       /* Load this */
-       x86_mov_reg_membase (code, X86_EAX, X86_ESP, this_offset + 4, 4);
-       /* Load vtable address */
-       x86_mov_reg_membase (code, X86_EAX, X86_EAX, 0, 4);
-       x86_jump_membase (code, X86_EAX, vt_offset);
-
-       g_assert ((code - start) < buf_len);
-
-       nacl_domain_code_validate (domain, &start, buf_len, &code);
-
-       mono_arch_flush_icache (start, code - start);
-       mono_profiler_code_buffer_new (start, code - start, MONO_PROFILER_CODE_BUFFER_IMT_TRAMPOLINE, NULL);
-
-       return start;
-}
-
 void
 mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr)
 {
@@ -789,6 +758,7 @@ mono_arch_create_sdb_trampoline (gboolean single_step, MonoTrampInfo **info, gbo
        /* Argument area */
        framesize += sizeof (mgreg_t);
 
+       framesize = ALIGN_TO (framesize, 8);
        ctx_offset = framesize;
        framesize += sizeof (MonoContext);