2006-06-21 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / mini / inssel-ia64.brg

diff --git a/mono/mini/inssel-ia64.brg b/mono/mini/inssel-ia64.brg
index 8f454fe07ba251bfa9c6b40271442ab53ecbed01..decc72c06903aede70a08d48e9c93dabb7a43519 100644 (file)
--- a/mono/mini/inssel-ia64.brg
+++ b/mono/mini/inssel-ia64.brg
@@ -1,5 +1,6 @@
 
 int size_to_ia64_load_u_membase_inc (int size);
+int size_to_store_membase_reg (int size);
 int size_to_ia64_store_membase_inc_reg (int size);
 
 %%
@@ -303,10 +304,17 @@ reg: OP_ATOMIC_ADD_NEW_I8 (base, OP_ICONST) {
        tree->inst_offset = state->left->tree->inst_offset; 
     
        mono_bblock_add_inst (s->cbb, tree);
+} cost {
+       int imm = state->right->tree->inst_imm;
+
+       MBCOND (imm == 1 || imm == 4 || imm == 8 || imm == 16 || imm == -1 || imm == -4 || imm == -8 || imm == -16);
+       return 1;
 }
 
 reg: OP_ATOMIC_EXCHANGE_I4 (base, reg),
-reg: OP_ATOMIC_EXCHANGE_I8 (base, reg) {
+reg: OP_ATOMIC_EXCHANGE_I8 (base, reg),
+reg: OP_ATOMIC_ADD_NEW_I4 (base, reg),
+reg: OP_ATOMIC_ADD_NEW_I8 (base, reg) {
        tree->opcode = tree->opcode;
        tree->dreg = state->reg1;
        tree->sreg2 = state->right->reg1;
@@ -339,7 +347,6 @@ stmt: OP_MEMSET (base) "0" {
 
        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, dest_reg, state->left->tree->inst_basereg, state->left->tree->inst_offset);     
 
-       /* FIXME: Alignment */
        for (unit = align; unit >= 1; unit = unit >> 1) {
                dest_reg2 = mono_regstate_next_int (s->rs);
 
@@ -359,7 +366,10 @@ stmt: OP_MEMSET (base) "0" {
                }
 
                while (size >= unit) {
-                       MONO_EMIT_NEW_STORE_MEMBASE (s, size_to_ia64_store_membase_inc_reg (unit), dest_reg, 0, val_reg);
+                       if (size == unit)
+                               MONO_EMIT_NEW_STORE_MEMBASE (s, size_to_store_membase_reg (unit), dest_reg, 0, val_reg);
+                       else
+                               MONO_EMIT_NEW_STORE_MEMBASE (s, size_to_ia64_store_membase_inc_reg (unit), dest_reg, 0, val_reg);
                        size -= unit;
                }
        }       
@@ -385,9 +395,7 @@ stmt: OP_MEMCPY (base, base) "0" {
        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, dest_reg, state->left->tree->inst_basereg, state->left->tree->inst_offset);     
        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, src_reg, state->right->tree->inst_basereg, state->right->tree->inst_offset);
 
-       /* FIXME: Alignment */
        for (unit = align; unit >= 1; unit = unit >> 1) {
-
                while (size >= unit) {
                        cur_reg = mono_regstate_next_int (s->rs);
                        MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, size_to_ia64_load_u_membase_inc (unit), cur_reg, src_reg, 0);
@@ -417,6 +425,24 @@ size_to_ia64_load_u_membase_inc (int size)
        }
 }
 
+int
+size_to_store_membase_reg (int size)
+{
+       switch (size) {
+       case 1:
+               return OP_STOREI1_MEMBASE_REG;
+       case 2:
+               return OP_STOREI2_MEMBASE_REG;
+       case 4:
+               return OP_STOREI4_MEMBASE_REG;
+       case 8:
+               return OP_STOREI8_MEMBASE_REG;
+       default:
+               g_assert_not_reached ();
+               return -1;
+       }
+}
+
 int
 size_to_ia64_store_membase_inc_reg (int size)
 {