New tests, message update

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

diff --git a/mono/mini/inssel-ia64.brg b/mono/mini/inssel-ia64.brg
index 9699d9635f7e075d5d443dcdbfb2838366742d72..fb9662438870017506ce68656714b2bba0fc8532 100644 (file)
--- a/mono/mini/inssel-ia64.brg
+++ b/mono/mini/inssel-ia64.brg
@@ -1,7 +1,4 @@
 
-int size_to_ia64_load_u_membase_inc (int size);
-int size_to_ia64_store_membase_inc_reg (int size);
-
 %%
 
 #
@@ -135,7 +132,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->backend.reg3, FALSE);
 }
 
 stmt: OP_OUTARG_REG (CEE_LDIND_I (base)),
@@ -156,7 +153,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->backend.reg3, FALSE);
 }
 
 stmt: OP_OUTARG_REG (OP_I8CONST),
@@ -169,7 +166,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->backend.reg3, FALSE);
 }
 
 stmt: OP_OUTARG_REG (CEE_LDIND_I (OP_REGVAR)),
@@ -184,7 +181,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->backend.reg3, FALSE);
 }
 
 stmt: OP_OUTARG_FREG (freg) {
@@ -195,7 +192,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->backend.reg3, TRUE);
 }
 
 stmt: OP_OUTARG (reg) {
@@ -221,7 +218,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->backend.reg3, FALSE);
 }
 
 stmt: OP_SETRET (reg) {
@@ -270,7 +267,7 @@ stmt: OP_START_HANDLER {
      mono_bblock_add_inst (s->cbb, tree);
 }
 
-stmt: CEE_ENDFINALLY {
+stmt: OP_ENDFINALLY {
      mono_bblock_add_inst (s->cbb, tree);
 }
 
@@ -296,17 +293,24 @@ reg: CEE_LDIND_U4 (OP_REGVAR) "0" {
 
 reg: OP_ATOMIC_ADD_NEW_I4 (base, OP_ICONST),
 reg: OP_ATOMIC_ADD_NEW_I8 (base, OP_ICONST) {
-       tree->opcode = tree->opcode == OP_ATOMIC_ADD_NEW_I4 ? OP_IA64_FETCHADD4_IMM : OP_IA64_FETCHADD8_IMM;
+       tree->opcode = tree->opcode == OP_ATOMIC_ADD_NEW_I4 ? OP_ATOMIC_ADD_IMM_NEW_I4 : OP_ATOMIC_ADD_IMM_NEW_I8;
        tree->dreg = state->reg1;
        tree->inst_imm = state->right->tree->inst_imm;
        tree->inst_basereg = state->left->tree->inst_basereg; 
        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;
@@ -316,10 +320,20 @@ reg: OP_ATOMIC_EXCHANGE_I8 (base, reg) {
        mono_bblock_add_inst (s->cbb, tree);
 }
 
+reg: OP_ATOMIC_ADD_IMM_NEW_I4 (base),
+reg: OP_ATOMIC_ADD_IMM_NEW_I8 (base) {
+       tree->opcode = tree->opcode;
+       tree->dreg = state->reg1;
+       tree->inst_basereg = state->left->tree->inst_basereg; 
+       tree->inst_offset = state->left->tree->inst_offset; 
+    
+       mono_bblock_add_inst (s->cbb, tree);
+}
+
 # Optimized memset implementation
 stmt: OP_MEMSET (base) "0" {
        int dest_reg, dest_reg2, val_reg, unit, align;
-       int size = tree->unused;
+       int size = tree->backend.memcpy_args->size;
 
        dest_reg = mono_regstate_next_int (s->rs);
 
@@ -339,7 +353,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 +372,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;
                }
        }       
@@ -369,7 +385,7 @@ stmt: OP_MEMSET (base) "0" {
 # Optimized memcpy implementation
 stmt: OP_MEMCPY (base, base) "0" {
        int cur_reg, src_reg, dest_reg, unit;
-       int size = tree->unused;
+       int size = tree->backend.memcpy_args->size;
        int align;
 
        src_reg = mono_regstate_next_int (s->rs);
@@ -385,9 +401,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);
@@ -399,7 +413,7 @@ stmt: OP_MEMCPY (base, base) "0" {
 
 %%
 
-int
+static int
 size_to_ia64_load_u_membase_inc (int size)
 {
        switch (size) {
@@ -417,7 +431,25 @@ size_to_ia64_load_u_membase_inc (int size)
        }
 }
 
-int
+static 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;
+       }
+}
+
+static int
 size_to_ia64_store_membase_inc_reg (int size)
 {
        switch (size) {