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 452796a25e69d4835277c98a029c9f58eccfe04c..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);
 
 %%
@@ -135,7 +136,7 @@ stmt: OP_OUTARG_REG (reg) {
        tree->dreg = mono_regstate_next_int (s->rs);
        mono_bblock_add_inst (s->cbb, tree);
 
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, FALSE);
+       mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->unused, FALSE);
 }
 
 stmt: OP_OUTARG_REG (CEE_LDIND_I (base)),
@@ -156,7 +157,7 @@ stmt: OP_OUTARG_REG (CEE_LDIND_I8 (base)) {
        MONO_EMIT_LOAD_MEMBASE_OP (s, tree, ldind_to_load_membase (state->left->tree->opcode),
                                        dreg, base->inst_basereg, base->inst_offset);
 
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, FALSE);
+       mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->unused, FALSE);
 }
 
 stmt: OP_OUTARG_REG (OP_I8CONST),
@@ -169,7 +170,7 @@ stmt: OP_OUTARG_REG (OP_ICONST) {
        tree->dreg = mono_regstate_next_int (s->rs);
        mono_bblock_add_inst (s->cbb, tree);
 
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, FALSE);
+       mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->unused, FALSE);
 }
 
 stmt: OP_OUTARG_REG (CEE_LDIND_I (OP_REGVAR)),
@@ -184,7 +185,7 @@ stmt: OP_OUTARG_REG (CEE_LDIND_REF (OP_REGVAR)) {
        tree->dreg = mono_regstate_next_int (s->rs);
        mono_bblock_add_inst (s->cbb, tree);
 
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, FALSE);
+       mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->unused, FALSE);
 }
 
 stmt: OP_OUTARG_FREG (freg) {
@@ -195,7 +196,7 @@ stmt: OP_OUTARG_FREG (freg) {
        tree->dreg = mono_regstate_next_float (s->rs);
        mono_bblock_add_inst (s->cbb, tree);
 
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, TRUE);
+       mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->unused, TRUE);
 }
 
 stmt: OP_OUTARG (reg) {
@@ -221,7 +222,7 @@ stmt: OP_OUTARG_REG (CEE_LDOBJ (OP_REGOFFSET)) {
        tree->dreg = mono_regstate_next_int (s->rs);
        mono_bblock_add_inst (s->cbb, tree);
 
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, FALSE);
+       mono_call_inst_add_outarg_reg (s, call, tree->dreg, tree->unused, FALSE);
 }
 
 stmt: OP_SETRET (reg) {
@@ -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,23 +347,29 @@ 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);
 
                /* Use two destination regs to increase paralellism */
                if (size >= 2 * unit) {
-                       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, dest_reg2, state->left->tree->inst_basereg, state->left->tree->inst_offset + unit);
+                       int diff = (size / (2 * unit)) * unit;
+                       MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, dest_reg2, state->left->tree->inst_basereg, state->left->tree->inst_offset + diff);
 
                        while (size >= (2 * unit)) {
                                MONO_EMIT_NEW_STORE_MEMBASE (s, size_to_ia64_store_membase_inc_reg (unit), dest_reg, 0, val_reg);
                                MONO_EMIT_NEW_STORE_MEMBASE (s, size_to_ia64_store_membase_inc_reg (unit), dest_reg2, 0, val_reg);
                                size -= 2 * unit;
                        }
+
+                       if (size > 0)
+                               MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, dest_reg, dest_reg, diff);
                }
 
                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;
                }
        }       
@@ -381,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);
@@ -413,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)
 {