X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fmini.h;h=e7fc859c250c3b22c299c1d6b94ace2ec2e3bb92;hb=4f187040c6f09094b6d53a3926931bcc73bcfd15;hp=a4b2cb23dc1d7dbcb4a326e89796029bc400ab9f;hpb=1bc7eca560fb35c7bfcc86a7ffefac19f8424021;p=mono.git diff --git a/mono/mini/mini.h b/mono/mini/mini.h index a4b2cb23dc1..e7fc859c250 100644 --- a/mono/mini/mini.h +++ b/mono/mini/mini.h @@ -43,14 +43,10 @@ #include "jit.h" #include "cfgdump.h" -#include "mono/metadata/class-internals.h" -#include "mono/metadata/domain-internals.h" -#include "mono/metadata/object.h" #include "mono/metadata/tabledefs.h" #include "mono/metadata/marshal.h" #include "mono/metadata/security-manager.h" #include "mono/metadata/exception.h" -#include "mono/utils/mono-compiler.h" #ifdef __native_client_codegen__ #include @@ -125,7 +121,7 @@ #endif /* Version number of the AOT file format */ -#define MONO_AOT_FILE_VERSION 138 +#define MONO_AOT_FILE_VERSION 139 //TODO: This is x86/amd64 specific. #define mono_simd_shuffle_mask(a,b,c,d) ((a) | ((b) << 2) | ((c) << 4) | ((d) << 6)) @@ -545,7 +541,6 @@ typedef struct MonoLMF MonoLMF; typedef struct MonoSpillInfo MonoSpillInfo; typedef struct MonoTraceSpec MonoTraceSpec; -extern MonoNativeTlsKey mono_jit_tls_id; extern MonoTraceSpec *mono_jit_trace_calls; extern gboolean mono_break_on_exc; extern int mono_exc_esp_offset; @@ -563,6 +558,7 @@ extern const char *mono_build_date; extern gboolean mono_do_signal_chaining; extern gboolean mono_do_crash_chaining; extern MONO_API gboolean mono_use_llvm; +extern MONO_API gboolean mono_use_interpreter; extern gboolean mono_do_single_method_regression; extern guint32 mono_single_method_regression_opt; extern MonoMethod *mono_current_single_method; @@ -571,6 +567,7 @@ extern GHashTable *mono_single_method_hash; extern gboolean mono_using_xdebug; extern int mini_verbose; extern int valgrind_register; +extern GList* mono_aot_paths; #define INS_INFO(opcode) (&ins_info [((opcode) - OP_START - 1) * 4]) @@ -589,6 +586,8 @@ extern const gint8 ins_sreg_counts []; #define MONO_BB_FOR_EACH_INS_SAFE(bb, n, ins) for ((ins) = (bb)->code, n = (ins) ? (ins)->next : NULL; (ins); (ins) = (n), (n) = (ins) ? (ins)->next : NULL) +#define MONO_BB_FOR_EACH_INS_REVERSE(bb, ins) for ((ins) = (bb)->last_ins; (ins); (ins) = (ins)->prev) + #define MONO_BB_FOR_EACH_INS_REVERSE_SAFE(bb, p, ins) for ((ins) = (bb)->last_ins, p = (ins) ? (ins)->prev : NULL; (ins); (ins) = (p), (p) = (ins) ? (ins)->prev : NULL) #define mono_bb_first_ins(bb) (bb)->code @@ -827,7 +826,7 @@ typedef struct { * in the structure. */ int nslots; - /* Only if storage == LLVMArgAsFpArgs/LLVMArgFpStruct (4/8) */ + /* Only if storage == LLVMArgAsIArgs/LLVMArgAsFpArgs/LLVMArgFpStruct (4/8) */ int esize; /* Parameter index in the LLVM signature */ int pindex; @@ -1278,6 +1277,8 @@ typedef enum { * which implements the method. */ MONO_RGCTX_INFO_VIRT_METHOD_BOX_TYPE, + /* Resolve to 2 (TRUE) or 1 (FALSE) */ + MONO_RGCTX_INFO_CLASS_IS_REF_OR_CONTAINS_REFS } MonoRgctxInfoType; typedef struct _MonoRuntimeGenericContextInfoTemplate { @@ -1495,8 +1496,6 @@ typedef struct { guint emulate_long_shift_opts : 1; guint have_objc_get_selector : 1; guint have_generalized_imt_trampoline : 1; - guint have_tls_get : 1; - guint have_tls_get_reg : 1; guint have_liverange_ops: 1; guint have_op_tail_call : 1; guint have_dummy_init : 1; @@ -1528,7 +1527,9 @@ typedef enum { /* Whenever to compile in llvm-only mode */ JIT_FLAG_LLVM_ONLY = (1 << 6), /* Whenever calls to pinvoke functions are made directly */ - JIT_FLAG_DIRECT_PINVOKE = (1 << 7) + JIT_FLAG_DIRECT_PINVOKE = (1 << 7), + /* Whenever this is a compile-all run and the result should be discarded */ + JIT_FLAG_DISCARD_RESULTS = (1 << 8), } JitFlags; /* Bit-fields in the MonoBasicBlock.region */ @@ -2086,12 +2087,6 @@ typedef struct { int type; } StackSlot; -#if HAVE_ARRAY_ELEM_INIT -extern const guint8 mono_burg_arity []; -#else -extern guint8 mono_burg_arity []; -#endif - extern const char MONO_ARCH_CPU_SPEC []; #define MONO_ARCH_CPU_SPEC_IDX_COMBINE(a) a ## _idx #define MONO_ARCH_CPU_SPEC_IDX(a) MONO_ARCH_CPU_SPEC_IDX_COMBINE(a) @@ -2133,12 +2128,13 @@ typedef struct { gboolean better_cast_details; gboolean mdb_optimizations; gboolean no_gdb_backtrace; - gboolean suspend_on_sigsegv; + gboolean suspend_on_native_crash; gboolean suspend_on_exception; gboolean suspend_on_unhandled; gboolean dyn_runtime_invoke; gboolean gdb; - gboolean arm_use_fallback_tls; + gboolean lldb; + gboolean use_fallback_tls; /* * Whenever data such as next sequence points and flags is required. * Next sequence points and flags are required by the debugger agent. @@ -2334,6 +2330,7 @@ MonoDomain* mini_init (const char *filename, const char *ru void mini_cleanup (MonoDomain *domain); MONO_API MonoDebugOptions *mini_get_debug_options (void); MONO_API gboolean mini_parse_debug_option (const char *option); +void mini_profiler_enable_with_options (const char *profile_options); /* graph dumping */ void mono_cfg_dump_create_context (MonoCompile *cfg); @@ -2393,7 +2390,7 @@ void mono_merge_basic_blocks (MonoCompile *cfg, MonoBasicBlock *b void mono_optimize_branches (MonoCompile *cfg); void mono_blockset_print (MonoCompile *cfg, MonoBitSet *set, const char *name, guint idom); -const char*mono_ji_type_to_string (MonoJumpInfoType type); +const char*mono_ji_type_to_string (MonoJumpInfoType type) MONO_LLVM_INTERNAL; void mono_print_ji (const MonoJumpInfo *ji); void mono_print_ins_index (int i, MonoInst *ins); GString *mono_print_ins_index_strbuf (int i, MonoInst *ins); @@ -2403,7 +2400,7 @@ void mono_print_code (MonoCompile *cfg, const char *msg); MONO_API void mono_print_method_from_ip (void *ip); MONO_API char *mono_pmip (void *ip); gboolean mono_debug_count (void); -MONO_API const char* mono_inst_name (int op); +MONO_LLVM_INTERNAL const char* mono_inst_name (int op); int mono_op_to_op_imm (int opcode); int mono_op_imm_to_op (int opcode); int mono_load_membase_to_load_mem (int opcode); @@ -2431,17 +2428,7 @@ void mono_set_lmf (MonoLMF *lmf); MonoJitTlsData* mono_get_jit_tls (void); MONO_API MonoDomain* mono_jit_thread_attach (MonoDomain *domain); MONO_API void mono_jit_set_domain (MonoDomain *domain); -gint32 mono_get_jit_tls_offset (void); -gint32 mono_get_lmf_tls_offset (void); -gint32 mono_get_lmf_addr_tls_offset (void); -int mini_get_tls_offset (MonoTlsKey key); -gboolean mini_tls_get_supported (MonoCompile *cfg, MonoTlsKey key); MonoInst* mono_create_tls_get (MonoCompile *cfg, MonoTlsKey key); -MonoInst* mono_get_jit_tls_intrinsic (MonoCompile *cfg); -MonoInst* mono_get_domain_intrinsic (MonoCompile* cfg); -MonoInst* mono_get_thread_intrinsic (MonoCompile* cfg); -MonoInst* mono_get_lmf_intrinsic (MonoCompile* cfg); -MonoInst* mono_get_lmf_addr_intrinsic (MonoCompile* cfg); GList *mono_varlist_insert_sorted (MonoCompile *cfg, GList *list, MonoMethodVar *mv, int sort_type); GList *mono_varlist_sort (MonoCompile *cfg, GList *list, int sort_type); void mono_analyze_liveness (MonoCompile *cfg); @@ -2464,6 +2451,7 @@ MonoInst* mono_emit_jit_icall (MonoCompile *cfg, gconstpointer func, MonoInst ** MonoInst* mono_emit_jit_icall_by_info (MonoCompile *cfg, int il_offset, MonoJitICallInfo *info, MonoInst **args); MonoInst* mono_emit_method_call (MonoCompile *cfg, MonoMethod *method, MonoInst **args, MonoInst *this_ins); void mono_create_helper_signatures (void); +MonoInst* mono_emit_native_call (MonoCompile *cfg, gconstpointer func, MonoMethodSignature *sig, MonoInst **args); gboolean mini_class_is_system_array (MonoClass *klass); MonoMethodSignature *mono_get_element_address_signature (int arity); @@ -2558,7 +2546,7 @@ void mono_draw_graph (MonoCompile *cfg, MonoGraphOptions void mono_add_ins_to_end (MonoBasicBlock *bb, MonoInst *inst); gpointer mono_create_ftnptr (MonoDomain *domain, gpointer addr); -MONO_API void mono_replace_ins (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins, MonoInst **prev, MonoBasicBlock *first_bb, MonoBasicBlock *last_bb); +void mono_replace_ins (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins, MonoInst **prev, MonoBasicBlock *first_bb, MonoBasicBlock *last_bb); int mono_find_method_opcode (MonoMethod *method); MonoJitICallInfo *mono_register_jit_icall (gconstpointer func, const char *name, MonoMethodSignature *sig, gboolean is_save); @@ -2619,6 +2607,7 @@ MonoFtnDesc *mini_create_llvmonly_ftndesc (MonoDomain *domain, gpointer add gboolean mono_running_on_valgrind (void); void* mono_global_codeman_reserve (int size); +void mono_global_codeman_foreach (MonoCodeManagerFunc func, void *user_data); const char *mono_regname_full (int reg, int bank); gint32* mono_allocate_stack_slots (MonoCompile *cfg, gboolean backward, guint32 *stack_size, guint32 *stack_align); void mono_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb); @@ -2754,6 +2743,7 @@ gboolean mono_arch_tail_call_supported (MonoCompile *cfg, MonoMethodSig int mono_arch_translate_tls_offset (int offset); gboolean mono_arch_opcode_supported (int opcode); void mono_arch_setup_resume_sighandler_ctx (MonoContext *ctx, gpointer func); +gboolean mono_arch_have_fast_tls (void); #ifdef MONO_ARCH_SOFT_FLOAT_FALLBACK gboolean mono_arch_is_soft_float (void); @@ -2827,6 +2817,7 @@ void mono_arch_notify_pending_exc (MonoThreadInfo *info); guint8* mono_arch_get_call_target (guint8 *code); guint32 mono_arch_get_plt_info_offset (guint8 *plt_entry, mgreg_t *regs, guint8 *code); GSList *mono_arch_get_trampolines (gboolean aot); +gpointer mono_arch_get_enter_icall_trampoline (MonoTrampInfo **info); /* Handle block guard */ gpointer mono_arch_install_handler_block_guard (MonoJitInfo *ji, MonoJitExceptionInfo *clause, MonoContext *ctx, gpointer new_value); @@ -2850,7 +2841,7 @@ typedef gboolean (*MonoJitStackWalk) (StackFrameInfo *frame, MonoCont void mono_exceptions_init (void); gboolean mono_handle_exception (MonoContext *ctx, MonoObject *obj); -void mono_handle_native_sigsegv (const char *signal, void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *siginfo); +void mono_handle_native_crash (const char *signal, void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *siginfo); MONO_API void mono_print_thread_dump (void *sigctx); MONO_API void mono_print_thread_dump_from_ctx (MonoContext *ctx); void mono_walk_stack_with_ctx (MonoJitStackWalk func, MonoContext *start_ctx, MonoUnwindOptions unwind_options, void *user_data); @@ -3188,7 +3179,6 @@ void mono_runtime_cleanup_handlers (void); void mono_runtime_setup_stat_profiler (void); void mono_runtime_shutdown_stat_profiler (void); void mono_runtime_posix_install_handlers (void); -pid_t mono_runtime_syscall_fork (void); void mono_gdb_render_native_backtraces (pid_t crashed_pid); void mono_cross_helpers_run (void); @@ -3208,21 +3198,12 @@ void MONO_SIG_HANDLER_SIGNATURE (mono_sigsegv_signal_handler); void MONO_SIG_HANDLER_SIGNATURE (mono_sigint_signal_handler) ; gboolean MONO_SIG_HANDLER_SIGNATURE (mono_chain_signal); -#ifndef MONO_ARCH_HAVE_TLS_GET -#define MONO_ARCH_HAVE_TLS_GET 0 -#endif - #ifdef MONO_ARCH_VARARG_ICALLS #define ARCH_VARARG_ICALLS 1 #else #define ARCH_VARARG_ICALLS 0 #endif -/* - * Native unwinder integration - */ -void mono_exception_native_unwind (void *ctx, MONO_SIG_HANDLER_INFO_TYPE *info); - /* * Coop support for trampolines */