PR148 again: don't defuse IF_LCMPxx

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

diff --git a/src/vm/jit/i386/arch.h b/src/vm/jit/i386/arch.h
index d5d71e803b16127c5de2c7b5e152dedb7c7b0073..1d90338e2d64bab5e7edd265504e2428b45d54d9 100644 (file)
--- a/src/vm/jit/i386/arch.h
+++ b/src/vm/jit/i386/arch.h
@@ -1,9 +1,7 @@
 /* src/vm/jit/i386/arch.h - architecture defines for i386
 
-   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
+   Copyright (C) 1996-2010
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -35,6 +33,21 @@
 
 /* define x86 register numbers ************************************************/
 
+#if !defined(__SOLARIS__) || !defined(SKIP_REG_DEFS)
+
+#if defined(__SOLARIS__)
+
+#undef EAX
+#undef ECX
+#undef EDX
+#undef EBX
+#undef ESP
+#undef EBP
+#undef ESI
+#undef EDI
+
+#endif
+
 #define EAX    0
 #define ECX    1
 #define EDX    2
@@ -44,6 +57,8 @@
 #define ESI    6
 #define EDI    7
 
+#endif
+
 /* define architecture features ***********************************************/
 
 #define SUPPORT_DIVISION                 1
@@ -118,10 +133,27 @@
 #define SUPPORT_HARDWARE_DIVIDE_BY_ZERO  1
 
 
+/* stackframe *****************************************************************/
+
+#define STACKFRMAE_RA_BETWEEN_FRAMES              1
+#define STACKFRAME_RA_TOP_OF_FRAME                0
+#define STACKFRAME_RA_LINKAGE_AREA                0
+#define STACKFRAME_LEAFMETHODS_RA_REGISTER        0
+#define STACKFRAME_SYNC_NEEDS_TWO_SLOTS           0
+
+
 /* replacement ****************************************************************/
 
 #define REPLACEMENT_PATCH_SIZE           2       /* bytes */
 
+/* subtype ********************************************************************/
+
+#define USES_NEW_SUBTYPE                 1
+
+/* memory barriers ************************************************************/
+
+#define CAS_PROVIDES_FULL_BARRIER        1
+
 #endif /* _ARCH_H */