Author: lupus
Date: 2006-09-11 06:33:35 -0400 (Mon, 11 Sep 2006)
New Revision: 65218

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/mini-arm.c
Log:


Mon Sep 11 11:31:10 BST 2006 Paolo Molaro <[EMAIL PROTECTED]>

        * mini-arm.c: support larger stack frames (bug #79272).



Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2006-09-11 09:34:04 UTC (rev 65217)
+++ trunk/mono/mono/mini/ChangeLog      2006-09-11 10:33:35 UTC (rev 65218)
@@ -1,3 +1,8 @@
+
+Mon Sep 11 11:31:10 BST 2006 Paolo Molaro <[EMAIL PROTECTED]>
+
+       * mini-arm.c: support larger stack frames (bug #79272).
+
 2006-09-08  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * aot-runtime.c (mono_aot_get_class_from_name): Remove a debug printf.

Modified: trunk/mono/mono/mini/mini-arm.c
===================================================================
--- trunk/mono/mono/mini/mini-arm.c     2006-09-11 09:34:04 UTC (rev 65217)
+++ trunk/mono/mono/mini/mini-arm.c     2006-09-11 10:33:35 UTC (rev 65218)
@@ -100,16 +100,26 @@
                arm_patch (code - 4, start_loop);
                return code;
        }
-       g_assert (arm_is_imm12 (doffset));
-       g_assert (arm_is_imm12 (doffset + size));
-       g_assert (arm_is_imm12 (soffset));
-       g_assert (arm_is_imm12 (soffset + size));
-       while (size >= 4) {
-               ARM_LDR_IMM (code, ARMREG_LR, sreg, soffset);
-               ARM_STR_IMM (code, ARMREG_LR, dreg, doffset);
-               doffset += 4;
-               soffset += 4;
-               size -= 4;
+       if (arm_is_imm12 (doffset) && arm_is_imm12 (doffset + size) &&
+                       arm_is_imm12 (soffset) && arm_is_imm12 (soffset + 
size)) {
+               while (size >= 4) {
+                       ARM_LDR_IMM (code, ARMREG_LR, sreg, soffset);
+                       ARM_STR_IMM (code, ARMREG_LR, dreg, doffset);
+                       doffset += 4;
+                       soffset += 4;
+                       size -= 4;
+               }
+       } else if (size) {
+               code = emit_big_add (code, ARMREG_R0, sreg, soffset);
+               code = emit_big_add (code, ARMREG_R1, dreg, doffset);
+               doffset = soffset = 0;
+               while (size >= 4) {
+                       ARM_LDR_IMM (code, ARMREG_LR, ARMREG_R0, soffset);
+                       ARM_STR_IMM (code, ARMREG_LR, ARMREG_R1, doffset);
+                       doffset += 4;
+                       soffset += 4;
+                       size -= 4;
+               }
        }
        g_assert (size == 0);
        return code;
@@ -2810,8 +2820,13 @@
                                        }
                                        break;
                                case 2:
-                                       g_assert (arm_is_imm8 
(inst->inst_offset));
-                                       ARM_STRH_IMM (code, ainfo->reg, 
inst->inst_basereg, inst->inst_offset);
+                                       if (arm_is_imm8 (inst->inst_offset)) {
+                                               ARM_STRH_IMM (code, ainfo->reg, 
inst->inst_basereg, inst->inst_offset);
+                                       } else {
+                                               code = mono_arm_emit_load_imm 
(code, ARMREG_IP, inst->inst_offset);
+                                               ARM_ADD_REG_REG (code, 
ARMREG_IP, ARMREG_IP, inst->inst_basereg);
+                                               ARM_STRH_IMM (code, ainfo->reg, 
ARMREG_IP, 0);
+                                       }
                                        break;
                                case 8:
                                        g_assert (arm_is_imm12 
(inst->inst_offset));
@@ -2838,8 +2853,13 @@
                                        break;
                                case 2:
                                        ARM_LDR_IMM (code, ARMREG_LR, 
ARMREG_SP, (prev_sp_offset + ainfo->offset));
-                                       g_assert (arm_is_imm8 
(inst->inst_offset));
-                                       ARM_STRH_IMM (code, ARMREG_LR, 
inst->inst_basereg, inst->inst_offset);
+                                       if (arm_is_imm8 (inst->inst_offset)) {
+                                               ARM_STRH_IMM (code, ARMREG_LR, 
inst->inst_basereg, inst->inst_offset);
+                                       } else {
+                                               code = mono_arm_emit_load_imm 
(code, ARMREG_IP, inst->inst_offset);
+                                               ARM_ADD_REG_REG (code, 
ARMREG_IP, ARMREG_IP, inst->inst_basereg);
+                                               ARM_STRH_IMM (code, ARMREG_LR, 
ARMREG_IP, 0);
+                                       }
                                        break;
                                case 8:
                                        g_assert (arm_is_imm12 
(inst->inst_offset));

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

Reply via email to