#include "mono/metadata/metadata-internals.h"
#include "mono/metadata/domain-internals.h"
#include "mono/metadata/gc-internal.h"
+#include "mono/metadata/threads-types.h"
#include <mono/os/gc_wrapper.h>
#include <string.h>
#include <errno.h>
#define OPDEF(a,b,c,d,e,f,g,h,i,j) \
a = i,
+typedef enum {
+ MONO_MARSHAL_NONE, /* No marshalling needed */
+ MONO_MARSHAL_COPY, /* Can be copied by value to the new domain */
+ MONO_MARSHAL_COPY_OUT, /* out parameter that needs to be copied back to the original instance */
+ MONO_MARSHAL_SERIALIZE /* Value needs to be serialized into the new domain */
+} MonoXDomainMarshalType;
+
enum {
#include "mono/cil/opcode.def"
LAST = 0xff
unsigned char *code;
};
-static void
-emit_struct_conv (MonoMethodBuilder *mb, MonoClass *klass, gboolean to_object);
+struct _MonoRemotingMethods {
+ MonoMethod *invoke;
+ MonoMethod *invoke_with_check;
+ MonoMethod *xdomain_invoke;
+ MonoMethod *xdomain_dispatch;
+};
-static MonoMethod *
-mono_find_method_by_name (MonoClass *klass, const char *name, int param_count)
-{
- MonoMethod *res = NULL;
- int i;
+typedef struct _MonoRemotingMethods MonoRemotingMethods;
- for (i = 0; i < klass->method.count; ++i) {
- if (klass->methods [i]->name[0] == name [0] &&
- !strcmp (name, klass->methods [i]->name) &&
- klass->methods [i]->signature->param_count == param_count) {
- res = klass->methods [i];
- break;
- }
- }
- return res;
-}
+static void
+delegate_hash_table_add (MonoDelegate *d);
+
+static void
+emit_struct_conv (MonoMethodBuilder *mb, MonoClass *klass, gboolean to_object);
#ifdef DEBUG_RUNTIME_CODE
static char*
static CRITICAL_SECTION marshal_mutex;
/* Maps wrapper methods to the methods they wrap */
-static MonoGHashTable *wrapper_hash;
+static GHashTable *wrapper_hash;
static guint32 last_error_tls_id;
+static void mono_struct_delete_old (MonoClass *klass, char *ptr);
+void * mono_marshal_string_to_utf16 (MonoString *s);
+
+static gpointer mono_string_to_lpstr (MonoString *string_obj);
+
static void
register_icall (gpointer func, const char *name, const char *sigstr, gboolean save)
{
mono_register_jit_icall (func, name, sig, save);
}
+static MonoMethodSignature*
+signature_no_pinvoke (MonoMethodSignature* sig)
+{
+ if (sig->pinvoke) {
+ sig = mono_metadata_signature_dup (sig);
+ sig->pinvoke = FALSE;
+ }
+
+ return sig;
+}
+
void
mono_marshal_init (void)
{
if (!module_initialized) {
module_initialized = TRUE;
InitializeCriticalSection (&marshal_mutex);
- MONO_GC_REGISTER_ROOT (wrapper_hash);
- wrapper_hash = mono_g_hash_table_new (NULL, NULL);
+ wrapper_hash = g_hash_table_new (NULL, NULL);
last_error_tls_id = TlsAlloc ();
+ register_icall (mono_marshal_string_to_utf16, "mono_marshal_string_to_utf16", "ptr obj", FALSE);
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_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_bstr, "mono_string_to_bstr", "ptr obj", FALSE);
register_icall (mono_string_to_ansibstr, "mono_string_to_ansibstr", "ptr object", FALSE);
register_icall (mono_string_builder_to_utf8, "mono_string_builder_to_utf8", "ptr object", FALSE);
register_icall (mono_array_to_lparray, "mono_array_to_lparray", "ptr object", FALSE);
register_icall (mono_delegate_to_ftnptr, "mono_delegate_to_ftnptr", "ptr object", FALSE);
register_icall (mono_ftnptr_to_delegate, "mono_ftnptr_to_delegate", "object ptr ptr", FALSE);
- register_icall (mono_marshal_string_array, "mono_marshal_string_array", "ptr object", FALSE);
- register_icall (mono_marshal_string_array_to_unicode, "mono_marshal_string_array_to_unicode", "ptr object", FALSE);
register_icall (mono_marshal_asany, "mono_marshal_asany", "ptr object int32", FALSE);
register_icall (mono_marshal_free_asany, "mono_marshal_free_asany", "void object ptr int32", FALSE);
+ register_icall (mono_marshal_alloc, "mono_marshal_alloc", "ptr int32", FALSE);
+ register_icall (mono_marshal_free, "mono_marshal_free", "void ptr", FALSE);
register_icall (mono_string_utf8_to_builder, "mono_string_utf8_to_builder", "void ptr ptr", FALSE);
register_icall (mono_string_utf16_to_builder, "mono_string_utf16_to_builder", "void ptr ptr", FALSE);
register_icall (mono_marshal_free_array, "mono_marshal_free_array", "void ptr int32", FALSE);
register_icall (mono_string_to_byvalwstr, "mono_string_to_byvalwstr", "void ptr ptr int32", FALSE);
register_icall (g_free, "g_free", "void ptr", FALSE);
register_icall (mono_object_isinst, "mono_object_isinst", "object object ptr", FALSE);
+ register_icall (mono_struct_delete_old, "mono_struct_delete_old", "void ptr ptr", FALSE);
+ }
+}
+
+
+MonoClass *byte_array_class;
+static MonoMethod *method_rs_serialize, *method_rs_deserialize, *method_exc_fixexc, *method_rs_appdomain_target;
+static MonoMethod *method_set_context, *method_get_context, *method_reset_datastore, *method_restore_datastore;
+static MonoMethod *method_set_call_context, *method_needs_context_sink, *method_rs_serialize_exc;
+
+static void
+mono_remoting_marshal_init (void)
+{
+ MonoClass *klass;
+
+ static gboolean module_initialized = FALSE;
+
+ if (!module_initialized) {
+ klass = mono_class_from_name (mono_defaults.corlib, "System.Runtime.Remoting", "RemotingServices");
+ method_rs_serialize = mono_class_get_method_from_name (klass, "SerializeCallData", -1);
+ method_rs_deserialize = mono_class_get_method_from_name (klass, "DeserializeCallData", -1);
+ method_rs_serialize_exc = mono_class_get_method_from_name (klass, "SerializeExceptionData", -1);
+
+ klass = mono_defaults.real_proxy_class;
+ method_rs_appdomain_target = mono_class_get_method_from_name (klass, "GetAppDomainTarget", -1);
+
+ klass = mono_defaults.exception_class;
+ method_exc_fixexc = mono_class_get_method_from_name (klass, "FixRemotingException", -1);
+
+ klass = mono_defaults.thread_class;
+ method_reset_datastore = mono_class_get_method_from_name (klass, "ResetDataStoreStatus", -1);
+ method_restore_datastore = mono_class_get_method_from_name (klass, "RestoreDataStoreStatus", -1);
+ method_get_context = mono_class_get_method_from_name (klass, "get_CurrentContext", -1);
+
+ klass = mono_defaults.appdomain_class;
+ method_set_context = mono_class_get_method_from_name (klass, "InternalSetContext", -1);
+ byte_array_class = mono_array_class_get (mono_defaults.byte_class, 1);
+
+ klass = mono_class_from_name (mono_defaults.corlib, "System.Runtime.Remoting.Messaging", "CallContext");
+ method_set_call_context = mono_class_get_method_from_name (klass, "SetCurrentCallContext", -1);
+
+ klass = mono_class_from_name (mono_defaults.corlib, "System.Runtime.Remoting.Contexts", "Context");
+ method_needs_context_sink = mono_class_get_method_from_name (klass, "get_NeedsContextSink", -1);
}
}
klass = ((MonoObject *)delegate)->vtable->klass;
g_assert (klass->delegate);
-
method = delegate->method_info->method;
- invoke = mono_find_method_by_name (klass, "Invoke", method->signature->param_count);
+ invoke = mono_class_get_method_from_name (klass, "Invoke", method->signature->param_count);
mspecs = g_new (MonoMarshalSpec*, invoke->signature->param_count + 1);
mono_method_get_marshal_info (invoke, mspecs);
wrapper = mono_marshal_get_managed_wrapper (method, delegate->target, mspecs);
for (i = invoke->signature->param_count; i >= 0; i--)
- g_free (mspecs [i]);
+ if (mspecs [i])
+ mono_metadata_free_marshal_spec (mspecs [i]);
g_free (mspecs);
delegate->delegate_trampoline = mono_compile_method (wrapper);
+ // Add the delegate to the delegate hash table
+ delegate_hash_table_add (delegate);
+
return delegate->delegate_trampoline;
}
+static GHashTable *delegate_hash_table;
+
+static GHashTable *
+delegate_hash_table_new (void) {
+ return g_hash_table_new (NULL, NULL);
+}
+
+static void
+delegate_hash_table_remove (MonoDelegate *d)
+{
+ EnterCriticalSection (&marshal_mutex);
+ if (delegate_hash_table == NULL)
+ delegate_hash_table = delegate_hash_table_new ();
+ g_hash_table_remove (delegate_hash_table, d->delegate_trampoline);
+ LeaveCriticalSection (&marshal_mutex);
+}
+
+void
+delegate_hash_table_add (MonoDelegate *d)
+{
+ EnterCriticalSection (&marshal_mutex);
+ if (delegate_hash_table == NULL)
+ delegate_hash_table = delegate_hash_table_new ();
+ g_hash_table_insert (delegate_hash_table, d->delegate_trampoline, d);
+ LeaveCriticalSection (&marshal_mutex);
+}
+
MonoDelegate*
mono_ftnptr_to_delegate (MonoClass *klass, gpointer ftn)
{
MonoDelegate *d;
- MonoJitInfo *ji;
-
- d = (MonoDelegate*)mono_object_new (mono_domain_get (), klass);
- ji = mono_jit_info_table_find (mono_domain_get (), ftn);
- if (ji == NULL)
- mono_raise_exception (mono_get_exception_argument ("", "Function pointer was not created by a Delegate."));
-
- /* FIXME: discard the wrapper and call the original method */
- mono_delegate_ctor ((MonoObject*)d, NULL, ftn);
+ EnterCriticalSection (&marshal_mutex);
+ if (delegate_hash_table == NULL)
+ delegate_hash_table = delegate_hash_table_new ();
+ d = g_hash_table_lookup (delegate_hash_table, ftn);
+ LeaveCriticalSection (&marshal_mutex);
+ if (d == NULL)
+ mono_raise_exception (mono_get_exception_argument (NULL, "Additional information: Function pointer was not created by a delegate."));
return d;
}
MonoJitInfo *ji;
void *ptr, *ptr2;
+ delegate_hash_table_remove (delegate);
ptr2 = delegate->delegate_trampoline;
ptr = InterlockedExchangePointer (&delegate->delegate_trampoline, NULL);
return;
}
- mono_runtime_free_method (ji->method);
+ mono_runtime_free_method (mono_object_domain (delegate), ji->method);
}
gpointer
if (!sb)
return NULL;
- res = g_malloc0 (mono_stringbuilder_capacity (sb) + 1);
+ res = mono_marshal_alloc (mono_stringbuilder_capacity (sb) + 1);
tmp = g_utf16_to_utf8 (mono_string_chars (sb->str), sb->length, NULL, res, &error);
if (error) {
g_error_free (error);
mono_raise_exception (mono_get_exception_execution_engine ("Failed to convert StringBuilder from utf16 to utf8"));
}
- else
+ else {
memcpy (res, tmp, sb->length + 1);
+ g_free (tmp);
+ }
return res;
}
return mono_string_chars (sb->str);
}
+static gpointer
+mono_string_to_lpstr (MonoString *s)
+{
+#ifdef PLATFORM_WIN32
+ char *as, *tmp;
+ glong len;
+ GError *error = NULL;
+
+ if (s == NULL)
+ return NULL;
+
+ if (!s->length) {
+ as = CoTaskMemAlloc (1);
+ as [0] = '\0';
+ return as;
+ }
+
+ tmp = g_utf16_to_utf8 (mono_string_chars (s), s->length, NULL, &len, &error);
+ if (error) {
+ g_warning (error->message);
+ g_error_free (error);
+ return NULL;
+ }
+ else {
+ as = CoTaskMemAlloc (len + 1);
+ memcpy (as, tmp, len + 1);
+ return as;
+ }
+#else
+ return mono_string_to_utf8 (s);
+#endif
+}
+
gpointer
mono_string_to_ansibstr (MonoString *string_obj)
{
- g_error ("implement me");
+ g_error ("UnmanagedMarshal.BStr is not implemented.");
return NULL;
}
gpointer
mono_string_to_bstr (MonoString *string_obj)
{
- g_error ("implement me");
+ g_error ("UnmanagedMarshal.AnsiBStr is not implemented.");
return NULL;
}
m->klass = klass;
m->name = g_strdup (name);
m->inline_info = 1;
- m->inline_count = -1;
m->wrapper_type = type;
mb->code_size = 256;
mono_mb_emit_byte (mb, CEE_ADD);
mono_mb_emit_byte (mb, CEE_LDIND_I);
mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
- mono_mb_emit_byte (mb, CEE_MONO_LDPTR);
+ mono_mb_emit_byte (mb, CEE_MONO_CLASSCONST);
mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_defaults.transparent_proxy_class));
mono_mb_emit_byte (mb, branch_code);
pos = mb->pos;
return pos;
}
+static int
+mono_mb_emit_xdomain_check (MonoMethodBuilder *mb, int branch_code)
+{
+ int pos;
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoTransparentProxy, rp));
+ mono_mb_emit_byte (mb, CEE_LDIND_REF);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoRealProxy, target_domain_id));
+ mono_mb_emit_byte (mb, CEE_LDIND_I4);
+ mono_mb_emit_icon (mb, -1);
+ mono_mb_emit_byte (mb, branch_code);
+ pos = mb->pos;
+ mono_mb_emit_i4 (mb, 0);
+ return pos;
+}
+
void
mono_mb_emit_i4 (MonoMethodBuilder *mb, gint32 data)
{
void
mono_mb_emit_managed_call (MonoMethodBuilder *mb, MonoMethod *method, MonoMethodSignature *opt_sig)
{
- mono_mb_emit_byte (mb, CEE_PREFIX1);
- mono_mb_emit_byte (mb, CEE_LDFTN);
+ mono_mb_emit_byte (mb, CEE_CALL);
mono_mb_emit_i4 (mb, mono_mb_add_data (mb, method));
- mono_mb_emit_calli (mb, opt_sig ? opt_sig : method->signature);
}
void
mono_mb_emit_icall (mb, mono_string_new_wrapper);
mono_mb_emit_byte (mb, CEE_STIND_I);
break;
+ case MONO_MARSHAL_CONV_STR_BYVALWSTR:
+ mono_mb_emit_byte (mb, CEE_LDLOC_1);
+ mono_mb_emit_byte (mb, CEE_LDLOC_0);
+ mono_mb_emit_icall (mb, mono_string_from_utf16);
+ mono_mb_emit_byte (mb, CEE_STIND_I);
+ break;
case MONO_MARSHAL_CONV_STR_LPTSTR:
case MONO_MARSHAL_CONV_STR_LPSTR:
mono_mb_emit_byte (mb, CEE_LDLOC_1);
case MONO_MARSHAL_CONV_STR_ANSIBSTR:
case MONO_MARSHAL_CONV_STR_TBSTR:
case MONO_MARSHAL_CONV_ARRAY_SAVEARRAY:
- case MONO_MARSHAL_CONV_STR_BYVALWSTR:
default:
g_warning ("marshaling conversion %d not implemented", conv);
g_assert_not_reached ();
{
switch (conv) {
case MONO_MARSHAL_CONV_STR_LPWSTR:
- return mono_string_to_utf16;
+ return mono_marshal_string_to_utf16;
case MONO_MARSHAL_CONV_LPWSTR_STR:
return mono_string_from_utf16;
case MONO_MARSHAL_CONV_LPSTR_STR:
return mono_string_new_wrapper;
case MONO_MARSHAL_CONV_STR_LPTSTR:
case MONO_MARSHAL_CONV_STR_LPSTR:
- return mono_string_to_utf8;
+ return mono_string_to_lpstr;
case MONO_MARSHAL_CONV_STR_BSTR:
return mono_string_to_bstr;
case MONO_MARSHAL_CONV_STR_TBSTR:
continue;
ntype = mono_type_to_unmanaged (ftype, info->fields [i].mspec, TRUE, klass->unicode, &conv);
-
+
if (last_field) {
msize = klass->instance_size - info->fields [i].field->offset;
usize = info->native_size - info->fields [i].offset;
}
static void
-emit_thread_interrupt_checkpoint (MonoMethodBuilder *mb)
+emit_struct_free (MonoMethodBuilder *mb, MonoClass *klass, int struct_var)
+{
+ /* Call DestroyStructure */
+ /* FIXME: Only do this if needed */
+ mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+ mono_mb_emit_byte (mb, CEE_MONO_CLASSCONST);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, klass));
+ mono_mb_emit_ldloc (mb, struct_var);
+ mono_mb_emit_icall (mb, mono_struct_delete_old);
+}
+
+static void
+emit_thread_interrupt_checkpoint_call (MonoMethodBuilder *mb, gpointer checkpoint_func)
{
- static MonoMethodSignature *state_check_sig = NULL;
int pos_noabort;
-
- if (!state_check_sig) {
- state_check_sig = mono_metadata_signature_alloc (mono_defaults.corlib, 0);
- state_check_sig->ret = &mono_defaults.void_class->byval_arg;
- state_check_sig->pinvoke = 0;
- }
-
+
mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
mono_mb_emit_byte (mb, CEE_MONO_LDPTR);
mono_mb_emit_i4 (mb, mono_mb_add_data (mb, (gpointer) mono_thread_interruption_request_flag ()));
mono_mb_emit_byte (mb, CEE_LDIND_I4);
pos_noabort = mono_mb_emit_branch (mb, CEE_BRFALSE);
- mono_mb_emit_native_call (mb, state_check_sig, mono_thread_interruption_checkpoint);
+ mono_mb_emit_icall (mb, checkpoint_func);
mono_mb_patch_addr (mb, pos_noabort, mb->pos - (pos_noabort + 4));
}
+static void
+emit_thread_interrupt_checkpoint (MonoMethodBuilder *mb)
+{
+ if (strstr (mb->method->name, "mono_thread_interruption_checkpoint"))
+ return;
+
+ emit_thread_interrupt_checkpoint_call (mb, mono_thread_interruption_checkpoint);
+}
+
+static void
+emit_thread_force_interrupt_checkpoint (MonoMethodBuilder *mb)
+{
+ emit_thread_interrupt_checkpoint_call (mb, mono_thread_force_interruption_checkpoint);
+}
+
static MonoAsyncResult *
mono_delegate_begin_invoke (MonoDelegate *delegate, gpointer *params)
{
}
}
-static MonoMarshalNative
-mono_marshal_get_stringbuilder_to_ptr_encoding (MonoMethodPInvoke *piinfo, MonoMarshalSpec *spec)
+static MonoMarshalConv
+mono_marshal_get_string_to_ptr_conv (MonoMethodPInvoke *piinfo, MonoMarshalSpec *spec)
+{
+ MonoMarshalNative encoding = mono_marshal_get_string_encoding (piinfo, spec);
+
+ switch (encoding) {
+ case MONO_NATIVE_LPWSTR:
+ return MONO_MARSHAL_CONV_STR_LPWSTR;
+ case MONO_NATIVE_LPSTR:
+ return MONO_MARSHAL_CONV_STR_LPSTR;
+ case MONO_NATIVE_LPTSTR:
+ return MONO_MARSHAL_CONV_STR_LPTSTR;
+ default:
+ return -1;
+ }
+}
+
+static MonoMarshalConv
+mono_marshal_get_stringbuilder_to_ptr_conv (MonoMethodPInvoke *piinfo, MonoMarshalSpec *spec)
{
MonoMarshalNative encoding = mono_marshal_get_string_encoding (piinfo, spec);
}
}
-static MonoMarshalNative
-mono_marshal_get_ptr_to_stringbuilder_encoding (MonoMethodPInvoke *piinfo, MonoMarshalSpec *spec, gboolean *need_free)
+static MonoMarshalConv
+mono_marshal_get_ptr_to_stringbuilder_conv (MonoMethodPInvoke *piinfo, MonoMarshalSpec *spec, gboolean *need_free)
{
MonoMarshalNative encoding = mono_marshal_get_string_encoding (piinfo, spec);
}
}
+/*
+ * Return whenever a field of a native structure or an array member needs to
+ * be freed.
+ */
+static gboolean
+mono_marshal_need_free (MonoType *t, MonoMethodPInvoke *piinfo, MonoMarshalSpec *spec)
+{
+ MonoMarshalNative encoding;
+ MonoMarshalConv conv;
+
+ switch (t->type) {
+ case MONO_TYPE_VALUETYPE:
+ /* FIXME: Optimize this */
+ return TRUE;
+ case MONO_TYPE_OBJECT:
+ case MONO_TYPE_CLASS:
+ if (t->data.klass == mono_defaults.stringbuilder_class) {
+ gboolean need_free;
+ conv = mono_marshal_get_ptr_to_stringbuilder_conv (piinfo, spec, &need_free);
+ return need_free;
+ }
+ return FALSE;
+ case MONO_TYPE_STRING:
+ encoding = mono_marshal_get_string_encoding (piinfo, spec);
+ return (encoding == MONO_NATIVE_LPWSTR) ? FALSE : TRUE;
+ default:
+ return FALSE;
+ }
+}
+
static inline MonoMethod*
mono_marshal_find_in_cache (GHashTable *cache, gpointer key)
{
/* This does not acquire any locks */
res = mono_mb_create_method (mb, sig, max_stack);
g_hash_table_insert (cache, key, res);
- mono_g_hash_table_insert (wrapper_hash, res, key);
+ g_hash_table_insert (wrapper_hash, res, key);
}
- else
- /* Somebody created it before us */
- ;
LeaveCriticalSection (&marshal_mutex);
return res;
}
+
+static inline MonoMethod*
+mono_marshal_remoting_find_in_cache (MonoMethod *method, int wrapper_type)
+{
+ MonoMethod *res = NULL;
+ MonoRemotingMethods *wrps;
+
+ EnterCriticalSection (&marshal_mutex);
+ wrps = g_hash_table_lookup (method->klass->image->remoting_invoke_cache, method);
+
+ if (wrps) {
+ switch (wrapper_type) {
+ case MONO_WRAPPER_REMOTING_INVOKE: res = wrps->invoke; break;
+ case MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK: res = wrps->invoke_with_check; break;
+ case MONO_WRAPPER_XDOMAIN_INVOKE: res = wrps->xdomain_invoke; break;
+ case MONO_WRAPPER_XDOMAIN_DISPATCH: res = wrps->xdomain_dispatch; break;
+ }
+ }
+
+ LeaveCriticalSection (&marshal_mutex);
+ return res;
+}
+
+/* Create the method from the builder and place it in the cache */
+static inline MonoMethod*
+mono_remoting_mb_create_and_cache (MonoMethod *key, MonoMethodBuilder *mb,
+ MonoMethodSignature *sig, int max_stack)
+{
+ MonoMethod **res = NULL;
+ MonoRemotingMethods *wrps;
+ GHashTable *cache = key->klass->image->remoting_invoke_cache;
+
+ EnterCriticalSection (&marshal_mutex);
+ wrps = g_hash_table_lookup (cache, key);
+ if (!wrps) {
+ wrps = g_new0 (MonoRemotingMethods, 1);
+ g_hash_table_insert (cache, key, wrps);
+ }
+
+ switch (mb->method->wrapper_type) {
+ case MONO_WRAPPER_REMOTING_INVOKE: res = &wrps->invoke; break;
+ case MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK: res = &wrps->invoke_with_check; break;
+ case MONO_WRAPPER_XDOMAIN_INVOKE: res = &wrps->xdomain_invoke; break;
+ case MONO_WRAPPER_XDOMAIN_DISPATCH: res = &wrps->xdomain_dispatch; break;
+ default: g_assert_not_reached (); break;
+ }
+
+ if (*res == NULL) {
+ /* This does not acquire any locks */
+ *res = mono_mb_create_method (mb, sig, max_stack);
+ g_hash_table_insert (wrapper_hash, *res, key);
+ }
+
+ LeaveCriticalSection (&marshal_mutex);
+
+ return *res;
+}
+
MonoMethod *
mono_marshal_method_from_wrapper (MonoMethod *wrapper)
{
return wrapper;
EnterCriticalSection (&marshal_mutex);
- res = mono_g_hash_table_lookup (wrapper_hash, wrapper);
+ res = g_hash_table_lookup (wrapper_hash, wrapper);
LeaveCriticalSection (&marshal_mutex);
-
- if (res && wrapper->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK)
- /* See mono_marshal_get_remoting_invoke_with_check */
- return (MonoMethod*)((char*)res - 1);
- else
- return res;
+ return res;
}
MonoMethod *
g_assert (method && method->klass->parent == mono_defaults.multicastdelegate_class &&
!strcmp (method->name, "BeginInvoke"));
- sig = method->signature;
+ sig = signature_no_pinvoke (method->signature);
cache = method->klass->image->delegate_begin_invoke_cache;
if ((res = mono_marshal_find_in_cache (cache, sig)))
g_assert (method != NULL);
- sig = method->signature;
+ sig = signature_no_pinvoke (method->signature);
msg = mono_method_call_message_new (method, params, NULL, NULL, NULL);
g_assert (method && method->klass->parent == mono_defaults.multicastdelegate_class &&
!strcmp (method->name, "EndInvoke"));
- sig = method->signature;
+ sig = signature_no_pinvoke (method->signature);
cache = method->klass->image->delegate_end_invoke_cache;
if ((res = mono_marshal_find_in_cache (cache, sig)))
static MonoMethodSignature *csig = NULL;
MonoMethodBuilder *mb;
MonoMethod *res;
- GHashTable *cache;
int params_var;
g_assert (method);
- if (method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE)
+ if (method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE || method->wrapper_type == MONO_WRAPPER_XDOMAIN_INVOKE)
return method;
- sig = method->signature;
+ sig = signature_no_pinvoke (method->signature);
/* we cant remote methods without this pointer */
if (!sig->hasthis)
return method;
- cache = method->klass->image->remoting_invoke_cache;
- if ((res = mono_marshal_find_in_cache (cache, method)))
+ if ((res = mono_marshal_remoting_find_in_cache (method, MONO_WRAPPER_REMOTING_INVOKE)))
return res;
if (!csig) {
mono_mb_emit_restore_result (mb, sig->ret);
}
- res = mono_mb_create_and_cache (cache, method, mb, sig, sig->param_count + 16);
+ res = mono_remoting_mb_create_and_cache (method, mb, sig, sig->param_count + 16);
mono_mb_free (mb);
return res;
}
-MonoMethod *
-mono_marshal_get_remoting_invoke_with_check (MonoMethod *method)
+/* mono_get_xdomain_marshal_type()
+ * Returns the kind of marshalling that a type needs for cross domain calls.
+ */
+static MonoXDomainMarshalType
+mono_get_xdomain_marshal_type (MonoType *t)
{
- MonoMethodSignature *sig;
- MonoMethodBuilder *mb;
- MonoMethod *res, *native;
- GHashTable *cache;
- int i, pos;
-
- g_assert (method);
-
- if (method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK)
- return method;
-
- sig = method->signature;
-
- /* we cant remote methods without this pointer */
- g_assert (sig->hasthis);
-
- cache = method->klass->image->remoting_invoke_cache;
- if ((res = mono_marshal_find_in_cache (cache, (char *)method + 1)))
- return res;
-
- mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK);
+ switch (t->type) {
+ case MONO_TYPE_VOID:
+ g_assert_not_reached ();
+ break;
+ case MONO_TYPE_U1:
+ case MONO_TYPE_I1:
+ case MONO_TYPE_BOOLEAN:
+ case MONO_TYPE_U2:
+ case MONO_TYPE_I2:
+ case MONO_TYPE_CHAR:
+ case MONO_TYPE_U4:
+ case MONO_TYPE_I4:
+ case MONO_TYPE_I8:
+ case MONO_TYPE_U8:
+ case MONO_TYPE_R4:
+ case MONO_TYPE_R8:
+ return MONO_MARSHAL_NONE;
+ case MONO_TYPE_STRING:
+ return MONO_MARSHAL_COPY;
+ case MONO_TYPE_ARRAY:
+ case MONO_TYPE_SZARRAY: {
+ MonoClass *elem_class = mono_class_from_mono_type (t)->element_class;
+ if (mono_get_xdomain_marshal_type (&(elem_class->byval_arg)) != MONO_MARSHAL_SERIALIZE)
+ return MONO_MARSHAL_COPY;
+ break;
+ }
+ }
- mono_mb_emit_ldarg (mb, 0);
- pos = mono_mb_emit_proxy_check (mb, CEE_BNE_UN);
+ if (mono_class_from_mono_type (t) == mono_defaults.stringbuilder_class)
+ return MONO_MARSHAL_COPY;
+
+ return MONO_MARSHAL_SERIALIZE;
+}
- native = mono_marshal_get_remoting_invoke (method);
- for (i = 0; i <= sig->param_count; i++)
- mono_mb_emit_ldarg (mb, i);
-
- mono_mb_emit_managed_call (mb, native, native->signature);
- mono_mb_emit_byte (mb, CEE_RET);
+/* mono_marshal_xdomain_copy_value
+ * Makes a copy of "val" suitable for the current domain.
+ */
+static MonoObject *
+mono_marshal_xdomain_copy_value (MonoObject *val)
+{
+ MonoDomain *domain;
+ if (val == NULL) return NULL;
- mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
+ domain = mono_domain_get ();
- for (i = 0; i <= sig->param_count; i++)
+ switch (mono_object_class (val)->byval_arg.type) {
+ case MONO_TYPE_VOID:
+ g_assert_not_reached ();
+ break;
+ case MONO_TYPE_U1:
+ case MONO_TYPE_I1:
+ case MONO_TYPE_BOOLEAN:
+ case MONO_TYPE_U2:
+ case MONO_TYPE_I2:
+ case MONO_TYPE_CHAR:
+ case MONO_TYPE_U4:
+ case MONO_TYPE_I4:
+ case MONO_TYPE_I8:
+ case MONO_TYPE_U8:
+ case MONO_TYPE_R4:
+ case MONO_TYPE_R8: {
+ return mono_value_box (domain, mono_object_class (val), ((char*)val) + sizeof(MonoObject));
+ }
+ case MONO_TYPE_STRING: {
+ MonoString *str = (MonoString *) val;
+ return (MonoObject *) mono_string_new_utf16 (domain, mono_string_chars (str), mono_string_length (str));
+ }
+ case MONO_TYPE_ARRAY:
+ case MONO_TYPE_SZARRAY: {
+ MonoArray *acopy;
+ MonoXDomainMarshalType mt = mono_get_xdomain_marshal_type (&(mono_object_class (val)->element_class->byval_arg));
+ if (mt == MONO_MARSHAL_SERIALIZE) return NULL;
+ acopy = mono_array_clone_in_domain (domain, (MonoArray *) val);
+ if (mt == MONO_MARSHAL_COPY) {
+ int i, len = mono_array_length (acopy);
+ for (i = 0; i < len; i++) {
+ MonoObject *item = mono_array_get (acopy, gpointer, i);
+ mono_array_set (acopy, gpointer, i, mono_marshal_xdomain_copy_value (item));
+ }
+ }
+ return (MonoObject *) acopy;
+ }
+ }
+
+ if (mono_object_class (val) == mono_defaults.stringbuilder_class) {
+ MonoStringBuilder *oldsb = (MonoStringBuilder *) val;
+ MonoStringBuilder *newsb = (MonoStringBuilder *) mono_object_new (domain, mono_defaults.stringbuilder_class);
+ newsb->str = mono_string_new_utf16 (domain, mono_string_chars (oldsb->str), mono_string_length (oldsb->str));
+ newsb->length = oldsb->length;
+ return (MonoObject *) newsb;
+ }
+ return NULL;
+}
+
+/* mono_marshal_xdomain_copy_out_value()
+ * Copies the contents of the src instance into the dst instance. src and dst
+ * must have the same type, and if they are arrays, the same size.
+ */
+static void
+mono_marshal_xdomain_copy_out_value (MonoObject *src, MonoObject *dst)
+{
+ if (src == NULL || dst == NULL) return;
+
+ g_assert (mono_object_class (src) == mono_object_class (dst));
+
+ switch (mono_object_class (src)->byval_arg.type) {
+ case MONO_TYPE_ARRAY:
+ case MONO_TYPE_SZARRAY: {
+ int mt = mono_get_xdomain_marshal_type (&(mono_object_class (src)->element_class->byval_arg));
+ if (mt == MONO_MARSHAL_SERIALIZE) return;
+ if (mt == MONO_MARSHAL_COPY) {
+ int i, len = mono_array_length ((MonoArray *)dst);
+ for (i = 0; i < len; i++) {
+ MonoObject *item = mono_array_get ((MonoArray *)src, gpointer, i);
+ mono_array_set ((MonoArray *)dst, gpointer, i, mono_marshal_xdomain_copy_value (item));
+ }
+ } else {
+ mono_array_full_copy ((MonoArray *)src, (MonoArray *)dst);
+ }
+ return;
+ }
+ }
+
+ if (mono_object_class (src) == mono_defaults.stringbuilder_class) {
+ MonoStringBuilder *src_sb = (MonoStringBuilder *) src;
+ MonoStringBuilder *dst_sb = (MonoStringBuilder *) dst;
+
+ dst_sb->str = mono_string_new_utf16 (mono_object_domain (dst), mono_string_chars (src_sb->str), mono_string_length (src_sb->str));
+ dst_sb->length = src_sb->length;
+ }
+}
+
+static void
+mono_marshal_emit_xdomain_copy_value (MonoMethodBuilder *mb, MonoClass *pclass)
+{
+ static MonoMethodSignature *csig = NULL;
+ if (!csig) {
+ csig = mono_metadata_signature_alloc (mono_defaults.corlib, 1);
+ csig->params [0] = &mono_defaults.object_class->byval_arg;
+ csig->ret = &mono_defaults.object_class->byval_arg;
+ csig->pinvoke = 1;
+ }
+
+ mono_mb_emit_native_call (mb, csig, mono_marshal_xdomain_copy_value);
+ mono_mb_emit_byte (mb, CEE_CASTCLASS);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, pclass));
+}
+
+static void
+mono_marshal_emit_xdomain_copy_out_value (MonoMethodBuilder *mb, MonoClass *pclass)
+{
+ static MonoMethodSignature *csig = NULL;
+ if (!csig) {
+ csig = mono_metadata_signature_alloc (mono_defaults.corlib, 2);
+ csig->params [0] = &mono_defaults.object_class->byval_arg;
+ csig->params [1] = &mono_defaults.object_class->byval_arg;
+ csig->ret = &mono_defaults.void_class->byval_arg;
+ csig->pinvoke = 1;
+ }
+
+ mono_mb_emit_native_call (mb, csig, mono_marshal_xdomain_copy_out_value);
+}
+
+/* mono_marshal_supports_fast_xdomain()
+ * Returns TRUE if the method can use the fast xdomain wrapper.
+ */
+static gboolean
+mono_marshal_supports_fast_xdomain (MonoMethod *method)
+{
+ return !method->klass->contextbound &&
+ !((method->flags & METHOD_ATTRIBUTE_SPECIAL_NAME) && (strcmp (".ctor", method->name) == 0));
+}
+
+static gint32
+mono_marshal_set_domain_by_id (gint32 id, MonoBoolean push)
+{
+ MonoDomain *current_domain = mono_domain_get ();
+ MonoDomain *domain = mono_domain_get_by_id (id);
+
+ if (!domain || !mono_domain_set (domain, FALSE))
+ mono_raise_exception (mono_get_exception_appdomain_unloaded ());
+
+ if (push)
+ mono_thread_push_appdomain_ref (domain);
+ else
+ mono_thread_pop_appdomain_ref ();
+
+ return current_domain->domain_id;
+}
+
+static void
+mono_marshal_emit_switch_domain (MonoMethodBuilder *mb)
+{
+ static MonoMethodSignature *csig = NULL;
+ if (!csig) {
+ csig = mono_metadata_signature_alloc (mono_defaults.corlib, 2);
+ csig->params [0] = &mono_defaults.int32_class->byval_arg;
+ csig->params [1] = &mono_defaults.int32_class->byval_arg;
+ csig->ret = &mono_defaults.int32_class->byval_arg;
+ csig->pinvoke = 1;
+ }
+
+ mono_mb_emit_native_call (mb, csig, mono_marshal_set_domain_by_id);
+}
+
+/* mono_marshal_emit_load_domain_method ()
+ * Loads into the stack a pointer to the code of the provided method for
+ * the current domain.
+ */
+static void
+mono_marshal_emit_load_domain_method (MonoMethodBuilder *mb, MonoMethod *method)
+{
+ static MonoMethodSignature *csig = NULL;
+ if (!csig) {
+ csig = mono_metadata_signature_alloc (mono_defaults.corlib, 1);
+ csig->params [0] = &mono_defaults.int_class->byval_arg;
+ csig->ret = &mono_defaults.int_class->byval_arg;
+ csig->pinvoke = 1;
+ }
+
+ /* We need a pointer to the method for the running domain (not the domain
+ * that compiles the method).
+ */
+ mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+ mono_mb_emit_byte (mb, CEE_MONO_LDPTR);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, method));
+ mono_mb_emit_native_call (mb, csig, mono_compile_method);
+}
+
+/* mono_marshal_get_xappdomain_dispatch ()
+ * Generates a method that dispatches a method call from another domain into
+ * the current domain.
+ */
+static MonoMethod *
+mono_marshal_get_xappdomain_dispatch (MonoMethod *method, int *marshal_types, int complex_count, int complex_out_count, int ret_marshal_type)
+{
+ MonoMethodSignature *sig, *csig;
+ MonoMethodBuilder *mb;
+ MonoMethod *res;
+ int i, j, param_index, copy_locals_base;
+ MonoClass *ret_class = NULL;
+ int loc_array=0, loc_return=0, loc_serialized_exc=0;
+ MonoExceptionClause *main_clause;
+ MonoMethodHeader *header;
+ int pos, pos_leave;
+ gboolean copy_return;
+
+ if ((res = mono_marshal_remoting_find_in_cache (method, MONO_WRAPPER_XDOMAIN_DISPATCH)))
+ return res;
+
+ sig = method->signature;
+ copy_return = (sig->ret->type != MONO_TYPE_VOID && ret_marshal_type != MONO_MARSHAL_SERIALIZE);
+
+ j = 0;
+ csig = mono_metadata_signature_alloc (mono_defaults.corlib, 3 + sig->param_count - complex_count);
+ csig->params [j++] = &mono_defaults.object_class->byval_arg;
+ csig->params [j++] = &byte_array_class->this_arg;
+ csig->params [j++] = &byte_array_class->this_arg;
+ for (i = 0; i < sig->param_count; i++) {
+ if (marshal_types [i] != MONO_MARSHAL_SERIALIZE)
+ csig->params [j++] = sig->params [i];
+ }
+ if (copy_return)
+ csig->ret = sig->ret;
+ else
+ csig->ret = &mono_defaults.void_class->byval_arg;
+ csig->pinvoke = 1;
+ csig->hasthis = FALSE;
+
+ mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_XDOMAIN_DISPATCH);
+ mb->method->save_lmf = 1;
+
+ /* Locals */
+
+ loc_serialized_exc = mono_mb_add_local (mb, &byte_array_class->byval_arg);
+ if (complex_count > 0)
+ loc_array = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+ if (sig->ret->type != MONO_TYPE_VOID) {
+ loc_return = mono_mb_add_local (mb, sig->ret);
+ ret_class = mono_class_from_mono_type (sig->ret);
+ }
+
+ /* try */
+
+ main_clause = g_new0 (MonoExceptionClause, 1);
+ main_clause->try_offset = mb->pos;
+
+ /* Clean the call context */
+
+ mono_mb_emit_byte (mb, CEE_LDNULL);
+ mono_mb_emit_managed_call (mb, method_set_call_context, NULL);
+ mono_mb_emit_byte (mb, CEE_POP);
+
+ /* Deserialize call data */
+
+ mono_mb_emit_ldarg (mb, 1);
+ mono_mb_emit_byte (mb, CEE_LDIND_REF);
+ mono_mb_emit_byte (mb, CEE_DUP);
+ mono_mb_emit_byte (mb, CEE_BRFALSE_S);
+ pos = mb->pos;
+ mono_mb_emit_byte (mb, 0);
+
+ mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
+ mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
+
+ if (complex_count > 0)
+ mono_mb_emit_stloc (mb, loc_array);
+ else
+ mono_mb_emit_byte (mb, CEE_POP);
+
+ mono_mb_patch_addr_s (mb, pos, mb->pos - (pos + 1));
+
+ /* Get the target object */
+
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_managed_call (mb, method_rs_appdomain_target, NULL);
+
+ /* Load the arguments */
+
+ copy_locals_base = mb->locals;
+ param_index = 3; // Index of the first non-serialized parameter of this wrapper
+ j = 0;
+ for (i = 0; i < sig->param_count; i++) {
+ MonoType *pt = sig->params [i];
+ MonoClass *pclass = mono_class_from_mono_type (pt);
+ switch (marshal_types [i]) {
+ case MONO_MARSHAL_SERIALIZE: {
+ /* take the value from the serialized array */
+ mono_mb_emit_ldloc (mb, loc_array);
+ mono_mb_emit_icon (mb, j++);
+ if (pt->byref) {
+ if (pclass->valuetype) {
+ mono_mb_emit_byte (mb, CEE_LDELEM_REF);
+ mono_mb_emit_byte (mb, CEE_UNBOX);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, pclass));
+ } else {
+ mono_mb_emit_byte (mb, CEE_LDELEMA);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, pclass));
+ }
+ } else {
+ if (pclass->valuetype) {
+ mono_mb_emit_byte (mb, CEE_LDELEM_REF);
+ mono_mb_emit_byte (mb, CEE_UNBOX);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, pclass));
+ mono_mb_emit_byte (mb, CEE_LDOBJ);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, pclass));
+ } else {
+ mono_mb_emit_byte (mb, CEE_LDELEM_REF);
+ if (pclass != mono_defaults.object_class) {
+ mono_mb_emit_byte (mb, CEE_CASTCLASS);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, pclass));
+ }
+ }
+ }
+ break;
+ }
+ case MONO_MARSHAL_COPY_OUT: {
+ /* Keep a local copy of the value since we need to copy it back after the call */
+ int copy_local = mono_mb_add_local (mb, &(pclass->byval_arg));
+ mono_mb_emit_ldarg (mb, param_index++);
+ mono_marshal_emit_xdomain_copy_value (mb, pclass);
+ mono_mb_emit_byte (mb, CEE_DUP);
+ mono_mb_emit_stloc (mb, copy_local);
+ break;
+ }
+ case MONO_MARSHAL_COPY: {
+ mono_mb_emit_ldarg (mb, param_index);
+ if (pt->byref) {
+ mono_mb_emit_byte (mb, CEE_DUP);
+ mono_mb_emit_byte (mb, CEE_DUP);
+ mono_mb_emit_byte (mb, CEE_LDIND_REF);
+ mono_marshal_emit_xdomain_copy_value (mb, pclass);
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ } else {
+ mono_marshal_emit_xdomain_copy_value (mb, pclass);
+ }
+ param_index++;
+ break;
+ }
+ case MONO_MARSHAL_NONE:
+ mono_mb_emit_ldarg (mb, param_index++);
+ break;
+ }
+ }
+
+ /* Make the call to the real object */
+
+ emit_thread_force_interrupt_checkpoint (mb);
+ mono_mb_emit_managed_call (mb, method, NULL);
+
+ if (sig->ret->type != MONO_TYPE_VOID)
+ mono_mb_emit_stloc (mb, loc_return);
+
+ /* copy back MONO_MARSHAL_COPY_OUT parameters */
+
+ j = 0;
+ param_index = 3;
+ for (i = 0; i < sig->param_count; i++) {
+ if (marshal_types [i] == MONO_MARSHAL_SERIALIZE) continue;
+ if (marshal_types [i] == MONO_MARSHAL_COPY_OUT) {
+ mono_mb_emit_ldloc (mb, copy_locals_base + (j++));
+ mono_mb_emit_ldarg (mb, param_index);
+ mono_marshal_emit_xdomain_copy_out_value (mb, mono_class_from_mono_type (sig->params [i]));
+ }
+ param_index++;
+ }
+
+ /* Serialize the return values */
+
+ if (complex_out_count > 0) {
+ /* Reset parameters in the array that don't need to be serialized back */
+ j = 0;
+ for (i = 0; i < sig->param_count; i++) {
+ if (marshal_types[i] != MONO_MARSHAL_SERIALIZE) continue;
+ if (!sig->params [i]->byref) {
+ mono_mb_emit_ldloc (mb, loc_array);
+ mono_mb_emit_icon (mb, j);
+ mono_mb_emit_byte (mb, CEE_LDNULL);
+ mono_mb_emit_byte (mb, CEE_STELEM_REF);
+ }
+ j++;
+ }
+
+ /* Add the return value to the array */
+
+ if (ret_marshal_type == MONO_MARSHAL_SERIALIZE) {
+ mono_mb_emit_ldloc (mb, loc_array);
+ mono_mb_emit_icon (mb, complex_count); /* The array has an additional slot to hold the ret value */
+ mono_mb_emit_ldloc (mb, loc_return);
+ if (ret_class->valuetype) {
+ mono_mb_emit_byte (mb, CEE_BOX);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, ret_class));
+ }
+ mono_mb_emit_byte (mb, CEE_STELEM_REF);
+ }
+
+ /* Serialize */
+
+ mono_mb_emit_ldarg (mb, 1);
+ mono_mb_emit_ldloc (mb, loc_array);
+ mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ } else if (ret_marshal_type == MONO_MARSHAL_SERIALIZE) {
+ mono_mb_emit_ldarg (mb, 1);
+ mono_mb_emit_ldloc (mb, loc_return);
+ if (ret_class->valuetype) {
+ mono_mb_emit_byte (mb, CEE_BOX);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, ret_class));
+ }
+ mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ } else {
+ mono_mb_emit_ldarg (mb, 1);
+ mono_mb_emit_byte (mb, CEE_LDNULL);
+ mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ }
+
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_byte (mb, CEE_LDNULL);
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ mono_mb_emit_byte (mb, CEE_LEAVE);
+ pos_leave = mb->pos;
+ mono_mb_emit_i4 (mb, 0);
+
+ /* Main exception catch */
+ main_clause->flags = MONO_EXCEPTION_CLAUSE_NONE;
+ main_clause->try_len = mb->pos - main_clause->try_offset;
+ main_clause->data.catch_class = mono_defaults.object_class;
+
+ /* handler code */
+ main_clause->handler_offset = mb->pos;
+ mono_mb_emit_managed_call (mb, method_rs_serialize_exc, NULL);
+ mono_mb_emit_stloc (mb, loc_serialized_exc);
+ mono_mb_emit_ldarg (mb, 2);
+ mono_mb_emit_ldloc (mb, loc_serialized_exc);
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ mono_mb_emit_byte (mb, CEE_LEAVE);
+ mono_mb_emit_i4 (mb, 0);
+ main_clause->handler_len = mb->pos - main_clause->handler_offset;
+ /* end catch */
+
+ mono_mb_patch_addr (mb, pos_leave, mb->pos - (pos_leave + 4));
+
+ if (copy_return)
+ mono_mb_emit_ldloc (mb, loc_return);
+
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ res = mono_remoting_mb_create_and_cache (method, mb, csig, csig->param_count + 16);
+ mono_mb_free (mb);
+
+ header = ((MonoMethodNormal *)res)->header;
+ header->num_clauses = 1;
+ header->clauses = main_clause;
+
+ return res;
+}
+
+/* mono_marshal_get_xappdomain_invoke ()
+ * Generates a fast remoting wrapper for cross app domain calls.
+ */
+MonoMethod *
+mono_marshal_get_xappdomain_invoke (MonoMethod *method)
+{
+ MonoMethodSignature *sig;
+ static MonoMethodSignature *sig_context_get;
+ static MonoMethodSignature *sig_context_set;
+ MonoMethodBuilder *mb;
+ MonoMethod *res;
+ int i, j, complex_count, complex_out_count, copy_locals_base;
+ int *marshal_types;
+ MonoClass *ret_class = NULL;
+ MonoMethod *xdomain_method;
+ int ret_marshal_type = MONO_MARSHAL_NONE;
+ int loc_array=0, loc_serialized_data=-1, loc_real_proxy;
+ int loc_old_domainid, loc_return=0, loc_serialized_exc=0, loc_context, loc_datastore;
+ int pos, pos_noex;
+ gboolean copy_return = FALSE;
+
+ g_assert (method);
+
+ if (method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE || method->wrapper_type == MONO_WRAPPER_XDOMAIN_INVOKE)
+ return method;
+
+ /* we cant remote methods without this pointer */
+ if (!method->signature->hasthis)
+ return method;
+
+ if (!mono_marshal_supports_fast_xdomain (method))
+ return mono_marshal_get_remoting_invoke (method);
+
+ mono_remoting_marshal_init ();
+
+ if ((res = mono_marshal_remoting_find_in_cache (method, MONO_WRAPPER_XDOMAIN_INVOKE)))
+ return res;
+
+ sig = signature_no_pinvoke (method->signature);
+
+ if (sig_context_set == NULL) {
+ sig_context_set = mono_metadata_signature_alloc (mono_defaults.corlib, 1);
+ sig_context_set->params [0] = &mono_defaults.object_class->byval_arg;
+ sig_context_set->ret = &mono_defaults.void_class->byval_arg;
+ sig_context_set->pinvoke = 1;
+
+ sig_context_get = mono_metadata_signature_alloc (mono_defaults.corlib, 0);
+ sig_context_get->ret = &mono_defaults.object_class->byval_arg;
+ sig_context_get->pinvoke = 1;
+ }
+
+ mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_XDOMAIN_INVOKE);
+ mb->method->save_lmf = 1;
+
+ /* Count the number of parameters that need to be serialized */
+
+ marshal_types = alloca (sizeof (int) * sig->param_count);
+ complex_count = complex_out_count = 0;
+ for (i = 0; i < sig->param_count; i++) {
+ MonoType *ptype = sig->params[i];
+ int mt = mono_get_xdomain_marshal_type (ptype);
+
+ /* If the [Out] attribute is applied to a parameter that can be internally copied,
+ * the copy will be made by reusing the original object instance
+ */
+ if ((ptype->attrs & PARAM_ATTRIBUTE_OUT) != 0 && mt == MONO_MARSHAL_COPY && !ptype->byref)
+ mt = MONO_MARSHAL_COPY_OUT;
+ else if (mt == MONO_MARSHAL_SERIALIZE) {
+ complex_count++;
+ if (ptype->byref) complex_out_count++;
+ }
+ marshal_types [i] = mt;
+ }
+
+ if (sig->ret->type != MONO_TYPE_VOID) {
+ ret_marshal_type = mono_get_xdomain_marshal_type (sig->ret);
+ ret_class = mono_class_from_mono_type (sig->ret);
+ copy_return = ret_marshal_type != MONO_MARSHAL_SERIALIZE;
+ }
+
+ /* Locals */
+
+ if (complex_count > 0)
+ loc_array = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+ loc_serialized_data = mono_mb_add_local (mb, &byte_array_class->byval_arg);
+ loc_real_proxy = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+ if (copy_return)
+ loc_return = mono_mb_add_local (mb, sig->ret);
+ loc_old_domainid = mono_mb_add_local (mb, &mono_defaults.int32_class->byval_arg);
+ loc_serialized_exc = mono_mb_add_local (mb, &byte_array_class->byval_arg);
+ loc_context = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+ loc_datastore = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+
+ /* Save thread domain data */
+
+ mono_mb_emit_native_call (mb, sig_context_get, mono_context_get);
+ mono_mb_emit_byte (mb, CEE_DUP);
+ mono_mb_emit_stloc (mb, loc_context);
+
+ /* If the thread is not running in the default context, it needs to go
+ * through the whole remoting sink, since the context is going to change
+ */
+ mono_mb_emit_managed_call (mb, method_needs_context_sink, NULL);
+ mono_mb_emit_byte (mb, CEE_BRFALSE_S);
+ pos = mb->pos;
+ mono_mb_emit_byte (mb, 0);
+
+ mono_mb_emit_ldarg (mb, 0);
+ for (i = 0; i < sig->param_count; i++)
+ mono_mb_emit_ldarg (mb, i + 1);
+
+ mono_mb_emit_managed_call (mb, mono_marshal_get_remoting_invoke (method), NULL);
+ mono_mb_emit_byte (mb, CEE_RET);
+ mono_mb_patch_addr_s (mb, pos, mb->pos - pos - 1);
+
+ mono_mb_emit_managed_call (mb, method_reset_datastore, NULL);
+ mono_mb_emit_stloc (mb, loc_datastore);
+
+ /* Create the array that will hold the parameters to be serialized */
+
+ if (complex_count > 0) {
+ mono_mb_emit_icon (mb, (ret_marshal_type == MONO_MARSHAL_SERIALIZE && complex_out_count > 0) ? complex_count + 1 : complex_count); /* +1 for the return type */
+ mono_mb_emit_byte (mb, CEE_NEWARR);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_defaults.object_class));
+
+ j = 0;
+ for (i = 0; i < sig->param_count; i++) {
+ if (marshal_types [i] != MONO_MARSHAL_SERIALIZE) continue;
+ MonoClass *pclass = mono_class_from_mono_type (sig->params[i]);
+ mono_mb_emit_byte (mb, CEE_DUP);
+ mono_mb_emit_icon (mb, j);
+ mono_mb_emit_ldarg (mb, i + 1); /* 0=this */
+ if (sig->params[i]->byref) {
+ if (pclass->valuetype) {
+ mono_mb_emit_byte (mb, CEE_LDOBJ);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, pclass));
+ } else {
+ mono_mb_emit_byte (mb, CEE_LDIND_REF);
+ }
+ }
+ if (pclass->valuetype) {
+ mono_mb_emit_byte (mb, CEE_BOX);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, pclass));
+ }
+ mono_mb_emit_byte (mb, CEE_STELEM_REF);
+ j++;
+ }
+ mono_mb_emit_stloc (mb, loc_array);
+
+ /* Serialize parameters */
+
+ mono_mb_emit_ldloc (mb, loc_array);
+ mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
+ mono_mb_emit_stloc (mb, loc_serialized_data);
+ } else {
+ mono_mb_emit_byte (mb, CEE_LDNULL);
+ mono_mb_emit_managed_call (mb, method_rs_serialize, NULL);
+ mono_mb_emit_stloc (mb, loc_serialized_data);
+ }
+
+ /* Get the target domain id */
+
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoTransparentProxy, rp));
+ mono_mb_emit_byte (mb, CEE_LDIND_REF);
+ mono_mb_emit_byte (mb, CEE_DUP);
+ mono_mb_emit_stloc (mb, loc_real_proxy);
+
+ mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoRealProxy, target_domain_id));
+ mono_mb_emit_byte (mb, CEE_LDIND_I4);
+ mono_mb_emit_byte (mb, CEE_LDC_I4_1);
+
+ /* switch domain */
+
+ mono_marshal_emit_switch_domain (mb);
+ mono_mb_emit_stloc (mb, loc_old_domainid);
+
+ /* Load the arguments */
+
+ mono_mb_emit_ldloc (mb, loc_real_proxy);
+ mono_mb_emit_ldloc_addr (mb, loc_serialized_data);
+ mono_mb_emit_ldloc_addr (mb, loc_serialized_exc);
+
+ copy_locals_base = mb->locals;
+ for (i = 0; i < sig->param_count; i++) {
+ switch (marshal_types [i]) {
+ case MONO_MARSHAL_SERIALIZE:
+ continue;
+ case MONO_MARSHAL_COPY: {
+ mono_mb_emit_ldarg (mb, i+1);
+ if (sig->params [i]->byref) {
+ /* make a local copy of the byref parameter. The real parameter
+ * will be updated after the xdomain call
+ */
+ MonoClass *pclass = mono_class_from_mono_type (sig->params [i]);
+ int copy_local = mono_mb_add_local (mb, &(pclass->byval_arg));
+ mono_mb_emit_byte (mb, CEE_LDIND_REF);
+ mono_mb_emit_stloc (mb, copy_local);
+ mono_mb_emit_ldloc_addr (mb, copy_local);
+ }
+ break;
+ }
+ case MONO_MARSHAL_COPY_OUT:
+ case MONO_MARSHAL_NONE:
+ mono_mb_emit_ldarg (mb, i+1);
+ break;
+ }
+ }
+
+ /* Make the call to the invoke wrapper in the target domain */
+
+ xdomain_method = mono_marshal_get_xappdomain_dispatch (method, marshal_types, complex_count, complex_out_count, ret_marshal_type);
+ mono_marshal_emit_load_domain_method (mb, xdomain_method);
+ mono_mb_emit_calli (mb, xdomain_method->signature);
+
+ if (copy_return)
+ mono_mb_emit_stloc (mb, loc_return);
+
+ /* Switch domain */
+
+ mono_mb_emit_ldloc (mb, loc_old_domainid);
+ mono_mb_emit_byte (mb, CEE_LDC_I4_0);
+ mono_marshal_emit_switch_domain (mb);
+ mono_mb_emit_byte (mb, CEE_POP);
+
+ /* Restore thread domain data */
+
+ mono_mb_emit_ldloc (mb, loc_context);
+ mono_mb_emit_native_call (mb, sig_context_set, mono_context_set);
+ mono_mb_emit_ldloc (mb, loc_datastore);
+ mono_mb_emit_managed_call (mb, method_restore_datastore, NULL);
+
+ /* if (loc_serialized_exc != null) ... */
+
+ mono_mb_emit_ldloc (mb, loc_serialized_exc);
+ mono_mb_emit_byte (mb, CEE_BRFALSE_S);
+ pos_noex = mb->pos;
+ mono_mb_emit_byte (mb, 0);
+
+ mono_mb_emit_ldloc (mb, loc_serialized_exc);
+ mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
+ mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
+ mono_mb_emit_byte (mb, CEE_CASTCLASS);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_defaults.exception_class));
+ mono_mb_emit_managed_call (mb, method_exc_fixexc, NULL);
+ mono_mb_emit_byte (mb, CEE_THROW);
+ mono_mb_patch_addr_s (mb, pos_noex, mb->pos - pos_noex - 1);
+
+ /* copy back non-serialized output parameters */
+
+ j = 0;
+ for (i = 0; i < sig->param_count; i++) {
+ if (!sig->params [i]->byref || marshal_types [i] != MONO_MARSHAL_COPY) continue;
+ mono_mb_emit_ldarg (mb, i + 1);
+ mono_mb_emit_ldloc (mb, copy_locals_base + (j++));
+ mono_marshal_emit_xdomain_copy_value (mb, mono_class_from_mono_type (sig->params [i]));
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ }
+
+ /* Deserialize out parameters */
+
+ if (complex_out_count > 0) {
+ mono_mb_emit_ldloc (mb, loc_serialized_data);
+ mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
+ mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
+ mono_mb_emit_stloc (mb, loc_array);
+
+ /* Copy back output parameters and return type */
+
+ j = 0;
+ for (i = 0; i < sig->param_count; i++) {
+ if (marshal_types [i] != MONO_MARSHAL_SERIALIZE) continue;
+ if (sig->params[i]->byref) {
+ MonoClass *pclass = mono_class_from_mono_type (sig->params [i]);
+ mono_mb_emit_ldarg (mb, i + 1);
+ mono_mb_emit_ldloc (mb, loc_array);
+ mono_mb_emit_icon (mb, j);
+ mono_mb_emit_byte (mb, CEE_LDELEM_REF);
+ if (pclass->valuetype) {
+ mono_mb_emit_byte (mb, CEE_UNBOX);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, pclass));
+ mono_mb_emit_byte (mb, CEE_LDOBJ);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, pclass));
+ mono_mb_emit_byte (mb, CEE_STOBJ);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, pclass));
+ } else {
+ if (pclass != mono_defaults.object_class) {
+ mono_mb_emit_byte (mb, CEE_CASTCLASS);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, pclass));
+ }
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ }
+ }
+ j++;
+ }
+
+ if (ret_marshal_type == MONO_MARSHAL_SERIALIZE) {
+ mono_mb_emit_ldloc (mb, loc_array);
+ mono_mb_emit_icon (mb, complex_count);
+ mono_mb_emit_byte (mb, CEE_LDELEM_REF);
+ if (ret_class->valuetype) {
+ mono_mb_emit_byte (mb, CEE_UNBOX);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, ret_class));
+ mono_mb_emit_byte (mb, CEE_LDOBJ);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, ret_class));
+ }
+ }
+ } else if (ret_marshal_type == MONO_MARSHAL_SERIALIZE) {
+ mono_mb_emit_ldloc (mb, loc_serialized_data);
+ mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
+ mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
+ if (ret_class->valuetype) {
+ mono_mb_emit_byte (mb, CEE_UNBOX);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, ret_class));
+ mono_mb_emit_byte (mb, CEE_LDOBJ);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, ret_class));
+ } else if (ret_class != mono_defaults.object_class) {
+ mono_mb_emit_byte (mb, CEE_CASTCLASS);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, ret_class));
+ }
+ } else {
+ mono_mb_emit_ldloc (mb, loc_serialized_data);
+ mono_mb_emit_byte (mb, CEE_DUP);
+ mono_mb_emit_byte (mb, CEE_BRFALSE_S);
+ pos = mb->pos;
+ mono_mb_emit_byte (mb, 0);
+ mono_marshal_emit_xdomain_copy_value (mb, byte_array_class);
+
+ mono_mb_patch_addr_s (mb, pos, mb->pos - (pos + 1));
+ mono_mb_emit_managed_call (mb, method_rs_deserialize, NULL);
+ mono_mb_emit_byte (mb, CEE_POP);
+ }
+
+ if (copy_return) {
+ mono_mb_emit_ldloc (mb, loc_return);
+ if (ret_marshal_type == MONO_MARSHAL_COPY)
+ mono_marshal_emit_xdomain_copy_value (mb, ret_class);
+ }
+
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ res = mono_remoting_mb_create_and_cache (method, mb, sig, sig->param_count + 16);
+ mono_mb_free (mb);
+
+ return res;
+}
+
+MonoMethod *
+mono_marshal_get_remoting_invoke_for_target (MonoMethod *method, MonoRemotingTarget target_type)
+{
+ if (target_type == MONO_REMOTING_TARGET_APPDOMAIN)
+ return mono_marshal_get_xappdomain_invoke (method);
+ else
+ return mono_marshal_get_remoting_invoke (method);
+}
+
+G_GNUC_UNUSED static gpointer
+mono_marshal_load_remoting_wrapper (MonoRealProxy *rp, MonoMethod *method)
+{
+ if (rp->target_domain_id != -1)
+ return mono_compile_method (mono_marshal_get_xappdomain_invoke (method));
+ else
+ return mono_compile_method (mono_marshal_get_remoting_invoke (method));
+}
+
+MonoMethod *
+mono_marshal_get_remoting_invoke_with_check (MonoMethod *method)
+{
+ MonoMethodSignature *sig;
+ MonoMethodBuilder *mb;
+ MonoMethod *res, *native;
+ int i, pos, pos_rem;
+
+ g_assert (method);
+
+ if (method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK)
+ return method;
+
+ sig = signature_no_pinvoke (method->signature);
+
+ /* we cant remote methods without this pointer */
+ g_assert (sig->hasthis);
+
+ if ((res = mono_marshal_remoting_find_in_cache (method, MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK)))
+ return res;
+
+ mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK);
+
+ for (i = 0; i <= sig->param_count; i++)
mono_mb_emit_ldarg (mb, i);
+
+ mono_mb_emit_ldarg (mb, 0);
+ pos = mono_mb_emit_proxy_check (mb, CEE_BNE_UN);
+
+ if (mono_marshal_supports_fast_xdomain (method)) {
+ mono_mb_emit_ldarg (mb, 0);
+ pos_rem = mono_mb_emit_xdomain_check (mb, CEE_BEQ);
+ /* wrapper for cross app domain calls */
+ native = mono_marshal_get_xappdomain_invoke (method);
+ mono_mb_emit_managed_call (mb, native, native->signature);
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ mono_mb_patch_addr (mb, pos_rem, mb->pos - (pos_rem + 4));
+ }
+ /* wrapper for normal remote calls */
+ native = mono_marshal_get_remoting_invoke (method);
+ mono_mb_emit_managed_call (mb, native, native->signature);
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ /* not a proxy */
+ mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
mono_mb_emit_managed_call (mb, method, method->signature);
mono_mb_emit_byte (mb, CEE_RET);
- res = mono_mb_create_and_cache (cache, (char*)method + 1,
- mb, sig, sig->param_count + 16);
+ res = mono_remoting_mb_create_and_cache (method, mb, sig, sig->param_count + 16);
mono_mb_free (mb);
return res;
g_assert (method && method->klass->parent == mono_defaults.multicastdelegate_class &&
!strcmp (method->name, "Invoke"));
- sig = method->signature;
+ sig = signature_no_pinvoke (method->signature);
cache = method->klass->image->delegate_invoke_cache;
if ((res = mono_marshal_find_in_cache (cache, sig)))
MonoMethodSignature *sig;
} CtorSigPair;
+
+
/*
* generates IL code for the runtime invoke function
* MonoObject *runtime_invoke (MonoObject *this, void **params, MonoObject **exc, void* method)
MonoMethod *res = NULL;
GSList *item;
static MonoString *string_dummy = NULL;
- int i, pos;
+ static MonoMethodSignature *dealy_abort_sig = NULL;
+ int i, pos, posna;
char *name;
g_assert (method);
return res;
}
+ if (!dealy_abort_sig) {
+ dealy_abort_sig = mono_metadata_signature_alloc (mono_defaults.corlib, 0);
+ dealy_abort_sig->ret = &mono_defaults.void_class->byval_arg;
+ dealy_abort_sig->pinvoke = 0;
+ }
+
target_klass = mono_defaults.object_class;
/* to make it work with our special string constructors */
}
mono_mb_emit_ldarg (mb, 3);
+ emit_thread_force_interrupt_checkpoint (mb);
mono_mb_emit_calli (mb, callsig);
if (sig->ret->byref) {
clause->try_len = mb->pos;
/* filter code */
- clause->token_or_filter = mb->pos;
+ clause->data.filter_offset = mb->pos;
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_stloc (mb, 0);
+ /* Check for the abort exception */
+ mono_mb_emit_ldloc (mb, 1);
+ mono_mb_emit_byte (mb, CEE_ISINST);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_defaults.threadabortexception_class));
+ mono_mb_emit_byte (mb, CEE_BRFALSE_S);
+ posna = mb->pos;
+ mono_mb_emit_byte (mb, 0);
+
+ /* Delay the abort exception */
+ mono_mb_emit_native_call (mb, dealy_abort_sig, ves_icall_System_Threading_Thread_ResetAbort);
+
+ mono_mb_patch_addr_s (mb, posna, mb->pos - posna - 1);
mono_mb_emit_byte (mb, CEE_LEAVE);
mono_mb_emit_i4 (mb, 0);
if (!res) {
res = mono_mb_create_method (mb, csig, sig->param_count + 16);
g_hash_table_insert (cache, callsig, res);
- mono_g_hash_table_insert (wrapper_hash, res, callsig);
+ g_hash_table_insert (wrapper_hash, res, callsig);
}
LeaveCriticalSection (&marshal_mutex);
return res;
}
+static void
+raise_auto_layout_exception (MonoClass *klass)
+{
+ char *msg = g_strdup_printf ("The type `%s.%s' layout needs to be Sequential or Explicit",
+ klass->name_space, klass->name);
+
+ MonoException *e = mono_exception_from_name_msg (
+ mono_get_corlib (), "System.Runtime.InteropServices",
+ "MarshalDirectiveException", msg);
+ g_free (msg);
+ mono_raise_exception (e);
+}
+
/*
* generates IL code to call managed methods from unmanaged code
*/
mklass = mono_class_from_mono_type (mtype);
g_assert (mklass != NULL);
- marshal_native_to_managed = mono_find_method_by_name (mklass, "MarshalNativeToManaged", 1);
+ marshal_native_to_managed = mono_class_get_method_from_name (mklass, "MarshalNativeToManaged", 1);
g_assert (marshal_native_to_managed);
- get_instance = mono_find_method_by_name (mklass, "GetInstance", 1);
+ get_instance = mono_class_get_method_from_name (mklass, "GetInstance", 1);
g_assert (get_instance);
switch (t->type) {
tmp_locals [i] = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
- mono_mb_emit_ldstr (mb, spec->data.custom_data.cookie);
+ mono_mb_emit_ldstr (mb, g_strdup (spec->data.custom_data.cookie));
mono_mb_emit_byte (mb, CEE_CALL);
mono_mb_emit_i4 (mb, mono_mb_add_data (mb, get_instance));
case MONO_TYPE_CLASS: {
klass = t->data.klass;
- tmp_locals [i] = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+ tmp_locals [i] = mono_mb_add_local (mb, &klass->byval_arg);
if (klass->delegate) {
g_assert (!t->byref);
mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
- mono_mb_emit_byte (mb, CEE_MONO_LDPTR);
+ mono_mb_emit_byte (mb, CEE_MONO_CLASSCONST);
mono_mb_emit_i4 (mb, mono_mb_add_data (mb, klass));
mono_mb_emit_ldarg (mb, i);
mono_mb_emit_icall (mb, conv_to_icall (MONO_MARSHAL_CONV_FTN_DEL));
break;
}
- /* FIXME: Raise a MarshalDirectiveException here */
- g_assert ((klass->flags & TYPE_ATTRIBUTE_LAYOUT_MASK) != TYPE_ATTRIBUTE_AUTO_LAYOUT);
+ /* The class can not have an automatic layout */
+ if ((klass->flags & TYPE_ATTRIBUTE_LAYOUT_MASK) == TYPE_ATTRIBUTE_AUTO_LAYOUT)
+ raise_auto_layout_exception (klass);
if (t->attrs & PARAM_ATTRIBUTE_OUT) {
mono_mb_emit_byte (mb, CEE_LDNULL);
mono_mb_emit_i4 (mb, mono_mb_add_data (mb, klass));
mono_mb_emit_stloc (mb, tmp_locals [i]);
mono_mb_emit_ldloc (mb, tmp_locals [i]);
+ mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+ mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
mono_mb_emit_icon (mb, sizeof (MonoObject));
mono_mb_emit_byte (mb, CEE_ADD);
mono_mb_emit_byte (mb, CEE_STLOC_1);
mono_mb_emit_byte (mb, CEE_LDLOC_3);
mono_mb_emit_stloc (mb, loc1);
- mono_mb_emit_ldstr (mb, spec->data.custom_data.cookie);
+ mono_mb_emit_ldstr (mb, g_strdup (spec->data.custom_data.cookie));
mono_mb_emit_byte (mb, CEE_CALL);
- mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_find_method_by_name (mklass, "GetInstance", 1)));
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_class_get_method_from_name (mklass, "GetInstance", 1)));
mono_mb_emit_byte (mb, CEE_DUP);
mono_mb_emit_byte (mb, CEE_LDLOC_3);
mono_mb_emit_byte (mb, CEE_CALLVIRT);
- mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_find_method_by_name (mklass, "MarshalManagedToNative", 1)));
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_class_get_method_from_name (mklass, "MarshalManagedToNative", 1)));
mono_mb_emit_byte (mb, CEE_STLOC_3);
mono_mb_emit_ldloc (mb, loc1);
mono_mb_emit_byte (mb, CEE_CALLVIRT);
- mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_find_method_by_name (mklass, "CleanUpManagedData", 1)));
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_class_get_method_from_name (mklass, "CleanUpManagedData", 1)));
break;
default:
case MONO_TYPE_VALUETYPE:
klass = sig->ret->data.klass;
if (((klass->flags & TYPE_ATTRIBUTE_LAYOUT_MASK) == TYPE_ATTRIBUTE_EXPLICIT_LAYOUT) ||
- klass->blittable || klass->enumtype)
+ klass->blittable || klass->enumtype) {
+ mono_mb_emit_byte (mb, CEE_STLOC_3);
break;
+ }
/* load pointer to returned value type */
mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
break;
}
- /* FIXME: Raise a MarshalDirectiveException here */
- g_assert ((klass->flags & TYPE_ATTRIBUTE_LAYOUT_MASK) != TYPE_ATTRIBUTE_AUTO_LAYOUT);
+ /* The class can not have an automatic layout */
+ if ((klass->flags & TYPE_ATTRIBUTE_LAYOUT_MASK) == TYPE_ATTRIBUTE_AUTO_LAYOUT)
+ raise_auto_layout_exception (klass);
mono_mb_emit_byte (mb, CEE_STLOC_0);
/* Check for null */
/* Set src */
mono_mb_emit_byte (mb, CEE_LDLOC_0);
+ mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+ mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
mono_mb_emit_icon (mb, sizeof (MonoObject));
mono_mb_emit_byte (mb, CEE_ADD);
mono_mb_emit_byte (mb, CEE_STLOC_0);
mklass = mono_class_from_mono_type (mtype);
g_assert (mklass != NULL);
- get_instance = mono_find_method_by_name (mklass, "GetInstance", 1);
+ get_instance = mono_class_get_method_from_name (mklass, "GetInstance", 1);
g_assert (get_instance);
- cleanup_managed = mono_find_method_by_name (mklass, "CleanUpManagedData", 1);
+ cleanup_managed = mono_class_get_method_from_name (mklass, "CleanUpManagedData", 1);
g_assert (cleanup_managed);
switch (t->type) {
/* Call CleanUpManagedData */
- mono_mb_emit_ldstr (mb, spec->data.custom_data.cookie);
+ mono_mb_emit_ldstr (mb, g_strdup (spec->data.custom_data.cookie));
mono_mb_emit_byte (mb, CEE_CALL);
mono_mb_emit_i4 (mb, mono_mb_add_data (mb, get_instance));
/* Set src */
mono_mb_emit_ldloc (mb, tmp_locals [i]);
+ mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+ mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
mono_mb_emit_icon (mb, sizeof (MonoObject));
mono_mb_emit_byte (mb, CEE_ADD);
mono_mb_emit_byte (mb, CEE_STLOC_0);
typedef struct {
MonoMethodBuilder *mb;
MonoMethodPInvoke *piinfo;
+ int *orig_conv_args; /* Locals containing the original values of byref args */
} EmitMarshalContext;
typedef enum {
static int
emit_marshal_custom (EmitMarshalContext *m, int argnum, MonoType *t,
- MonoMarshalSpec *spec,
- int conv_arg, MonoType **conv_arg_type,
- MarshalAction action)
+ MonoMarshalSpec *spec,
+ int conv_arg, MonoType **conv_arg_type,
+ MarshalAction action)
{
MonoType *mtype;
MonoClass *mklass;
mklass = mono_class_from_mono_type (mtype);
g_assert (mklass != NULL);
- get_instance = mono_find_method_by_name (mklass, "GetInstance", 1);
+ get_instance = mono_class_get_method_from_name (mklass, "GetInstance", 1);
g_assert (get_instance);
- cleanup_native = mono_find_method_by_name (mklass, "CleanUpNativeData", 1);
+ cleanup_native = mono_class_get_method_from_name (mklass, "CleanUpNativeData", 1);
g_assert (cleanup_native);
- marshal_managed_to_native = mono_find_method_by_name (mklass, "MarshalManagedToNative", 1);
+ marshal_managed_to_native = mono_class_get_method_from_name (mklass, "MarshalManagedToNative", 1);
g_assert (marshal_managed_to_native);
- marshal_native_to_managed = mono_find_method_by_name (mklass, "MarshalNativeToManaged", 1);
+ marshal_native_to_managed = mono_class_get_method_from_name (mklass, "MarshalNativeToManaged", 1);
g_assert (marshal_native_to_managed);
switch (action) {
conv_arg = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
- mono_mb_emit_ldstr (mb, spec->data.custom_data.cookie);
+ mono_mb_emit_ldstr (mb, g_strdup (spec->data.custom_data.cookie));
mono_mb_emit_byte (mb, CEE_CALL);
mono_mb_emit_i4 (mb, mono_mb_add_data (mb, get_instance));
case MONO_TYPE_ARRAY:
case MONO_TYPE_SZARRAY:
case MONO_TYPE_VALUETYPE:
- mono_mb_emit_ldstr (mb, spec->data.custom_data.cookie);
+ mono_mb_emit_ldstr (mb, g_strdup (spec->data.custom_data.cookie));
mono_mb_emit_byte (mb, CEE_CALL);
mono_mb_emit_i4 (mb, mono_mb_add_data (mb, get_instance));
mono_mb_emit_byte (mb, CEE_LDLOC_3);
mono_mb_emit_stloc (mb, loc1);
- mono_mb_emit_ldstr (mb, spec->data.custom_data.cookie);
+ mono_mb_emit_ldstr (mb, g_strdup (spec->data.custom_data.cookie));
mono_mb_emit_byte (mb, CEE_CALL);
mono_mb_emit_i4 (mb, mono_mb_add_data (mb, get_instance));
static int
emit_marshal_asany (EmitMarshalContext *m, int argnum, MonoType *t,
- MonoMarshalSpec *spec,
- int conv_arg, MonoType **conv_arg_type,
- MarshalAction action)
+ MonoMarshalSpec *spec,
+ int conv_arg, MonoType **conv_arg_type,
+ MarshalAction action)
{
MonoMethodBuilder *mb = m->mb;
static int
emit_marshal_vtype (EmitMarshalContext *m, int argnum, MonoType *t,
- MonoMarshalSpec *spec,
- int conv_arg, MonoType **conv_arg_type,
- MarshalAction action)
+ MonoMarshalSpec *spec,
+ int conv_arg, MonoType **conv_arg_type,
+ MarshalAction action)
{
MonoMethodBuilder *mb = m->mb;
MonoClass *klass;
- int pos;
+ int pos = 0;
klass = t->data.klass;
break;
case MARSHAL_ACTION_CONV_OUT:
- if (!t->byref)
- break;
-
if (((klass->flags & TYPE_ATTRIBUTE_LAYOUT_MASK) == TYPE_ATTRIBUTE_EXPLICIT_LAYOUT) ||
klass->blittable || klass->enumtype)
break;
- /* dst = argument */
- mono_mb_emit_ldarg (mb, argnum);
- mono_mb_emit_byte (mb, CEE_STLOC_1);
+ if (t->byref) {
+ /* dst = argument */
+ mono_mb_emit_ldarg (mb, argnum);
+ mono_mb_emit_byte (mb, CEE_STLOC_1);
- mono_mb_emit_byte (mb, CEE_LDLOC_1);
- mono_mb_emit_byte (mb, CEE_BRFALSE);
- pos = mb->pos;
- mono_mb_emit_i4 (mb, 0);
+ mono_mb_emit_byte (mb, CEE_LDLOC_1);
+ mono_mb_emit_byte (mb, CEE_BRFALSE);
+ pos = mb->pos;
+ mono_mb_emit_i4 (mb, 0);
- /* src = tmp_locals [i] */
- mono_mb_emit_ldloc (mb, conv_arg);
- mono_mb_emit_byte (mb, CEE_STLOC_0);
+ /* src = tmp_locals [i] */
+ mono_mb_emit_ldloc (mb, conv_arg);
+ mono_mb_emit_byte (mb, CEE_STLOC_0);
- /* emit valuetype conversion code */
- emit_struct_conv (mb, klass, TRUE);
-
- mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
+ /* emit valuetype conversion code */
+ emit_struct_conv (mb, klass, TRUE);
+ }
+
+ emit_struct_free (mb, klass, conv_arg);
+
+ if (t->byref)
+ mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
break;
case MARSHAL_ACTION_CONV_RESULT:
}
static int
-emit_marshal (EmitMarshalContext *m, int argnum, MonoType *t,
- MonoMarshalSpec *spec, int conv_arg,
- MonoType **conv_arg_type, MarshalAction action)
+emit_marshal_string (EmitMarshalContext *m, int argnum, MonoType *t,
+ MonoMarshalSpec *spec,
+ int conv_arg, MonoType **conv_arg_type,
+ MarshalAction action)
{
MonoMethodBuilder *mb = m->mb;
- MonoClass *klass;
- int pos;
-
- /* Ensure that we have marshalling info for this param */
- mono_marshal_load_type_info (mono_class_from_mono_type (t));
+ MonoMarshalNative encoding = mono_marshal_get_string_encoding (m->piinfo, spec);
+ MonoMarshalConv conv = mono_marshal_get_string_to_ptr_conv (m->piinfo, spec);
- if (spec && spec->native == MONO_NATIVE_CUSTOM)
- return emit_marshal_custom (m, argnum, t, spec, conv_arg, conv_arg_type, action);
-
- if (spec && spec->native == MONO_NATIVE_ASANY)
- return emit_marshal_asany (m, argnum, t, spec, conv_arg, conv_arg_type, action);
-
- switch (t->type) {
- case MONO_TYPE_VALUETYPE:
- return emit_marshal_vtype (m, argnum, t, spec, conv_arg, conv_arg_type, action);
- case MONO_TYPE_STRING: {
- MonoMarshalNative encoding = mono_marshal_get_string_encoding (m->piinfo, spec);
-
+ switch (action) {
+ case MARSHAL_ACTION_CONV_IN:
*conv_arg_type = &mono_defaults.int_class->byval_arg;
conv_arg = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
mono_mb_emit_ldarg (mb, argnum);
}
- switch (encoding) {
- case MONO_NATIVE_LPWSTR:
- mono_mb_emit_icall (mb, conv_to_icall (MONO_MARSHAL_CONV_STR_LPWSTR));
- break;
- case MONO_NATIVE_LPSTR:
- mono_mb_emit_icall (mb, conv_to_icall (MONO_MARSHAL_CONV_STR_LPSTR));
- break;
- case MONO_NATIVE_LPTSTR:
- mono_mb_emit_icall (mb, conv_to_icall (MONO_MARSHAL_CONV_STR_LPTSTR));
- break;
- default: {
+ if (conv == -1) {
char *msg = g_strdup_printf ("string marshalling conversion %d not implemented", encoding);
MonoException *exc = mono_get_exception_not_implemented (msg);
g_warning (msg);
g_free (msg);
mono_raise_exception (exc);
}
- }
+ else
+ mono_mb_emit_icall (mb, conv_to_icall (conv));
mono_mb_emit_stloc (mb, conv_arg);
break;
+
+ case MARSHAL_ACTION_CONV_OUT:
+ 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 (MONO_MARSHAL_CONV_LPSTR_STR));
+ mono_mb_emit_byte (mb, CEE_STIND_I);
+ } else {
+ if (mono_marshal_need_free (t, m->piinfo, spec)) {
+ mono_mb_emit_ldloc (mb, conv_arg);
+ mono_mb_emit_icall (mb, mono_marshal_free);
+ }
+ }
+ break;
+
+ case MARSHAL_ACTION_CONV_RESULT:
+ mono_mb_emit_byte (mb, CEE_STLOC_0);
+ mono_mb_emit_byte (mb, CEE_LDLOC_0);
+
+ if (spec) {
+ switch (spec->native) {
+ case MONO_NATIVE_LPWSTR:
+ mono_mb_emit_icall (mb, conv_to_icall (MONO_MARSHAL_CONV_LPWSTR_STR));
+ break;
+ default:
+ g_warning ("marshalling conversion not implemented");
+ g_assert_not_reached ();
+ }
+ } else {
+ mono_mb_emit_icall (mb, conv_to_icall (MONO_MARSHAL_CONV_LPSTR_STR));
+ }
+ mono_mb_emit_byte (mb, CEE_STLOC_3);
+
+ /* free the string */
+ mono_mb_emit_byte (mb, CEE_LDLOC_0);
+ mono_mb_emit_icall (mb, g_free);
+ break;
+
+ default:
+ g_assert_not_reached ();
}
- case MONO_TYPE_CLASS:
- case MONO_TYPE_OBJECT:
- klass = t->data.klass;
+ return conv_arg;
+}
+
+static int
+emit_marshal_object (EmitMarshalContext *m, int argnum, MonoType *t,
+ MonoMarshalSpec *spec,
+ int conv_arg, MonoType **conv_arg_type,
+ MarshalAction action)
+{
+ MonoMethodBuilder *mb = m->mb;
+ MonoClass *klass = t->data.klass;
+ int pos, pos2, loc;
+
+ switch (action) {
+ case MARSHAL_ACTION_CONV_IN:
*conv_arg_type = &mono_defaults.int_class->byval_arg;
conv_arg = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+ m->orig_conv_args [argnum] = 0;
+
if (klass->delegate) {
g_assert (!t->byref);
mono_mb_emit_ldarg (mb, argnum);
mono_mb_emit_icall (mb, conv_to_icall (MONO_MARSHAL_CONV_DEL_FTN));
mono_mb_emit_stloc (mb, conv_arg);
} else if (klass == mono_defaults.stringbuilder_class) {
- MonoMarshalNative encoding = mono_marshal_get_stringbuilder_to_ptr_encoding (m->piinfo, spec);
+ MonoMarshalNative encoding = mono_marshal_get_string_encoding (m->piinfo, spec);
+ MonoMarshalConv conv = mono_marshal_get_stringbuilder_to_ptr_conv (m->piinfo, spec);
g_assert (!t->byref);
mono_mb_emit_ldarg (mb, argnum);
- if (encoding != -1)
- mono_mb_emit_icall (mb, conv_to_icall (encoding));
+ if (conv != -1)
+ mono_mb_emit_icall (mb, conv_to_icall (conv));
else {
char *msg = g_strdup_printf ("stringbuilder marshalling conversion %d not implemented", encoding);
MonoException *exc = mono_get_exception_not_implemented (msg);
if (t->attrs & PARAM_ATTRIBUTE_OUT)
break;
- mono_mb_emit_ldarg (mb, argnum);
- mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_ldarg (mb, argnum);
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+
+ } else {
+ mono_mb_emit_ldarg (mb, argnum);
+ mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+ mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
+ }
+
+ /* store the address of the source into local variable 0 */
+ mono_mb_emit_byte (mb, CEE_STLOC_0);
+ mono_mb_emit_byte (mb, CEE_LDLOC_0);
+ mono_mb_emit_byte (mb, CEE_BRFALSE);
+ pos = mb->pos;
+ mono_mb_emit_i4 (mb, 0);
+
+ /* allocate space for the native struct and store the address */
+ mono_mb_emit_icon (mb, mono_class_native_size (klass, NULL));
+ mono_mb_emit_byte (mb, CEE_PREFIX1);
+ mono_mb_emit_byte (mb, CEE_LOCALLOC);
+ mono_mb_emit_stloc (mb, conv_arg);
+
+ if (t->byref) {
+ /* Need to store the original buffer so we can free it later */
+ m->orig_conv_args [argnum] = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+ mono_mb_emit_ldloc (mb, conv_arg);
+ mono_mb_emit_stloc (mb, m->orig_conv_args [argnum]);
+ }
+
+ /* set the src_ptr */
+ mono_mb_emit_byte (mb, CEE_LDLOC_0);
+ mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+ mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
+ mono_mb_emit_icon (mb, sizeof (MonoObject));
+ mono_mb_emit_byte (mb, CEE_ADD);
+ mono_mb_emit_byte (mb, CEE_STLOC_0);
+
+ /* set dst_ptr */
+ mono_mb_emit_ldloc (mb, conv_arg);
+ mono_mb_emit_byte (mb, CEE_STLOC_1);
+
+ /* emit valuetype conversion code */
+ emit_struct_conv (mb, klass, FALSE);
+
+ mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
+ }
+ break;
+
+ case MARSHAL_ACTION_CONV_OUT:
+ if (klass == mono_defaults.stringbuilder_class) {
+ gboolean need_free;
+ MonoMarshalNative encoding;
+ MonoMarshalConv conv;
+
+ encoding = mono_marshal_get_string_encoding (m->piinfo, spec);
+ conv = mono_marshal_get_ptr_to_stringbuilder_conv (m->piinfo, spec, &need_free);
+
+ g_assert (!t->byref);
+ g_assert (encoding != -1);
+
+ mono_mb_emit_ldarg (mb, argnum);
+ mono_mb_emit_ldloc (mb, conv_arg);
+
+ mono_mb_emit_icall (mb, conv_to_icall (conv));
+
+ if (need_free) {
+ mono_mb_emit_ldloc (mb, conv_arg);
+ mono_mb_emit_icall (mb, mono_marshal_free);
+ }
+ break;
+ }
+
+ if (klass->delegate)
+ break;
+
+ if (t->byref && (t->attrs & PARAM_ATTRIBUTE_OUT)) {
+ /* allocate a new object */
+ mono_mb_emit_ldarg (mb, argnum);
+ mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+ mono_mb_emit_byte (mb, CEE_MONO_NEWOBJ);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, t->data.klass));
+ mono_mb_emit_byte (mb, CEE_STIND_I);
+ }
+
+ /* dst = *argument */
+ mono_mb_emit_ldarg (mb, argnum);
+
+ if (t->byref)
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+
+ mono_mb_emit_byte (mb, CEE_STLOC_1);
+
+ mono_mb_emit_byte (mb, CEE_LDLOC_1);
+ mono_mb_emit_byte (mb, CEE_BRFALSE);
+ pos = mb->pos;
+ mono_mb_emit_i4 (mb, 0);
+
+ if (t->byref || (t->attrs & PARAM_ATTRIBUTE_OUT)) {
+ mono_mb_emit_byte (mb, CEE_LDLOC_1);
+ mono_mb_emit_icon (mb, sizeof (MonoObject));
+ mono_mb_emit_byte (mb, CEE_ADD);
+ mono_mb_emit_byte (mb, CEE_STLOC_1);
+
+ /* src = tmp_locals [i] */
+ mono_mb_emit_ldloc (mb, conv_arg);
+ mono_mb_emit_byte (mb, CEE_STLOC_0);
+
+ /* emit valuetype conversion code */
+ emit_struct_conv (mb, t->data.klass, TRUE);
+
+ /* Free the structure returned by the native code */
+ emit_struct_free (mb, klass, conv_arg);
+
+ if (m->orig_conv_args [argnum]) {
+ /*
+ * If the native function changed the pointer, then free
+ * the original structure plus the new pointer.
+ */
+ mono_mb_emit_ldloc (mb, m->orig_conv_args [argnum]);
+ mono_mb_emit_ldloc (mb, conv_arg);
+ mono_mb_emit_byte (mb, CEE_BEQ);
+ pos2 = mb->pos;
+ mono_mb_emit_i4 (mb, 0);
+
+ if (!(t->attrs & PARAM_ATTRIBUTE_OUT)) {
+ g_assert (m->orig_conv_args [argnum]);
+
+ emit_struct_free (mb, klass, m->orig_conv_args [argnum]);
+ }
+
+ mono_mb_emit_ldloc (mb, conv_arg);
+ mono_mb_emit_icall (mb, g_free);
- } else {
- mono_mb_emit_ldarg (mb, argnum);
- mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
- mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
+ mono_mb_patch_addr (mb, pos2, mb->pos - (pos2 + 4));
}
-
- /* store the address of the source into local variable 0 */
+ }
+ else
+ /* Free the original structure passed to native code */
+ emit_struct_free (mb, klass, conv_arg);
+
+ mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
+ break;
+
+ case MARSHAL_ACTION_CONV_RESULT:
+ if (klass->delegate) {
+ g_assert (!t->byref);
+ mono_mb_emit_byte (mb, CEE_STLOC_0);
+ mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+ mono_mb_emit_byte (mb, CEE_MONO_CLASSCONST);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, klass));
+ mono_mb_emit_byte (mb, CEE_LDLOC_0);
+ mono_mb_emit_icall (mb, conv_to_icall (MONO_MARSHAL_CONV_FTN_DEL));
+ mono_mb_emit_byte (mb, CEE_STLOC_3);
+ } else {
+ /* set src */
mono_mb_emit_byte (mb, CEE_STLOC_0);
+
+ /* Make a copy since emit_conv modifies local 0 */
+ loc = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+ mono_mb_emit_byte (mb, CEE_LDLOC_0);
+ mono_mb_emit_stloc (mb, loc);
+
+ mono_mb_emit_byte (mb, CEE_LDNULL);
+ mono_mb_emit_byte (mb, CEE_STLOC_3);
+
mono_mb_emit_byte (mb, CEE_LDLOC_0);
mono_mb_emit_byte (mb, CEE_BRFALSE);
pos = mb->pos;
mono_mb_emit_i4 (mb, 0);
-
- /* allocate space for the native struct and store the address */
- mono_mb_emit_icon (mb, mono_class_native_size (klass, NULL));
- mono_mb_emit_byte (mb, CEE_PREFIX1);
- mono_mb_emit_byte (mb, CEE_LOCALLOC);
- mono_mb_emit_stloc (mb, conv_arg);
-
- /* set the src_ptr */
- mono_mb_emit_byte (mb, CEE_LDLOC_0);
+
+ /* allocate result object */
+
+ mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+ mono_mb_emit_byte (mb, CEE_MONO_NEWOBJ);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, klass));
+ mono_mb_emit_byte (mb, CEE_STLOC_3);
+
+ /* set dst */
+
+ mono_mb_emit_byte (mb, CEE_LDLOC_3);
+ mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+ mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
mono_mb_emit_icon (mb, sizeof (MonoObject));
mono_mb_emit_byte (mb, CEE_ADD);
- mono_mb_emit_byte (mb, CEE_STLOC_0);
-
- /* set dst_ptr */
- mono_mb_emit_ldloc (mb, conv_arg);
mono_mb_emit_byte (mb, CEE_STLOC_1);
-
- /* emit valuetype conversion code */
- emit_struct_conv (mb, klass, FALSE);
-
+
+ /* emit conversion code */
+ emit_struct_conv (mb, klass, TRUE);
+
+ emit_struct_free (mb, klass, loc);
+
+ /* Free the pointer allocated by unmanaged code */
+ mono_mb_emit_ldloc (mb, loc);
+ mono_mb_emit_icall (mb, g_free);
mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
}
-
break;
- case MONO_TYPE_ARRAY:
- case MONO_TYPE_SZARRAY:
- klass = mono_class_from_mono_type (t);
-
- *conv_arg_type = &mono_defaults.int_class->byval_arg;
- conv_arg = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
- if (klass->element_class == mono_defaults.string_class) {
- MonoMarshalNative encoding = mono_marshal_get_string_encoding (m->piinfo, spec);
+ default:
+ g_assert_not_reached ();
+ }
- mono_mb_emit_ldarg (mb, argnum);
- if (t->byref)
- mono_mb_emit_byte (mb, CEE_LDIND_I);
+ return conv_arg;
+}
- switch (encoding) {
- case MONO_NATIVE_LPSTR:
- mono_mb_emit_icall (mb, mono_marshal_string_array);
- break;
- case MONO_NATIVE_LPWSTR:
- mono_mb_emit_icall (mb, mono_marshal_string_array_to_unicode);
- break;
- default: {
- char *msg = g_strdup_printf ("string array marshalling conversion %d not implemented", encoding);
- MonoException *exc = mono_get_exception_not_implemented (msg);
- g_warning (msg);
- g_free (msg);
- mono_raise_exception (exc);
- }
- }
- mono_mb_emit_stloc (mb, conv_arg);
- }
- else if (klass->element_class->blittable) {
+static int
+emit_marshal_array (EmitMarshalContext *m, int argnum, MonoType *t,
+ MonoMarshalSpec *spec,
+ int conv_arg, MonoType **conv_arg_type,
+ MarshalAction action)
+{
+ MonoMethodBuilder *mb = m->mb;
+ MonoClass *klass = mono_class_from_mono_type (t);
+ gboolean need_convert, need_free;
+
+ switch (action) {
+ case MARSHAL_ACTION_CONV_IN:
+ *conv_arg_type = &mono_defaults.int_class->byval_arg;
+ conv_arg = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+
+ if (klass->element_class->blittable) {
mono_mb_emit_ldarg (mb, argnum);
if (t->byref)
mono_mb_emit_byte (mb, CEE_LDIND_I);
MonoClass *eklass;
guint32 label1, label2, label3;
int index_var, src_var, dest_ptr, esize;
- MonoMarshalNative encoding = mono_marshal_get_stringbuilder_to_ptr_encoding (m->piinfo, spec);
+ MonoMarshalNative encoding;
+ MonoMarshalConv conv;
+ gboolean is_string = FALSE;
dest_ptr = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
eklass = klass->element_class;
+ encoding = mono_marshal_get_string_encoding (m->piinfo, spec);
+ if (eklass == mono_defaults.string_class) {
+ is_string = TRUE;
+ conv = mono_marshal_get_string_to_ptr_conv (m->piinfo, spec);
+ }
+ else if (eklass == mono_defaults.stringbuilder_class) {
+ is_string = TRUE;
+ conv = mono_marshal_get_stringbuilder_to_ptr_conv (m->piinfo, spec);
+ }
+ else
+ conv = -1;
+
src_var = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
mono_mb_emit_ldarg (mb, argnum);
if (t->byref)
label1 = mb->pos;
mono_mb_emit_i4 (mb, 0);
- if (eklass == mono_defaults.stringbuilder_class) {
- if (encoding == -1) {
- char *msg = g_strdup_printf ("stringbuilder marshalling conversion %d not implemented", encoding);
+ if (is_string) {
+ if (conv == -1) {
+ char *msg = g_strdup_printf ("string/stringbuilder marshalling conversion %d not implemented", encoding);
MonoException *exc = mono_get_exception_not_implemented (msg);
g_warning (msg);
g_free (msg);
}
}
- if (eklass == mono_defaults.stringbuilder_class)
+ if (is_string)
esize = sizeof (gpointer);
else
esize = mono_class_native_size (eklass, NULL);
mono_mb_emit_icon (mb, esize);
mono_mb_emit_ldloc (mb, src_var);
mono_mb_emit_byte (mb, CEE_LDLEN);
+
+ if (eklass == mono_defaults.string_class) {
+ /* Make the array bigger for the terminating null */
+ mono_mb_emit_byte (mb, CEE_LDC_I4_1);
+ mono_mb_emit_byte (mb, CEE_ADD);
+ }
mono_mb_emit_byte (mb, CEE_MUL);
mono_mb_emit_byte (mb, CEE_PREFIX1);
mono_mb_emit_byte (mb, CEE_LOCALLOC);
/* Emit marshalling code */
- if (eklass == mono_defaults.stringbuilder_class) {
+ if (is_string) {
mono_mb_emit_ldloc (mb, dest_ptr);
mono_mb_emit_ldloc (mb, src_var);
mono_mb_emit_ldloc (mb, index_var);
mono_mb_emit_byte (mb, CEE_LDELEM_REF);
- mono_mb_emit_icall (mb, conv_to_icall (encoding));
+ mono_mb_emit_icall (mb, conv_to_icall (conv));
mono_mb_emit_byte (mb, CEE_STIND_I);
}
else {
mono_mb_emit_byte (mb, CEE_BR);
mono_mb_emit_i4 (mb, label2 - (mb->pos + 4));
- mono_mb_patch_addr (mb, label1, mb->pos - (label1 + 4));
mono_mb_patch_addr (mb, label3, mb->pos - (label3 + 4));
+
+ if (eklass == mono_defaults.string_class) {
+ /* Null terminate */
+ mono_mb_emit_ldloc (mb, dest_ptr);
+ mono_mb_emit_byte (mb, CEE_LDC_I4_0);
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
+ }
+
+ mono_mb_patch_addr (mb, label1, mb->pos - (label1 + 4));
}
break;
- case MONO_TYPE_BOOLEAN: {
+
+ case MARSHAL_ACTION_CONV_OUT:
+ /* Character arrays are implicitly marshalled as [Out] */
+ need_convert = (klass->element_class == mono_defaults.char_class) || (klass->element_class == mono_defaults.stringbuilder_class) || (t->attrs & PARAM_ATTRIBUTE_OUT);
+ need_free = mono_marshal_need_free (&klass->element_class->byval_arg,
+ m->piinfo, spec);
+
+ if (need_convert || need_free) {
+ /* FIXME: Optimize blittable case */
+ MonoClass *eklass;
+ guint32 label1, label2, label3;
+ int index_var, src_ptr, loc, esize;
+
+ eklass = klass->element_class;
+ if ((eklass == mono_defaults.stringbuilder_class) || (eklass == mono_defaults.string_class))
+ esize = sizeof (gpointer);
+ else
+ esize = mono_class_native_size (eklass, NULL);
+ src_ptr = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+ loc = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+
+ /* Check null */
+ mono_mb_emit_ldarg (mb, argnum);
+ if (t->byref)
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_byte (mb, CEE_BRFALSE);
+ label1 = mb->pos;
+ mono_mb_emit_i4 (mb, 0);
+
+ mono_mb_emit_ldloc (mb, conv_arg);
+ mono_mb_emit_stloc (mb, src_ptr);
+
+ /* Emit marshalling loop */
+ index_var = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+ mono_mb_emit_byte (mb, CEE_LDC_I4_0);
+ mono_mb_emit_stloc (mb, index_var);
+ label2 = mb->pos;
+ mono_mb_emit_ldloc (mb, index_var);
+ mono_mb_emit_ldarg (mb, argnum);
+ if (t->byref)
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_byte (mb, CEE_LDLEN);
+ mono_mb_emit_byte (mb, CEE_BGE);
+ label3 = mb->pos;
+ mono_mb_emit_i4 (mb, 0);
+
+ /* Emit marshalling code */
+
+ if (eklass == mono_defaults.stringbuilder_class) {
+ gboolean need_free2;
+ MonoMarshalConv conv = mono_marshal_get_ptr_to_stringbuilder_conv (m->piinfo, spec, &need_free2);
+
+ g_assert (conv != -1);
+
+ /* dest */
+ mono_mb_emit_ldarg (mb, argnum);
+ if (t->byref)
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_ldloc (mb, index_var);
+ mono_mb_emit_byte (mb, CEE_LDELEM_REF);
+
+ /* src */
+ mono_mb_emit_ldloc (mb, src_ptr);
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+
+ mono_mb_emit_icall (mb, conv_to_icall (conv));
+
+ if (need_free) {
+ /* src */
+ mono_mb_emit_ldloc (mb, src_ptr);
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+
+ mono_mb_emit_icall (mb, mono_marshal_free);
+ }
+ }
+ else if (eklass == mono_defaults.string_class) {
+ if (need_free) {
+ /* src */
+ mono_mb_emit_ldloc (mb, src_ptr);
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+
+ mono_mb_emit_icall (mb, mono_marshal_free);
+ }
+ }
+ else {
+ if (need_convert) {
+ /* set the src_ptr */
+ mono_mb_emit_ldloc (mb, src_ptr);
+ mono_mb_emit_byte (mb, CEE_STLOC_0);
+
+ /* set dst_ptr */
+ mono_mb_emit_ldarg (mb, argnum);
+ if (t->byref)
+ mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_ldloc (mb, index_var);
+ mono_mb_emit_byte (mb, CEE_LDELEMA);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, eklass));
+ mono_mb_emit_byte (mb, CEE_STLOC_1);
+
+ /* emit valuetype conversion code */
+ emit_struct_conv (mb, eklass, TRUE);
+ }
+
+ if (need_free) {
+ mono_mb_emit_ldloc (mb, src_ptr);
+ mono_mb_emit_stloc (mb, loc);
+ mono_mb_emit_ldloc (mb, loc);
+
+ emit_struct_free (mb, eklass, loc);
+ }
+ }
+
+ mono_mb_emit_add_to_local (mb, index_var, 1);
+ mono_mb_emit_add_to_local (mb, src_ptr, esize);
+
+ mono_mb_emit_byte (mb, CEE_BR);
+ mono_mb_emit_i4 (mb, label2 - (mb->pos + 4));
+
+ mono_mb_patch_addr (mb, label1, mb->pos - (label1 + 4));
+ mono_mb_patch_addr (mb, label3, mb->pos - (label3 + 4));
+ }
+ break;
+
+ case MARSHAL_ACTION_CONV_RESULT:
+ /* fixme: we need conversions here */
+ mono_mb_emit_byte (mb, CEE_STLOC_3);
+
+ default:
+ g_assert_not_reached ();
+ }
+
+ return conv_arg;
+}
+
+static int
+emit_marshal_boolean (EmitMarshalContext *m, int argnum, MonoType *t,
+ MonoMarshalSpec *spec,
+ int conv_arg, MonoType **conv_arg_type,
+ MarshalAction action)
+{
+ MonoMethodBuilder *mb = m->mb;
+
+ switch (action) {
+ case MARSHAL_ACTION_CONV_IN: {
MonoType *local_type;
int variant_bool = 0;
if (!t->byref)
break;
default:
g_warning ("marshalling bool as native type %x is currently not supported", spec->native);
+ local_type = &mono_defaults.int32_class->byval_arg;
break;
}
}
mono_mb_emit_stloc (mb, conv_arg);
break;
}
+
+ case MARSHAL_ACTION_CONV_RESULT:
+ /* maybe we need to make sure that it fits within 8 bits */
+ mono_mb_emit_byte (mb, CEE_STLOC_3);
+ break;
+
+ default:
+ g_assert_not_reached ();
+ }
+
+ return conv_arg;
+}
+
+static int
+emit_marshal (EmitMarshalContext *m, int argnum, MonoType *t,
+ MonoMarshalSpec *spec, int conv_arg,
+ MonoType **conv_arg_type, MarshalAction action)
+{
+ /* Ensure that we have marshalling info for this param */
+ mono_marshal_load_type_info (mono_class_from_mono_type (t));
+
+ if (spec && spec->native == MONO_NATIVE_CUSTOM)
+ return emit_marshal_custom (m, argnum, t, spec, conv_arg, conv_arg_type, action);
+
+ if (spec && spec->native == MONO_NATIVE_ASANY)
+ return emit_marshal_asany (m, argnum, t, spec, conv_arg, conv_arg_type, action);
+
+ switch (t->type) {
+ case MONO_TYPE_VALUETYPE:
+ return emit_marshal_vtype (m, argnum, t, spec, conv_arg, conv_arg_type, action);
+ case MONO_TYPE_STRING:
+ return emit_marshal_string (m, argnum, t, spec, conv_arg, conv_arg_type, action);
+ case MONO_TYPE_CLASS:
+ case MONO_TYPE_OBJECT:
+ return emit_marshal_object (m, argnum, t, spec, conv_arg, conv_arg_type, action);
+ case MONO_TYPE_ARRAY:
+ case MONO_TYPE_SZARRAY:
+ return emit_marshal_array (m, argnum, t, spec, conv_arg, conv_arg_type, action);
+ case MONO_TYPE_BOOLEAN:
+ return emit_marshal_boolean (m, argnum, t, spec, conv_arg, conv_arg_type, action);
}
return conv_arg;
* @method: The MonoMethod to wrap.
*
* generates IL code for the pinvoke wrapper (the generated method
- * calls the unmanaged code in method->addr)
+ * calls the unmanaged code in piinfo->addr)
*/
MonoMethod *
mono_marshal_get_native_wrapper (MonoMethod *method)
{
EmitMarshalContext m;
MonoMethodSignature *sig, *csig;
- MonoMethodPInvoke *piinfo;
+ MonoMethodPInvoke *piinfo = (MonoMethodPInvoke *) method;
MonoMethodBuilder *mb;
MonoMarshalSpec **mspecs;
MonoMethod *res;
GHashTable *cache;
MonoClass *klass;
gboolean pinvoke = FALSE;
- int i, pos, argnum, *tmp_locals;
+ int i, argnum, *tmp_locals;
int type;
const char *exc_class = "MissingMethodException";
const char *exc_arg = NULL;
(method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL))
pinvoke = TRUE;
- if (!method->addr) {
+ if (!piinfo->addr) {
if (pinvoke)
mono_lookup_pinvoke_call (method, &exc_class, &exc_arg);
else
- method->addr = mono_lookup_internal_call (method);
+ piinfo->addr = mono_lookup_internal_call (method);
}
mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_MANAGED_TO_NATIVE);
mb->method->save_lmf = 1;
-
- piinfo = (MonoMethodPInvoke *)method;
-
- if (!method->addr) {
+
+ if (!piinfo->addr) {
mono_mb_emit_exception (mb, exc_class, exc_arg);
csig = mono_metadata_signature_dup (sig);
csig->pinvoke = 0;
for (i = 0; i < sig->param_count; i++)
mono_mb_emit_ldarg (mb, i + sig->hasthis);
- g_assert (method->addr);
- mono_mb_emit_native_call (mb, csig, method->addr);
+ g_assert (piinfo->addr);
+ mono_mb_emit_native_call (mb, csig, piinfo->addr);
emit_thread_interrupt_checkpoint (mb);
mono_mb_emit_byte (mb, CEE_RET);
/* we first do all conversions */
tmp_locals = alloca (sizeof (int) * sig->param_count);
+ m.orig_conv_args = alloca (sizeof (int) * (sig->param_count + 1));
for (i = 0; i < sig->param_count; i ++) {
tmp_locals [i] = emit_marshal (&m, i + sig->hasthis, sig->params [i], mspecs [i + 1], 0, &csig->params [i], MARSHAL_ACTION_CONV_IN);
break;
case MONO_TYPE_CHAR:
/* fixme: dont know how to marshal that. We cant simply
- * convert it to a one byte UTF8 character, because an
- * unicode character may need more that one byte in UTF8 */
- mono_mb_emit_ldarg (mb, argnum);
- break;
- case MONO_TYPE_TYPEDBYREF:
- case MONO_TYPE_FNPTR:
- default:
- g_warning ("type 0x%02x unknown", t->type);
- g_assert_not_reached ();
- }
- }
- }
-
- /* call the native method */
- mono_mb_emit_native_call (mb, csig, method->addr);
-
- /* Set LastError if needed */
- if (piinfo->piflags & PINVOKE_ATTRIBUTE_SUPPORTS_LAST_ERROR) {
- MonoMethodSignature *lasterr_sig;
-
- lasterr_sig = mono_metadata_signature_alloc (mono_defaults.corlib, 0);
- lasterr_sig->ret = &mono_defaults.void_class->byval_arg;
- lasterr_sig->pinvoke = 1;
-
- mono_mb_emit_native_call (mb, lasterr_sig, mono_marshal_set_last_error);
- }
-
- /* Ensure that we have marshalling info for the return */
- mono_marshal_load_type_info (mono_class_from_mono_type (sig->ret));
-
- /* convert the result */
- if (!sig->ret->byref) {
- MonoMarshalSpec *spec = mspecs [0];
- type = sig->ret->type;
-
- if (spec && spec->native == MONO_NATIVE_CUSTOM) {
- emit_marshal (&m, 0, sig->ret, spec, 0, NULL, MARSHAL_ACTION_CONV_RESULT);
- } else {
-
- handle_enum:
- switch (type) {
- case MONO_TYPE_VOID:
- break;
- case MONO_TYPE_I1:
- case MONO_TYPE_U1:
- case MONO_TYPE_I2:
- case MONO_TYPE_U2:
- case MONO_TYPE_I4:
- case MONO_TYPE_U4:
- case MONO_TYPE_I:
- case MONO_TYPE_U:
- case MONO_TYPE_PTR:
- case MONO_TYPE_R4:
- case MONO_TYPE_R8:
- case MONO_TYPE_I8:
- case MONO_TYPE_U8:
- /* no conversions necessary */
- mono_mb_emit_byte (mb, CEE_STLOC_3);
- break;
- case MONO_TYPE_BOOLEAN:
- /* maybe we need to make sure that it fits within 8 bits */
- mono_mb_emit_byte (mb, CEE_STLOC_3);
- break;
- case MONO_TYPE_VALUETYPE:
- klass = sig->ret->data.klass;
- if (klass->enumtype) {
- type = sig->ret->data.klass->enum_basetype->type;
- goto handle_enum;
- }
- emit_marshal (&m, 0, sig->ret, spec, 0, NULL, MARSHAL_ACTION_CONV_RESULT);
- break;
- case MONO_TYPE_STRING:
- mono_mb_emit_byte (mb, CEE_STLOC_0);
- mono_mb_emit_byte (mb, CEE_LDLOC_0);
-
- if (spec) {
- switch (spec->native) {
- case MONO_NATIVE_LPWSTR:
- mono_mb_emit_icall (mb, conv_to_icall (MONO_MARSHAL_CONV_LPWSTR_STR));
- break;
- default:
- g_warning ("marshalling conversion not implemented");
- g_assert_not_reached ();
- }
- } else {
- mono_mb_emit_icall (mb, conv_to_icall (MONO_MARSHAL_CONV_LPSTR_STR));
- }
- mono_mb_emit_byte (mb, CEE_STLOC_3);
-
- /* free the string */
- mono_mb_emit_byte (mb, CEE_LDLOC_0);
- mono_mb_emit_icall (mb, g_free);
- break;
- case MONO_TYPE_CLASS:
- case MONO_TYPE_OBJECT:
- klass = sig->ret->data.klass;
-
- /* set src */
- mono_mb_emit_byte (mb, CEE_STLOC_0);
-
- mono_mb_emit_byte (mb, CEE_LDNULL);
- mono_mb_emit_byte (mb, CEE_STLOC_3);
-
-
- mono_mb_emit_byte (mb, CEE_LDLOC_0);
- mono_mb_emit_byte (mb, CEE_BRFALSE);
- pos = mb->pos;
- mono_mb_emit_i4 (mb, 0);
-
- /* allocate result object */
-
- mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
- mono_mb_emit_byte (mb, CEE_MONO_NEWOBJ);
- mono_mb_emit_i4 (mb, mono_mb_add_data (mb, klass));
- mono_mb_emit_byte (mb, CEE_STLOC_3);
-
- /* set dst */
-
- mono_mb_emit_byte (mb, CEE_LDLOC_3);
- mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
- mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
- mono_mb_emit_icon (mb, sizeof (MonoObject));
- mono_mb_emit_byte (mb, CEE_ADD);
- mono_mb_emit_byte (mb, CEE_STLOC_1);
-
- /* emit conversion code */
- emit_struct_conv (mb, klass, TRUE);
-
- mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
- break;
- case MONO_TYPE_ARRAY:
- case MONO_TYPE_SZARRAY:
- /* fixme: we need conversions here */
- mono_mb_emit_byte (mb, CEE_STLOC_3);
- break;
- case MONO_TYPE_CHAR:
- /* fixme: we need conversions here */
- mono_mb_emit_byte (mb, CEE_STLOC_3);
- break;
- case MONO_TYPE_TYPEDBYREF:
- case MONO_TYPE_FNPTR:
- default:
- g_warning ("return type 0x%02x unknown", sig->ret->type);
- g_assert_not_reached ();
- }
- }
- } else {
- mono_mb_emit_byte (mb, CEE_STLOC_3);
- }
-
- /*
- * Need to call this after converting the result since MONO_VTADDR needs
- * to be adjacent to the call instruction.
- */
- emit_thread_interrupt_checkpoint (mb);
-
- /* we need to convert byref arguments back and free string arrays */
- for (i = 0; i < sig->param_count; i++) {
- MonoType *t = sig->params [i];
- MonoMarshalSpec *spec = mspecs [i + 1];
-
- argnum = i + sig->hasthis;
-
- if (spec && ((spec->native == MONO_NATIVE_CUSTOM) || (spec->native == MONO_NATIVE_ASANY))) {
- emit_marshal (&m, argnum, t, spec, tmp_locals [i], NULL, MARSHAL_ACTION_CONV_OUT);
- continue;
- }
-
- switch (t->type) {
- case MONO_TYPE_STRING:
- if (t->byref && (t->attrs & PARAM_ATTRIBUTE_OUT)) {
- mono_mb_emit_ldarg (mb, argnum);
- mono_mb_emit_ldloc (mb, tmp_locals [i]);
- mono_mb_emit_icall (mb, conv_to_icall (MONO_MARSHAL_CONV_LPSTR_STR));
- mono_mb_emit_byte (mb, CEE_STIND_I);
- } else {
- mono_mb_emit_ldloc (mb, tmp_locals [i]);
- mono_mb_emit_icall (mb, g_free);
- }
- break;
- case MONO_TYPE_CLASS:
- case MONO_TYPE_OBJECT:
- if (t->data.klass == mono_defaults.stringbuilder_class) {
- gboolean need_free;
- MonoMarshalNative encoding;
-
- encoding = mono_marshal_get_ptr_to_stringbuilder_encoding (piinfo, spec, &need_free);
-
- g_assert (!t->byref);
- g_assert (encoding != -1);
-
- mono_mb_emit_ldarg (mb, argnum);
- mono_mb_emit_ldloc (mb, tmp_locals [i]);
-
- mono_mb_emit_icall (mb, conv_to_icall (encoding));
-
- if (need_free) {
- mono_mb_emit_ldloc (mb, tmp_locals [i]);
- mono_mb_emit_icall (mb, g_free);
- }
- break;
- }
-
- if (!(t->byref || (t->attrs & PARAM_ATTRIBUTE_OUT)))
- continue;
-
- if (t->byref && (t->attrs & PARAM_ATTRIBUTE_OUT)) {
- /* allocate a new object */
- mono_mb_emit_ldarg (mb, argnum);
- mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
- mono_mb_emit_byte (mb, CEE_MONO_NEWOBJ);
- mono_mb_emit_i4 (mb, mono_mb_add_data (mb, t->data.klass));
- mono_mb_emit_byte (mb, CEE_STIND_I);
- }
-
- /* dst = *argument */
- mono_mb_emit_ldarg (mb, argnum);
-
- if (t->byref)
- mono_mb_emit_byte (mb, CEE_LDIND_I);
-
- mono_mb_emit_byte (mb, CEE_STLOC_1);
-
- mono_mb_emit_byte (mb, CEE_LDLOC_1);
- mono_mb_emit_byte (mb, CEE_BRFALSE);
- pos = mb->pos;
- mono_mb_emit_i4 (mb, 0);
-
- mono_mb_emit_byte (mb, CEE_LDLOC_1);
- mono_mb_emit_icon (mb, sizeof (MonoObject));
- mono_mb_emit_byte (mb, CEE_ADD);
- mono_mb_emit_byte (mb, CEE_STLOC_1);
-
- /* src = tmp_locals [i] */
- mono_mb_emit_ldloc (mb, tmp_locals [i]);
- mono_mb_emit_byte (mb, CEE_STLOC_0);
-
- /* emit valuetype conversion code */
- emit_struct_conv (mb, t->data.klass, TRUE);
-
- mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
- break;
- case MONO_TYPE_VALUETYPE:
- emit_marshal (&m, argnum, t, spec, tmp_locals [i], NULL, MARSHAL_ACTION_CONV_OUT);
- break;
- case MONO_TYPE_SZARRAY:
- klass = mono_class_from_mono_type (t);
-
- if (klass->element_class == mono_defaults.string_class) {
- MonoMarshalNative encoding = mono_marshal_get_string_encoding (piinfo, spec);
- g_assert (tmp_locals [i]);
-
- mono_mb_emit_ldarg (mb, argnum);
- if (t->byref)
- mono_mb_emit_byte (mb, CEE_LDIND_I);
- mono_mb_emit_byte (mb, CEE_BRFALSE);
- pos = mb->pos;
- mono_mb_emit_i4 (mb, 0);
-
- mono_mb_emit_ldloc (mb, tmp_locals [i]);
-
- switch (encoding) {
- case MONO_NATIVE_LPWSTR:
- /*
- * The array elements point to the managed string data so
- * they don't need to be freed.
- */
- mono_mb_emit_icall (mb, g_free);
- break;
- default:
- mono_mb_emit_ldarg (mb, argnum);
- if (t->byref)
- mono_mb_emit_byte (mb, CEE_LDIND_I);
- mono_mb_emit_byte (mb, CEE_LDLEN);
- mono_mb_emit_icall (mb, conv_to_icall (MONO_MARSHAL_FREE_ARRAY));
- break;
- }
-
- mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
- }
-
- if (t->byref)
- /*
- * FIXME: Need to convert data back but we don't know the
- * size of the array.
- */
- continue;
-
- /* Character arrays are implicitly marshalled as [Out] */
- if ((klass->element_class == mono_defaults.char_class) || (klass->element_class == mono_defaults.stringbuilder_class) || (t->attrs & PARAM_ATTRIBUTE_OUT)) {
- /* FIXME: Optimize blittable case */
- MonoClass *eklass;
- guint32 label1, label2, label3;
- int index_var, src_ptr, esize;
-
- eklass = klass->element_class;
- if (eklass == mono_defaults.stringbuilder_class)
- esize = sizeof (gpointer);
- else
- esize = mono_class_native_size (eklass, NULL);
- src_ptr = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
-
- /* Check null */
- mono_mb_emit_ldarg (mb, argnum);
- mono_mb_emit_byte (mb, CEE_BRFALSE);
- label1 = mb->pos;
- mono_mb_emit_i4 (mb, 0);
-
- mono_mb_emit_ldloc (mb, tmp_locals [i]);
- mono_mb_emit_stloc (mb, src_ptr);
-
- /* Emit marshalling loop */
- index_var = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
- mono_mb_emit_byte (mb, CEE_LDC_I4_0);
- mono_mb_emit_stloc (mb, index_var);
- label2 = mb->pos;
- mono_mb_emit_ldloc (mb, index_var);
+ * convert it to a one byte UTF8 character, because an
+ * unicode character may need more that one byte in UTF8 */
mono_mb_emit_ldarg (mb, argnum);
- mono_mb_emit_byte (mb, CEE_LDLEN);
- mono_mb_emit_byte (mb, CEE_BGE);
- label3 = mb->pos;
- mono_mb_emit_i4 (mb, 0);
-
- /* Emit marshalling code */
+ break;
+ case MONO_TYPE_TYPEDBYREF:
+ case MONO_TYPE_FNPTR:
+ default:
+ g_warning ("type 0x%02x unknown", t->type);
+ g_assert_not_reached ();
+ }
+ }
+ }
- if (eklass == mono_defaults.stringbuilder_class) {
- gboolean need_free;
- MonoMarshalNative encoding = mono_marshal_get_ptr_to_stringbuilder_encoding (piinfo, spec, &need_free);
+ /* call the native method */
+ mono_mb_emit_native_call (mb, csig, piinfo->addr);
- g_assert (encoding != -1);
+ /* Set LastError if needed */
+ if (piinfo->piflags & PINVOKE_ATTRIBUTE_SUPPORTS_LAST_ERROR) {
+ MonoMethodSignature *lasterr_sig;
- /* dest */
- mono_mb_emit_ldarg (mb, argnum);
- mono_mb_emit_ldloc (mb, index_var);
- mono_mb_emit_byte (mb, CEE_LDELEM_REF);
+ lasterr_sig = mono_metadata_signature_alloc (mono_defaults.corlib, 0);
+ lasterr_sig->ret = &mono_defaults.void_class->byval_arg;
+ lasterr_sig->pinvoke = 1;
- /* src */
- mono_mb_emit_ldloc (mb, src_ptr);
- mono_mb_emit_byte (mb, CEE_LDIND_I);
+ mono_mb_emit_native_call (mb, lasterr_sig, mono_marshal_set_last_error);
+ }
- mono_mb_emit_icall (mb, conv_to_icall (encoding));
+ /* convert the result */
+ if (!sig->ret->byref) {
+ MonoMarshalSpec *spec = mspecs [0];
+ type = sig->ret->type;
- if (need_free) {
- /* src */
- mono_mb_emit_ldloc (mb, src_ptr);
- mono_mb_emit_byte (mb, CEE_LDIND_I);
+ if (spec && spec->native == MONO_NATIVE_CUSTOM) {
+ emit_marshal (&m, 0, sig->ret, spec, 0, NULL, MARSHAL_ACTION_CONV_RESULT);
+ } else {
- mono_mb_emit_icall (mb, g_free);
- }
+ handle_enum:
+ switch (type) {
+ case MONO_TYPE_VOID:
+ break;
+ case MONO_TYPE_I1:
+ case MONO_TYPE_U1:
+ case MONO_TYPE_I2:
+ case MONO_TYPE_U2:
+ case MONO_TYPE_I4:
+ case MONO_TYPE_U4:
+ case MONO_TYPE_I:
+ case MONO_TYPE_U:
+ case MONO_TYPE_PTR:
+ case MONO_TYPE_R4:
+ case MONO_TYPE_R8:
+ case MONO_TYPE_I8:
+ case MONO_TYPE_U8:
+ /* no conversions necessary */
+ mono_mb_emit_byte (mb, CEE_STLOC_3);
+ break;
+ case MONO_TYPE_VALUETYPE:
+ klass = sig->ret->data.klass;
+ if (klass->enumtype) {
+ type = sig->ret->data.klass->enum_basetype->type;
+ goto handle_enum;
}
- else {
- /* set the src_ptr */
- mono_mb_emit_ldloc (mb, src_ptr);
- mono_mb_emit_byte (mb, CEE_STLOC_0);
+ emit_marshal (&m, 0, sig->ret, spec, 0, NULL, MARSHAL_ACTION_CONV_RESULT);
+ break;
+ case MONO_TYPE_STRING:
+ case MONO_TYPE_CLASS:
+ case MONO_TYPE_OBJECT:
+ case MONO_TYPE_BOOLEAN:
+ case MONO_TYPE_ARRAY:
+ case MONO_TYPE_SZARRAY:
+ emit_marshal (&m, 0, sig->ret, spec, 0, NULL, MARSHAL_ACTION_CONV_RESULT);
+ break;
+ case MONO_TYPE_CHAR:
+ /* fixme: we need conversions here */
+ mono_mb_emit_byte (mb, CEE_STLOC_3);
+ break;
+ case MONO_TYPE_TYPEDBYREF:
+ case MONO_TYPE_FNPTR:
+ default:
+ g_warning ("return type 0x%02x unknown", sig->ret->type);
+ g_assert_not_reached ();
+ }
+ }
+ } else {
+ mono_mb_emit_byte (mb, CEE_STLOC_3);
+ }
- /* set dst_ptr */
- mono_mb_emit_ldarg (mb, argnum);
- mono_mb_emit_ldloc (mb, index_var);
- mono_mb_emit_byte (mb, CEE_LDELEMA);
- mono_mb_emit_i4 (mb, mono_mb_add_data (mb, eklass));
- mono_mb_emit_byte (mb, CEE_STLOC_1);
+ /*
+ * Need to call this after converting the result since MONO_VTADDR needs
+ * to be adjacent to the call instruction.
+ */
+ emit_thread_interrupt_checkpoint (mb);
- /* emit valuetype conversion code */
- emit_struct_conv (mb, eklass, TRUE);
- }
+ /* we need to convert byref arguments back and free string arrays */
+ for (i = 0; i < sig->param_count; i++) {
+ MonoType *t = sig->params [i];
+ MonoMarshalSpec *spec = mspecs [i + 1];
- mono_mb_emit_add_to_local (mb, index_var, 1);
- mono_mb_emit_add_to_local (mb, src_ptr, esize);
+ argnum = i + sig->hasthis;
- mono_mb_emit_byte (mb, CEE_BR);
- mono_mb_emit_i4 (mb, label2 - (mb->pos + 4));
+ if (spec && ((spec->native == MONO_NATIVE_CUSTOM) || (spec->native == MONO_NATIVE_ASANY))) {
+ emit_marshal (&m, argnum, t, spec, tmp_locals [i], NULL, MARSHAL_ACTION_CONV_OUT);
+ continue;
+ }
- mono_mb_patch_addr (mb, label1, mb->pos - (label1 + 4));
- mono_mb_patch_addr (mb, label3, mb->pos - (label3 + 4));
- }
+ switch (t->type) {
+ case MONO_TYPE_STRING:
+ case MONO_TYPE_VALUETYPE:
+ case MONO_TYPE_CLASS:
+ case MONO_TYPE_OBJECT:
+ case MONO_TYPE_SZARRAY:
+ emit_marshal (&m, argnum, t, spec, tmp_locals [i], NULL, MARSHAL_ACTION_CONV_OUT);
break;
case MONO_TYPE_BOOLEAN:
if (!t->byref)
g_free (mspecs [i]);
g_free (mspecs);
- /* printf ("CODE FOR %s: \n%s.\n", mono_method_full_name (res, TRUE), mono_disasm_code (0, res, ((MonoMethodNormal*)res)->header->code, ((MonoMethodNormal*)res)->header->code + ((MonoMethodNormal*)res)->header->code_size)); */
+ /* printf ("CODE FOR %s: \n%s.\n", mono_method_full_name (res, TRUE), mono_disasm_code (0, res, ((MonoMethodNormal*)res)->header->code, ((MonoMethodNormal*)res)->header->code + ((MonoMethodNormal*)res)->header->code_size)); */
return res;
}
mono_upgrade_remote_class_wrapper (MonoReflectionType *rtype, MonoTransparentProxy *tproxy)
{
MonoClass *klass;
+ MonoDomain *domain = ((MonoObject*)tproxy)->vtable->domain;
klass = mono_class_from_mono_type (rtype->type);
- mono_upgrade_remote_class (((MonoObject*)tproxy)->vtable->domain, tproxy->remote_class, klass);
- ((MonoObject*)tproxy)->vtable = tproxy->remote_class->vtable;
+ mono_upgrade_remote_class (domain, tproxy->remote_class, klass);
+ ((MonoObject*)tproxy)->vtable = mono_remote_class_vtable (domain, tproxy->remote_class, tproxy->rp);
}
/**
g_assert (klass != NULL);
+ mono_marshal_load_type_info (klass);
+
if (klass->str_to_ptr)
return klass->str_to_ptr;
if (!stoptr)
- stoptr = mono_find_method_by_name (mono_defaults.marshal_class, "StructureToPtr", 3);
+ stoptr = mono_class_get_method_from_name (mono_defaults.marshal_class, "StructureToPtr", 3);
g_assert (stoptr);
mb = mono_mb_new (klass, stoptr->name, MONO_WRAPPER_UNKNOWN);
g_assert (klass != NULL);
+ mono_marshal_load_type_info (klass);
+
if (klass->ptr_to_str)
return klass->ptr_to_str;
if (!ptostr)
- ptostr = mono_find_method_by_name (mono_defaults.marshal_class, "PtrToStructure", 2);
+ ptostr = mono_class_get_method_from_name (mono_defaults.marshal_class, "PtrToStructure", 2);
g_assert (ptostr);
mb = mono_mb_new (klass, ptostr->name, MONO_WRAPPER_UNKNOWN);
MonoMethodBuilder *mb;
MonoMethod *res;
GHashTable *cache;
- int i, pos, this_local, ret_local;
+ int i, pos, this_local, ret_local = 0;
g_assert (method);
if ((res = mono_marshal_find_in_cache (cache, method)))
return res;
- sig = method->signature;
+ sig = signature_no_pinvoke (method->signature);
mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_SYNCHRONIZED);
mono_mb_emit_ldarg (mb, 0);
for (i = 0; i < sig->param_count; i++)
mono_mb_emit_ldarg (mb, i + (sig->hasthis == TRUE));
- mono_mb_emit_managed_call (mb, method, method->signature);
+
+ /* this is needed to avoid recursion */
+ mono_mb_emit_byte (mb, CEE_PREFIX1);
+ mono_mb_emit_byte (mb, CEE_LDFTN);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, method));
+ mono_mb_emit_calli (mb, method->signature);
+
if (!MONO_TYPE_IS_VOID (sig->ret))
mono_mb_emit_stloc (mb, ret_local);
return res;
}
+
+/*
+ * the returned method calls 'method' unboxing the this argument
+ */
+MonoMethod *
+mono_marshal_get_unbox_wrapper (MonoMethod *method)
+{
+ MonoMethodSignature *sig = method->signature;
+ int i;
+ MonoMethodBuilder *mb;
+ MonoMethod *res;
+ GHashTable *cache;
+
+ cache = method->klass->image->unbox_wrapper_cache;
+ if ((res = mono_marshal_find_in_cache (cache, method)))
+ return res;
+
+ mb = mono_mb_new (method->klass, method->name, MONO_WRAPPER_UNBOX);
+
+ g_assert (sig->hasthis);
+
+ mono_mb_emit_ldarg (mb, 0);
+ mono_mb_emit_icon (mb, sizeof (MonoObject));
+ mono_mb_emit_byte (mb, CEE_ADD);
+ for (i = 0; i < sig->param_count; ++i)
+ mono_mb_emit_ldarg (mb, i + 1);
+ mono_mb_emit_managed_call (mb, method, NULL);
+ mono_mb_emit_byte (mb, CEE_RET);
+
+ res = mono_mb_create_and_cache (cache, method,
+ mb, sig, sig->param_count + 16);
+ mono_mb_free (mb);
+
+ /* printf ("CODE FOR %s: \n%s.\n", mono_method_full_name (res, TRUE), mono_disasm_code (0, res, ((MonoMethodNormal*)res)->header->code, ((MonoMethodNormal*)res)->header->code + ((MonoMethodNormal*)res)->header->code_size)); */
+
+ return res;
+}
+
MonoMethod*
mono_marshal_get_stelemref ()
{
guint32 b1, b2, b3, b4;
guint32 copy_pos;
int aklass, vklass;
+ int array_slot_addr;
if (ret)
return ret;
/* void stelemref (void* array, int idx, void* value) */
sig->ret = &mono_defaults.void_class->byval_arg;
- sig->params [0] = &mono_defaults.int_class->byval_arg;
+ sig->params [0] = &mono_defaults.object_class->byval_arg;
sig->params [1] = &mono_defaults.int_class->byval_arg; /* this is a natural sized int */
- sig->params [2] = &mono_defaults.int_class->byval_arg;
+ sig->params [2] = &mono_defaults.object_class->byval_arg;
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);
/*
the method:
- <check ABC>
+ <ldelema (bound check)>
if (!value)
goto store;
goto long;
store:
- array [idx] = value;
+ *array_slot_addr = value;
return;
long:
throw new ArrayTypeMismatchException ();
*/
- /* ABC */
+ /* ldelema (implicit bound check) */
mono_mb_emit_ldarg (mb, 0);
mono_mb_emit_ldarg (mb, 1);
mono_mb_emit_byte (mb, CEE_LDELEMA);
- mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_defaults.int_class));
- mono_mb_emit_byte (mb, CEE_POP);
+ mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_defaults.object_class));
+ mono_mb_emit_stloc (mb, array_slot_addr);
/* if (!value) goto do_store */
mono_mb_emit_ldarg (mb, 2);
copy_pos = mb->pos;
/* do_store */
mono_mb_patch_addr (mb, b1, mb->pos - (b1 + 4));
- mono_mb_emit_ldarg (mb, 0);
- mono_mb_emit_ldarg (mb, 1);
+ mono_mb_emit_ldloc (mb, array_slot_addr);
mono_mb_emit_ldarg (mb, 2);
- mono_mb_emit_byte (mb, CEE_STELEM_I);
+ mono_mb_emit_byte (mb, CEE_STIND_REF);
mono_mb_emit_byte (mb, CEE_RET);
mono_mb_emit_byte (mb, CEE_RET);
ret = mono_mb_create_method (mb, sig, 4);
+ mono_mb_free (mb);
return ret;
}
-/* FIXME: on win32 we should probably use GlobalAlloc(). */
void*
-mono_marshal_alloc (gpointer size)
+mono_marshal_alloc (gulong size)
{
gpointer res;
- MONO_ARCH_SAVE_REGS;
-
- if ((gulong)size == 0)
- /* This returns a valid pointer for size 0 on MS.NET */
- size = (gpointer)4;
-
+#ifdef PLATFORM_WIN32
+ res = CoTaskMemAlloc (size);
+#else
res = g_try_malloc ((gulong)size);
if (!res)
mono_gc_out_of_memory ((gulong)size);
-
+#endif
return res;
}
void
-mono_marshal_free (gpointer ptr)
+mono_marshal_free (gpointer ptr)
{
- MONO_ARCH_SAVE_REGS;
-
+#ifdef PLATFORM_WIN32
+ CoTaskMemFree (ptr);
+#else
g_free (ptr);
+#endif
}
void
}
void *
-mono_marshal_string_array (MonoArray *array)
-{
- char **result;
- int i, len;
-
- if (!array)
- return NULL;
-
- len = mono_array_length (array);
-
- result = g_malloc (sizeof (char *) * (len + 1));
- for (i = 0; i < len; ++i) {
- MonoString *s = (MonoString *)mono_array_get (array, gpointer, i);
- result [i] = s ? mono_string_to_utf8 (s): NULL;
- }
- /* null terminate the array */
- result [i] = NULL;
-
- return result;
-}
-
-void *
-mono_marshal_string_array_to_unicode (MonoArray *array)
+mono_marshal_string_to_utf16 (MonoString *s)
{
- gunichar2 **result;
- int i, len;
-
- if (!array)
- return NULL;
-
- len = mono_array_length (array);
-
- result = g_malloc (sizeof (gunichar2 *) * (len + 1));
- for (i = 0; i < len; ++i) {
- MonoString *s = (MonoString *)mono_array_get (array, gpointer, i);
- result [i] = s ? mono_string_chars (s) : NULL;
- }
- /* null terminate the array */
- result [i] = NULL;
-
- return result;
+ return s ? mono_string_chars (s) : NULL;
}
/**
MONO_ARCH_SAVE_REGS;
if (ptr == NULL)
- return mono_string_new (mono_domain_get (), "");
+ return NULL;
else
return mono_string_new (mono_domain_get (), ptr);
}
{
MONO_ARCH_SAVE_REGS;
- if (ptr == NULL)
- return mono_string_new (mono_domain_get (), "");
- else
+ if (ptr == NULL) {
+ mono_raise_exception (mono_get_exception_argument_null ("ptr"));
+ g_assert_not_reached ();
+ return NULL;
+ } else
return mono_string_new_len (mono_domain_get (), ptr, len);
}
MONO_ARCH_SAVE_REGS;
if (ptr == NULL)
- return mono_string_new (mono_domain_get (), "");
+ return NULL;
while (*t++)
len++;
MONO_ARCH_SAVE_REGS;
- if (ptr == NULL)
- return mono_string_new (mono_domain_get (), "");
- else
+ if (ptr == NULL) {
+ mono_raise_exception (mono_get_exception_argument_null ("ptr"));
+ g_assert_not_reached ();
+ return NULL;
+ } else
return mono_string_new_utf16 (domain, ptr, len);
}
fname = mono_string_to_utf8 (field_name);
klass = mono_class_from_mono_type (type->type);
- while(klass && match_index == -1) {
+ while (klass && match_index == -1) {
for (i = 0; i < klass->field.count; ++i) {
if (*fname == *klass->fields [i].name && strcmp (fname, klass->fields [i].name) == 0) {
match_index = i;
}
}
- if(match_index == -1)
+ if (match_index == -1)
klass = klass->parent;
}
g_free (fname);
if(match_index == -1) {
- MonoException* exc;
- gchar *tmp;
+ MonoException* exc;
+ gchar *tmp;
- /* Get back original class instance */
- klass = mono_class_from_mono_type (type->type);
+ /* Get back original class instance */
+ klass = mono_class_from_mono_type (type->type);
- tmp = g_strdup_printf ("Field passed in is not a marshaled member of the type %s", klass->name);
- exc = mono_get_exception_argument ("fieldName", tmp);
- g_free (tmp);
+ tmp = g_strdup_printf ("Field passed in is not a marshaled member of the type %s", klass->name);
+ exc = mono_get_exception_argument ("fieldName", tmp);
+ g_free (tmp);
- mono_raise_exception ((MonoException*)exc);
- }
+ mono_raise_exception ((MonoException*)exc);
+ }
- info = mono_marshal_load_type_info (klass);
- return info->fields [match_index].offset;
+ info = mono_marshal_load_type_info (klass);
+ return info->fields [match_index].offset;
}
gpointer
case MONO_MARSHAL_CONV_STR_BSTR:
case MONO_MARSHAL_CONV_STR_ANSIBSTR:
case MONO_MARSHAL_CONV_STR_TBSTR:
- g_free (*(gpointer *)cpos);
+ mono_marshal_free (*(gpointer *)cpos);
break;
default:
continue;
mono_struct_delete_old (klass, (char *)src);
}
+
+/* FIXME: on win32 we should probably use GlobalAlloc(). */
+void*
+ves_icall_System_Runtime_InteropServices_Marshal_AllocHGlobal (int size)
+{
+ gpointer res;
+
+ MONO_ARCH_SAVE_REGS;
+
+ if ((gulong)size == 0)
+ /* This returns a valid pointer for size 0 on MS.NET */
+ size = 4;
+
+ res = g_try_malloc ((gulong)size);
+ if (!res)
+ mono_gc_out_of_memory ((gulong)size);
+
+ return res;
+}
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_FreeHGlobal (void *ptr)
+{
+ MONO_ARCH_SAVE_REGS;
+
+ g_free (ptr);
+}
+
void*
ves_icall_System_Runtime_InteropServices_Marshal_AllocCoTaskMem (int size)
{
- /* FIXME: Call AllocCoTaskMem under windows */
MONO_ARCH_SAVE_REGS;
+#ifdef PLATFORM_WIN32
+ return CoTaskMemAlloc (size);
+#else
return g_try_malloc ((gulong)size);
+#endif
}
void
ves_icall_System_Runtime_InteropServices_Marshal_FreeCoTaskMem (void *ptr)
{
- /* FIXME: Call FreeCoTaskMem under windows */
MONO_ARCH_SAVE_REGS;
+#ifdef PLATFORM_WIN32
+ CoTaskMemFree (ptr);
+#else
g_free (ptr);
+#endif
}
void*
return mono_array_addr_with_size (arrayobj, mono_array_element_size (arrayobj->obj.vtable->klass), index);
}
+MonoDelegate*
+ves_icall_System_Runtime_InteropServices_Marshal_GetDelegateForFunctionPointerInternal (void *ftn, MonoReflectionType *type)
+{
+ return mono_ftnptr_to_delegate (mono_type_get_class (type->type), ftn);
+}
+
MonoMarshalType *
mono_marshal_load_type_info (MonoClass* klass)
{
*/
gint32
mono_class_native_size (MonoClass *klass, guint32 *align)
-{
-
+{
if (!klass->marshal_info)
mono_marshal_load_type_info (klass);
return mono_string_to_utf16 ((MonoString*)o);
break;
case MONO_NATIVE_LPSTR:
- return mono_string_to_utf8 ((MonoString*)o);
+ return mono_string_to_lpstr ((MonoString*)o);
break;
default:
g_warning ("marshaling conversion %d not implemented", string_encoding);
klass->blittable || klass->enumtype)
return mono_object_unbox (o);
- res = g_malloc0 (mono_class_native_size (klass, NULL));
+ res = mono_marshal_alloc (mono_class_native_size (klass, NULL));
method = mono_marshal_get_struct_to_ptr (o->vtable->klass);
MonoType *t;
MonoClass *klass;
- /* FIXME: Free embedded data as well */
-
if (o == NULL)
return;
case MONO_TYPE_STRING:
switch (string_encoding) {
case MONO_NATIVE_LPWSTR:
- g_free (ptr);
- break;
case MONO_NATIVE_LPSTR:
- g_free (ptr);
+ mono_marshal_free (ptr);
break;
default:
g_warning ("marshaling conversion %d not implemented", string_encoding);
klass->blittable || klass->enumtype)
break;
- g_free (ptr);
+ mono_struct_delete_old (klass, ptr);
+
+ mono_marshal_free (ptr);
break;
}
default:
projects / mono.git / blobdiff