2006-08-17 Zoltan Varga <vargaz@gmail.com>

	* marshal.c (mono_marshal_get_xappdomain_invoke): Use the new helper functions here.

	* appdomain.c (ves_icall_System_AppDomain_createDomain): Fix a warning.

svn path=/trunk/mono/; revision=63856

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 1d277be0670bb196dc02ba19e5d1a698086b5f2e..5f2cb922df130b08a3fe7fcfa2d59c88472122db 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-17  Zoltan Varga  <vargaz@gmail.com>
+
+       * marshal.c (mono_marshal_get_xappdomain_invoke): Use the new helper functions here.
+
+       * appdomain.c (ves_icall_System_AppDomain_createDomain): Fix a warning.
+
 2006-08-16 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * appdomain.c:

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index 52adb63b77570141131c7eb6fd5dc955a22cf178..7ceb1e14e7e9d104b6bc156aa881826ffb84ecb8 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -471,11 +471,9 @@ ves_icall_System_AppDomain_getRootDomain ()
 MonoAppDomain *
 ves_icall_System_AppDomain_createDomain (MonoString *friendly_name, MonoAppDomainSetup *setup)
 {
-       MonoDomain *domain = mono_domain_get ();
        MonoClass *adclass;
        MonoAppDomain *ad;
        MonoDomain *data;
-       GSList *tmp;
        
        MONO_ARCH_SAVE_REGS;
 

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index 40937175dc7080d9b628f6c76eaf4cd8caedf5cd..653540e31281e349ba371da8fa41f6e5823de998 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -3688,13 +3688,11 @@ mono_marshal_get_xappdomain_invoke (MonoMethod *method)
        mono_mb_emit_ldloc (mb, loc_domainid);
        mono_mb_emit_ptr (mb, method->klass->image);
        mono_mb_emit_icall (mb, mono_marshal_check_domain_image);
-       mono_mb_emit_byte (mb, CEE_BRTRUE_S);
-       pos_dispatch = mb->pos;
-       mono_mb_emit_byte (mb, 0);
+       pos_dispatch = mono_mb_emit_short_branch (mb, CEE_BRTRUE_S);
 
        /* Use the whole remoting sink to dispatch this message */
 
-       mono_mb_patch_addr_s (mb, pos, mb->pos - pos - 1);
+       mono_mb_patch_short_branch (mb, pos);
 
        mono_mb_emit_ldarg (mb, 0);
        for (i = 0; i < sig->param_count; i++)
@@ -3702,7 +3700,7 @@ mono_marshal_get_xappdomain_invoke (MonoMethod *method)
        
        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_dispatch, mb->pos - pos_dispatch - 1);
+       mono_mb_patch_short_branch (mb, pos_dispatch);
 
        /* Create the array that will hold the parameters to be serialized */