Author: zoltan
Date: 2007-12-03 10:53:20 -0500 (Mon, 03 Dec 2007)
New Revision: 90550

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/mini-arm.c
Log:
2007-12-03  Zoltan Varga  <[EMAIL PROTECTED]>

        * mini-arm.c (mono_arch_emit_exceptions): Avoid uninitialized memory in 
the
        code stream.


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2007-12-03 15:51:32 UTC (rev 90549)
+++ trunk/mono/mono/mini/ChangeLog      2007-12-03 15:53:20 UTC (rev 90550)
@@ -1,3 +1,8 @@
+2007-12-03  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * mini-arm.c (mono_arch_emit_exceptions): Avoid uninitialized memory in 
the
+       code stream.
+
 2007-11-30  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * aot-runtime (mono_aot_get_method_from_vt_slot): Add support for 
multi-byte method ref encodings.

Modified: trunk/mono/mono/mini/mini-arm.c
===================================================================
--- trunk/mono/mono/mini/mini-arm.c     2007-12-03 15:51:32 UTC (rev 90549)
+++ trunk/mono/mono/mini/mini-arm.c     2007-12-03 15:53:20 UTC (rev 90550)
@@ -3545,7 +3545,8 @@
                        }
                        arm_patch (ip, code);
                        //*(int*)code = 0xef9f0001;
-                       code += 4;
+                       //code += 4;
+                       ARM_NOP (code);
                        /*mono_add_patch_info (cfg, code - cfg->native_code, 
MONO_PATCH_INFO_EXC_NAME, patch_info->data.target);*/
                        ARM_LDR_IMM (code, ARMREG_R0, ARMREG_PC, 0);
                        /* we got here from a conditional call, so the calling 
ip is set in lr already */

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

Reply via email to