X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fmini-x86.h;h=9d0812ec5dacab592dfa34255d35c455b8576f3e;hb=4ed696564fa7c92d6f6e678a72e5db267f2c1590;hp=994899a79c359fd3686c68b1440793615faeaaa0;hpb=a8b22e0e864c03b8cfd2f2cb5a8075b6611c5553;p=mono.git diff --git a/mono/mini/mini-x86.h b/mono/mini/mini-x86.h index 994899a79c3..9d0812ec5da 100644 --- a/mono/mini/mini-x86.h +++ b/mono/mini/mini-x86.h @@ -43,30 +43,37 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep); #endif /* PLATFORM_WIN32 */ -#if defined( __linux__) || defined(__sun) || defined(__APPLE__) +#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 #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 @@ -115,9 +122,13 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep); #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; @@ -141,7 +152,17 @@ typedef void* MonoCompileArch; #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__) +#elif defined(__APPLE__) && defined(_STRUCT_MCONTEXT) + #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(__APPLE__) && !defined(_STRUCT_MCONTEXT) #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) @@ -151,6 +172,16 @@ typedef void* MonoCompileArch; #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]) @@ -215,6 +246,7 @@ typedef struct { } \ MONO_CONTEXT_SET_IP ((ctx), (start_func)); \ MONO_CONTEXT_SET_BP ((ctx), stackptr); \ + MONO_CONTEXT_SET_SP ((ctx), stackptr); \ } while (0) #else @@ -223,6 +255,7 @@ typedef struct { 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 @@ -231,15 +264,33 @@ typedef struct { #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_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_ATOMIC_ADD 1 +#define MONO_ARCH_HAVE_ATOMIC_EXCHANGE 1 +#define MONO_ARCH_HAVE_ATOMIC_CAS_IMM 1 +#define MONO_ARCH_HAVE_IMT 1 +#define MONO_ARCH_HAVE_TLS_GET 1 +#define MONO_ARCH_IMT_REG X86_EDX +#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 + +#if !defined(__APPLE__) +#define MONO_ARCH_AOT_SUPPORTED 1 +#endif + +typedef struct { + guint8 *address; + guint8 saved_byte; +} MonoBreakpointInfo; + +extern MonoBreakpointInfo mono_breakpoint_info [MONO_BREAKPOINT_ARRAY_SIZE]; #endif /* __MONO_MINI_X86_H__ */