2008-06-13 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mono/mini/inssel-x86.brg b/mono/mini/inssel-x86.brg
index 8b69d09c5bb274be739c378eeb1de6d90e261137..b317835e15bec3f4e69ea39f3944d0f7aa3cac4a 100644 (file)
--- a/mono/mini/inssel-x86.brg
+++ b/mono/mini/inssel-x86.brg
@@ -1,7 +1,6 @@
 #define MONO_EMIT_NEW_X86_COMPARE_MEMBASE_REG(cfg,basereg,offset,operand) do { \
                MonoInst *inst; \
-               inst = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoInst)); \
-               inst->opcode = OP_X86_COMPARE_MEMBASE_REG; \
+               MONO_INST_NEW ((cfg), inst, OP_X86_COMPARE_MEMBASE_REG); \
                inst->inst_basereg = basereg; \
                inst->inst_offset = offset; \
                inst->sreg2 = operand; \
@@ -10,8 +9,7 @@
 
 #define MONO_EMIT_NEW_X86_COMPARE_MEMBASE_IMM(cfg,basereg,offset,operand) do { \
                MonoInst *inst; \
-               inst = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoInst)); \
-               inst->opcode = OP_X86_COMPARE_MEMBASE_IMM; \
+               MONO_INST_NEW ((cfg), inst, OP_X86_COMPARE_MEMBASE_IMM); \
                inst->inst_basereg = basereg; \
                inst->inst_offset = offset; \
                inst->inst_imm = operand; \
@@ -694,7 +692,9 @@ reg: CEE_MUL(reg, CEE_LDIND_I4 (base)) {
 } 
 
 reg: OP_IMIN (reg, reg),
-reg: OP_IMAX (reg, reg) {
+reg: OP_IMIN_UN (reg, reg),
+reg: OP_IMAX (reg, reg),
+reg: OP_IMAX_UN (reg, reg) {
        MONO_EMIT_BIALU (s, tree, tree->opcode, state->reg1, state->left->reg1, state->right->reg1);
 }
 
@@ -723,22 +723,14 @@ lreg: OP_LSHR_UN (lreg, OP_ICONST) "0" {
 }
 
 reg: OP_ATOMIC_ADD_NEW_I4 (base, reg),
-reg: OP_ATOMIC_ADD_I4 (base, reg) {
+reg: OP_ATOMIC_ADD_I4 (base, reg),
+reg: OP_ATOMIC_EXCHANGE_I4 (base, reg),
+reg: OP_ATOMIC_CAS_IMM_I4 (base, reg) {
        tree->opcode = tree->opcode;
-       tree->inst_basereg = state->left->tree->inst_basereg; 
-       tree->inst_offset = state->left->tree->inst_offset; 
        tree->dreg = state->reg1;
        tree->sreg2 = state->right->reg1;
-    
-       mono_bblock_add_inst (s->cbb, tree);
-}
-
-reg: OP_ATOMIC_EXCHANGE_I4 (base, reg) {
-    tree->opcode = OP_ATOMIC_EXCHANGE_I4;
-    tree->dreg = state->reg1;
-    tree->sreg2 = state->right->reg1;
-    tree->inst_basereg = state->left->tree->inst_basereg; 
-    tree->inst_offset = state->left->tree->inst_offset; 
+       tree->inst_basereg = state->left->tree->inst_basereg; 
+       tree->inst_offset = state->left->tree->inst_offset; 
     
        mono_bblock_add_inst (s->cbb, tree);
 }