static guint32 load_type_info_tls_id;
static void
-delegate_hash_table_add (MonoDelegate *d, MonoObject **target_loc);
+delegate_hash_table_add (MonoDelegate *d);
static void
emit_struct_conv (MonoMethodBuilder *mb, MonoClass *klass, gboolean to_object);
+static void
+emit_struct_conv_full (MonoMethodBuilder *mb, MonoClass *klass, gboolean to_object, MonoMarshalNative string_encoding);
+
static void
mono_struct_delete_old (MonoClass *klass, char *ptr);
static MonoStringBuilder *
mono_string_utf16_to_builder2 (gunichar2 *text);
+static MonoString*
+mono_string_new_len_wrapper (const char *text, guint length);
+
static void
mono_byvalarray_to_array (MonoArray *arr, gpointer native_arr, MonoClass *eltype, guint32 elnum);
register_icall (mono_string_to_utf16, "mono_string_to_utf16", "ptr obj", FALSE);
register_icall (mono_string_from_utf16, "mono_string_from_utf16", "obj ptr", FALSE);
register_icall (mono_string_new_wrapper, "mono_string_new_wrapper", "obj ptr", FALSE);
+ register_icall (mono_string_new_len_wrapper, "mono_string_new_len_wrapper", "obj ptr int", FALSE);
register_icall (mono_string_to_utf8, "mono_string_to_utf8", "ptr obj", FALSE);
register_icall (mono_string_to_lpstr, "mono_string_to_lpstr", "ptr obj", FALSE);
register_icall (mono_string_to_ansibstr, "mono_string_to_ansibstr", "ptr object", FALSE);
register_icall (mono_upgrade_remote_class_wrapper, "mono_upgrade_remote_class_wrapper", "void object object", FALSE);
register_icall (type_from_handle, "type_from_handle", "object ptr", FALSE);
register_icall (mono_gc_wbarrier_generic_nostore, "wb_generic", "void ptr", FALSE);
+ register_icall (mono_gchandle_get_target, "mono_gchandle_get_target", "object int32", TRUE);
mono_cominterop_init ();
}
{
MonoMethod *method, *wrapper;
MonoClass *klass;
- MonoObject **target_loc;
+ uint32_t target_handle = 0;
if (!delegate)
return NULL;
if (delegate->target) {
/* Produce a location which can be embedded in JITted code */
- target_loc = mono_gc_alloc_fixed (sizeof (MonoObject*), NULL);
- *target_loc = delegate->target;
- } else {
- target_loc = NULL;
+ target_handle = mono_gchandle_new_weakref (delegate->target, FALSE);
}
- wrapper = mono_marshal_get_managed_wrapper (method, klass, target_loc);
+ wrapper = mono_marshal_get_managed_wrapper (method, klass, target_handle);
delegate->delegate_trampoline = mono_compile_method (wrapper);
// Add the delegate to the delegate hash table
- delegate_hash_table_add (delegate, target_loc);
+ delegate_hash_table_add (delegate);
/* when the object is collected, collect the dynamic method, too */
mono_object_register_finalizer ((MonoObject*)delegate);
* object pointer itself, otherwise we use a GC handle.
*/
static GHashTable *delegate_hash_table;
-/* Contains root locations pointing to the this arguments of delegates */
-static MonoGHashTable *delegate_target_locations;
static GHashTable *
delegate_hash_table_new (void) {
static void
delegate_hash_table_remove (MonoDelegate *d)
{
- MonoObject **target_loc;
#ifdef HAVE_MOVING_COLLECTOR
guint32 gchandle;
#endif
gchandle = GPOINTER_TO_UINT (g_hash_table_lookup (delegate_hash_table, d->delegate_trampoline));
#endif
g_hash_table_remove (delegate_hash_table, d->delegate_trampoline);
- if (delegate_target_locations)
- target_loc = mono_g_hash_table_lookup (delegate_target_locations, d->delegate_trampoline);
- else
- target_loc = NULL;
- if (target_loc)
- mono_g_hash_table_remove (delegate_target_locations, d->delegate_trampoline);
mono_marshal_unlock ();
- if (target_loc) {
- mono_gc_free_fixed (target_loc);
- }
#ifdef HAVE_MOVING_COLLECTOR
mono_gchandle_free (gchandle);
#endif
}
static void
-delegate_hash_table_add (MonoDelegate *d, MonoObject **target_loc)
+delegate_hash_table_add (MonoDelegate *d)
{
#ifdef HAVE_MOVING_COLLECTOR
guint32 gchandle = mono_gchandle_new_weakref ((MonoObject*)d, FALSE);
mono_marshal_lock ();
if (delegate_hash_table == NULL)
delegate_hash_table = delegate_hash_table_new ();
- if (delegate_target_locations == NULL) {
- /* Has to be conservative as the values are not object references */
- delegate_target_locations = mono_g_hash_table_new_type (NULL, NULL, MONO_HASH_CONSERVATIVE_GC);
- MONO_GC_REGISTER_ROOT (delegate_target_locations);
- }
#ifdef HAVE_MOVING_COLLECTOR
old_gchandle = GPOINTER_TO_UINT (g_hash_table_lookup (delegate_hash_table, d->delegate_trampoline));
g_hash_table_insert (delegate_hash_table, d->delegate_trampoline, GUINT_TO_POINTER (gchandle));
#else
g_hash_table_insert (delegate_hash_table, d->delegate_trampoline, d);
#endif
- if (target_loc)
- /* This keeps target_loc alive for Boehm */
- mono_g_hash_table_insert (delegate_target_locations, d->delegate_trampoline, target_loc);
mono_marshal_unlock ();
}
}
if (ptr) {
+ uint32_t gchandle;
+ void **method_data;
ji = mono_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (ptr));
g_assert (ji);
+ method_data = ((MonoMethodWrapper*)ji->method)->method_data;
+
+ /*the target gchandle is the first entry after size and the wrapper itself.*/
+ gchandle = GPOINTER_TO_UINT (method_data [2]);
+
+ if (gchandle)
+ mono_gchandle_free (gchandle);
+
mono_runtime_free_method (mono_object_domain (delegate), ji->method);
}
}
case MONO_TYPE_R4:
case MONO_TYPE_R8:
case MONO_TYPE_VALUETYPE:
+ case MONO_TYPE_PTR:
/* nothing to do */
break;
case MONO_TYPE_GENERICINST:
- case MONO_TYPE_PTR:
case MONO_TYPE_OBJECT:
case MONO_TYPE_ARRAY:
case MONO_TYPE_SZARRAY:
*((gunichar2 *) dst + len) = 0;
}
+static MonoString*
+mono_string_new_len_wrapper (const char *text, guint length)
+{
+ return mono_string_new_len (mono_domain_get (), text, length);
+}
+
static int
mono_mb_emit_proxy_check (MonoMethodBuilder *mb, int branch_code)
{
return mono_mb_emit_branch (mb, branch_code);
}
+/*
+ * mono_mb_emit_exception_marshal_directive:
+ *
+ * This function assumes ownership of MSG, which should be malloc-ed.
+ */
static void
-mono_mb_emit_exception_marshal_directive (MonoMethodBuilder *mb, const char *msg)
+mono_mb_emit_exception_marshal_directive (MonoMethodBuilder *mb, char *msg)
{
- mono_mb_emit_exception_full (mb, "System.Runtime.InteropServices", "MarshalDirectiveException", msg);
+ char *s;
+
+ if (!mb->dynamic) {
+ s = mono_image_strdup (mb->method->klass->image, msg);
+ g_free (msg);
+ } else {
+ s = g_strdup (msg);
+ }
+ mono_mb_emit_exception_full (mb, "System.Runtime.InteropServices", "MarshalDirectiveException", s);
}
guint
char *msg = g_strdup_printf ("marshaling conversion %d not implemented", conv);
mono_mb_emit_exception_marshal_directive (mb, msg);
- g_free (msg);
break;
}
}
return mono_marshal_string_to_utf16;
case MONO_MARSHAL_CONV_LPWSTR_STR:
return mono_string_from_utf16;
+ case MONO_MARSHAL_CONV_LPTSTR_STR:
+#ifdef TARGET_WIN32
+ return mono_string_from_utf16;
+#else
+ return mono_string_new_wrapper;
+#endif
case MONO_MARSHAL_CONV_LPSTR_STR:
return mono_string_new_wrapper;
case MONO_MARSHAL_CONV_STR_LPTSTR:
}
static void
-emit_struct_conv (MonoMethodBuilder *mb, MonoClass *klass, gboolean to_object)
+emit_struct_conv_full (MonoMethodBuilder *mb, MonoClass *klass, gboolean to_object,
+ MonoMarshalNative string_encoding)
{
MonoMarshalType *info;
int i;
case MONO_TYPE_R8:
mono_mb_emit_ldloc (mb, 1);
mono_mb_emit_ldloc (mb, 0);
- mono_mb_emit_byte (mb, mono_type_to_ldind (ftype));
- mono_mb_emit_byte (mb, mono_type_to_stind (ftype));
+ if (t == MONO_TYPE_CHAR && ntype == MONO_NATIVE_U1 && string_encoding != MONO_NATIVE_LPWSTR) {
+ if (to_object) {
+ mono_mb_emit_byte (mb, CEE_LDIND_U1);
+ mono_mb_emit_byte (mb, CEE_STIND_I2);
+ } else {
+ mono_mb_emit_byte (mb, CEE_LDIND_U2);
+ mono_mb_emit_byte (mb, CEE_STIND_I1);
+ }
+ } else {
+ mono_mb_emit_byte (mb, mono_type_to_ldind (ftype));
+ mono_mb_emit_byte (mb, mono_type_to_stind (ftype));
+ }
break;
case MONO_TYPE_VALUETYPE: {
int src_var, dst_var;
}
}
+static void
+emit_struct_conv (MonoMethodBuilder *mb, MonoClass *klass, gboolean to_object)
+{
+ emit_struct_conv_full (mb, klass, to_object, -1);
+}
+
static void
emit_struct_free (MonoMethodBuilder *mb, MonoClass *klass, int struct_var)
{
case MONO_NATIVE_LPWSTR:
return MONO_MARSHAL_CONV_STR_LPWSTR;
case MONO_NATIVE_LPSTR:
+ case MONO_NATIVE_VBBYREFSTR:
return MONO_MARSHAL_CONV_STR_LPSTR;
case MONO_NATIVE_LPTSTR:
return MONO_MARSHAL_CONV_STR_LPTSTR;
*need_free = FALSE;
return MONO_MARSHAL_CONV_LPWSTR_STR;
case MONO_NATIVE_LPSTR:
+ case MONO_NATIVE_VBBYREFSTR:
return MONO_MARSHAL_CONV_LPSTR_STR;
case MONO_NATIVE_LPTSTR:
return MONO_MARSHAL_CONV_LPTSTR_STR;
return *var;
}
+static GHashTable*
+get_cache_full (GHashTable **var, GHashFunc hash_func, GCompareFunc equal_func, GDestroyNotify key_destroy_func, GDestroyNotify value_destroy_func)
+{
+ if (!(*var)) {
+ mono_marshal_lock ();
+ if (!(*var)) {
+ GHashTable *cache =
+ g_hash_table_new_full (hash_func, equal_func, key_destroy_func, value_destroy_func);
+ mono_memory_barrier ();
+ *var = cache;
+ }
+ mono_marshal_unlock ();
+ }
+ return *var;
+}
+
GHashTable*
mono_marshal_get_cache (GHashTable **var, GHashFunc hash_func, GCompareFunc equal_func)
{
{
MonoMethod **res = NULL;
MonoRemotingMethods *wrps;
- GHashTable *cache = get_cache (&key->klass->image->remoting_invoke_cache, mono_aligned_addr_hash, NULL);
+ GHashTable *cache = get_cache_full (&key->klass->image->remoting_invoke_cache, mono_aligned_addr_hash, NULL, NULL, g_free);
mono_marshal_lock ();
wrps = g_hash_table_lookup (cache, key);
mono_marshal_method_from_wrapper (MonoMethod *wrapper)
{
gpointer res;
+ int wrapper_type = wrapper->wrapper_type;
- if (wrapper->wrapper_type == MONO_WRAPPER_NONE || wrapper->wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
+ if (wrapper_type == MONO_WRAPPER_NONE || wrapper_type == MONO_WRAPPER_DYNAMIC_METHOD)
return wrapper;
- res = mono_method_get_wrapper_data (wrapper, 1);
- if (res == NULL)
- return wrapper;
- return res;
+ switch (wrapper_type) {
+ case MONO_WRAPPER_REMOTING_INVOKE:
+ case MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK:
+ case MONO_WRAPPER_XDOMAIN_INVOKE:
+ case MONO_WRAPPER_SYNCHRONIZED:
+ case MONO_WRAPPER_MANAGED_TO_NATIVE:
+ case MONO_WRAPPER_RUNTIME_INVOKE:
+ res = mono_method_get_wrapper_data (wrapper, 1);
+ if (res == NULL)
+ return wrapper;
+ return res;
+ default:
+ return NULL;
+ }
}
/*
return mono_metadata_signature_equal (pair1->sig, pair2->sig) && (pair1->method == pair2->method);
}
+static gboolean
+signature_method_pair_matches_method (gpointer key, gpointer value, gpointer user_data)
+{
+ SignatureMethodPair *pair = (SignatureMethodPair*)key;
+ MonoMethod *method = (MonoMethod*)user_data;
+
+ return pair->method == method;
+}
+
static void
free_signature_method_pair (SignatureMethodPair *pair)
{
MonoMethod *
mono_marshal_get_delegate_invoke (MonoMethod *method, MonoDelegate *del)
{
- MonoMethodSignature *sig, *static_sig;
+ MonoMethodSignature *sig, *static_sig, *invoke_sig;
int i;
MonoMethodBuilder *mb;
MonoMethod *res, *newm;
MonoMethod *target_method = NULL;
MonoClass *target_class = NULL;
gboolean callvirt = FALSE;
+ gboolean closed_over_null = FALSE;
+ gboolean static_method_with_first_arg_bound = FALSE;
/*
* If the delegate target is null, and the target method is not static, a virtual
g_assert (method && method->klass->parent == mono_defaults.multicastdelegate_class &&
!strcmp (method->name, "Invoke"));
- sig = mono_signature_no_pinvoke (method);
+ invoke_sig = sig = mono_signature_no_pinvoke (method);
+
+ if (callvirt)
+ closed_over_null = sig->param_count == mono_method_signature (del->method)->param_count;
+
+ if (del && del->method && mono_method_signature (del->method)->param_count == sig->param_count + 1 && (del->method->flags & METHOD_ATTRIBUTE_STATIC)) {
+ invoke_sig = mono_method_signature (del->method);
+ target_method = del->method;
+ static_method_with_first_arg_bound = TRUE;
+ }
+
+ if (callvirt || static_method_with_first_arg_bound) {
+ GHashTable **cache_ptr;
+ if (static_method_with_first_arg_bound)
+ cache_ptr = &method->klass->image->delegate_bound_static_invoke_cache;
+ else
+ cache_ptr = &method->klass->image->delegate_abstract_invoke_cache;
- if (callvirt) {
/* We need to cache the signature+method pair */
mono_marshal_lock ();
- if (!method->klass->image->delegate_abstract_invoke_cache)
- method->klass->image->delegate_abstract_invoke_cache = g_hash_table_new_full (signature_method_pair_hash, (GEqualFunc)signature_method_pair_equal, (GDestroyNotify)free_signature_method_pair, NULL);
- cache = method->klass->image->delegate_abstract_invoke_cache;
- key.sig = sig;
+ if (!*cache_ptr)
+ *cache_ptr = g_hash_table_new_full (signature_method_pair_hash, (GEqualFunc)signature_method_pair_equal, (GDestroyNotify)free_signature_method_pair, NULL);
+ cache = *cache_ptr;
+ key.sig = invoke_sig;
key.method = target_method;
res = g_hash_table_lookup (cache, &key);
mono_marshal_unlock ();
static_sig = signature_dup (method->klass->image, sig);
static_sig->hasthis = 0;
+ if (!static_method_with_first_arg_bound)
+ invoke_sig = static_sig;
name = mono_signature_to_name (sig, "invoke");
mb = mono_mb_new (get_wrapper_target_class (method->klass->image), name, MONO_WRAPPER_DELEGATE_INVOKE);
mono_mb_emit_byte (mb, CEE_LDIND_REF);
mono_mb_emit_stloc (mb, local_target);
- /* if target != null */
- mono_mb_emit_ldloc (mb, local_target);
- pos0 = mono_mb_emit_branch (mb, CEE_BRFALSE);
-
- /* then call this->method_ptr nonstatic */
- if (callvirt) {
- // FIXME:
- mono_mb_emit_exception_full (mb, "System", "NotImplementedException", "");
- } else {
- mono_mb_emit_ldloc (mb, local_target);
- for (i = 0; i < sig->param_count; ++i)
- mono_mb_emit_ldarg (mb, i + 1);
- mono_mb_emit_ldarg (mb, 0);
- mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoDelegate, method_ptr));
- mono_mb_emit_byte (mb, CEE_LDIND_I );
- mono_mb_emit_op (mb, CEE_CALLI, sig);
+ /*static methods with bound first arg can have null target and still be bound*/
+ if (!static_method_with_first_arg_bound) {
+ /* if target != null */
+ mono_mb_emit_ldloc (mb, local_target);
+ pos0 = mono_mb_emit_branch (mb, CEE_BRFALSE);
- mono_mb_emit_byte (mb, CEE_RET);
- }
+ /* then call this->method_ptr nonstatic */
+ if (callvirt) {
+ // FIXME:
+ mono_mb_emit_exception_full (mb, "System", "NotImplementedException", "");
+ } else {
+ mono_mb_emit_ldloc (mb, local_target);
+ for (i = 0; i < sig->param_count; ++i)
+ mono_mb_emit_ldarg (mb, i + 1);
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoDelegate, method_ptr));
+ mono_mb_emit_byte (mb, CEE_LDIND_I );
+ mono_mb_emit_op (mb, CEE_CALLI, sig);
- /* else [target == null] call this->method_ptr static */
- mono_mb_patch_branch (mb, pos0);
+ mono_mb_emit_byte (mb, CEE_RET);
+ }
+
+ /* else [target == null] call this->method_ptr static */
+ mono_mb_patch_branch (mb, pos0);
+ }
if (callvirt) {
- mono_mb_emit_ldarg (mb, 1);
- mono_mb_emit_op (mb, CEE_CASTCLASS, target_class);
- for (i = 1; i < sig->param_count; ++i)
- mono_mb_emit_ldarg (mb, i + 1);
- mono_mb_emit_op (mb, CEE_CALLVIRT, target_method);
+ if (!closed_over_null) {
+ mono_mb_emit_ldarg (mb, 1);
+ mono_mb_emit_op (mb, CEE_CASTCLASS, target_class);
+ for (i = 1; i < sig->param_count; ++i)
+ mono_mb_emit_ldarg (mb, i + 1);
+ mono_mb_emit_op (mb, CEE_CALLVIRT, target_method);
+ } else {
+ mono_mb_emit_byte (mb, CEE_LDNULL);
+ for (i = 0; i < sig->param_count; ++i)
+ mono_mb_emit_ldarg (mb, i + 1);
+ mono_mb_emit_op (mb, CEE_CALL, target_method);
+ }
} else {
+ if (static_method_with_first_arg_bound) {
+ mono_mb_emit_ldloc (mb, local_target);
+ if (!MONO_TYPE_IS_REFERENCE (invoke_sig->params[0]))
+ mono_mb_emit_op (mb, CEE_UNBOX_ANY, mono_class_from_mono_type (invoke_sig->params[0]));
+ }
for (i = 0; i < sig->param_count; ++i)
mono_mb_emit_ldarg (mb, i + 1);
mono_mb_emit_ldarg (mb, 0);
mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoDelegate, method_ptr));
mono_mb_emit_byte (mb, CEE_LDIND_I );
- mono_mb_emit_op (mb, CEE_CALLI, static_sig);
+ mono_mb_emit_op (mb, CEE_CALLI, invoke_sig);
}
mono_mb_emit_byte (mb, CEE_RET);
- if (callvirt) {
+ if (static_method_with_first_arg_bound || callvirt) {
// From mono_mb_create_and_cache
mb->skip_visibility = 1;
newm = mono_mb_create_method (mb, sig, sig->param_count + 16);
if (!res) {
res = newm;
new_key = g_new0 (SignatureMethodPair, 1);
- new_key->sig = sig;
- new_key->method = target_method;
+ *new_key = key;
+ if (static_method_with_first_arg_bound)
+ new_key->sig = signature_dup (del->method->klass->image, key.sig);
g_hash_table_insert (cache, new_key, res);
mono_marshal_set_wrapper_info (res, new_key);
mono_marshal_unlock ();
res->hasthis = FALSE;
for (i = sig->param_count - 1; i >= 0; i --)
res->params [i + 1] = sig->params [i];
- res->params [0] = &mono_ptr_class_get (&klass->byval_arg)->byval_arg;
+ res->params [0] = klass->valuetype ? &klass->this_arg : &klass->byval_arg;
return res;
}
}
/*
- * generates IL code for the runtime invoke function
- * MonoObject *runtime_invoke (MonoObject *this, void **params, MonoObject **exc, void* method)
+ * emit_invoke_call:
*
- * we also catch exceptions if exc != null
- * If VIRTUAL is TRUE, then METHOD is invoked virtually on THIS. This is useful since
- * it means that the compiled code for METHOD does not have to be looked up
- * before calling the runtime invoke wrapper. In this case, the wrapper ignores
- * its METHOD argument.
+ * Emit the call to the wrapper method from a runtime invoke wrapper.
*/
-MonoMethod *
-mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean virtual)
+static void
+emit_invoke_call (MonoMethodBuilder *mb, MonoMethod *method,
+ MonoMethodSignature *sig, MonoMethodSignature *callsig,
+ int loc_res,
+ gboolean virtual, gboolean need_direct_wrapper)
{
- MonoMethodSignature *sig, *csig, *callsig;
- MonoExceptionClause *clause;
- MonoMethodBuilder *mb;
- GHashTable *cache = NULL;
- MonoClass *target_klass;
- MonoMethod *res = NULL;
static MonoString *string_dummy = NULL;
- static MonoMethodSignature *cctor_signature = NULL;
- static MonoMethodSignature *finalize_signature = NULL;
- int i, pos;
- char *name;
- gboolean need_direct_wrapper = FALSE;
+ int i;
int *tmp_nullable_locals;
-
- g_assert (method);
-
- if (!cctor_signature) {
- cctor_signature = mono_metadata_signature_alloc (mono_defaults.corlib, 0);
- cctor_signature->ret = &mono_defaults.void_class->byval_arg;
- }
- if (!finalize_signature) {
- finalize_signature = mono_metadata_signature_alloc (mono_defaults.corlib, 0);
- finalize_signature->ret = &mono_defaults.void_class->byval_arg;
- finalize_signature->hasthis = 1;
- }
-
- if (virtual)
- need_direct_wrapper = TRUE;
-
- /*
- * Use a separate cache indexed by methods to speed things up and to avoid the
- * boundless mempool growth caused by the signature_dup stuff below.
- */
- if (virtual)
- cache = get_cache (&method->klass->image->runtime_invoke_vcall_cache, mono_aligned_addr_hash, NULL);
- else
- cache = get_cache (&method->klass->image->runtime_invoke_direct_cache, mono_aligned_addr_hash, NULL);
- res = mono_marshal_find_in_cache (cache, method);
- if (res)
- return res;
-
- if (method->klass->rank && (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) &&
- (method->iflags & METHOD_IMPL_ATTRIBUTE_NATIVE)) {
- /*
- * Array Get/Set/Address methods. The JIT implements them using inline code
- * so we need to create an invoke wrapper which calls the method directly.
- */
- need_direct_wrapper = TRUE;
- }
-
- if (method->string_ctor) {
- callsig = lookup_string_ctor_signature (mono_method_signature (method));
- if (!callsig)
- callsig = add_string_ctor_signature (method);
- /* Can't share this as we push a string as this */
- need_direct_wrapper = TRUE;
- } else {
- if (method->klass->valuetype && mono_method_signature (method)->hasthis) {
- /*
- * Valuetype methods receive a managed pointer as the this argument.
- * Create a new signature to reflect this.
- */
- callsig = signature_dup_add_this (mono_method_signature (method), method->klass);
- /* Can't share this as it would be shared with static methods taking an IntPtr argument */
- need_direct_wrapper = TRUE;
- } else {
- if (method->dynamic)
- callsig = signature_dup (method->klass->image, mono_method_signature (method));
- else
- callsig = mono_method_signature (method);
- }
- }
-
-#if 0
- /* Vtypes/nullables/Byrefs cause too many problems */
- for (i = 0; i < callsig->param_count; ++i) {
- if (MONO_TYPE_ISSTRUCT (callsig->params [i]) || callsig->params [i]->byref)
- need_direct_wrapper = TRUE;
- }
-#endif
-
- /*
- * We try to share runtime invoke wrappers between different methods but have to
- * be careful about methods whose klass has a type cctor, since putting the wrapper
- * into that klass would mean that calling a method of klass A might invoke the
- * type initializer of class B, or throw an exception if the type initializer
- * was called before and failed. See #349621 for an example.
- * We avoid that for mscorlib methods by putting every wrapper into the object class.
- */
- if (method->klass->image == mono_defaults.corlib)
- target_klass = mono_defaults.object_class;
- else {
- /* Try to share wrappers for non-corlib methods with simple signatures */
- if (mono_metadata_signature_equal (callsig, cctor_signature)) {
- callsig = cctor_signature;
- target_klass = mono_defaults.object_class;
- } else if (mono_metadata_signature_equal (callsig, finalize_signature)) {
- callsig = finalize_signature;
- target_klass = mono_defaults.object_class;
- } else {
- // FIXME: This breaks too many things
- /*
- if (mono_class_get_cctor (method->klass))
- need_direct_wrapper = TRUE;
- */
-
- target_klass = get_wrapper_target_class (method->klass->image);
- }
- }
-
- if (need_direct_wrapper) {
- /* Already searched at the start */
- } else {
- MonoMethodSignature *tmp_sig;
-
- callsig = mono_marshal_get_runtime_invoke_sig (callsig);
-
- cache = get_cache (&target_klass->image->runtime_invoke_cache,
- (GHashFunc)mono_signature_hash,
- (GCompareFunc)runtime_invoke_signature_equal);
-
- /* from mono_marshal_find_in_cache */
- mono_marshal_lock ();
- res = g_hash_table_lookup (cache, callsig);
- mono_marshal_unlock ();
-
- if (res) {
- g_free (callsig);
- return res;
- }
-
- /* Make a copy of the signature from the image mempool */
- tmp_sig = callsig;
- callsig = mono_metadata_signature_dup_full (target_klass->image, callsig);
- g_free (tmp_sig);
- }
+ gboolean void_ret = FALSE;
/* to make it work with our special string constructors */
if (!string_dummy) {
- MONO_GC_REGISTER_ROOT (string_dummy);
+ MONO_GC_REGISTER_ROOT_SINGLE (string_dummy);
string_dummy = mono_string_new_wrapper ("dummy");
}
-
- sig = mono_method_signature (method);
-
- csig = mono_metadata_signature_alloc (target_klass->image, 4);
-
- csig->ret = &mono_defaults.object_class->byval_arg;
- if (method->klass->valuetype && mono_method_signature (method)->hasthis)
- csig->params [0] = callsig->params [0];
- else
- csig->params [0] = &mono_defaults.object_class->byval_arg;
- csig->params [1] = &mono_defaults.int_class->byval_arg;
- csig->params [2] = &mono_defaults.int_class->byval_arg;
- csig->params [3] = &mono_defaults.int_class->byval_arg;
-
- name = mono_signature_to_name (callsig, virtual ? "runtime_invoke_virtual" : "runtime_invoke");
- mb = mono_mb_new (target_klass, name, MONO_WRAPPER_RUNTIME_INVOKE);
- g_free (name);
-
- /* allocate local 0 (object) tmp */
- mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
- /* allocate local 1 (object) exc */
- mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
-
- /* cond set *exc to null */
- mono_mb_emit_byte (mb, CEE_LDARG_2);
- mono_mb_emit_byte (mb, CEE_BRFALSE_S);
- mono_mb_emit_byte (mb, 3);
- mono_mb_emit_byte (mb, CEE_LDARG_2);
- mono_mb_emit_byte (mb, CEE_LDNULL);
- mono_mb_emit_byte (mb, CEE_STIND_REF);
-
- emit_thread_force_interrupt_checkpoint (mb);
if (virtual) {
g_assert (sig->hasthis);
break;
default:
g_assert_not_reached ();
- }
+ }
}
if (virtual) {
switch (sig->ret->type) {
case MONO_TYPE_VOID:
if (!method->string_ctor)
- mono_mb_emit_byte (mb, CEE_LDNULL);
+ void_ret = TRUE;
break;
case MONO_TYPE_BOOLEAN:
case MONO_TYPE_CHAR:
g_assert_not_reached ();
}
- mono_mb_emit_stloc (mb, 0);
+ if (!void_ret)
+ mono_mb_emit_stloc (mb, loc_res);
/* Convert back nullable-byref arguments */
for (i = 0; i < sig->param_count; i++) {
mono_mb_emit_byte (mb, CEE_STIND_REF);
}
}
-
- pos = mono_mb_emit_branch (mb, CEE_LEAVE);
- clause = mono_image_alloc0 (target_klass->image, sizeof (MonoExceptionClause));
- clause->flags = MONO_EXCEPTION_CLAUSE_FILTER;
- clause->try_len = mono_mb_get_label (mb);
+ g_free (tmp_nullable_locals);
+}
+
+static void
+emit_runtime_invoke_body (MonoMethodBuilder *mb, MonoClass *target_klass, MonoMethod *method,
+ MonoMethodSignature *sig, MonoMethodSignature *callsig,
+ gboolean virtual, gboolean need_direct_wrapper)
+{
+ gint32 labels [16];
+ MonoExceptionClause *clause;
+ int loc_res, loc_exc;
+
+ /* The wrapper looks like this:
+ *
+ * <interrupt check>
+ * if (exc) {
+ * try {
+ * return <call>
+ * } catch (Exception e) {
+ * *exc = e;
+ * }
+ * } else {
+ * return <call>
+ * }
+ */
+
+ /* allocate local 0 (object) tmp */
+ loc_res = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+ /* allocate local 1 (object) exc */
+ loc_exc = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+
+ /* *exc is assumed to be initialized to NULL by the caller */
- /* filter code */
- clause->data.filter_offset = mono_mb_get_label (mb);
-
- mono_mb_emit_byte (mb, CEE_POP);
mono_mb_emit_byte (mb, CEE_LDARG_2);
- mono_mb_emit_byte (mb, CEE_LDC_I4_0);
- mono_mb_emit_byte (mb, CEE_PREFIX1);
- mono_mb_emit_byte (mb, CEE_CGT_UN);
- mono_mb_emit_byte (mb, CEE_PREFIX1);
- mono_mb_emit_byte (mb, CEE_ENDFILTER);
+ labels [0] = mono_mb_emit_branch (mb, CEE_BRFALSE);
+
+ /*
+ * if (exc) case
+ */
+ labels [1] = mono_mb_get_label (mb);
+ emit_thread_force_interrupt_checkpoint (mb);
+ emit_invoke_call (mb, method, sig, callsig, loc_res, virtual, need_direct_wrapper);
+
+ labels [2] = mono_mb_emit_branch (mb, CEE_LEAVE);
+
+ /* Add a try clause around the call */
+ clause = mono_image_alloc0 (target_klass->image, sizeof (MonoExceptionClause));
+ clause->flags = MONO_EXCEPTION_CLAUSE_NONE;
+ clause->data.catch_class = mono_defaults.exception_class;
+ clause->try_offset = labels [1];
+ clause->try_len = mono_mb_get_label (mb) - labels [1];
clause->handler_offset = mono_mb_get_label (mb);
/* handler code */
- /* store exception */
- mono_mb_emit_stloc (mb, 1);
-
+ mono_mb_emit_stloc (mb, loc_exc);
mono_mb_emit_byte (mb, CEE_LDARG_2);
- mono_mb_emit_ldloc (mb, 1);
+ mono_mb_emit_ldloc (mb, loc_exc);
mono_mb_emit_byte (mb, CEE_STIND_REF);
- mono_mb_emit_byte (mb, CEE_LDNULL);
- mono_mb_emit_stloc (mb, 0);
-
mono_mb_emit_branch (mb, CEE_LEAVE);
clause->handler_len = mono_mb_get_pos (mb) - clause->handler_offset;
mono_mb_set_clauses (mb, 1, clause);
- /* return result */
- mono_mb_patch_branch (mb, pos);
+ mono_mb_patch_branch (mb, labels [2]);
+ mono_mb_emit_ldloc (mb, loc_res);
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ /*
+ * if (!exc) case
+ */
+ mono_mb_patch_branch (mb, labels [0]);
+ emit_thread_force_interrupt_checkpoint (mb);
+ emit_invoke_call (mb, method, sig, callsig, loc_res, virtual, need_direct_wrapper);
+
mono_mb_emit_ldloc (mb, 0);
mono_mb_emit_byte (mb, CEE_RET);
+}
- g_free (tmp_nullable_locals);
+/*
+ * generates IL code for the runtime invoke function
+ * MonoObject *runtime_invoke (MonoObject *this, void **params, MonoObject **exc, void* method)
+ *
+ * we also catch exceptions if exc != null
+ * If VIRTUAL is TRUE, then METHOD is invoked virtually on THIS. This is useful since
+ * it means that the compiled code for METHOD does not have to be looked up
+ * before calling the runtime invoke wrapper. In this case, the wrapper ignores
+ * its METHOD argument.
+ */
+MonoMethod *
+mono_marshal_get_runtime_invoke (MonoMethod *method, gboolean virtual)
+{
+ MonoMethodSignature *sig, *csig, *callsig;
+ MonoMethodBuilder *mb;
+ GHashTable *cache = NULL;
+ MonoClass *target_klass;
+ MonoMethod *res = NULL;
+ static MonoMethodSignature *cctor_signature = NULL;
+ static MonoMethodSignature *finalize_signature = NULL;
+ char *name;
+ gboolean need_direct_wrapper = FALSE;
+
+ g_assert (method);
+
+ if (!cctor_signature) {
+ cctor_signature = mono_metadata_signature_alloc (mono_defaults.corlib, 0);
+ cctor_signature->ret = &mono_defaults.void_class->byval_arg;
+ }
+ if (!finalize_signature) {
+ finalize_signature = mono_metadata_signature_alloc (mono_defaults.corlib, 0);
+ finalize_signature->ret = &mono_defaults.void_class->byval_arg;
+ finalize_signature->hasthis = 1;
+ }
+
+ if (virtual)
+ need_direct_wrapper = TRUE;
+
+ /*
+ * Use a separate cache indexed by methods to speed things up and to avoid the
+ * boundless mempool growth caused by the signature_dup stuff below.
+ */
+ if (virtual)
+ cache = get_cache (&method->klass->image->runtime_invoke_vcall_cache, mono_aligned_addr_hash, NULL);
+ else
+ cache = get_cache (&method->klass->image->runtime_invoke_direct_cache, mono_aligned_addr_hash, NULL);
+ res = mono_marshal_find_in_cache (cache, method);
+ if (res)
+ return res;
+
+ if (method->klass->rank && (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) &&
+ (method->iflags & METHOD_IMPL_ATTRIBUTE_NATIVE)) {
+ /*
+ * Array Get/Set/Address methods. The JIT implements them using inline code
+ * so we need to create an invoke wrapper which calls the method directly.
+ */
+ need_direct_wrapper = TRUE;
+ }
+
+ if (method->string_ctor) {
+ callsig = lookup_string_ctor_signature (mono_method_signature (method));
+ if (!callsig)
+ callsig = add_string_ctor_signature (method);
+ /* Can't share this as we push a string as this */
+ need_direct_wrapper = TRUE;
+ } else {
+ if (method->klass->valuetype && mono_method_signature (method)->hasthis) {
+ /*
+ * Valuetype methods receive a managed pointer as the this argument.
+ * Create a new signature to reflect this.
+ */
+ callsig = signature_dup_add_this (mono_method_signature (method), method->klass);
+ /* Can't share this as it would be shared with static methods taking an IntPtr argument */
+ need_direct_wrapper = TRUE;
+ } else {
+ if (method->dynamic)
+ callsig = signature_dup (method->klass->image, mono_method_signature (method));
+ else
+ callsig = mono_method_signature (method);
+ }
+ }
+
+ target_klass = get_wrapper_target_class (method->klass->image);
+
+ /* Try to share wrappers for non-corlib methods with simple signatures */
+ if (mono_metadata_signature_equal (callsig, cctor_signature)) {
+ callsig = cctor_signature;
+ target_klass = mono_defaults.object_class;
+ } else if (mono_metadata_signature_equal (callsig, finalize_signature)) {
+ callsig = finalize_signature;
+ target_klass = mono_defaults.object_class;
+ }
+
+ if (need_direct_wrapper) {
+ /* Already searched at the start */
+ } else {
+ MonoMethodSignature *tmp_sig;
+
+ callsig = mono_marshal_get_runtime_invoke_sig (callsig);
+
+ cache = get_cache (&target_klass->image->runtime_invoke_cache,
+ (GHashFunc)mono_signature_hash,
+ (GCompareFunc)runtime_invoke_signature_equal);
+
+ /* from mono_marshal_find_in_cache */
+ mono_marshal_lock ();
+ res = g_hash_table_lookup (cache, callsig);
+ mono_marshal_unlock ();
+
+ if (res) {
+ g_free (callsig);
+ return res;
+ }
+
+ /* Make a copy of the signature from the image mempool */
+ tmp_sig = callsig;
+ callsig = mono_metadata_signature_dup_full (target_klass->image, callsig);
+ g_free (tmp_sig);
+ }
+
+ sig = mono_method_signature (method);
+
+ csig = mono_metadata_signature_alloc (target_klass->image, 4);
+
+ csig->ret = &mono_defaults.object_class->byval_arg;
+ if (method->klass->valuetype && mono_method_signature (method)->hasthis)
+ csig->params [0] = callsig->params [0];
+ else
+ csig->params [0] = &mono_defaults.object_class->byval_arg;
+ csig->params [1] = &mono_defaults.int_class->byval_arg;
+ csig->params [2] = &mono_defaults.int_class->byval_arg;
+ csig->params [3] = &mono_defaults.int_class->byval_arg;
+ csig->pinvoke = 1;
+#if TARGET_WIN32
+ /* This is called from runtime code so it has to be cdecl */
+ csig->call_convention = MONO_CALL_C;
+#endif
+
+ name = mono_signature_to_name (callsig, virtual ? "runtime_invoke_virtual" : "runtime_invoke");
+ mb = mono_mb_new (target_klass, name, MONO_WRAPPER_RUNTIME_INVOKE);
+ g_free (name);
+
+ emit_runtime_invoke_body (mb, target_klass, method, sig, callsig, virtual, need_direct_wrapper);
if (need_direct_wrapper) {
mb->skip_visibility = 1;
if (!ICustomMarshaler) {
ICustomMarshaler = mono_class_from_name (mono_defaults.corlib, "System.Runtime.InteropServices", "ICustomMarshaler");
- g_assert (ICustomMarshaler);
+ if (!ICustomMarshaler) {
+ exception_msg = g_strdup ("Current profile doesn't support ICustomMarshaler");
+ goto handle_exception;
+ }
cleanup_native = mono_class_get_method_from_name (ICustomMarshaler, "CleanUpNativeData", 1);
g_assert (cleanup_native);
if (!get_instance)
exception_msg = g_strdup_printf ("Custom marshaler '%s' does not implement a static GetInstance method that takes a single string parameter and returns an ICustomMarshaler.", mklass->name);
+handle_exception:
/* Throw exception and emit compensation code if neccesary */
if (exception_msg) {
switch (action) {
break;
}
- if (t->byref && (t->attrs & PARAM_ATTRIBUTE_OUT)) {
+ if (encoding == MONO_NATIVE_VBBYREFSTR) {
+ static MonoMethod *m;
+
+ if (!m) {
+ m = mono_class_get_method_from_name_flags (mono_defaults.string_class, "get_Length", -1, 0);
+ g_assert (m);
+ }
+
+ /*
+ * Have to allocate a new string with the same length as the original, and
+ * copy the contents of the buffer pointed to by CONV_ARG into it.
+ */
+ g_assert (t->byref);
+ mono_mb_emit_ldarg (mb, argnum);
+ mono_mb_emit_ldloc (mb, conv_arg);
+ mono_mb_emit_ldarg (mb, argnum);
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_managed_call (mb, m, NULL);
+ mono_mb_emit_icall (mb, mono_string_new_len_wrapper);
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ } else if (t->byref && (t->attrs & PARAM_ATTRIBUTE_OUT)) {
mono_mb_emit_ldarg (mb, argnum);
mono_mb_emit_ldloc (mb, conv_arg);
mono_mb_emit_icall (mb, conv_to_icall (conv));
break;
case MARSHAL_ACTION_PUSH:
- if (t->byref)
+ if (t->byref && encoding != MONO_NATIVE_VBBYREFSTR)
mono_mb_emit_ldloc_addr (mb, conv_arg);
else
mono_mb_emit_ldloc (mb, conv_arg);
if (t->data.klass->flags & TYPE_ATTRIBUTE_ABSTRACT){
mono_mb_emit_byte (mb, CEE_POP);
- mono_mb_emit_exception_marshal_directive (mb, "Returned SafeHandles should not be abstract");
+ mono_mb_emit_exception_marshal_directive (mb, g_strdup ("Returned SafeHandles should not be abstract"));
break;
}
*conv_arg_type = intptr_type;
if (t->byref){
- mono_mb_emit_exception_marshal_directive (mb,
- "HandleRefs can not be returned from unmanaged code (or passed by ref)");
+ char *msg = g_strdup ("HandleRefs can not be returned from unmanaged code (or passed by ref)");
+ mono_mb_emit_exception_marshal_directive (mb, msg);
break;
}
mono_mb_emit_ldarg_addr (mb, argnum);
}
case MARSHAL_ACTION_CONV_RESULT: {
- mono_mb_emit_exception_marshal_directive (mb,
- "HandleRefs can not be returned from unmanaged code (or passed by ref)");
+ char *msg = g_strdup ("HandleRefs can not be returned from unmanaged code (or passed by ref)");
+ mono_mb_emit_exception_marshal_directive (mb, msg);
break;
}
}
mono_mb_emit_ldloc (mb, conv_arg);
- mono_mb_emit_icall (mb, g_free);
+ mono_mb_emit_icall (mb, mono_marshal_free);
mono_mb_patch_branch (mb, pos2);
}
/* Free the pointer allocated by unmanaged code */
mono_mb_emit_ldloc (mb, loc);
- mono_mb_emit_icall (mb, g_free);
+ mono_mb_emit_icall (mb, mono_marshal_free);
mono_mb_patch_branch (mb, pos);
}
break;
return conv_arg;
}
+static gboolean
+mono_pinvoke_is_unicode (MonoMethodPInvoke *piinfo)
+{
+ switch (piinfo->piflags & PINVOKE_ATTRIBUTE_CHAR_SET_MASK) {
+ case PINVOKE_ATTRIBUTE_CHAR_SET_ANSI:
+ return FALSE;
+ case PINVOKE_ATTRIBUTE_CHAR_SET_UNICODE:
+ return TRUE;
+ case PINVOKE_ATTRIBUTE_CHAR_SET_AUTO:
+ default:
+#ifdef TARGET_WIN32
+ return TRUE;
+#else
+ return FALSE;
+#endif
+ }
+}
+
static int
emit_marshal_array (EmitMarshalContext *m, int argnum, MonoType *t,
MonoMarshalSpec *spec,
if (is_string)
esize = sizeof (gpointer);
+ else if (eklass == mono_defaults.char_class) /*can't call mono_marshal_type_size since it causes all sorts of asserts*/
+ esize = mono_pinvoke_is_unicode (m->piinfo) ? 2 : 1;
else
esize = mono_class_native_size (eklass, NULL);
mono_mb_emit_stloc (mb, 1);
/* emit valuetype conversion code */
- emit_struct_conv (mb, eklass, FALSE);
+ emit_struct_conv_full (mb, eklass, FALSE, eklass == mono_defaults.char_class ? encoding : -1);
}
mono_mb_emit_add_to_local (mb, index_var, 1);
eklass = klass->element_class;
if ((eklass == mono_defaults.stringbuilder_class) || (eklass == mono_defaults.string_class))
esize = sizeof (gpointer);
+ else if (eklass == mono_defaults.char_class)
+ esize = mono_pinvoke_is_unicode (m->piinfo) ? 2 : 1;
else
esize = mono_class_native_size (eklass, NULL);
src_ptr = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
mono_mb_emit_stloc (mb, 1);
/* emit valuetype conversion code */
- emit_struct_conv (mb, eklass, TRUE);
+ emit_struct_conv_full (mb, eklass, TRUE, eklass == mono_defaults.char_class ? encoding : -1);
}
if (need_free) {
if (is_string)
esize = sizeof (gpointer);
+ else if (eklass == mono_defaults.char_class)
+ esize = mono_pinvoke_is_unicode (m->piinfo) ? 2 : 1;
else
esize = mono_class_native_size (eklass, NULL);
mb, csig, csig->param_count + 16);
mono_mb_free (mb);
+ mono_marshal_set_wrapper_info (res, NULL);
+
/* code_for (res); */
return res;
* THIS_LOC is the memory location where the target of the delegate is stored.
*/
void
-mono_marshal_emit_managed_wrapper (MonoMethodBuilder *mb, MonoMethodSignature *invoke_sig, MonoMarshalSpec **mspecs, EmitMarshalContext* m, MonoMethod *method, MonoObject** this_loc)
+mono_marshal_emit_managed_wrapper (MonoMethodBuilder *mb, MonoMethodSignature *invoke_sig, MonoMarshalSpec **mspecs, EmitMarshalContext* m, MonoMethod *method, uint32_t target_handle)
{
MonoMethodSignature *sig, *csig;
int i, *tmp_locals;
emit_thread_interrupt_checkpoint (mb);
if (sig->hasthis) {
- if (this_loc) {
- mono_mb_emit_ptr (mb, this_loc);
- mono_mb_emit_byte (mb, CEE_LDIND_REF);
+ if (target_handle) {
+ mono_mb_emit_icon (mb, (gint32)target_handle);
+ mono_mb_emit_icall (mb, mono_gchandle_get_target);
} else {
/* fixme: */
g_assert_not_reached ();
}
} else if (closed) {
- mono_mb_emit_ptr (mb, this_loc);
- mono_mb_emit_byte (mb, CEE_LDIND_REF);
+ mono_mb_emit_icon (mb, (gint32)target_handle);
+ mono_mb_emit_icall (mb, mono_gchandle_get_target);
}
for (i = 0; i < sig->param_count; i++) {
* generates IL code to call managed methods from unmanaged code
*/
MonoMethod *
-mono_marshal_get_managed_wrapper (MonoMethod *method, MonoClass *delegate_klass, MonoObject **this_loc)
+mono_marshal_get_managed_wrapper (MonoMethod *method, MonoClass *delegate_klass, uint32_t target_handle)
{
static MonoClass *UnmanagedFunctionPointerAttribute;
MonoMethodSignature *sig, *csig, *invoke_sig;
* options.
*/
cache = get_cache (&method->klass->image->managed_wrapper_cache, mono_aligned_addr_hash, NULL);
- if (!this_loc && (res = mono_marshal_find_in_cache (cache, method)))
+ if (!target_handle && (res = mono_marshal_find_in_cache (cache, method)))
return res;
invoke = mono_get_delegate_invoke (delegate_klass);
mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_NATIVE_TO_MANAGED);
+ /*the target gchandle must be the first entry after size and the wrapper itself.*/
+ mono_mb_add_data (mb, GUINT_TO_POINTER (target_handle));
+
/* we copy the signature, so that we can modify it */
- if (this_loc)
+ if (target_handle)
/* Need to free this later */
csig = mono_metadata_signature_dup (invoke_sig);
else
mono_custom_attrs_free (cinfo);
}
- mono_marshal_emit_managed_wrapper (mb, invoke_sig, mspecs, &m, method, this_loc);
+ mono_marshal_emit_managed_wrapper (mb, invoke_sig, mspecs, &m, method, target_handle);
- if (!this_loc)
+ if (!target_handle)
res = mono_mb_create_and_cache (cache, method,
mb, csig, sig->param_count + 16);
else {
/* FIXME: Implement VTFIXUP_TYPE_FROM_UNMANAGED_RETAIN_APPDOMAIN. */
- mono_marshal_emit_managed_wrapper (mb, sig, mspecs, &m, method, NULL);
+ mono_marshal_emit_managed_wrapper (mb, sig, mspecs, &m, method, 0);
mb->dynamic = 1;
method = mono_mb_create_method (mb, csig, sig->param_count + 16);
}
/*
- * mono_marshal_get_isinst:
- * @klass: the type of the field
- *
- * This method generates a function which can be used to check if an object is
- * an instance of the given type, icluding the case where the object is a proxy.
- * The generated function has the following signature:
- * MonoObject* __isinst_wrapper_ (MonoObject *obj)
+ * This does the equivalent of mono_object_castclass_with_cache.
*/
MonoMethod *
-mono_marshal_get_isinst (MonoClass *klass)
+mono_marshal_get_castclass_with_cache (void)
{
- static MonoMethodSignature *isint_sig = NULL;
- GHashTable *cache;
+ static MonoMethod *cached;
MonoMethod *res;
- int pos_was_ok, pos_failed, pos_end, pos_end2;
- char *name;
MonoMethodBuilder *mb;
+ MonoMethodSignature *sig;
+ int return_null_pos, cache_miss_pos, invalid_cast_pos;
- cache = get_cache (&klass->image->isinst_cache, mono_aligned_addr_hash, NULL);
- if ((res = mono_marshal_find_in_cache (cache, klass)))
- return res;
-
- if (!isint_sig) {
- isint_sig = mono_metadata_signature_alloc (mono_defaults.corlib, 1);
- isint_sig->params [0] = &mono_defaults.object_class->byval_arg;
- isint_sig->ret = &mono_defaults.object_class->byval_arg;
- isint_sig->pinvoke = 0;
- }
-
- name = g_strdup_printf ("__isinst_wrapper_%s", klass->name);
- mb = mono_mb_new (mono_defaults.object_class, name, MONO_WRAPPER_ISINST);
- g_free (name);
-
- mb->method->save_lmf = 1;
+ if (cached)
+ return cached;
- /* check if the object is a proxy that needs special cast */
- mono_mb_emit_ldarg (mb, 0);
- mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+ mb = mono_mb_new (mono_defaults.object_class, "__castclass_with_cache", MONO_WRAPPER_CASTCLASS);
+ sig = mono_metadata_signature_alloc (mono_defaults.corlib, 3);
+ sig->params [0] = &mono_defaults.object_class->byval_arg;
+ sig->params [1] = &mono_defaults.int_class->byval_arg;
+ sig->params [2] = &mono_defaults.int_class->byval_arg;
+ sig->ret = &mono_defaults.object_class->byval_arg;
+ sig->pinvoke = 0;
+
+ /* allocate local 0 (pointer) obj_vtable */
+ mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+
+ /*if (!obj)*/
+ mono_mb_emit_ldarg (mb, 0);
+ return_null_pos = mono_mb_emit_branch (mb, CEE_BRFALSE);
+
+ /*obj_vtable = obj->vtable;*/
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoObject, vtable));
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_stloc (mb, 0);
+
+ /* *cache */
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_ldloc (mb, 0);
+
+ /*if (*cache == obj_vtable)*/
+ cache_miss_pos = mono_mb_emit_branch (mb, CEE_BNE_UN);
+
+ /*return obj;*/
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ mono_mb_patch_branch (mb, cache_miss_pos);
+ /*if (mono_object_isinst (obj, klass)) */
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_ldarg (mb, 1);
+ mono_mb_emit_icall (mb, mono_object_isinst);
+ invalid_cast_pos = mono_mb_emit_branch (mb, CEE_BRFALSE);
+
+ /**cache = obj_vtable;*/
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_ldloc (mb, 0);
+ mono_mb_emit_byte (mb, CEE_STIND_I);
+
+ /*return obj;*/
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ /*fails*/
+ mono_mb_patch_branch (mb, invalid_cast_pos);
+ mono_mb_emit_exception (mb, "InvalidCastException", NULL);
+
+ /*return null*/
+ mono_mb_patch_branch (mb, return_null_pos);
+ mono_mb_emit_byte (mb, CEE_LDNULL);
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ res = mono_mb_create_method (mb, sig, 8);
+ if (InterlockedCompareExchangePointer ((volatile gpointer *)&cached, res, NULL)) {
+ mono_free_method (res);
+ mono_metadata_free_method_signature (sig);
+ }
+ mono_mb_free (mb);
+
+ return cached;
+}
+
+/*
+ * This does the equivalent of mono_object_isinst_with_cache.
+ */
+MonoMethod *
+mono_marshal_get_isinst_with_cache (void)
+{
+ static MonoMethod *cached;
+ MonoMethod *res;
+ MonoMethodBuilder *mb;
+ MonoMethodSignature *sig;
+ int return_null_pos, cache_miss_pos, cache_hit_pos, not_an_instance_pos, negative_cache_hit_pos;
+
+ if (cached)
+ return cached;
+
+ mb = mono_mb_new (mono_defaults.object_class, "__isisnt_with_cache", MONO_WRAPPER_CASTCLASS);
+ sig = mono_metadata_signature_alloc (mono_defaults.corlib, 3);
+ sig->params [0] = &mono_defaults.object_class->byval_arg;
+ sig->params [1] = &mono_defaults.int_class->byval_arg;
+ sig->params [2] = &mono_defaults.int_class->byval_arg;
+ sig->ret = &mono_defaults.object_class->byval_arg;
+ sig->pinvoke = 0;
+
+ /* allocate local 0 (pointer) obj_vtable */
+ mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+ /* allocate local 1 (pointer) cached_vtable */
+ mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+
+ /*if (!obj)*/
+ mono_mb_emit_ldarg (mb, 0);
+ return_null_pos = mono_mb_emit_branch (mb, CEE_BRFALSE);
+
+ /*obj_vtable = obj->vtable;*/
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoObject, vtable));
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_stloc (mb, 0);
+
+ /* cached_vtable = *cache*/
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_stloc (mb, 1);
+
+ mono_mb_emit_ldloc (mb, 1);
+ mono_mb_emit_byte (mb, CEE_LDC_I4);
+ mono_mb_emit_i4 (mb, ~0x1);
+ mono_mb_emit_byte (mb, CEE_CONV_U);
+ mono_mb_emit_byte (mb, CEE_AND);
+ mono_mb_emit_ldloc (mb, 0);
+ /*if ((cached_vtable & ~0x1)== obj_vtable)*/
+ cache_miss_pos = mono_mb_emit_branch (mb, CEE_BNE_UN);
+
+ /*return (cached_vtable & 0x1) ? NULL : obj;*/
+ mono_mb_emit_ldloc (mb, 1);
+ mono_mb_emit_byte(mb, CEE_LDC_I4_1);
+ mono_mb_emit_byte (mb, CEE_CONV_U);
+ mono_mb_emit_byte (mb, CEE_AND);
+ negative_cache_hit_pos = mono_mb_emit_branch (mb, CEE_BRTRUE);
+
+ /*obj*/
+ mono_mb_emit_ldarg (mb, 0);
+ cache_hit_pos = mono_mb_emit_branch (mb, CEE_BR);
+
+ /*NULL*/
+ mono_mb_patch_branch (mb, negative_cache_hit_pos);
+ mono_mb_emit_byte (mb, CEE_LDNULL);
+
+ mono_mb_patch_branch (mb, cache_hit_pos);
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ mono_mb_patch_branch (mb, cache_miss_pos);
+ /*if (mono_object_isinst (obj, klass)) */
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_ldarg (mb, 1);
+ mono_mb_emit_icall (mb, mono_object_isinst);
+ not_an_instance_pos = mono_mb_emit_branch (mb, CEE_BRFALSE);
+
+ /**cache = obj_vtable;*/
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_ldloc (mb, 0);
+ mono_mb_emit_byte (mb, CEE_STIND_I);
+
+ /*return obj;*/
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ /*not an instance*/
+ mono_mb_patch_branch (mb, not_an_instance_pos);
+ /* *cache = (gpointer)(obj_vtable | 0x1);*/
+ mono_mb_emit_ldarg (mb, 2);
+ /*obj_vtable | 0x1*/
+ mono_mb_emit_ldloc (mb, 0);
+ mono_mb_emit_byte(mb, CEE_LDC_I4_1);
+ mono_mb_emit_byte (mb, CEE_CONV_U);
+ mono_mb_emit_byte (mb, CEE_OR);
+
+ /* *cache = ... */
+ mono_mb_emit_byte (mb, CEE_STIND_I);
+
+ /*return null*/
+ mono_mb_patch_branch (mb, return_null_pos);
+ mono_mb_emit_byte (mb, CEE_LDNULL);
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ res = mono_mb_create_method (mb, sig, 8);
+ if (InterlockedCompareExchangePointer ((volatile gpointer *)&cached, res, NULL)) {
+ mono_free_method (res);
+ mono_metadata_free_method_signature (sig);
+ }
+ mono_mb_free (mb);
+
+ return cached;
+}
+
+/*
+ * mono_marshal_get_isinst:
+ * @klass: the type of the field
+ *
+ * This method generates a function which can be used to check if an object is
+ * an instance of the given type, icluding the case where the object is a proxy.
+ * The generated function has the following signature:
+ * MonoObject* __isinst_wrapper_ (MonoObject *obj)
+ */
+MonoMethod *
+mono_marshal_get_isinst (MonoClass *klass)
+{
+ static MonoMethodSignature *isint_sig = NULL;
+ GHashTable *cache;
+ MonoMethod *res;
+ int pos_was_ok, pos_failed, pos_end, pos_end2;
+ char *name;
+ MonoMethodBuilder *mb;
+
+ cache = get_cache (&klass->image->isinst_cache, mono_aligned_addr_hash, NULL);
+ if ((res = mono_marshal_find_in_cache (cache, klass)))
+ return res;
+
+ if (!isint_sig) {
+ isint_sig = mono_metadata_signature_alloc (mono_defaults.corlib, 1);
+ isint_sig->params [0] = &mono_defaults.object_class->byval_arg;
+ isint_sig->ret = &mono_defaults.object_class->byval_arg;
+ isint_sig->pinvoke = 0;
+ }
+
+ name = g_strdup_printf ("__isinst_wrapper_%s", klass->name);
+ mb = mono_mb_new (mono_defaults.object_class, name, MONO_WRAPPER_ISINST);
+ g_free (name);
+
+ mb->method->save_lmf = 1;
+
+ /* check if the object is a proxy that needs special cast */
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
mono_mb_emit_op (mb, CEE_MONO_CISINST, klass);
/* The result of MONO_ISINST can be:
return res;
}
+enum {
+ STELEMREF_OBJECT, /*no check at all*/
+ STELEMREF_SEALED_CLASS, /*check vtable->klass->element_type */
+ STELEMREF_CLASS, /*only the klass->parents check*/
+ STELEMREF_INTERFACE, /*interfaces without variant generic arguments. */
+ STELEMREF_COMPLEX, /*arrays, MBR or types with variant generic args - go straight to icalls*/
+ STELEMREF_KIND_COUNT
+};
+
+static const char *strelemref_wrapper_name[] = {
+ "object", "sealed_class", "class", "interface", "complex"
+};
+
+static gboolean
+is_monomorphic_array (MonoClass *klass)
+{
+ MonoClass *element_class;
+ if (klass->rank != 1)
+ return FALSE;
+
+ element_class = klass->element_class;
+ return (element_class->flags & TYPE_ATTRIBUTE_SEALED) || element_class->valuetype;
+}
+
+static int
+get_virtual_stelemref_kind (MonoClass *element_class)
+{
+ if (element_class == mono_defaults.object_class)
+ return STELEMREF_OBJECT;
+ if (is_monomorphic_array (element_class))
+ return STELEMREF_SEALED_CLASS;
+ if (MONO_CLASS_IS_INTERFACE (element_class) && !mono_class_has_variant_generic_params (element_class))
+ return STELEMREF_INTERFACE;
+ /*Arrays are sealed but are covariant on their element type, We can't use any of the fast paths.*/
+ if (element_class->marshalbyref || element_class->rank || mono_class_has_variant_generic_params (element_class))
+ return STELEMREF_COMPLEX;
+ if (element_class->flags & TYPE_ATTRIBUTE_SEALED)
+ return STELEMREF_SEALED_CLASS;
+ return STELEMREF_CLASS;
+}
+
+static void
+load_array_element_address (MonoMethodBuilder *mb)
+{
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_ldarg (mb, 1);
+ mono_mb_emit_op (mb, CEE_LDELEMA, mono_defaults.object_class);
+}
+
+static void
+load_array_class (MonoMethodBuilder *mb, int aklass)
+{
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoObject, vtable));
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoVTable, klass));
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoClass, element_class));
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_stloc (mb, aklass);
+}
+
+static void
+load_value_class (MonoMethodBuilder *mb, int vklass)
+{
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoObject, vtable));
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoVTable, klass));
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_stloc (mb, vklass);
+}
+
+#if 0
+static void
+record_slot_vstore (MonoObject *array, size_t index, MonoObject *value)
+{
+ char *name = mono_type_get_full_name (array->vtable->klass->element_class);
+ printf ("slow vstore of %s\n", name);
+ g_free (name);
+}
+#endif
+
+/*
+ * The wrapper info for the wrapper contains the wrapper 'kind' + 1.
+ *
+ * TODO:
+ * - Separate simple interfaces from variant interfaces or mbr types. This way we can avoid the icall for them.
+ * - Emit a (new) mono bytecode that produces OP_COND_EXC_NE_UN to raise ArrayTypeMismatch
+ * - Maybe mve some MonoClass field into the vtable to reduce the number of loads
+ * - Add a case for arrays of arrays.
+ */
+MonoMethod*
+mono_marshal_get_virtual_stelemref (MonoClass *array_class)
+{
+ static MonoMethod *cached_methods [STELEMREF_KIND_COUNT] = { NULL }; /*object iface sealed regular*/
+ static MonoMethodSignature *signature;
+ MonoMethodBuilder *mb;
+ MonoMethod *res;
+ int kind;
+ char *name;
+
+ guint32 b1, b2, b3;
+ int aklass, vklass, vtable, uiid;
+ int array_slot_addr;
+
+ g_assert (array_class->rank == 1);
+ kind = get_virtual_stelemref_kind (array_class->element_class);
+
+ if (cached_methods [kind])
+ return cached_methods [kind];
+
+ name = g_strdup_printf ("virt_stelemref_%s", strelemref_wrapper_name [kind]);
+ mb = mono_mb_new (mono_defaults.object_class, name, MONO_WRAPPER_STELEMREF);
+ g_free (name);
+
+ if (!signature) {
+ MonoMethodSignature *sig = mono_metadata_signature_alloc (mono_defaults.corlib, 2);
+
+ /* void this::stelemref (size_t idx, void* value) */
+ sig->ret = &mono_defaults.void_class->byval_arg;
+ sig->hasthis = TRUE;
+ sig->params [0] = &mono_defaults.int_class->byval_arg; /* this is a natural sized int */
+ sig->params [1] = &mono_defaults.object_class->byval_arg;
+ signature = sig;
+ }
+
+ /*For now simply call plain old stelemref*/
+ switch (kind) {
+ case STELEMREF_OBJECT:
+ /* ldelema (implicit bound check) */
+ load_array_element_address (mb);
+ /* do_store */
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ mono_mb_emit_byte (mb, CEE_RET);
+ break;
+
+ case STELEMREF_COMPLEX:
+ /*
+ <ldelema (bound check)>
+ if (!value)
+ goto store;
+ if (!mono_object_isinst (value, aklass))
+ goto do_exception;
+
+ do_store:
+ *array_slot_addr = value;
+
+ do_exception:
+ throw new ArrayTypeMismatchException ();
+ */
+
+ aklass = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+ array_slot_addr = mono_mb_add_local (mb, &mono_defaults.object_class->this_arg);
+
+#if 0
+ {
+ /*Use this to debug/record stores that are going thru the slow path*/
+ MonoMethodSignature *csig;
+ csig = mono_metadata_signature_alloc (mono_defaults.corlib, 3);
+ csig->ret = &mono_defaults.void_class->byval_arg;
+ csig->params [0] = &mono_defaults.object_class->byval_arg;
+ csig->params [1] = &mono_defaults.int_class->byval_arg; /* this is a natural sized int */
+ csig->params [2] = &mono_defaults.object_class->byval_arg;
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_ldarg (mb, 1);
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_native_call (mb, csig, record_slot_vstore);
+ }
+#endif
+
+ /* ldelema (implicit bound check) */
+ load_array_element_address (mb);
+ mono_mb_emit_stloc (mb, array_slot_addr);
+
+ /* if (!value) goto do_store */
+ mono_mb_emit_ldarg (mb, 2);
+ b1 = mono_mb_emit_branch (mb, CEE_BRFALSE);
+
+ /* aklass = array->vtable->klass->element_class */
+ load_array_class (mb, aklass);
+
+ /*if (mono_object_isinst (value, aklass)) */
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_ldloc (mb, aklass);
+ mono_mb_emit_icall (mb, mono_object_isinst);
+ b2 = mono_mb_emit_branch (mb, CEE_BRFALSE);
+
+ /* do_store: */
+ mono_mb_patch_branch (mb, b1);
+ mono_mb_emit_ldloc (mb, array_slot_addr);
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ /* do_exception: */
+ mono_mb_patch_branch (mb, b2);
+
+ mono_mb_emit_exception (mb, "ArrayTypeMismatchException", NULL);
+ break;
+
+ case STELEMREF_SEALED_CLASS:
+ /*
+ <ldelema (bound check)>
+ if (!value)
+ goto store;
+
+ aklass = array->vtable->klass->element_class;
+ vklass = value->vtable->klass;
+
+ if (vklass != aklass)
+ goto do_exception;
+
+ do_store:
+ *array_slot_addr = value;
+
+ do_exception:
+ throw new ArrayTypeMismatchException ();
+ */
+ aklass = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+ vklass = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+ array_slot_addr = mono_mb_add_local (mb, &mono_defaults.object_class->this_arg);
+
+
+ /* ldelema (implicit bound check) */
+ load_array_element_address (mb);
+ mono_mb_emit_stloc (mb, array_slot_addr);
+
+ /* if (!value) goto do_store */
+ mono_mb_emit_ldarg (mb, 2);
+ b1 = mono_mb_emit_branch (mb, CEE_BRFALSE);
+
+ /* aklass = array->vtable->klass->element_class */
+ load_array_class (mb, aklass);
+
+ /* vklass = value->vtable->klass */
+ load_value_class (mb, vklass);
+
+ /*if (vklass != aklass) goto do_exception; */
+ mono_mb_emit_ldloc (mb, aklass);
+ mono_mb_emit_ldloc (mb, vklass);
+ b2 = mono_mb_emit_branch (mb, CEE_BNE_UN);
+
+ /* do_store: */
+ mono_mb_patch_branch (mb, b1);
+ mono_mb_emit_ldloc (mb, array_slot_addr);
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ /* do_exception: */
+ mono_mb_patch_branch (mb, b2);
+ mono_mb_emit_exception (mb, "ArrayTypeMismatchException", NULL);
+ break;
+
+ case STELEMREF_CLASS:
+ /*
+ the method:
+ <ldelema (bound check)>
+ if (!value)
+ goto do_store;
+
+ aklass = array->vtable->klass->element_class;
+ vklass = value->vtable->klass;
+
+ if (vklass->idepth < aklass->idepth)
+ goto do_exception;
+
+ if (vklass->supertypes [aklass->idepth - 1] != aklass)
+ goto do_exception;
+
+ do_store:
+ *array_slot_addr = value;
+ return;
+
+ long:
+ throw new ArrayTypeMismatchException ();
+ */
+ aklass = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+ vklass = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+ array_slot_addr = mono_mb_add_local (mb, &mono_defaults.object_class->this_arg);
+
+ /* ldelema (implicit bound check) */
+ load_array_element_address (mb);
+ mono_mb_emit_stloc (mb, array_slot_addr);
+
+ /* if (!value) goto do_store */
+ mono_mb_emit_ldarg (mb, 2);
+ b1 = mono_mb_emit_branch (mb, CEE_BRFALSE);
+
+ /* aklass = array->vtable->klass->element_class */
+ load_array_class (mb, aklass);
+
+ /* vklass = value->vtable->klass */
+ load_value_class (mb, vklass);
+
+ /*if (mono_object_isinst (value, aklass)) */
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_ldloc (mb, aklass);
+ mono_mb_emit_icall (mb, mono_object_isinst);
+ b2 = mono_mb_emit_branch (mb, CEE_BRFALSE);
+
+ /* if (vklass->idepth < aklass->idepth) goto failue */
+ mono_mb_emit_ldloc (mb, vklass);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoClass, idepth));
+ mono_mb_emit_byte (mb, CEE_LDIND_U2);
+
+ mono_mb_emit_ldloc (mb, aklass);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoClass, idepth));
+ mono_mb_emit_byte (mb, CEE_LDIND_U2);
+
+ b2 = mono_mb_emit_branch (mb, CEE_BLT_UN);
+
+ /* if (vklass->supertypes [aklass->idepth - 1] != aklass) goto failure */
+ mono_mb_emit_ldloc (mb, vklass);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoClass, supertypes));
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+
+ mono_mb_emit_ldloc (mb, aklass);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoClass, idepth));
+ mono_mb_emit_byte (mb, CEE_LDIND_U2);
+ mono_mb_emit_icon (mb, 1);
+ mono_mb_emit_byte (mb, CEE_SUB);
+ mono_mb_emit_icon (mb, sizeof (void*));
+ mono_mb_emit_byte (mb, CEE_MUL);
+ mono_mb_emit_byte (mb, CEE_ADD);
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+
+ mono_mb_emit_ldloc (mb, aklass);
+ b3 = mono_mb_emit_branch (mb, CEE_BNE_UN);
+
+ /* do_store: */
+ mono_mb_patch_branch (mb, b1);
+ mono_mb_emit_ldloc (mb, array_slot_addr);
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ /* do_exception: */
+ mono_mb_patch_branch (mb, b2);
+ mono_mb_patch_branch (mb, b3);
+
+ mono_mb_emit_exception (mb, "ArrayTypeMismatchException", NULL);
+ break;
+
+ case STELEMREF_INTERFACE:
+ /*Mono *klass;
+ MonoVTable *vt;
+ unsigned uiid;
+ if (value == NULL)
+ goto store;
+
+ klass = array->obj.vtable->klass->element_class;
+ vt = value->vtable;
+ uiid = klass->interface_id;
+ if (uiid > vt->max_interface_id)
+ goto exception;
+ if (!(vt->interface_bitmap [(uiid) >> 3] & (1 << ((uiid)&7))))
+ goto exception;
+ store:
+ mono_array_setref (array, index, value);
+ return;
+ exception:
+ mono_raise_exception (mono_get_exception_array_type_mismatch ());*/
+
+ array_slot_addr = mono_mb_add_local (mb, &mono_defaults.object_class->this_arg);
+ aklass = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+ vtable = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+ uiid = mono_mb_add_local (mb, &mono_defaults.int32_class->byval_arg);
+
+ /* ldelema (implicit bound check) */
+ load_array_element_address (mb);
+ mono_mb_emit_stloc (mb, array_slot_addr);
+
+ /* if (!value) goto do_store */
+ mono_mb_emit_ldarg (mb, 2);
+ b1 = mono_mb_emit_branch (mb, CEE_BRFALSE);
+
+ /* klass = array->vtable->klass->element_class */
+ load_array_class (mb, aklass);
+
+ /* vt = value->vtable */
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoObject, vtable));
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_stloc (mb, vtable);
+
+ /* uiid = klass->interface_id; */
+ mono_mb_emit_ldloc (mb, aklass);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoClass, interface_id));
+ mono_mb_emit_byte (mb, CEE_LDIND_U2);
+ mono_mb_emit_stloc (mb, uiid);
+
+ /*if (uiid > vt->max_interface_id)*/
+ mono_mb_emit_ldloc (mb, uiid);
+ mono_mb_emit_ldloc (mb, vtable);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoVTable, max_interface_id));
+ mono_mb_emit_byte (mb, CEE_LDIND_U2);
+ b2 = mono_mb_emit_branch (mb, CEE_BGT_UN);
+
+ /* if (!(vt->interface_bitmap [(uiid) >> 3] & (1 << ((uiid)&7)))) */
+
+ /*vt->interface_bitmap*/
+ mono_mb_emit_ldloc (mb, vtable);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoVTable, interface_bitmap));
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+
+ /*uiid >> 3*/
+ mono_mb_emit_ldloc (mb, uiid);
+ mono_mb_emit_icon (mb, 3);
+ mono_mb_emit_byte (mb, CEE_SHR_UN);
+
+ /*vt->interface_bitmap [(uiid) >> 3]*/
+ mono_mb_emit_byte (mb, CEE_ADD); /*interface_bitmap is a guint8 array*/
+ mono_mb_emit_byte (mb, CEE_LDIND_U1);
+
+ /*(1 << ((uiid)&7)))*/
+ mono_mb_emit_icon (mb, 1);
+ mono_mb_emit_ldloc (mb, uiid);
+ mono_mb_emit_icon (mb, 7);
+ mono_mb_emit_byte (mb, CEE_AND);
+ mono_mb_emit_byte (mb, CEE_SHL);
+
+ /*bitwise and the whole thing*/
+ mono_mb_emit_byte (mb, CEE_AND);
+ b3 = mono_mb_emit_branch (mb, CEE_BRFALSE);
+
+ /* do_store: */
+ mono_mb_patch_branch (mb, b1);
+ mono_mb_emit_ldloc (mb, array_slot_addr);
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ /* do_exception: */
+ mono_mb_patch_branch (mb, b2);
+ mono_mb_patch_branch (mb, b3);
+ mono_mb_emit_exception (mb, "ArrayTypeMismatchException", NULL);
+ break;
+
+ default:
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_ldarg (mb, 1);
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_managed_call (mb, mono_marshal_get_stelemref (), NULL);
+ mono_mb_emit_byte (mb, CEE_RET);
+ g_assert (0);
+ }
+
+ res = mono_mb_create_method (mb, signature, 4);
+ res->flags |= METHOD_ATTRIBUTE_VIRTUAL;
+ mono_marshal_set_wrapper_info (res, GUINT_TO_POINTER (kind + 1));
+
+ mono_marshal_lock ();
+ if (!cached_methods [kind]) {
+ cached_methods [kind] = res;
+ mono_marshal_unlock ();
+ } else {
+ mono_marshal_unlock ();
+ mono_free_method (res);
+ }
+
+ mono_mb_free (mb);
+ return cached_methods [kind];
+}
+
MonoMethod*
mono_marshal_get_stelemref ()
{
type = rtype->type;
klass = mono_class_from_mono_type (type);
+ if (!mono_class_init (klass))
+ mono_raise_exception (mono_class_get_exception_for_failure (klass));
+
layout = (klass->flags & TYPE_ATTRIBUTE_LAYOUT_MASK);
if (layout == TYPE_ATTRIBUTE_AUTO_LAYOUT) {
MonoObject *
ves_icall_System_Runtime_InteropServices_Marshal_PtrToStructure_type (gpointer src, MonoReflectionType *type)
{
+ MonoClass *klass;
MonoDomain *domain = mono_domain_get ();
MonoObject *res;
MONO_CHECK_ARG_NULL (src);
MONO_CHECK_ARG_NULL (type);
- res = mono_object_new (domain, mono_class_from_mono_type (type->type));
+ klass = mono_class_from_mono_type (type->type);
+ if (!mono_class_init (klass))
+ mono_raise_exception (mono_class_get_exception_for_failure (klass));
+
+ res = mono_object_new (domain, klass);
ptr_to_structure (src, res);
fname = mono_string_to_utf8 (field_name);
klass = mono_class_from_mono_type (type->type);
+ if (!mono_class_init (klass))
+ mono_raise_exception (mono_class_get_exception_for_failure (klass));
while (klass && match_index == -1) {
MonoClassField* field;
MONO_CHECK_ARG_NULL (type);
klass = mono_class_from_mono_type (type->type);
+ if (!mono_class_init (klass))
+ mono_raise_exception (mono_class_get_exception_for_failure (klass));
mono_struct_delete_old (klass, (char *)src);
}
MonoDelegate*
ves_icall_System_Runtime_InteropServices_Marshal_GetDelegateForFunctionPointerInternal (void *ftn, MonoReflectionType *type)
{
- return mono_ftnptr_to_delegate (mono_type_get_class (type->type), ftn);
+ MonoClass *klass = mono_type_get_class (type->type);
+ if (!mono_class_init (klass))
+ mono_raise_exception (mono_class_get_exception_for_failure (klass));
+
+ return mono_ftnptr_to_delegate (klass, ftn);
}
/**
mono_marshal_load_type_info (MonoClass* klass)
{
int j, count = 0;
- guint32 native_size = 0, min_align = 1;
+ guint32 native_size = 0, min_align = 1, packing;
MonoMarshalType *info;
MonoClassField* field;
gpointer iter;
info->native_size = parent_size;
}
+ packing = klass->packing_size ? klass->packing_size : 8;
iter = NULL;
j = 0;
while ((field = mono_class_get_fields (klass, &iter))) {
case TYPE_ATTRIBUTE_EXPLICIT_LAYOUT:
size = mono_marshal_type_size (field->type, info->fields [j].mspec,
&align, TRUE, klass->unicode);
- align = klass->packing_size ? MIN (klass->packing_size, align): align;
- min_align = MAX (align, min_align);
+ min_align = packing;
info->fields [j].offset = field->offset - sizeof (MonoObject);
info->native_size = MAX (info->native_size, info->fields [j].offset + size);
break;
j++;
}
- if(layout != TYPE_ATTRIBUTE_AUTO_LAYOUT) {
+ if (layout != TYPE_ATTRIBUTE_AUTO_LAYOUT) {
info->native_size = MAX (native_size, info->native_size);
+ /*
+ * If the provided Size is equal or larger than the calculated size, and there
+ * was no Pack attribute, we set min_align to 1 to avoid native_size being increased
+ */
+ if (layout == TYPE_ATTRIBUTE_EXPLICIT_LAYOUT)
+ if (native_size && native_size == info->native_size && klass->packing_size == 0)
+ min_align = 1;
}
if (info->native_size & (min_align - 1)) {
klass->blittable = FALSE;
/* If this is an array type, ensure that we have element info */
- if (klass->element_class && !mono_marshal_is_loading_type_info (klass->element_class)) {
+ if (klass->rank && !mono_marshal_is_loading_type_info (klass->element_class)) {
mono_marshal_load_type_info (klass->element_class);
}
case MONO_TYPE_STRING:
switch (string_encoding) {
case MONO_NATIVE_LPWSTR:
- return mono_string_to_utf16 ((MonoString*)o);
+ return mono_marshal_string_to_utf16_copy ((MonoString*)o);
break;
case MONO_NATIVE_LPSTR:
return mono_string_to_lpstr ((MonoString*)o);
void
mono_marshal_free_dynamic_wrappers (MonoMethod *method)
{
+ MonoImage *image = method->klass->image;
+
g_assert (method->dynamic);
- mono_marshal_lock ();
+ /* This could be called during shutdown */
+ if (marshal_mutex_initialized)
+ mono_marshal_lock ();
/*
* FIXME: We currently leak the wrappers. Freeing them would be tricky as
* they could be shared with other methods ?
*/
- if (method->klass->image->runtime_invoke_direct_cache)
- g_hash_table_remove (method->klass->image->runtime_invoke_direct_cache, method);
- mono_marshal_unlock ();
+ if (image->runtime_invoke_direct_cache)
+ g_hash_table_remove (image->runtime_invoke_direct_cache, method);
+ if (image->delegate_bound_static_invoke_cache)
+ g_hash_table_foreach_remove (image->delegate_bound_static_invoke_cache, signature_method_pair_matches_method, method);
+ if (image->delegate_abstract_invoke_cache)
+ g_hash_table_foreach_remove (image->delegate_abstract_invoke_cache, signature_method_pair_matches_method, method);
+
+ if (marshal_mutex_initialized)
+ mono_marshal_unlock ();
}
/*
g_hash_table_foreach_remove (method->klass->image->delegate_abstract_invoke_cache,
signature_method_pair_matches_signature, (gpointer)sig);
+ if (sig && method->klass->image->delegate_bound_static_invoke_cache)
+ g_hash_table_foreach_remove (method->klass->image->delegate_bound_static_invoke_cache,
+ signature_method_pair_matches_signature, (gpointer)sig);
+
/*
* indexed by MonoMethod pointers
*/
projects / mono.git / blobdiff