2008-01-05 Jonathan Pobst <monkey@jpobst.com>

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

diff --git a/mono/mini/mini-s390x.h b/mono/mini/mini-s390x.h
index 811f65e3b377d2da2674ea64457c8ddc4738ef9b..d338ce4e8d98f875d693c6b89ccf0ef2da018f0b 100644 (file)
--- a/mono/mini/mini-s390x.h
+++ b/mono/mini/mini-s390x.h
@@ -4,13 +4,14 @@
 #include <mono/arch/s390x/s390x-codegen.h>
 #include <signal.h>
 
+#define MONO_ARCH_CPU_SPEC s390x_cpu_desc
+
 #define MONO_MAX_IREGS 16
 #define MONO_MAX_FREGS 16
 
 /*-------------------------------------------*/
 /* Parameters used by the register allocator */
 /*-------------------------------------------*/
-#define MONO_ARCH_HAS_XP_LOCAL_REGALLOC 1
 
 #define MONO_EMIT_NEW_MOVE(cfg,dest,offset,src,imm,size) do {                  \
                 MonoInst *inst;                                                \
@@ -49,7 +50,7 @@
                        }                                                       \
                }                                                               \
                 inst->opcode     = OP_S390_MOVE;                               \
-               inst->unused      = size;                                       \
+               inst->backend.size        = size;                                       \
                mono_bblock_add_inst (cfg->cbb, inst);                          \
        } while (0)
 
@@ -58,27 +59,27 @@
        switch (size) {                                                         \
                case 0:                                                         \
                        MONO_EMIT_NEW_ICONST(cfg, reg, 0);                      \
-                       mono_call_inst_add_outarg_reg (call, reg, dr, FALSE);   \
+                       mono_call_inst_add_outarg_reg(s, call, reg, dr, FALSE); \
                break;                                                          \
                case 1:                                                         \
                        MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOADU1_MEMBASE,   \
                                reg, sr, so);                                   \
-                       mono_call_inst_add_outarg_reg (call, reg, dr, FALSE);   \
+                       mono_call_inst_add_outarg_reg(s, call, reg, dr, FALSE); \
                break;                                                          \
                case 2:                                                         \
                        MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOADU2_MEMBASE,   \
                                reg, sr, so);                                   \
-                       mono_call_inst_add_outarg_reg (call, reg, dr, FALSE);   \
+                       mono_call_inst_add_outarg_reg(s, call, reg, dr, FALSE); \
                break;                                                          \
                case 4:                                                         \
                        MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOADI4_MEMBASE,   \
                                reg, sr, so);                                   \
-                       mono_call_inst_add_outarg_reg (call, reg, dr, FALSE);   \
+                       mono_call_inst_add_outarg_reg(s, call, reg, dr, FALSE); \
                break;                                                          \
                case 8:                                                         \
                        MONO_EMIT_NEW_LOAD_MEMBASE_OP(cfg, OP_LOAD_MEMBASE,     \
                                reg, sr, so);                                   \
-                       mono_call_inst_add_outarg_reg (call, reg, dr, FALSE);   \
+                       mono_call_inst_add_outarg_reg(s, call, reg, dr, FALSE); \
                break;                                                          \
        }                                                                       \
 } while (0)
@@ -119,6 +120,29 @@
        }                                                                       \
 } while (0)
 
+#define S390_LONG(loc, opy, op, r, ix, br, off)                                        \
+       if (has_ld) {                                                           \
+               if (s390_is_imm20(off)) {                                       \
+                       s390_##opy (loc, r, ix, br, off);                       \
+               } else {                                                        \
+                       s390_basr (code, s390_r13, 0);                          \
+                       s390_j    (code, 6);                                    \
+                       s390_llong(code, off);                                  \
+                       s390_lg   (code, s390_r13, 0, s390_r13, 4);             \
+                       s390_##op (code, r, s390_r13, br, 0);                   \
+               }                                                               \
+       } else {                                                                \
+               if (s390_is_uimm12(off)) {                                      \
+                       s390_##op (loc, r, ix, br, off);                        \
+               } else {                                                        \
+                       s390_basr (code, s390_r13, 0);                          \
+                       s390_j    (code, 6);                                    \
+                       s390_llong(code, off);                                  \
+                       s390_lg   (code, s390_r13, 0, s390_r13, 4);             \
+                       s390_##op (code, r, s390_r13, br, 0);                   \
+               }                                                               \
+       }
+
 struct MonoLMF {
        gpointer    previous_lmf;
        gpointer    lmf_addr;
@@ -203,7 +227,7 @@ typedef struct
 
 #define MONO_ARCH_IS_GLOBAL_IREG(reg) 0
 
-#define MONO_ARCH_FRAME_ALIGNMENT (sizeof (glong))
+#define MONO_ARCH_FRAME_ALIGNMENT 8
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
 #define MONO_ARCH_BASEREG s390_r15
@@ -242,8 +266,9 @@ typedef struct
 
 #define MONO_INIT_CONTEXT_FROM_FUNC(ctx,func) do {                     \
                MonoS390StackFrame *sframe;                             \
-               __asm__ volatile("lg    %0,0(15)" : "=r" (sframe));     \
+               __asm__ volatile("lgr   %0,15" : "=r" (sframe));        \
                MONO_CONTEXT_SET_BP ((ctx), sframe->prev);              \
+               MONO_CONTEXT_SET_SP ((ctx), sframe->prev);              \
                sframe = (MonoS390StackFrame*)sframe->prev;             \
                MONO_CONTEXT_SET_IP ((ctx), sframe->return_address);    \
        } while (0)