2005-12-12 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mono/mini/inssel-ppc.brg b/mono/mini/inssel-ppc.brg
index 38eced8c0dc73db531fb418fb775a9485d5608bd..a1883912efd1981e87e16d4826420581dec8538c 100644 (file)
--- a/mono/mini/inssel-ppc.brg
+++ b/mono/mini/inssel-ppc.brg
@@ -129,6 +129,26 @@ stmt: OP_SETRET (OP_ICONST) {
        mono_bblock_add_inst (s->cbb, tree);
 }
 
+stmt: CEE_STIND_I (OP_REGVAR, CEE_SUB (CEE_LDIND_I (OP_REGVAR), OP_ICONST)),
+stmt: CEE_STIND_I4 (OP_REGVAR, CEE_SUB (CEE_LDIND_I4 (OP_REGVAR), OP_ICONST)),
+stmt: CEE_STIND_I (OP_REGVAR, CEE_ADD (CEE_LDIND_I (OP_REGVAR), OP_ICONST)),
+stmt: CEE_STIND_I4 (OP_REGVAR, CEE_ADD (CEE_LDIND_I4 (OP_REGVAR), OP_ICONST)) {
+       int con = state->right->right->tree->inst_c0;
+       int dreg = state->left->tree->dreg;
+       int sreg = state->right->left->left->tree->dreg;
+
+       if (state->right->op == CEE_ADD)
+               tree->opcode = OP_ADD_IMM;
+       else if (state->right->op == CEE_SUB)
+               tree->opcode = OP_SUB_IMM;
+       else
+               g_assert_not_reached ();
+       tree->inst_imm = con;
+       tree->sreg1 = sreg;
+       tree->dreg = dreg;
+       mono_bblock_add_inst (s->cbb, tree);
+}
+
 stmt: OP_OUTARG (reg) {
        if (tree->inst_imm) {
                MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, ppc_r1, tree->inst_imm, state->left->reg1);
@@ -254,13 +274,39 @@ stmt: OP_OUTARG_R8 (freg) {
        mono_bblock_add_inst (s->cbb, tree);
 }
 
+stmt: OP_OUTARG_R8 (CEE_LDOBJ (base)) {
+       /* small struct with fp value goes in a fp register */
+       MonoInst *vt = state->left->left->tree;
+       int tmpr, soffset;
+       soffset = vt->inst_offset;
+       tmpr = mono_regstate_next_float (s->rs);
+       MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADR4_MEMBASE, tmpr, vt->inst_basereg, soffset);
+       MONO_EMIT_NEW_UNALU (s, OP_SETFREG, tree->unused, tmpr);
+}
+
 stmt: OP_OUTARG_VT (CEE_LDOBJ (base)) {
        MonoInst *vt = state->left->left->tree;
        int start_reg = tree->unused & 0xff;
        int nregs = (tree->unused >> 8) & 0xff;
        int ovf_size = (tree->unused >> 16) & 0xffff;
        int i, tmpr, soffset;
+       int size = 0;
        soffset = vt->inst_offset;
+/*
+  Darwin needs some special handling for 1 and 2 byte arguments
+*/
+#ifdef __APPLE__
+       if (vt->inst_vtype && MONO_TYPE_ISSTRUCT (vt->inst_vtype) && vt->inst_vtype->type != MONO_TYPE_TYPEDBYREF)
+           size =  mono_class_native_size (mono_class_from_mono_type (vt->inst_vtype), NULL);
+       if (size == 2 || size == 1) {
+               tmpr = mono_regstate_next_int (s->rs);
+               if (size == 1)
+                       MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI1_MEMBASE, tmpr, vt->inst_basereg, soffset);
+               else
+                       MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADI2_MEMBASE, tmpr, vt->inst_basereg, soffset);
+               MONO_EMIT_NEW_UNALU (s, OP_SETREG, start_reg, tmpr);
+       } else
+#endif
        for (i = 0; i < nregs; ++i) {
                tmpr = mono_regstate_next_int (s->rs);
                MONO_EMIT_NEW_LOAD_MEMBASE (s, tmpr, vt->inst_basereg, soffset);
@@ -292,7 +338,7 @@ stmt: OP_OUTARG_VT (reg) {
        if (nregs) {
                tree->opcode = OP_SETREG;
                tree->dreg = start_reg;
-               tree->sreg1 = state->left->tree->dreg;
+               tree->sreg1 = state->left->reg1;
                mono_bblock_add_inst (s->cbb, tree);
        } else {
                g_assert_not_reached ();