2008-02-07 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mono/mini/mini-s390.h b/mono/mini/mini-s390.h
index 8fc8d364d30efd27fe2d31b2a56876bf73b9a98b..2ae45621d88622810fc92d4107d492c8bb2fc53d 100644 (file)
--- a/mono/mini/mini-s390.h
+++ b/mono/mini/mini-s390.h
@@ -4,13 +4,14 @@
 #include <mono/arch/s390/s390-codegen.h>
 #include <signal.h>
 
+#define MONO_ARCH_CPU_SPEC s390_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;                                                \
@@ -156,6 +157,9 @@ typedef struct
 #define MONO_ARCH_EMULATE_LMUL                         1
 #define MONO_ARCH_HAVE_IS_INT_OVERFLOW         1
 #define MONO_ARCH_NEED_DIV_CHECK               1
+#define MONO_ARCH_HAVE_ATOMIC_ADD 1
+#define MONO_ARCH_HAVE_ATOMIC_EXCHANGE 1
+#define MONO_ARCH_ENABLE_NORMALIZE_OPCODES 1
 // #define MONO_ARCH_SIGSEGV_ON_ALTSTACK               1
 // #define MONO_ARCH_SIGNAL_STACK_SIZE         65536
 // #define MONO_ARCH_HAVE_THROW_CORLIB_EXCEPTION       1
@@ -215,14 +219,12 @@ typedef struct
 
 #define MONO_ARCH_IS_GLOBAL_IREG(reg) 0
 
-#define MONO_ARCH_FRAME_ALIGNMENT (sizeof (glong))
+#define MONO_ARCH_FRAME_ALIGNMENT 4
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
 #define MONO_ARCH_BASEREG s390_r15
 #define MONO_ARCH_RETREG1 s390_r2
 
-#define MONO_SPARC_STACK_BIAS 0
-
 /*-----------------------------------------------*/
 /* Macros used to generate instructions          */
 /*-----------------------------------------------*/
@@ -256,6 +258,7 @@ typedef struct
                MonoS390StackFrame *sframe;                             \
                __asm__ volatile("lr    %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)