* src/vm/jit/patcher-common.cpp: Conditionally restored NOP-insertion at

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

diff --git a/src/vm/jit/x86_64/arch.h b/src/vm/jit/x86_64/arch.h
index afe25ca1a8ce037afe28cc92bd3f42ea890891e8..ef425cb2148fa98812c8c205de464d3f913bd3f7 100644 (file)
--- a/src/vm/jit/x86_64/arch.h
+++ b/src/vm/jit/x86_64/arch.h
@@ -1,9 +1,7 @@
 /* src/vm/jit/x86_64/arch.h - architecture defines for x86_64
 
-   Copyright (C) 1996-2005, 2006 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
+   Copyright (C) 1996-2008, 2009
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,30 +20,21 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes:
-
-   $Id: arch.h 6134 2006-12-07 20:14:40Z edwin $
-
 */
 
 
 #ifndef _ARCH_H
 #define _ARCH_H
 
-/* define architecture features ***********************************************/
+#define JIT_COMPILER_VIA_SIGNAL
 
-#define U8_AVAILABLE                     1
+#include "config.h"
 
-/* #define USEBUILTINTABLE */
+
+/* define architecture features ***********************************************/
 
 #define SUPPORT_DIVISION                 1
 #define SUPPORT_LONG                     1
-#define SUPPORT_FLOAT                    1
-#define SUPPORT_DOUBLE                   1
 
 #define SUPPORT_I2F                      1
 #define SUPPORT_I2D                      1
@@ -77,13 +66,67 @@
 #define SUPPORT_CONST_STORE_ZERO_ONLY    0  /* on some risc machines we can   */
                                             /* only store REG_ZERO            */
 
+
+/* float **********************************************************************/
+
+#define SUPPORT_FLOAT                    1
+
+#if defined(ENABLE_SOFT_FLOAT_CMP)
+# define SUPPORT_FLOAT_CMP               0
+#else
+# define SUPPORT_FLOAT_CMP               1
+#endif
+
+
+/* double *********************************************************************/
+
+#define SUPPORT_DOUBLE                   1
+
+#if defined(ENABLE_SOFT_FLOAT_CMP)
+# define SUPPORT_DOUBLE_CMP              0
+#else
+# define SUPPORT_DOUBLE_CMP              1
+#endif
+
+
 #define CONSECUTIVE_INTEGER_ARGS
 #define CONSECUTIVE_FLOAT_ARGS
 
+
+/* branches *******************************************************************/
+
+#define SUPPORT_BRANCH_CONDITIONAL_CONDITION_REGISTER       1
+#define SUPPORT_BRANCH_CONDITIONAL_ONE_INTEGER_REGISTER     0
+#define SUPPORT_BRANCH_CONDITIONAL_TWO_INTEGER_REGISTERS    0
+#define SUPPORT_BRANCH_CONDITIONAL_UNSIGNED_CONDITIONS      1
+
+
+/* exceptions *****************************************************************/
+
+#define SUPPORT_HARDWARE_DIVIDE_BY_ZERO  1
+
+
+/* stackframe *****************************************************************/
+
+#define STACKFRMAE_RA_BETWEEN_FRAMES              1
+#define STACKFRAME_RA_TOP_OF_FRAME                0
+#define STACKFRAME_LEAFMETHODS_RA_REGISTER        0
+#define STACKFRAME_SYNC_NEEDS_TWO_SLOTS           0
+
+
 /* replacement ****************************************************************/
 
-#define REPLACEMENT_PATCH_SIZE           5             /* bytes */
-#define REPLACEMENT_STUB_SIZE            (10+2+10+2+1) /* bytes */
+#define REPLACEMENT_PATCH_SIZE           2             /* bytes */
+
+/* subtype ********************************************************************/
+
+#define USES_NEW_SUBTYPE                 1
+
+/* memory barriers ************************************************************/
+
+#define CAS_PROVIDES_FULL_BARRIER        1
+
+#define USES_PATCHABLE_MEMORY_BARRIER    1
 
 #endif /* _ARCH_H */
 
@@ -99,4 +142,5 @@
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */