Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / mini / mini-arm-gsharedvt.c

diff --git a/mono/mini/mini-arm-gsharedvt.c b/mono/mini/mini-arm-gsharedvt.c
index 2c7f8812a699661bd095a63d227419d1b91f112e..5ec0f4ac68c8f186dcd58530ebab380c7f87a81c 100644 (file)
--- a/mono/mini/mini-arm-gsharedvt.c
+++ b/mono/mini/mini-arm-gsharedvt.c
@@ -1,5 +1,6 @@
-/*
- * mini-arm-gsharedvt.c: gsharedvt support code for arm
+/**
+ * \file
+ * gsharedvt support code for arm
  *
  * Authors:
  *   Zoltan Varga <vargaz@gmail.com>
@@ -217,8 +218,8 @@ mono_arch_get_gsharedvt_call_info (gpointer addr, MonoMethodSignature *normal_si
                        else
                                src_slot = map_stack_slot (ainfo->offset / 4);
                        g_assert (ndst < 256);
-                       g_assert (src_slot < 16);
-                       src [0] = (ndst << 4) | src_slot;
+                       g_assert (src_slot < 256);
+                       src [0] = (ndst << 8) | src_slot;
 
                        if (ainfo2->storage == RegTypeGeneral && ainfo2->size != 0 && ainfo2->size != 4) {
                                /* Have to load less than 4 bytes */
@@ -256,7 +257,7 @@ mono_arch_get_gsharedvt_call_info (gpointer addr, MonoMethodSignature *normal_si
                        ndst = get_arg_slots (ainfo2, &dst);
                }
                if (nsrc)
-                       src [0] |= (arg_marshal << 16);
+                       src [0] |= (arg_marshal << 24);
                nslots = MIN (nsrc, ndst);
 
                for (i = 0; i < nslots; ++i)