X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mono%2Fmini%2Fmini-amd64.h;h=6efc0c7b605226a82a3bde920aef57c73ed78598;hb=3fa714d92208ba69e12bb18b56dd518eb91d606a;hp=c2f8a8637434eae8ec072017eddce2ba47a3c8e6;hpb=8112493a2869b4d0dec8ae0c137e6b9aaa1f9e70;p=mono.git diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h index c2f8a863743..6efc0c7b605 100644 --- a/mono/mini/mini-amd64.h +++ b/mono/mini/mini-amd64.h @@ -3,8 +3,29 @@ #include #include +#include #include +#ifdef __native_client_codegen__ +#define kNaClAlignmentAMD64 32 +#define kNaClAlignmentMaskAMD64 (kNaClAlignmentAMD64 - 1) + +/* TODO: use kamd64NaClLengthOfCallImm */ +/* temporarily using kNaClAlignmentAMD64 so padding in */ +/* image-writer.c doesn't happen */ +#define kNaClLengthOfCallImm kNaClAlignmentAMD64 + +int is_nacl_call_reg_sequence (guint8* code); +void amd64_nacl_clear_legacy_prefix_tag (); +void amd64_nacl_tag_legacy_prefix (guint8* code); +void amd64_nacl_tag_rex (guint8* code); +guint8* amd64_nacl_get_legacy_prefix_tag (); +guint8* amd64_nacl_get_rex_tag (); +void amd64_nacl_instruction_pre (); +void amd64_nacl_instruction_post (guint8 **start, guint8 **end); +void amd64_nacl_membase_handler (guint8** code, gint8 basereg, gint32 offset, gint8 dreg); +#endif + #ifdef HOST_WIN32 #include /* use SIG* defines if possible */ @@ -76,8 +97,6 @@ struct sigcontext { }; #endif // sun, Solaris x86 -#define MONO_ARCH_SUPPORT_SIMD_INTRINSICS 1 - #ifndef DISABLE_SIMD #define MONO_ARCH_SIMD_INTRINSICS 1 #define MONO_ARCH_NEED_SIMD_BANK 1 @@ -86,7 +105,11 @@ struct sigcontext { +#if defined(__APPLE__) +#define MONO_ARCH_SIGNAL_STACK_SIZE MINSIGSTKSZ +#else #define MONO_ARCH_SIGNAL_STACK_SIZE (16 * 1024) +#endif #define MONO_ARCH_HAVE_RESTORE_STACK_SUPPORT 1 @@ -146,7 +169,13 @@ struct MonoLMF { gpointer lmf_addr; /* This is only set in trampoline LMF frames */ MonoMethod *method; +#if defined(__default_codegen__) || defined(HOST_WIN32) guint64 rip; +#elif defined(__native_client_codegen__) + /* On 64-bit compilers, default alignment is 8 for this field, */ + /* this allows the structure to match for 32-bit compilers. */ + guint64 rip __attribute__ ((aligned(8))); +#endif guint64 rbx; guint64 rbp; guint64 rsp; @@ -161,10 +190,10 @@ struct MonoLMF { }; typedef struct MonoCompileArch { - gint32 lmf_offset; gint32 localloc_offset; gint32 reg_save_area_offset; gint32 stack_alloc_size; + gint32 sp_fp_offset; gboolean omit_fp, omit_fp_computed, no_pushes; gpointer cinfo; gint32 async_point_count; @@ -172,33 +201,11 @@ typedef struct MonoCompileArch { #ifdef HOST_WIN32 gpointer unwindinfo; #endif + gpointer seq_point_info_var; gpointer ss_trigger_page_var; + gpointer lmf_var; } MonoCompileArch; -typedef struct { - guint64 rax; - guint64 rbx; - guint64 rcx; - guint64 rdx; - guint64 rbp; - guint64 rsp; - guint64 rsi; - guint64 rdi; - guint64 rip; - guint64 r12; - guint64 r13; - guint64 r14; - guint64 r15; -} MonoContext; - -#define MONO_CONTEXT_SET_IP(ctx,ip) do { (ctx)->rip = (guint64)(ip); } while (0); -#define MONO_CONTEXT_SET_BP(ctx,bp) do { (ctx)->rbp = (guint64)(bp); } while (0); -#define MONO_CONTEXT_SET_SP(ctx,esp) do { (ctx)->rsp = (guint64)(esp); } while (0); - -#define MONO_CONTEXT_GET_IP(ctx) ((gpointer)((ctx)->rip)) -#define MONO_CONTEXT_GET_BP(ctx) ((gpointer)((ctx)->rbp)) -#define MONO_CONTEXT_GET_SP(ctx) ((gpointer)((ctx)->rsp)) - #define MONO_CONTEXT_SET_LLVM_EXC_REG(ctx, exc) do { (ctx)->rax = (gsize)exc; } while (0) #define MONO_ARCH_INIT_TOP_LMF_ENTRY(lmf) @@ -231,22 +238,13 @@ typedef struct { #endif -/* - * This structure is an extension of MonoLMF and contains extra information. - */ -typedef struct { - struct MonoLMF lmf; - gboolean debugger_invoke; - MonoContext ctx; /* if debugger_invoke is TRUE */ -} MonoLMFExt; - /* * some icalls like mono_array_new_va needs to be called using a different * calling convention. */ #define MONO_ARCH_VARARG_ICALLS 1 -#ifndef HOST_WIN32 +#if !defined( HOST_WIN32 ) && !defined(__native_client__) && !defined(__native_client_codegen__) #define MONO_ARCH_USE_SIGACTION 1 @@ -256,7 +254,7 @@ typedef struct { #endif -#endif /* HOST_WIN32 */ +#endif /* !HOST_WIN32 && !__native_client__ */ #if defined (__APPLE__) @@ -288,6 +286,10 @@ typedef struct { #define MONO_ARCH_NOMAP32BIT +#elif defined (__DragonFly__) + +#define MONO_ARCH_NOMAP32BIT + #elif defined (__FreeBSD__) #define REG_RAX 7 @@ -332,24 +334,26 @@ typedef struct { #define MONO_ARCH_HAVE_IS_INT_OVERFLOW 1 #define MONO_ARCH_ENABLE_REGALLOC_IN_EH_BLOCKS 1 +#if !defined(__APPLE__) #define MONO_ARCH_ENABLE_MONO_LMF_VAR 1 +#endif #define MONO_ARCH_HAVE_INVALIDATE_METHOD 1 #define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE 1 #define MONO_ARCH_HAVE_ATOMIC_ADD 1 #define MONO_ARCH_HAVE_ATOMIC_EXCHANGE 1 #define MONO_ARCH_HAVE_ATOMIC_CAS 1 #define MONO_ARCH_HAVE_FULL_AOT_TRAMPOLINES 1 -#define MONO_ARCH_HAVE_FULL_AOT_TRAMPOLINES_2 1 #define MONO_ARCH_HAVE_IMT 1 -#define MONO_ARCH_HAVE_TLS_GET 1 +#define MONO_ARCH_HAVE_TLS_GET (mono_amd64_have_tls_get ()) #define MONO_ARCH_IMT_REG AMD64_R10 +#define MONO_ARCH_IMT_SCRATCH_REG AMD64_R11 #define MONO_ARCH_VTABLE_REG MONO_AMD64_ARG_REG1 /* * We use r10 for the imt/rgctx register rather than r11 because r11 is * used by the trampoline as a scratch register and hence might be * clobbered across method call boundaries. */ -#define MONO_ARCH_RGCTX_REG AMD64_R10 +#define MONO_ARCH_RGCTX_REG MONO_ARCH_IMT_REG #define MONO_ARCH_HAVE_CMOV_OPS 1 #define MONO_ARCH_HAVE_NOTIFY_PENDING_EXC 1 #define MONO_ARCH_HAVE_EXCEPTIONS_INIT 1 @@ -361,14 +365,11 @@ typedef struct { #if !defined(HOST_WIN32) #define MONO_ARCH_MONITOR_OBJECT_REG MONO_AMD64_ARG_REG1 #endif -#define MONO_ARCH_HAVE_STATIC_RGCTX_TRAMPOLINE 1 #define MONO_ARCH_HAVE_GET_TRAMPOLINES 1 #define MONO_ARCH_AOT_SUPPORTED 1 -#ifndef HOST_WIN32 +#if !defined( HOST_WIN32 ) && !defined( __native_client__ ) #define MONO_ARCH_SOFT_DEBUG_SUPPORTED 1 -#else -#define DISABLE_DEBUGGER_AGENT 1 #endif #if !defined(HOST_WIN32) || defined(__sun) @@ -390,9 +391,16 @@ typedef struct { #define MONO_ARCH_THIS_AS_FIRST_ARG 1 #define MONO_ARCH_HAVE_HANDLER_BLOCK_GUARD 1 #define MONO_ARCH_HAVE_CARD_TABLE_WBARRIER 1 +#define MONO_ARCH_HAVE_SETUP_RESUME_FROM_SIGNAL_HANDLER_CTX 1 +#define MONO_ARCH_GC_MAPS_SUPPORTED 1 +#define MONO_ARCH_HAVE_CONTEXT_SET_INT_REG 1 +#define MONO_ARCH_HAVE_SETUP_ASYNC_CALLBACK 1 +#define MONO_ARCH_HAVE_CREATE_LLVM_NATIVE_THUNK 1 +gboolean +mono_amd64_tail_call_supported (MonoMethodSignature *caller_sig, MonoMethodSignature *callee_sig) MONO_INTERNAL; -#define MONO_ARCH_USE_OP_TAIL_CALL(caller_sig, callee_sig) mono_metadata_signature_equal ((caller_sig), (callee_sig)) +#define MONO_ARCH_USE_OP_TAIL_CALL(caller_sig, callee_sig) mono_amd64_tail_call_supported (caller_sig, callee_sig) /* Used for optimization, not complete */ #define MONO_ARCH_IS_OP_MEMBASE(opcode) ((opcode) == OP_X86_PUSH_MEMBASE) @@ -428,6 +436,12 @@ mono_amd64_get_original_ip (void) MONO_INTERNAL; guint8* mono_amd64_emit_tls_get (guint8* code, int dreg, int tls_offset) MONO_INTERNAL; +gboolean +mono_amd64_have_tls_get (void) MONO_INTERNAL; + +GSList* +mono_amd64_get_exception_trampolines (gboolean aot) MONO_INTERNAL; + typedef struct { guint8 *address; guint8 saved_byte;