Author: zoltan
Date: 2008-02-08 09:18:17 -0500 (Fri, 08 Feb 2008)
New Revision: 95249

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/aot-runtime.c
Log:
2008-02-08  Zoltan Varga  <[EMAIL PROTECTED]>

        * aot-runtime.c (mono_aot_get_plt_entry): Fix a warning.


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2008-02-08 14:07:36 UTC (rev 95248)
+++ trunk/mono/mono/mini/ChangeLog      2008-02-08 14:18:17 UTC (rev 95249)
@@ -1,5 +1,7 @@
 2008-02-08  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * aot-runtime.c (mono_aot_get_plt_entry): Fix a warning.
+
        * objects.cs: Add tests for large argument offsets on ARM.
 
        * mini-arm.c (mono_arch_emit_prolog): Fix handling of arguments with 
large 

Modified: trunk/mono/mono/mini/aot-runtime.c
===================================================================
--- trunk/mono/mono/mini/aot-runtime.c  2008-02-08 14:07:36 UTC (rev 95248)
+++ trunk/mono/mono/mini/aot-runtime.c  2008-02-08 14:18:17 UTC (rev 95249)
@@ -2066,6 +2066,9 @@
 mono_aot_get_plt_entry (guint8 *code)
 {
        MonoAotModule *aot_module = find_aot_module (code);
+#if defined(__arm__)
+       guint32 ins;
+#endif
 
        if (!aot_module)
                return NULL;
@@ -2079,7 +2082,7 @@
                        return target;
        }
 #elif defined(__arm__)
-       guint32 ins = ((guint32*)code) [-1];
+       ins = ((guint32*)(gpointer)code) [-1];
 
        /* Should be a 'bl' */
        if ((((ins >> 25) & 0x7) == 0x5) && (((ins >> 24) & 0x1) == 0x1)) {

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to