* Removed all Id tags.

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

diff --git a/src/vm/jit/arm/arch.h b/src/vm/jit/arm/arch.h
index 992d902182f93d485c6c1fd43baea86a8f733a2f..a1175a355be9e7d26b6ff0eca08f7396311a97ea 100644 (file)
--- a/src/vm/jit/arm/arch.h
+++ b/src/vm/jit/arm/arch.h
@@ -1,6 +1,6 @@
 /* src/vm/jit/arm/arch.h - architecture defines for arm
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
    C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
    E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
    J. Wenninger, Institut f. Computersprachen - TU Wien
@@ -22,34 +22,21 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Michael Starzinger
-            Christian Thalinger
-
-   $Id: arch.h 6591 2007-01-02 19:14:25Z twisti $
-
 */
 
 
 #ifndef _ARCH_H
 #define _ARCH_H
 
+#include "config.h"
+
+
 /* define architecture features ***********************************************/
 
 #define U8_AVAILABLE                     1
 
-#define USEBUILTINTABLE
-
 #define SUPPORT_DIVISION                 0
 #define SUPPORT_LONG                     1
-#if defined(ENABLE_SOFTFLOAT)
-# define SUPPORT_FLOAT                   0
-# define SUPPORT_DOUBLE                  0
-#else
-# define SUPPORT_FLOAT                   1
-# define SUPPORT_DOUBLE                  1
-#endif /* defined(ENABLE_SOFTFLOAT) */
 
 #define SUPPORT_I2F                      1
 #define SUPPORT_I2D                      1
@@ -78,16 +65,47 @@
 #define SUPPORT_CONST_STORE_ZERO_ONLY    0  /* on some risc machines we can   */
                                             /* only store REG_ZERO            */
 
-#define HAS_4BYTE_STACKSLOT
+
+/* float **********************************************************************/
+
+#if defined(ENABLE_SOFTFLOAT)
+# define SUPPORT_FLOAT                   0
+#else
+# define SUPPORT_FLOAT                   1
+#endif
+
+#if defined(ENABLE_SOFT_FLOAT_CMP)
+# define SUPPORT_FLOAT_CMP               0
+#else
+# define SUPPORT_FLOAT_CMP               1
+#endif
+
+
+/* double *********************************************************************/
+
+#if defined(ENABLE_SOFTFLOAT)
+# define SUPPORT_DOUBLE                  0
+#else
+# define SUPPORT_DOUBLE                  1
+#endif
+
+#if defined(ENABLE_BUILTIN_FLOAT_CMP)
+# define SUPPORT_DOUBLE_CMP              0
+#else
+# define SUPPORT_DOUBLE_CMP              1
+#endif
+
+
 #define SUPPORT_COMBINE_INTEGER_REGISTERS
 #define SUPPORT_PASS_FLOATARGS_IN_INTREGS
 
-#define ALIGN_LONGS_IN_MEMORY       /* Align Longs and/or Doubles at          */
-#define ALIGN_DOUBLES_IN_MEMORY     /* 2*Stackslotsize relativ to stackframe  */
-/* Memory Positions for not Interface Stackslots (allocate_scratch_registers) */
-/* are not properly aligned in case HAS_4_BYTE_STACKSLOT is not defined!      */
-/* For HAS_4_BYTE_STACKSLOT archs no distinction is made between long and     */
-/* define SUPPORT_COMBINE_INTEGER_REGISTERS                                   */
+
+/* branches *******************************************************************/
+
+#define SUPPORT_BRANCH_CONDITIONAL_CONDITION_REGISTER       1
+#define SUPPORT_BRANCH_CONDITIONAL_UNSIGNED_CONDITIONS      1
+#define SUPPORT_BRANCH_CONDITIONAL_ONE_INTEGER_REGISTER     0
+#define SUPPORT_BRANCH_CONDITIONAL_TWO_INTEGER_REGISTERS    0
 
 
 /* exceptions *****************************************************************/
@@ -98,7 +116,6 @@
 /* replacement ****************************************************************/
 
 #define REPLACEMENT_PATCH_SIZE           4 /* bytes */
-#define REPLACEMENT_STUB_SIZE            5 /* words */
 
 #endif /* _ARCH_H */