[runtime] New profiler API.

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

diff --git a/mono/mini/tramp-arm64.c b/mono/mini/tramp-arm64.c
index da998d4b1aa72bf4197d648a21d7dea3d42d85ec..45e18d880aad9724d70a4bffa49cb106393ceebb 100644 (file)
--- a/mono/mini/tramp-arm64.c
+++ b/mono/mini/tramp-arm64.c
@@ -79,8 +79,7 @@ mono_arch_get_call_target (guint8 *code)
        code -= 4;
 
        imm = *(guint32*)code;
-       /* Should be a bl */
-       g_assert (((imm >> 31) & 0x1) == 0x1);
+       /* Should be a b/bl */
        g_assert (((imm >> 26) & 0x7) == 0x5);
 
        disp = (imm & 0x3ffffff);
@@ -558,7 +557,7 @@ mono_arch_create_handler_block_trampoline (MonoTrampInfo **info, gboolean aot)
        arm_brx (code, ARMREG_IP0);
 
        mono_arch_flush_icache (buf, code - buf);
-       mono_profiler_code_buffer_new (buf, code - buf, MONO_PROFILER_CODE_BUFFER_HELPER, NULL);
+       MONO_PROFILER_RAISE (jit_code_buffer, (buf, code - buf, MONO_PROFILER_CODE_BUFFER_HELPER, NULL));
        g_assert (code - buf <= tramp_size);
 
        *info = mono_tramp_info_create ("handler_block_trampoline", buf, code - buf, ji, unwind_ops);
@@ -807,7 +806,7 @@ mono_arch_get_enter_icall_trampoline (MonoTrampInfo **info)
        g_assert (code - start < buf_len);
 
        mono_arch_flush_icache (start, code - start);
-       mono_profiler_code_buffer_new (start, code - start, MONO_PROFILER_CODE_BUFFER_EXCEPTION_HANDLING, NULL);
+       MONO_PROFILER_RAISE (jit_code_buffer, (start, code - start, MONO_PROFILER_CODE_BUFFER_EXCEPTION_HANDLING, NULL));
 
        if (info)
                *info = mono_tramp_info_create ("enter_icall_trampoline", start, code - start, ji, unwind_ops);
@@ -877,4 +876,10 @@ mono_arch_create_sdb_trampoline (gboolean single_step, MonoTrampInfo **info, gbo
        return NULL;
 }
 
+gpointer
+mono_arch_get_enter_icall_trampoline (MonoTrampInfo **info)
+{
+       g_assert_not_reached ();
+       return NULL;
+}
 #endif /* !DISABLE_JIT */