2008-08-22 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 863f9d577c0d8f80f9e9ce52d0b8561c9bed03d0..35d2bb782c346d67a42e1593cfd4022a008df64e 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; \
@@ -50,8 +48,12 @@
 #
 
 stmt: OP_START_HANDLER,
-stmt: OP_ENDFINALLY,
+stmt: OP_ENDFINALLY {
+       mono_bblock_add_inst (s->cbb, tree);
+}
+
 stmt: OP_ENDFILTER (reg) {
+       tree->sreg1 = state->left->reg1;
        mono_bblock_add_inst (s->cbb, tree);
 }
 
@@ -652,14 +654,6 @@ stmt: CEE_POP (freg) "0" {
 
 # override the rules in inssel-float.brg that work for machines with FP registers 
 
-freg: OP_FCONV_TO_R8 (freg) "0" {
-       /* nothing to do */
-}
-
-freg: OP_FCONV_TO_R4 (freg) "0" {
-       /* fixme: nothing to do ??*/
-}
-
 reg: CEE_ADD(reg, CEE_LDIND_I4 (base)) {
        MonoInst *base = state->right->left->tree;
 
@@ -693,6 +687,13 @@ reg: CEE_MUL(reg, CEE_LDIND_I4 (base)) {
        mono_bblock_add_inst (s->cbb, tree);
 } 
 
+reg: OP_IMIN (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);
+}
+
 lreg: OP_LSHL (lreg, reg) "0" {
        MONO_EMIT_BIALU (s, tree, tree->opcode, state->reg1, state->left->reg1, state->right->reg1);
 }
@@ -718,22 +719,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);
 }