more c*****y windows issues.

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

diff --git a/mono/mini/mini-x86.h b/mono/mini/mini-x86.h
index 401f9be2f1d775192ad4bf2c43fb5cbcfeae1d1d..b3ce1f5ce6f12a331760eefb3f1c4eb32f210d47 100644 (file)
--- a/mono/mini/mini-x86.h
+++ b/mono/mini/mini-x86.h
@@ -43,6 +43,37 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep);
 
 #endif /* PLATFORM_WIN32 */
 
+#ifdef sun    // Solaris x86
+#  undef SIGSEGV_ON_ALTSTACK
+#  define MONO_ARCH_USE_SIGACTION 1
+struct sigcontext {
+        unsigned short gs, __gsh;
+        unsigned short fs, __fsh;
+        unsigned short es, __esh;
+        unsigned short ds, __dsh;
+        unsigned long edi;
+        unsigned long esi;
+        unsigned long ebp;
+        unsigned long esp;
+        unsigned long ebx;
+        unsigned long edx;
+        unsigned long ecx;
+        unsigned long eax;
+        unsigned long trapno;
+        unsigned long err;
+        unsigned long eip;
+        unsigned short cs, __csh;
+        unsigned long eflags;
+        unsigned long esp_at_signal;
+        unsigned short ss, __ssh;
+        unsigned long fpstate[95];
+      unsigned long filler[5];
+};
+#endif  // sun, Solaris x86
+
+/* Enables OP_LSHL, OP_LSHL_IMM, OP_LSHR, OP_LSHR_IMM, OP_LSHR_UN, OP_LSHR_UN_IMM */
+#define MONO_ARCH_NO_EMULATE_LONG_SHIFT_OPS
+
 #define MONO_MAX_IREGS 8
 #define MONO_MAX_FREGS 6
 
@@ -69,10 +100,10 @@ struct MonoLMF {
        gpointer    previous_lmf;
        gpointer    lmf_addr;
        MonoMethod *method;
-       guint32     ebp;
-       guint32     esi;
-       guint32     edi;
        guint32     ebx;
+       guint32     edi;
+       guint32     esi;
+       guint32     ebp;
        guint32     eip;
 };
 
@@ -111,6 +142,12 @@ typedef struct sigcontext MonoContext;
 #define MONO_CONTEXT_GET_BP(ctx) ((gpointer)((ctx)->SC_EBP))
 #define MONO_CONTEXT_GET_SP(ctx) ((gpointer)((ctx)->SC_ESP))
 
+#define MONO_INIT_CONTEXT_FROM_FUNC(ctx,start_func) do {       \
+               mono_arch_flush_register_windows ();    \
+               MONO_CONTEXT_SET_IP ((ctx), (start_func));      \
+               MONO_CONTEXT_SET_BP ((ctx), __builtin_frame_address (0));       \
+       } while (0)
+
 #ifndef PLATFORM_WIN32
 #ifdef HAVE_WORKING_SIGALTSTACK
 #define MONO_ARCH_SIGSEGV_ON_ALTSTACK
@@ -122,7 +159,18 @@ typedef struct sigcontext MonoContext;
 
 #endif
 
+void mono_x86_tramp_init (void);
+
 #define MONO_ARCH_BIGMUL_INTRINS 1
+#define MONO_ARCH_NEED_DIV_CHECK 1
+#define MONO_ARCH_HAVE_IS_INT_OVERFLOW 1
+#define MONO_ARCH_HAVE_INVALIDATE_METHOD 1
+#define MONO_ARCH_HAVE_PIC_AOT 1
+#define MONO_ARCH_NEED_GOT_VAR 1
+#define MONO_ARCH_HAVE_THROW_CORLIB_EXCEPTION 1
+#define MONO_ARCH_ENABLE_EMIT_STATE_OPT 1
+#define MONO_ARCH_HAVE_OUT_OF_LINE_BBLOCKS 1
+#define MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN
 
 #endif /* __MONO_MINI_X86_H__ */