2007-10-19 Marek Habersack <mhabersack@novell.com>

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

diff --git a/mono/mini/inssel-x86.brg b/mono/mini/inssel-x86.brg
index 47b52ce32a7ff988d3c5eda9eec93ed3b7b74b54..831e677b4b830cc513c121f732b8d8ee570daebd 100644 (file)
--- a/mono/mini/inssel-x86.brg
+++ b/mono/mini/inssel-x86.brg
@@ -75,6 +75,12 @@ stmt: CEE_STIND_I8 (OP_REGVAR, lreg) {
        MONO_EMIT_NEW_UNALU (s, OP_MOVE, X86_EDX, state->right->reg2);
 }
 
+reg: CEE_LDIND_I1 (OP_REGVAR) {
+       MONO_EMIT_UNALU (s, tree, OP_SEXT_I1, state->reg1, state->left->tree->dreg);}
+
+reg: CEE_LDIND_I2 (OP_REGVAR) {
+       MONO_EMIT_UNALU (s, tree, OP_SEXT_I2, state->reg1, state->left->tree->dreg);}
+
 lreg: OP_LNEG (lreg) "3" {
        int tmpr = mono_regstate_next_int (s->rs);
        MONO_EMIT_NEW_UNALU (s, CEE_NEG, state->reg1, state->left->reg1);
@@ -355,11 +361,14 @@ stmt: OP_OUTARG_R4 (freg) {
 }
 
 stmt: OP_OUTARG_R8 (freg) {
-       MONO_EMIT_NEW_BIALU_IMM (s, OP_SUB_IMM, X86_ESP, X86_ESP, 8);
+       int esp_displ = (tree->backend.arg_info >> 16) & 0xffff;
+       int esp_offset = tree->backend.arg_info & 0xffff;
+       if (esp_displ)
+               MONO_EMIT_NEW_BIALU_IMM (s, OP_SUB_IMM, X86_ESP, X86_ESP, esp_displ);
        tree->opcode = OP_STORER8_MEMBASE_REG;
        tree->sreg1 = state->left->reg1;
        tree->inst_destbasereg = X86_ESP;
-       tree->inst_offset = 0;
+       tree->inst_offset = esp_offset;
        mono_bblock_add_inst (s->cbb, tree);
 }