svn path=/trunk/mono/; revision=53658

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

diff --git a/mono/mini/inssel-arm.brg b/mono/mini/inssel-arm.brg
index 2b5e8da41a54aa36f1627c4a544a2408f580bbae..8f22fae267203fd4594fafb9dd37d6db98912240 100644 (file)
--- a/mono/mini/inssel-arm.brg
+++ b/mono/mini/inssel-arm.brg
@@ -175,16 +175,23 @@ stmt: OP_OUTARG (lreg) {
        int tdreg;
        tdreg = mono_regstate_next_int (s->rs);
        MONO_EMIT_NEW_UNALU (s, OP_SETREG, tdreg, state->left->reg2);
-
-       /* FIXME: switch the +1 if big endian */
-       mono_call_inst_add_outarg_reg (call, tdreg, tree->unused + 1, FALSE);
+       
+       /* An #if would be better here, but monoburg
+          strips them out as comments */
+       if (G_BYTE_ORDER == G_BIG_ENDIAN)
+               mono_call_inst_add_outarg_reg (call, tdreg, tree->unused, FALSE);
+       else
+               mono_call_inst_add_outarg_reg (call, tdreg, tree->unused + 1, FALSE);
 
        tree->opcode = OP_SETREG;
        tree->dreg = mono_regstate_next_int (s->rs);
        tree->sreg1 = state->left->reg1;
        mono_bblock_add_inst (s->cbb, tree);
-
-       mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, FALSE);
+       
+       if (G_BYTE_ORDER == G_BIG_ENDIAN)
+               mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused + 1, FALSE);
+       else
+               mono_call_inst_add_outarg_reg (call, tree->dreg, tree->unused, FALSE);
 }
 
 stmt: OP_OUTARG (OP_ICONST) {
@@ -236,9 +243,13 @@ stmt: OP_OUTARG_MEMBASE (reg) {
 
 stmt: OP_OUTARG_MEMBASE (lreg) {
        int offset = tree->unused >> 8;
-       /* FIXME: bigendian */
-       MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, ARMREG_SP, offset, state->left->reg1);
-       MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, ARMREG_SP, offset + 4, state->left->reg2);
+       if (G_BYTE_ORDER == G_BIG_ENDIAN) {
+               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, ARMREG_SP, offset, state->left->reg2);
+               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, ARMREG_SP, offset + 4, state->left->reg1);
+       } else {
+               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, ARMREG_SP, offset, state->left->reg1);
+               MONO_EMIT_NEW_STORE_MEMBASE (s, OP_STORE_MEMBASE_REG, ARMREG_SP, offset + 4, state->left->reg2);
+       }
 }
 
 stmt: OP_OUTARG_MEMBASE (freg) {
@@ -266,7 +277,7 @@ stmt: OP_OUTARG_VT (CEE_LDOBJ (base)) {
                tmpr = mono_regstate_next_int (s->rs);
                dreg = mono_regstate_next_int (s->rs);
                MONO_EMIT_NEW_LOAD_MEMBASE (s, tmpr, vt->inst_basereg, soffset);
-               MONO_EMIT_NEW_UNALU (s, OP_SETREG, start_reg + i, tmpr);
+               MONO_EMIT_NEW_UNALU (s, OP_SETREG, dreg, tmpr);
                mono_call_inst_add_outarg_reg (call, dreg, start_reg + i, FALSE);
                soffset += sizeof (gpointer);
        }