Author: zoltan
Date: 2007-08-28 05:34:30 -0400 (Tue, 28 Aug 2007)
New Revision: 84931

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/inssel-sparc.brg
   trunk/mono/mono/mini/inssel.brg
   trunk/mono/mono/mini/mini.c
Log:
2007-08-28  Zoltan Varga  <[EMAIL PROTECTED]>

        * mini.c (handle_initobj): Handle alignment properly.

        * inssel.brg (mini_emit_memset): Ditto. 

        * inssel.brg (mini_emit_memcpy): Ditto. 

        * inssel-sparc.brg: Ditto.              


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2007-08-28 09:14:36 UTC (rev 84930)
+++ trunk/mono/mono/mini/ChangeLog      2007-08-28 09:34:30 UTC (rev 84931)
@@ -1,5 +1,13 @@
 2007-08-28  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * mini.c (handle_initobj): Handle alignment properly.
+
+       * inssel.brg (mini_emit_memset): Ditto. 
+
+       * inssel.brg (mini_emit_memcpy): Ditto. 
+
+       * inssel-sparc.brg: Ditto.              
+
        * mini.h mini.c inssel-*.brg: Pass alignment information to 
OP_MEMCPY/MEMSET.
 
 2007-08-26  Zoltan Varga  <[EMAIL PROTECTED]>

Modified: trunk/mono/mono/mini/inssel-sparc.brg
===================================================================
--- trunk/mono/mono/mini/inssel-sparc.brg       2007-08-28 09:14:36 UTC (rev 
84930)
+++ trunk/mono/mono/mini/inssel-sparc.brg       2007-08-28 09:34:30 UTC (rev 
84931)
@@ -691,6 +691,16 @@
        else
                val_reg = sparc_g0;
 
+       if (align < 4) {
+               /* This could be optimized further if neccesary */
+               while (size >= 1) {
+                       MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI1_MEMBASE_REG, 
destreg, offset, val_reg);
+                       offset += 1;
+                       size -= 1;
+               }
+               return;
+       }       
+
        /* Target address must be dword aligned */
        if ((tree->inst_imm == 0) && (size >= 8) && 
                (destreg == sparc_fp) && (((offset - MONO_SPARC_STACK_BIAS) % 
8) == 0)) {
@@ -745,17 +755,16 @@
        else
                val_reg = sparc_g0;
 
-       /* FIXME: This assumes the destination is dword aligned */
-       /*
-       if ((tree->inst_imm == 0) && (size >= 8)) {
-               while (size >= 8) {
-                       MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI8_MEMBASE_IMM, 
destreg, offset, sparc_g0);
-                       offset += 8;
-                       size -= 8;
+       if (align < 4) {
+               /* This could be optimized further if neccesary */
+               while (size >= 1) {
+                       MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI1_MEMBASE_REG, 
destreg, offset, val_reg);
+                       offset += 1;
+                       size -= 1;
                }
-       }
-       */
-               
+               return;
+       }       
+
        while (size >= 4) {
                MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI4_MEMBASE_REG, 
destreg, offset, val_reg);
                offset += 4;

Modified: trunk/mono/mono/mini/inssel.brg
===================================================================
--- trunk/mono/mono/mini/inssel.brg     2007-08-28 09:14:36 UTC (rev 84930)
+++ trunk/mono/mono/mini/inssel.brg     2007-08-28 09:34:30 UTC (rev 84931)
@@ -1990,6 +1990,18 @@
 {
        int cur_reg;
 
+       if (align < 4) {
+               /* This could be optimized further if neccesary */
+               while (size >= 1) {
+                       cur_reg = mono_regstate_next_int (s->rs);
+                       MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI1_MEMBASE, 
cur_reg, srcreg, soffset);
+                       MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI1_MEMBASE_REG, 
destreg, doffset, cur_reg);
+                       doffset += 1;
+                       soffset += 1;
+                       size -= 1;
+               }
+       }
+
        /* FIXME: consider alignment for archs that need it. */
 #if !NO_UNALIGNED_ACCESS
        if (sizeof (gpointer) == 8) {
@@ -2040,6 +2052,16 @@
        else
                MONO_EMIT_NEW_ICONST (s, val_reg, val);
 
+       if (align < 4) {
+               /* This could be optimized further if neccesary */
+               while (size >= 1) {
+                       MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STOREI1_MEMBASE_REG, 
destreg, offset, val_reg);
+                       offset += 1;
+                       size -= 1;
+               }
+               return;
+       }       
+
        /* FIXME: consider alignment for archs that need it. */
 #if !NO_UNALIGNED_ACCESS
        if (sizeof (gpointer) == 8) {

Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c 2007-08-28 09:14:36 UTC (rev 84930)
+++ trunk/mono/mono/mini/mini.c 2007-08-28 09:34:30 UTC (rev 84931)
@@ -2878,32 +2878,25 @@
        ins->cil_code = ip;
        ins->inst_left = dest;
        ins->inst_right = zero_int32;
-       switch (n) {
-       case 1:
+       if (n == 1) {
                ins->opcode = CEE_STIND_I1;
                MONO_ADD_INS (bblock, ins);
-               break;
-       case 2:
+       } else if ((n == 2) && (align >= 2)) {
                ins->opcode = CEE_STIND_I2;
                MONO_ADD_INS (bblock, ins);
-               break;
-       case 4:
+       } else if ((n == 2) && (align >= 4)) {
                ins->opcode = CEE_STIND_I4;
                MONO_ADD_INS (bblock, ins);
-               break;
-       default:
-               if (n <= sizeof (gpointer) * 5) {
-                       NEW_MEMSET (cfg, ins, dest, 0, n, align);
-                       MONO_ADD_INS (bblock, ins);
-                       break;
-               }
+       } else if (n <= sizeof (gpointer) * 5) {
+               NEW_MEMSET (cfg, ins, dest, 0, n, align);
+               MONO_ADD_INS (bblock, ins);
+       } else {
                memset_method = get_memset_method ();
                handle_loaded_temps (cfg, bblock, stack_start, sp);
                iargs [0] = dest;
                NEW_ICONST (cfg, iargs [1], 0);
                NEW_ICONST (cfg, iargs [2], n);
                mono_emit_method_call_spilled (cfg, bblock, memset_method, 
memset_method->signature, iargs, ip, NULL);
-               break;
        }
 }
 

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

Reply via email to