Merged revisions 7693-7700 via svnmerge from

[cacao.git] / src / vm / jit / s390 / arch.h

diff --git a/src/vm/jit/s390/arch.h b/src/vm/jit/s390/arch.h
index 68d3f968a729914c6304557c06be0de28c4dec06..e5f96bcd9e45acee77dc0ed3e133926200874c03 100644 (file)
--- a/src/vm/jit/s390/arch.h
+++ b/src/vm/jit/s390/arch.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: arch.h 7312 2007-02-10 00:49:37Z pm $
+   $Id: arch.h 7695 2007-04-12 19:49:34Z twisti $
 
 */
 
@@ -37,21 +37,17 @@
 
 #define U8_AVAILABLE                     1
 
-/* #define USEBUILTINTABLE */
-
 #define SUPPORT_DIVISION                 1
 #define SUPPORT_LONG                     1
 
 #define SUPPORT_I2F                      1
 #define SUPPORT_I2D                      1
-#define SUPPORT_L2F                      1
-#define SUPPORT_L2D                      1
+#define SUPPORT_L2F                      0
+#define SUPPORT_L2D                      0
 
-/* ATTENTION: x86_64 architectures support these conversions, but we
-   need the builtin functions in corner cases */
-#define SUPPORT_F2I                      0
+#define SUPPORT_F2I                      1
 #define SUPPORT_F2L                      0
-#define SUPPORT_D2I                      0
+#define SUPPORT_D2I                      1
 #define SUPPORT_D2L                      0
 
 #define SUPPORT_LONG_ADD                 1
@@ -59,11 +55,11 @@
 #define SUPPORT_LONG_CMP_CONST           1
 #define SUPPORT_LONG_LOGICAL             1
 #define SUPPORT_LONG_SHIFT               1
-#define SUPPORT_LONG_MUL                 1
-#define SUPPORT_LONG_DIV                 1
+#define SUPPORT_LONG_MUL                 0
+#define SUPPORT_LONG_DIV                 0
 
-#define SUPPORT_LONG_DIV_POW2            1
-#define SUPPORT_LONG_REM_POW2            1
+#define SUPPORT_LONG_DIV_POW2            0
+#define SUPPORT_LONG_REM_POW2            0
 
 #define SUPPORT_CONST_LOGICAL            1  /* AND, OR, XOR with immediates   */
 #define SUPPORT_CONST_MUL                1  /* mutiply with immediate         */
@@ -98,6 +94,9 @@
 #define CONSECUTIVE_INTEGER_ARGS
 #define CONSECUTIVE_FLOAT_ARGS
 
+#define HAS_4BYTE_STACKSLOT
+#define SUPPORT_COMBINE_INTEGER_REGISTERS
+
 #endif /* _ARCH_H */