#endif /* PLATFORM_WIN32 */
-#ifdef sun // Solaris x86
-# 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
-
-#ifdef __linux__
+#if defined( __linux__) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__)
#define MONO_ARCH_USE_SIGACTION
#endif
#ifndef PLATFORM_WIN32
#ifdef HAVE_WORKING_SIGALTSTACK
+/*
+ * solaris doesn't have pthread_getattr_np () needed by the sigaltstack setup
+ * code.
+ */
+#ifndef __sun
#define MONO_ARCH_SIGSEGV_ON_ALTSTACK
+#endif
#define MONO_ARCH_USE_SIGACTION
-/* FreeBSD and NetBSD need SA_STACK and MAP_ANON re-definitions */
-# if defined(__FreeBSD__) || defined(__NetBSD__)
-# ifndef SA_STACK
-# define SA_STACK SA_ONSTACK
-# endif
-# ifndef MAP_ANONYMOUS
-# define MAP_ANONYMOUS MAP_ANON
-# endif
-# endif /* BSDs */
-
#endif /* HAVE_WORKING_SIGALTSTACK */
#endif /* !PLATFORM_WIN32 */
-#define MONO_ARCH_SIGNAL_STACK_SIZE (64 * 1024)
+/* we should lower this size and make sure we don't call heavy stack users in the segv handler */
+#define MONO_ARCH_SIGNAL_STACK_SIZE (16 * 1024)
/* 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_ARCH_CPU_SPEC x86_desc
+
#define MONO_MAX_IREGS 8
#define MONO_MAX_FREGS 6
/* Parameters used by the register allocator */
-#define MONO_ARCH_HAS_XP_LOCAL_REGALLOC
-
#define MONO_ARCH_CALLEE_REGS X86_CALLEE_REGS
#define MONO_ARCH_CALLEE_SAVED_REGS X86_CALLER_REGS
#define MONO_ARCH_USE_FPSTACK TRUE
#define MONO_ARCH_FPSTACK_SIZE 6
-/* FIXME: Don't constrain byte regs to eax */
-#define MONO_ARCH_INST_FIXED_REG(desc) ((desc == 's') ? X86_ECX : ((desc == 'a') ? X86_EAX : ((desc == 'd') ? X86_EDX : ((desc == 'y') ? X86_EAX : ((desc == 'l') ? X86_EAX : -1)))))
+#define MONO_ARCH_INST_FIXED_REG(desc) (((desc == ' ') || (desc == 'i')) ? -1 : ((desc == 's') ? X86_ECX : ((desc == 'a') ? X86_EAX : ((desc == 'd') ? X86_EDX : ((desc == 'l') ? X86_EAX : -1)))))
+
+#define MONO_ARCH_INST_FIXED_MASK(desc) ((desc == 'y') ? (X86_BYTE_REGS) : 0)
/* RDX is clobbered by the opcode implementation before accessing sreg2 */
#define MONO_ARCH_INST_SREG2_MASK(ins) (((ins [MONO_INST_CLOB] == 'a') || (ins [MONO_INST_CLOB] == 'd')) ? (1 << X86_EDX) : 0)
#define MONO_ARCH_INST_IS_REGPAIR(desc) (desc == 'l' || desc == 'L')
#define MONO_ARCH_INST_REGPAIR_REG2(desc,hreg1) (desc == 'l' ? X86_EDX : -1)
+#if defined(__APPLE__)
+#define MONO_ARCH_FRAME_ALIGNMENT 16
+#else
#define MONO_ARCH_FRAME_ALIGNMENT 4
+#endif
/* fixme: align to 16byte instead of 32byte (we align to 32byte to get
* reproduceable results for benchmarks */
#define MONO_ARCH_RETREG1 X86_EAX
#define MONO_ARCH_RETREG2 X86_EDX
+#define MONO_ARCH_AOT_PLT_OFFSET_REG X86_EAX
+
#define MONO_ARCH_ENCODE_LREG(r1,r2) (r1 | (r2<<3))
#define inst_dreg_low dreg&7
#define inst_sreg2_high sreg2>>3
struct MonoLMF {
- gpointer previous_lmf;
+ /* Offset by 1 if this is a trampoline LMF frame */
+ guint32 previous_lmf;
gpointer lmf_addr;
+ /* Only set in trampoline LMF frames */
MonoMethod *method;
+ /* Only set in trampoline LMF frames */
+ guint32 esp;
guint32 ebx;
guint32 edi;
guint32 esi;
typedef void* MonoCompileArch;
+#if defined(__FreeBSD__) || defined(__APPLE__)
+#include <ucontext.h>
+#endif
+
+#if defined(__FreeBSD__)
+ #define UCONTEXT_REG_EAX(ctx) ((ctx)->uc_mcontext.mc_eax)
+ #define UCONTEXT_REG_EBX(ctx) ((ctx)->uc_mcontext.mc_ebx)
+ #define UCONTEXT_REG_ECX(ctx) ((ctx)->uc_mcontext.mc_ecx)
+ #define UCONTEXT_REG_EDX(ctx) ((ctx)->uc_mcontext.mc_edx)
+ #define UCONTEXT_REG_EBP(ctx) ((ctx)->uc_mcontext.mc_ebp)
+ #define UCONTEXT_REG_ESP(ctx) ((ctx)->uc_mcontext.mc_esp)
+ #define UCONTEXT_REG_ESI(ctx) ((ctx)->uc_mcontext.mc_esi)
+ #define UCONTEXT_REG_EDI(ctx) ((ctx)->uc_mcontext.mc_edi)
+ #define UCONTEXT_REG_EIP(ctx) ((ctx)->uc_mcontext.mc_eip)
+#elif defined(__APPLE__)
+ #define UCONTEXT_REG_EAX(ctx) ((ctx)->uc_mcontext->ss.eax)
+ #define UCONTEXT_REG_EBX(ctx) ((ctx)->uc_mcontext->ss.ebx)
+ #define UCONTEXT_REG_ECX(ctx) ((ctx)->uc_mcontext->ss.ecx)
+ #define UCONTEXT_REG_EDX(ctx) ((ctx)->uc_mcontext->ss.edx)
+ #define UCONTEXT_REG_EBP(ctx) ((ctx)->uc_mcontext->ss.ebp)
+ #define UCONTEXT_REG_ESP(ctx) ((ctx)->uc_mcontext->ss.esp)
+ #define UCONTEXT_REG_ESI(ctx) ((ctx)->uc_mcontext->ss.esi)
+ #define UCONTEXT_REG_EDI(ctx) ((ctx)->uc_mcontext->ss.edi)
+ #define UCONTEXT_REG_EIP(ctx) ((ctx)->uc_mcontext->ss.eip)
+#elif defined(__NetBSD__)
+ #define UCONTEXT_REG_EAX(ctx) ((ctx)->uc_mcontext.__gregs [_REG_EAX])
+ #define UCONTEXT_REG_EBX(ctx) ((ctx)->uc_mcontext.__gregs [_REG_EBX])
+ #define UCONTEXT_REG_ECX(ctx) ((ctx)->uc_mcontext.__gregs [_REG_ECX])
+ #define UCONTEXT_REG_EDX(ctx) ((ctx)->uc_mcontext.__gregs [_REG_EDX])
+ #define UCONTEXT_REG_EBP(ctx) ((ctx)->uc_mcontext.__gregs [_REG_EBP])
+ #define UCONTEXT_REG_ESP(ctx) ((ctx)->uc_mcontext.__gregs [_REG_ESP])
+ #define UCONTEXT_REG_ESI(ctx) ((ctx)->uc_mcontext.__gregs [_REG_ESI])
+ #define UCONTEXT_REG_EDI(ctx) ((ctx)->uc_mcontext.__gregs [_REG_EDI])
+ #define UCONTEXT_REG_EIP(ctx) ((ctx)->uc_mcontext.__gregs [_REG_EIP])
+#else
+ #define UCONTEXT_REG_EAX(ctx) ((ctx)->uc_mcontext.gregs [REG_EAX])
+ #define UCONTEXT_REG_EBX(ctx) ((ctx)->uc_mcontext.gregs [REG_EBX])
+ #define UCONTEXT_REG_ECX(ctx) ((ctx)->uc_mcontext.gregs [REG_ECX])
+ #define UCONTEXT_REG_EDX(ctx) ((ctx)->uc_mcontext.gregs [REG_EDX])
+ #define UCONTEXT_REG_EBP(ctx) ((ctx)->uc_mcontext.gregs [REG_EBP])
+ #define UCONTEXT_REG_ESP(ctx) ((ctx)->uc_mcontext.gregs [REG_ESP])
+ #define UCONTEXT_REG_ESI(ctx) ((ctx)->uc_mcontext.gregs [REG_ESI])
+ #define UCONTEXT_REG_EDI(ctx) ((ctx)->uc_mcontext.gregs [REG_EDI])
+ #define UCONTEXT_REG_EIP(ctx) ((ctx)->uc_mcontext.gregs [REG_EIP])
+#endif
+
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
# define SC_EAX sc_eax
# define SC_EBX sc_ebx
} \
MONO_CONTEXT_SET_IP ((ctx), (start_func)); \
MONO_CONTEXT_SET_BP ((ctx), stackptr); \
-} while (0)
-
-#define MONO_INIT_CONTEXT_FROM_CALLER(ctx) do { \
- unsigned int stackptr, retaddr; \
- { \
- __asm mov stackptr, ebp \
- __asm mov eax, DWORD PTR [ebp + 4] \
- __asm mov retaddr, eax \
- } \
- MONO_CONTEXT_SET_IP ((ctx), retaddr); \
- /* FIXME: NOT WORKING -- THIS IS __builtin_frame_address (0) NOT (1) */ \
- MONO_CONTEXT_SET_BP ((ctx), stackptr); \
+ MONO_CONTEXT_SET_SP ((ctx), stackptr); \
} while (0)
#else
mono_arch_flush_register_windows (); \
MONO_CONTEXT_SET_IP ((ctx), (start_func)); \
MONO_CONTEXT_SET_BP ((ctx), __builtin_frame_address (0)); \
+ MONO_CONTEXT_SET_SP ((ctx), __builtin_frame_address (0)); \
} while (0)
#endif
#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_ENABLE_MONO_LMF_VAR 1
#define MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN 1
#define MONO_ARCH_HAVE_CREATE_SPECIFIC_TRAMPOLINE 1
#define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE 1
#define MONO_ARCH_HAVE_CREATE_VARS 1
+#define MONO_ARCH_HAVE_IMT 1
+#define MONO_ARCH_IMT_REG X86_EDX
+#define MONO_ARCH_COMMON_VTABLE_TRAMPOLINE 1
+
+#define MONO_ARCH_AOT_SUPPORTED 1
#endif /* __MONO_MINI_X86_H__ */
projects / mono.git / blobdiff