2009-01-04 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mono/mini/mini-x86.h b/mono/mini/mini-x86.h
index c1ecf90317ff0d23f0b6c52235e10cc5da6744e5..7c687ece033aa220c4a28bd1dce6cb08a5b73c89 100644 (file)
--- a/mono/mini/mini-x86.h
+++ b/mono/mini/mini-x86.h
@@ -282,13 +282,16 @@ typedef struct {
 #define MONO_ARCH_VTABLE_REG X86_EDX
 #define MONO_ARCH_COMMON_VTABLE_TRAMPOLINE 1
 #define MONO_ARCH_RGCTX_REG X86_EDX
-#define MONO_ARCH_ENABLE_NORMALIZE_OPCODES 1
 #define MONO_ARCH_HAVE_GENERALIZED_IMT_THUNK 1
+#if defined(__linux__) && !defined(HAVE_MOVING_COLLECTOR)
+#define MONO_ARCH_MONITOR_OBJECT_REG X86_EAX
+#endif
 
 #define MONO_ARCH_HAVE_CMOV_OPS 1
 
 #ifdef MONO_ARCH_SIMD_INTRINSICS
 #define MONO_ARCH_HAVE_DECOMPOSE_OPTS 1
+#define MONO_ARCH_HAVE_DECOMPOSE_LONG_OPTS 1
 #endif
 
 #if !defined(__APPLE__)
@@ -319,5 +322,8 @@ typedef struct {
 
 extern MonoBreakpointInfo mono_breakpoint_info [MONO_BREAKPOINT_ARRAY_SIZE];
 
+guint8*
+mono_x86_emit_tls_get (guint8* code, int dreg, int tls_offset) MONO_INTERNAL;
+
 #endif /* __MONO_MINI_X86_H__ */