X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Ftramp-s390x.c;h=e3262fbe9de16e3e7e0af9cddd9e05517d01ab89;hb=19046502886ad7697b4c6642337441a7fdafd28a;hp=4a604f97e16c1c72b5e6f2256774f25cbc61e4e0;hpb=61374d794c5d7084785b13ae8fa90c5c1a4680e8;p=mono.git diff --git a/mono/mini/tramp-s390x.c b/mono/mini/tramp-s390x.c index 4a604f97e16..e3262fbe9de 100644 --- a/mono/mini/tramp-s390x.c +++ b/mono/mini/tramp-s390x.c @@ -1,20 +1,19 @@ -/*------------------------------------------------------------------*/ -/* */ -/* Name - tramp-s390x.c */ -/* */ -/* Function - JIT trampoline code for S/390. */ -/* */ -/* Name - Neale Ferguson (Neale.Ferguson@SoftwareAG-usa.com) */ -/* */ -/* Date - January, 2004 */ -/* */ -/* Derivation - From exceptions-x86 & exceptions-ppc */ -/* Paolo Molaro (lupus@ximian.com) */ -/* Dietmar Maurer (dietmar@ximian.com) */ -/* */ -/* Copyright - 2001 Ximian, Inc. */ -/* */ -/*------------------------------------------------------------------*/ +/** + * \file + * Function - JIT trampoline code for S/390. + * + * Name - Neale Ferguson (Neale.Ferguson@SoftwareAG-usa.com) + * + * Date - January, 2004 + * + * Derivation - From exceptions-x86 & exceptions-ppc + * Paolo Molaro (lupus@ximian.com) + * Dietmar Maurer (dietmar@ximian.com) + * + * Copyright - 2001 Ximian, Inc. + * Licensed under the MIT license. See LICENSE file in the project root for full license information. + * + */ /*------------------------------------------------------------------*/ /* D e f i n e s */ @@ -48,6 +47,7 @@ #include "mini.h" #include "mini-s390x.h" #include "support-s390x.h" +#include "jit-icalls.h" /*========================= End of Includes ========================*/ @@ -57,6 +57,7 @@ typedef struct { guint8 stk[S390_MINIMAL_STACK_SIZE]; /* Standard s390x stack */ + guint64 saveFn; /* Call address */ struct MonoLMF LMF; /* LMF */ } trampStack_t; @@ -107,7 +108,7 @@ mono_arch_get_unbox_trampoline (MonoMethod *method, gpointer addr) g_assert ((code - start) <= 28); mono_arch_flush_icache (start, code - start); - mono_profiler_code_buffer_new (start, code - start, MONO_PROFILER_CODE_BUFFER_UNBOX_TRAMPOLINE, method); + MONO_PROFILER_RAISE (jit_code_buffer, (start, code - start, MONO_PROFILER_CODE_BUFFER_UNBOX_TRAMPOLINE, method)); snprintf(trampName, sizeof(trampName), "%s_unbox_trampoline", method->name); @@ -189,8 +190,7 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf code = buf = mono_global_codeman_reserve(512); - if ((tramp_type == MONO_TRAMPOLINE_JUMP) || - (tramp_type == MONO_TRAMPOLINE_HANDLER_BLOCK_GUARD)) + if (tramp_type == MONO_TRAMPOLINE_JUMP) has_caller = 0; else has_caller = 1; @@ -308,15 +308,22 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf S390_SET (buf, s390_r1, tramp); s390_basr (buf, s390_r14, s390_r1); - /* OK, code address is now on r2. Move it to r1, so that we - can restore r2 and use it from r1 later */ - s390_lgr (buf, s390_r1, s390_r2); + /* OK, code address is now on r2. Save it, so that we + can restore r2 and use it later */ + s390_stg (buf, s390_r2, 0, STK_BASE, G_STRUCT_OFFSET(trampStack_t, saveFn)); + + /* Check for thread interruption */ + S390_SET (buf, s390_r1, (guint8 *)mono_interruption_checkpoint_from_trampoline); + s390_basr (buf, s390_r14, s390_r1); /*---------------------------------------------------------- STEP 3: Restore the LMF ----------------------------------------------------------*/ restoreLMF(buf, STK_BASE, sizeof(trampStack_t)); + /* Reload result */ + s390_lg (buf, s390_r1, 0, STK_BASE, G_STRUCT_OFFSET(trampStack_t, saveFn)); + /*---------------------------------------------------------- STEP 4: call the compiled method ----------------------------------------------------------*/ @@ -346,7 +353,7 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf /* Flush instruction cache, since we've generated code */ mono_arch_flush_icache (code, buf - code); - mono_profiler_code_buffer_new (buf, code - buf, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL); + MONO_PROFILER_RAISE (jit_code_buffer, (buf, code - buf, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL)); g_assert (info); tramp_name = mono_get_generic_trampoline_name (tramp_type); @@ -412,8 +419,9 @@ mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_ty /* Flush instruction cache, since we've generated code */ mono_arch_flush_icache (code, buf - code); - mono_profiler_code_buffer_new (buf, code - buf, MONO_PROFILER_CODE_BUFFER_SPECIFIC_TRAMPOLINE, - (void *) mono_get_generic_trampoline_simple_name (tramp_type)); + MONO_PROFILER_RAISE (jit_code_buffer, (buf, code - buf, + MONO_PROFILER_CODE_BUFFER_SPECIFIC_TRAMPOLINE, + (void *) mono_get_generic_trampoline_simple_name (tramp_type))); /* Sanity check */ g_assert ((buf - code) <= SPECIFIC_TRAMPOLINE_SIZE); @@ -518,7 +526,9 @@ mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info g_free (rgctx_null_jumps); /* move the rgctx pointer to the VTABLE register */ +#if MONO_ARCH_VTABLE_REG != s390_r2 s390_lgr (code, MONO_ARCH_VTABLE_REG, s390_r2); +#endif tramp = mono_arch_create_specific_trampoline (GUINT_TO_POINTER (slot), MONO_TRAMPOLINE_RGCTX_LAZY_FETCH, mono_get_root_domain (), NULL); @@ -528,7 +538,7 @@ mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info s390_jg (code, displace); mono_arch_flush_icache (buf, code - buf); - mono_profiler_code_buffer_new (buf, code - buf, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL); + MONO_PROFILER_RAISE (jit_code_buffer, (buf, code - buf, MONO_PROFILER_CODE_BUFFER_GENERICS_TRAMPOLINE, NULL)); g_assert (code - buf <= tramp_size); @@ -545,20 +555,17 @@ mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info /* */ /* Name - mono_arch_get_static_rgctx_trampoline */ /* */ -/* Function - Create a trampoline which sets RGCTX_REG to MRGCTX*/ +/* Function - Create a trampoline which sets RGCTX_REG to ARG */ /* then jumps to ADDR. */ /* */ /*------------------------------------------------------------------*/ gpointer -mono_arch_get_static_rgctx_trampoline (MonoMethod *m, - MonoMethodRuntimeGenericContext *mrgctx, - gpointer addr) +mono_arch_get_static_rgctx_trampoline (gpointer arg, gpointer addr) { guint8 *code, *start; gint32 displace; int buf_len; - char trampName[128]; MonoDomain *domain = mono_domain_get (); @@ -566,17 +573,15 @@ mono_arch_get_static_rgctx_trampoline (MonoMethod *m, start = code = mono_domain_code_reserve (domain, buf_len); - S390_SET (code, MONO_ARCH_RGCTX_REG, mrgctx); + S390_SET (code, MONO_ARCH_RGCTX_REG, arg); displace = ((uintptr_t) addr - (uintptr_t) code) / 2; s390_jg (code, displace); 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_HELPER, NULL); + MONO_PROFILER_RAISE (jit_code_buffer, (start, code - start, MONO_PROFILER_CODE_BUFFER_HELPER, NULL)); - snprintf(trampName, sizeof(trampName), "%s_rgctx_trampoline", m->name); - - mono_tramp_info_register (mono_tramp_info_create (trampName, start, code - start, NULL, NULL), domain); + mono_tramp_info_register (mono_tramp_info_create (NULL, start, code - start, NULL, NULL), domain); return(start); } @@ -585,74 +590,17 @@ mono_arch_get_static_rgctx_trampoline (MonoMethod *m, /*------------------------------------------------------------------*/ /* */ -/* Name - handler_block_trampoline_helper */ -/* */ -/* Function - */ -/* */ -/*------------------------------------------------------------------*/ - -static void -handler_block_trampoline_helper (gpointer *ptr) -{ - MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id); - *ptr = jit_tls->handler_block_return_address; -} - -/*========================= End of Function ========================*/ - -/*------------------------------------------------------------------*/ -/* */ -/* Name - mono_arch_create_handler_block_trampoline */ +/* Name - mono_arch_get_enter_icall_trampoline. */ /* */ -/* Function - */ +/* Function - */ /* */ /*------------------------------------------------------------------*/ gpointer -mono_arch_create_handler_block_trampoline (MonoTrampInfo **info, gboolean aot) +mono_arch_get_enter_icall_trampoline (MonoTrampInfo **info) { - guint8 *tramp = mono_get_trampoline_code (MONO_TRAMPOLINE_HANDLER_BLOCK_GUARD); - guint8 *code, *buf; - int tramp_size = 64; - MonoJumpInfo *ji = NULL; - GSList *unwind_ops = NULL; - - g_assert (!aot); - - code = buf = mono_global_codeman_reserve (tramp_size); - - /* - * This trampoline restore the call chain of the handler block - * then jumps into the code that deals with it. - */ - - if (mono_get_jit_tls_offset () != -1) { - s390_ear (code, s390_r1, 0); - s390_sllg (code, s390_r1, s390_r1, 0, 32); - s390_ear (code, s390_r1, 1); - S390_SET (code, s390_r14, mono_get_jit_tls_offset()); - s390_lg (code, s390_r14, s390_r1, 0, G_STRUCT_OFFSET(MonoJitTlsData, handler_block_return_address)); - /* - * Simulate a call - */ - S390_SET (code, s390_r1, tramp); - s390_br (code, s390_r1); - } else { - /* - * Slow path uses a C helper - */ - S390_SET (code, s390_r2, tramp); - S390_SET (code, s390_r1, handler_block_trampoline_helper); - s390_br (code, s390_r1); - } - - mono_arch_flush_icache (buf, code - buf); - mono_profiler_code_buffer_new (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); - - return buf; + g_assert_not_reached (); + return NULL; } /*========================= End of Function ========================*/