2009-02-03 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / mini / mini-s390x.c

diff --git a/mono/mini/mini-s390x.c b/mono/mini/mini-s390x.c
index 429f2f8ab7631ed3dee97db90abf1f5a62336ca6..4a8b5a65a11679d59fe5dab585bd29db7ecf2c6f 100644 (file)
--- a/mono/mini/mini-s390x.c
+++ b/mono/mini/mini-s390x.c
@@ -156,7 +156,7 @@ if (ins->flags & MONO_INST_BRLABEL) {                                                       \
                s390_ldr (code, ins->dreg, ins->sreg1);                 \
        }
 
-#define MONO_EMIT_NEW_MOVE2(cfg,dest,offset,src,imm,size) do {                         \
+#define MONO_EMIT_NEW_MOVE(cfg,dest,offset,src,imm,size) do {                  \
                 MonoInst *inst;                                                \
                int tmpr = 0;                                                   \
                int sReg, dReg;                                                 \
@@ -196,7 +196,7 @@ if (ins->flags & MONO_INST_BRLABEL) {                                                       \
         MONO_ADD_INS (cfg->cbb, inst); \
        } while (0)
 
-#define MONO_OUTPUT_VTR2(cfg, size, dr, sr, so) do {                           \
+#define MONO_OUTPUT_VTR(cfg, size, dr, sr, so) do {                            \
        int reg = mono_alloc_preg (cfg); \
        switch (size) {                                                         \
                case 0:                                                         \
@@ -222,7 +222,7 @@ if (ins->flags & MONO_INST_BRLABEL) {                                                       \
        mono_call_inst_add_outarg_reg(cfg, call, reg, dr, FALSE);       \
 } while (0)
 
-#define MONO_OUTPUT_VTS2(cfg, size, dr, dx, sr, so) do {                               \
+#define MONO_OUTPUT_VTS(cfg, size, dr, dx, sr, so) do {                                \
        int tmpr;                                                               \
        switch (size) {                                                         \
                case 0:                                                         \
@@ -253,7 +253,7 @@ if (ins->flags & MONO_INST_BRLABEL) {                                                       \
                                dr, dx, tmpr);                                  \
                break;                                                          \
                case 8:                                                         \
-                       MONO_EMIT_NEW_MOVE2 (cfg, dr, dx, sr, so, size);                \
+                       MONO_EMIT_NEW_MOVE (cfg, dr, dx, sr, so, size);         \
                break;                                                          \
        }                                                                       \
 } while (0)
@@ -284,6 +284,7 @@ if (ins->flags & MONO_INST_BRLABEL) {                                                       \
 #include "mini-s390x.h"
 #include "cpu-s390x.h"
 #include "jit-icalls.h"
+#include "ir-emit.h"
 
 /*========================= End of Includes ========================*/
 
@@ -378,7 +379,6 @@ static guchar * emit_float_to_int (MonoCompile *, guchar *, int, int, int, gbool
 gpointer mono_arch_get_lmf_addr (void);
 static guint8 * emit_load_volatile_arguments (guint8 *, MonoCompile *);
 static void catch_SIGILL(int, siginfo_t *, void *);
-static void emit_sig_cookie (MonoCompile *, MonoCallInst *, CallInfo *, int);
 
 /*========================= End of Prototypes ======================*/
 
@@ -2253,9 +2253,9 @@ mono_arch_emit_outarg_vt (MonoCompile *cfg, MonoInst *ins, MonoInst *src)
                                arg->offPrm     = ainfo->offparm + cinfo->sz.offStruct;
                */
                if (ainfo->reg != STK_BASE) {
-                       MONO_OUTPUT_VTR2 (cfg, size, ainfo->reg, src->dreg, 0);
+                       MONO_OUTPUT_VTR (cfg, size, ainfo->reg, src->dreg, 0);
                } else {
-                       MONO_OUTPUT_VTS2 (cfg, size, ainfo->reg, ainfo->offset,
+                       MONO_OUTPUT_VTS (cfg, size, ainfo->reg, ainfo->offset,
                                                          src->dreg, 0);
                }       
        } else if (ainfo->regtype == RegTypeStructByValInFP) {
@@ -2272,7 +2272,7 @@ mono_arch_emit_outarg_vt (MonoCompile *cfg, MonoInst *ins, MonoInst *src)
 
                mono_call_inst_add_outarg_reg (cfg, call, dreg, ainfo->reg, TRUE);
        } else {
-               MONO_EMIT_NEW_MOVE2 (cfg, STK_BASE, ainfo->offparm,
+               MONO_EMIT_NEW_MOVE (cfg, STK_BASE, ainfo->offparm,
                                                         src->dreg, 0, size);
        }
 }
@@ -2540,9 +2540,6 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
 {
        MonoInst *ins, *next;
 
-       if (bb->max_vreg > cfg->rs->next_vreg)
-               cfg->rs->next_vreg = bb->max_vreg;
-
        MONO_BB_FOR_EACH_INS_SAFE (bb, next, ins) {
                switch (ins->opcode) {
                case OP_DIV_IMM:
@@ -2567,7 +2564,7 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
                }
        }
 
-       bb->max_vreg = cfg->rs->next_vreg;
+       bb->max_vreg = cfg->next_vreg;
 }
 
 /*========================= End of Function ========================*/