2007-05-27 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 cd98afc92e6d91a4f9ee920e002bc88904fb28fb..47b52ce32a7ff988d3c5eda9eec93ed3b7b74b54 100644 (file)
--- a/mono/mini/inssel-x86.brg
+++ b/mono/mini/inssel-x86.brg
@@ -37,10 +37,6 @@
                } \
        } while (0)
 
-int call_reg_to_call_membase (int opcode);
-int alu_reg_to_alu_imm (int op);
-int alu_reg_to_alu_membase_imm (int op);
-
 %%
 
 #
@@ -58,7 +54,7 @@ stmt: OP_START_HANDLER {
        MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, spvar->inst_basereg, spvar->inst_offset, X86_ESP);
 }
 
-stmt: CEE_ENDFINALLY {
+stmt: OP_ENDFINALLY {
        MonoInst *spvar = mono_find_spvar_for_region (s, s->cbb->region);
        MONO_EMIT_NEW_LOAD_MEMBASE (s, X86_ESP, spvar->inst_basereg, spvar->inst_offset); 
        tree->opcode = CEE_RET;
@@ -92,6 +88,7 @@ freg: OP_LCONV_TO_R8 (lreg) {
        tree->opcode = OP_X86_FP_LOAD_I8;
        tree->inst_basereg = X86_ESP;
        tree->inst_offset = 0;
+       tree->dreg = state->reg1;
        mono_bblock_add_inst (s->cbb, tree);
        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, X86_ESP, X86_ESP, 8);
 }
@@ -102,6 +99,7 @@ freg: OP_LCONV_TO_R4 (lreg) {
        tree->opcode = OP_X86_FP_LOAD_I8;
        tree->inst_basereg = X86_ESP;
        tree->inst_offset = 0;
+       tree->dreg = state->reg1;
        mono_bblock_add_inst (s->cbb, tree);
        /* change precision */
        MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORER4_MEMBASE_REG, X86_ESP, 0, state->reg1);
@@ -115,6 +113,7 @@ freg: CEE_CONV_R_UN (reg) {
        tree->opcode = OP_X86_FP_LOAD_I8;
        tree->inst_basereg = X86_ESP;
        tree->inst_offset = 0;
+       tree->dreg = state->reg1;
        mono_bblock_add_inst (s->cbb, tree);
        MONO_EMIT_NEW_BIALU_IMM (s, OP_ADD_IMM, X86_ESP, X86_ESP, 8);
 }
@@ -220,7 +219,7 @@ reg: OP_LOCALLOC (OP_ICONST) {
                mono_bblock_add_inst (s->cbb, tree);
        } else {
                guint32 size = state->left->tree->inst_c0;
-               size = (size + (MONO_ARCH_FRAME_ALIGNMENT - 1)) & ~ (MONO_ARCH_FRAME_ALIGNMENT - 1);
+               size = (size + (MONO_ARCH_LOCALLOC_ALIGNMENT - 1)) & ~ (MONO_ARCH_LOCALLOC_ALIGNMENT - 1);
                MONO_EMIT_NEW_BIALU_IMM (s, OP_SUB_IMM, X86_ESP, X86_ESP, size);
                MONO_EMIT_UNALU (s, tree, OP_MOVE, state->reg1, X86_ESP);
        }
@@ -402,6 +401,10 @@ stmt: OP_OUTARG_VT (reg) {
        mono_bblock_add_inst (s->cbb, tree);
 }
 
+stmt: OP_X86_OUTARG_ALIGN_STACK {
+       MONO_EMIT_NEW_BIALU_IMM (s, OP_SUB_IMM, X86_ESP, X86_ESP, tree->inst_c0);
+}      
+
 reg: OP_LDADDR (OP_REGOFFSET),
 reg: CEE_LDOBJ (OP_REGOFFSET) {
        if (state->left->tree->inst_offset) {
@@ -427,7 +430,7 @@ reg: CEE_LDELEMA (reg, reg) "15" {
                tree->sreg1 = state->left->reg1;
                tree->sreg2 = state->right->reg1;
                tree->inst_imm = G_STRUCT_OFFSET (MonoArray, vector);
-               tree->unused = fast_log2 [size];
+               tree->backend.shift_amount = fast_log2 [size];
                mono_bblock_add_inst (s->cbb, tree);
        } else {
                int mult_reg = mono_regstate_next_int (s->rs);
@@ -796,13 +799,13 @@ reg: OP_STR_CHAR_ADDR (reg, reg) "2" {
        tree->sreg1 = state->left->reg1;
        tree->sreg2 = state->right->reg1;
        tree->inst_imm = G_STRUCT_OFFSET (MonoString, chars);
-       tree->unused = 1; /* shift by two */
+       tree->backend.shift_amount = 1; /* shift by two */
        mono_bblock_add_inst (s->cbb, tree);
 }
 
 %%
 
-int
+static int
 alu_reg_to_alu_imm (int op)
 {
        switch (op) {
@@ -822,7 +825,7 @@ alu_reg_to_alu_imm (int op)
        return -1;
 }
 
-int
+static int
 alu_reg_to_alu_membase_imm (int op)
 {
        switch (op) {
@@ -842,7 +845,7 @@ alu_reg_to_alu_membase_imm (int op)
        return -1;
 }
 
-int
+static int
 call_reg_to_call_membase (int opcode)
 {
        switch (opcode) {