X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fmini.h;h=1fc3c4786867136927bee83a6906b20fb919767b;hb=3c4158a4004faedc3be00b731494a76c58eb34f8;hp=b448395bcbe09d73ce4ac5ad2417cc0465539e94;hpb=96f2570272f540b40735676e7158bfbfc9fd1e9b;p=mono.git diff --git a/mono/mini/mini.h b/mono/mini/mini.h index b448395bcbe..1fc3c478686 100644 --- a/mono/mini/mini.h +++ b/mono/mini/mini.h @@ -50,7 +50,7 @@ #endif /* Version number of the AOT file format */ -#define MONO_AOT_FILE_VERSION "29" +#define MONO_AOT_FILE_VERSION "32" #if 0 #define mono_bitset_foreach_bit(set,b,n) \ @@ -105,6 +105,12 @@ enum { } \ } while (0) +#define NULLIFY_INS(ins) do { \ + (ins)->opcode = OP_NOP; \ + (ins)->dreg = (ins)->sreg1 = (ins)->sreg2 = -1; \ + (ins)->ssa_op = MONO_SSA_NOP; \ + } while (0) + typedef struct MonoInst MonoInst; typedef struct MonoCallInst MonoCallInst; typedef struct MonoCallArgParm MonoCallArgParm; @@ -124,7 +130,15 @@ extern int mono_exc_esp_offset; #else extern gboolean mono_compile_aot; #endif -extern gboolean mono_use_security_manager; + +typedef enum { + MONO_SECURITY_MODE_NONE, + MONO_SECURITY_MODE_CORE_CLR, + MONO_SECURITY_MODE_CAS, + MONO_SECURITY_MODE_SMCS_HACK +} MonoSecurityMode; + +extern MonoSecurityMode mono_security_mode; struct MonoEdge { MonoEdge *next; @@ -133,9 +147,6 @@ struct MonoEdge { }; struct MonoSpillInfo { -#ifndef MONO_ARCH_HAS_XP_REGALLOC - MonoSpillInfo *next; -#endif int offset; }; @@ -204,7 +215,7 @@ struct MonoBasicBlock { MonoBitSet *dominators; MonoBitSet *dfrontier; MonoBasicBlock *idom; - GList *dominated; + GSList *dominated; /* fast dominator algorithm */ MonoBasicBlock *df_parent, *ancestor, *child, *label; MonoEdge *bucket; @@ -254,7 +265,7 @@ struct MonoBasicBlock { guint region; /* The current symbolic register number, used in local register allocation. */ - guint32 max_ireg, max_freg; + guint32 max_vreg; }; /* BBlock flags */ @@ -319,10 +330,8 @@ struct MonoCallInst { gboolean virtual; regmask_t used_iregs; regmask_t used_fregs; -#if defined(MONO_ARCH_HAS_XP_LOCAL_REGALLOC) GSList *out_ireg_args; GSList *out_freg_args; -#endif }; struct MonoCallArgParm { @@ -390,12 +399,14 @@ enum { MONO_INST_DEST, MONO_INST_SRC1, MONO_INST_SRC2, - MONO_INST_FLAGS, + MONO_INST_LEN, MONO_INST_CLOB, + /* Unused, commented out to reduce the size of the mdesc tables + MONO_INST_FLAGS, MONO_INST_COST, MONO_INST_DELAY, MONO_INST_RES, - MONO_INST_LEN, + */ MONO_INST_MAX }; @@ -441,37 +452,10 @@ typedef struct { } MonoJitTlsData; typedef enum { - MONO_PATCH_INFO_BB, - MONO_PATCH_INFO_ABS, - MONO_PATCH_INFO_LABEL, - MONO_PATCH_INFO_METHOD, - MONO_PATCH_INFO_METHOD_JUMP, - MONO_PATCH_INFO_METHOD_REL, - MONO_PATCH_INFO_METHODCONST, - MONO_PATCH_INFO_INTERNAL_METHOD, - MONO_PATCH_INFO_SWITCH, - MONO_PATCH_INFO_EXC, - MONO_PATCH_INFO_EXC_NAME, - MONO_PATCH_INFO_CLASS, - MONO_PATCH_INFO_IMAGE, - MONO_PATCH_INFO_FIELD, - MONO_PATCH_INFO_VTABLE, - MONO_PATCH_INFO_CLASS_INIT, - MONO_PATCH_INFO_SFLDA, - MONO_PATCH_INFO_LDSTR, - MONO_PATCH_INFO_LDTOKEN, - MONO_PATCH_INFO_TYPE_FROM_HANDLE, - MONO_PATCH_INFO_R4, - MONO_PATCH_INFO_R8, - MONO_PATCH_INFO_IP, - MONO_PATCH_INFO_IID, - MONO_PATCH_INFO_ADJUSTED_IID, - MONO_PATCH_INFO_BB_OVF, - MONO_PATCH_INFO_EXC_OVF, - MONO_PATCH_INFO_WRAPPER, - MONO_PATCH_INFO_GOT_OFFSET, - MONO_PATCH_INFO_DECLSEC, - MONO_PATCH_INFO_NONE +#define PATCH_INFO(a,b) MONO_PATCH_INFO_ ## a, +#include "patch-info.h" +#undef PATCH_INFO + MONO_PATCH_INFO_NUM } MonoJumpInfoType; /* @@ -558,7 +542,7 @@ typedef struct { MonoBasicBlock *bb_exit; MonoBasicBlock *bb_init; MonoBasicBlock **bblocks; - GHashTable *bb_hash; + MonoBasicBlock **cil_offset_to_bb; MonoMemPool *state_pool; /* used by instruction selection */ MonoBasicBlock *cbb; /* used by instruction selection */ MonoInst *prev_ins; /* in decompose */ @@ -571,6 +555,7 @@ typedef struct { guint varinfo_count; /* total storage in varinfo */ gint stack_offset; gint max_ireg; + gint cil_offset_to_bb_len; MonoRegState *rs; MonoSpillInfo *spill_info; /* machine register spills */ MonoSpillInfo *spill_info_float; /* fp register spills */ @@ -580,6 +565,7 @@ typedef struct { MonoMethod *inlined_method; /* the method which is currently inlined */ MonoInst *domainvar; /* a cache for the current domain */ MonoInst *got_var; /* Global Offset Table variable */ + MonoInst **args; struct MonoAliasingInformation *aliasing_info; @@ -595,6 +581,7 @@ typedef struct { MonoDomain *domain; + unsigned char *cil_start; unsigned char *native_code; guint code_size; guint code_len; @@ -624,10 +611,12 @@ typedef struct { guint32 lmf_offset; guint16 *intvars; MonoProfileCoverageInfo *coverage_info; + GHashTable *token_info_hash; MonoCompileArch arch; guint32 exception_type; /* MONO_EXCEPTION_* */ guint32 exception_data; char* exception_message; + gpointer exception_ptr; /* Fields used by the local reg allocator */ void* reginfo; @@ -664,12 +653,14 @@ typedef struct { gulong inlined_methods; gulong basic_blocks; gulong max_basic_blocks; + gulong locals_stack_size; gulong cas_declsec_check; gulong cas_linkdemand_icall; gulong cas_linkdemand_pinvoke; gulong cas_linkdemand_aptc; gulong cas_linkdemand; gulong cas_demand_generation; + gulong generic_virtual_invocations; MonoMethod *max_ratio_method; MonoMethod *biggest_method; gboolean enabled; @@ -760,6 +751,12 @@ extern const guint8 mono_burg_arity []; extern guint8 mono_burg_arity []; #endif +extern const char MONO_ARCH_CPU_SPEC [] MONO_INTERNAL; +#define MONO_ARCH_CPU_SPEC_IDX_COMBINE(a) a ## _idx +#define MONO_ARCH_CPU_SPEC_IDX(a) MONO_ARCH_CPU_SPEC_IDX_COMBINE(a) +extern const guint16 MONO_ARCH_CPU_SPEC_IDX(MONO_ARCH_CPU_SPEC) [] MONO_INTERNAL; +#define ins_get_spec(op) ((const char*)&MONO_ARCH_CPU_SPEC + MONO_ARCH_CPU_SPEC_IDX(MONO_ARCH_CPU_SPEC)[(op)]) + enum { MONO_COMP_DOM = 1, MONO_COMP_IDOM = 2, @@ -799,6 +796,25 @@ enum { BRANCH_UNDEF }; +typedef enum { + CMP_EQ, + CMP_NE, + CMP_LE, + CMP_GE, + CMP_LT, + CMP_GT, + CMP_LE_UN, + CMP_GE_UN, + CMP_LT_UN, + CMP_GT_UN +} CompRelation; + +typedef enum { + CMP_TYPE_L, + CMP_TYPE_I, + CMP_TYPE_F +} CompType; + /* Implicit exceptions */ enum { MONO_EXC_INDEX_OUT_OF_RANGE, @@ -816,7 +832,7 @@ typedef void (*MonoInstFunc) (MonoInst *tree, gpointer data); /* main function */ int mono_main (int argc, char* argv[]); void mono_set_defaults (int verbose_level, guint32 opts); -MonoDomain* mini_init (const char *filename) MONO_INTERNAL; +MonoDomain* mini_init (const char *filename, const char *runtime_version) MONO_INTERNAL; void mini_cleanup (MonoDomain *domain) MONO_INTERNAL; /* helper methods */ @@ -860,16 +876,17 @@ gint32 mono_get_lmf_addr_tls_offset (void) MONO_INTERNAL; GList *mono_varlist_insert_sorted (MonoCompile *cfg, GList *list, MonoMethodVar *mv, gboolean sort_end) MONO_INTERNAL; GList *mono_varlist_sort (MonoCompile *cfg, GList *list, int sort_type) MONO_INTERNAL; void mono_analyze_liveness (MonoCompile *cfg) MONO_INTERNAL; +void mono_liveness_handle_exception_clauses (MonoCompile *cfg) MONO_INTERNAL; void mono_linear_scan (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_mask) MONO_INTERNAL; void mono_create_jump_table (MonoCompile *cfg, MonoInst *label, MonoBasicBlock **bbs, int num_blocks) MONO_INTERNAL; int mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options) MONO_INTERNAL; MonoCompile *mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gboolean run_cctors, gboolean compile_aot, int parts) MONO_INTERNAL; void mono_destroy_compile (MonoCompile *cfg) MONO_INTERNAL; MonoJitICallInfo *mono_find_jit_opcode_emulation (int opcode) MONO_INTERNAL; - +void mono_print_ins (int i, MonoInst *ins) MONO_INTERNAL; void mono_aot_init (void) MONO_INTERNAL; -MonoJitInfo* mono_aot_get_method (MonoDomain *domain, +gpointer mono_aot_get_method (MonoDomain *domain, MonoMethod *method) MONO_INTERNAL; gpointer mono_aot_get_method_from_token (MonoDomain *domain, MonoImage *image, guint32 token) MONO_INTERNAL; gboolean mono_aot_is_got_entry (guint8 *code, guint8 *addr) MONO_INTERNAL; @@ -908,12 +925,14 @@ gpointer mono_create_jit_trampoline (MonoMethod *method) MONO_INTERNAL; gpointer mono_create_jit_trampoline_from_token (MonoImage *image, guint32 token) MONO_INTERNAL; MonoVTable* mono_find_class_init_trampoline_by_addr (gconstpointer addr) MONO_INTERNAL; gpointer mono_magic_trampoline (gssize *regs, guint8 *code, MonoMethod *m, guint8* tramp) MONO_INTERNAL; -gpointer mono_delegate_trampoline (gssize *regs, guint8 *code, MonoMethod *m, guint8* tramp) MONO_INTERNAL; +gpointer mono_delegate_trampoline (gssize *regs, guint8 *code, MonoClass *klass, guint8* tramp) MONO_INTERNAL; gpointer mono_aot_trampoline (gssize *regs, guint8 *code, guint8 *token_info, guint8* tramp) MONO_INTERNAL; gpointer mono_aot_plt_trampoline (gssize *regs, guint8 *code, guint8 *token_info, guint8* tramp) MONO_INTERNAL; void mono_class_init_trampoline (gssize *regs, guint8 *code, MonoVTable *vtable, guint8 *tramp) MONO_INTERNAL; +gpointer mono_debugger_create_notification_function (void) MONO_INTERNAL; + gboolean mono_running_on_valgrind (void) MONO_INTERNAL; void* mono_global_codeman_reserve (int size) MONO_INTERNAL; @@ -922,6 +941,9 @@ gint32* mono_allocate_stack_slots_full (MonoCompile *cfg, gboolean bac gint32* mono_allocate_stack_slots (MonoCompile *cfg, guint32 *stack_size, guint32 *stack_align) MONO_INTERNAL; void mono_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb) MONO_INTERNAL; MonoInst *mono_branch_optimize_exception_target (MonoCompile *cfg, MonoBasicBlock *bb, const char * exname) MONO_INTERNAL; +gboolean mono_is_regsize_var (MonoType *t) MONO_INTERNAL; +CompRelation mono_opcode_to_cond (int opcode) MONO_INTERNAL; +CompType mono_opcode_to_type (int opcode, int cmp_opcode) MONO_INTERNAL; /* methods that must be provided by the arch-specific port */ void mono_arch_cpu_init (void) MONO_INTERNAL; @@ -974,6 +996,7 @@ MonoJitInfo *mono_arch_find_jit_info (MonoDomain *domain, gpointer mono_arch_get_call_filter (void) MONO_INTERNAL; gpointer mono_arch_get_restore_context (void) MONO_INTERNAL; gboolean mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only) MONO_INTERNAL; +void mono_arch_handle_altstack_exception (void *sigctx, gpointer fault_addr, gboolean stack_ovf) MONO_INTERNAL; gpointer mono_arch_ip_from_context (void *sigctx) MONO_INTERNAL; void mono_arch_sigctx_to_monoctx (void *sigctx, MonoContext *ctx) MONO_INTERNAL; void mono_arch_monoctx_to_sigctx (MonoContext *mctx, void *ctx) MONO_INTERNAL; @@ -995,7 +1018,13 @@ void mono_arch_patch_plt_entry (guint8 *code, guint8 *addr) MON void mono_arch_nullify_class_init_trampoline(guint8 *code, gssize *regs) MONO_INTERNAL; void mono_arch_nullify_plt_entry (guint8 *code) MONO_INTERNAL; void mono_arch_patch_delegate_trampoline (guint8 *code, guint8 *tramp, gssize *regs, guint8 *addr) MONO_INTERNAL; +gpointer mono_arch_get_this_arg_from_call (MonoMethodSignature *sig, gssize *regs, guint8 *code); +gpointer mono_arch_get_delegate_invoke_impl (MonoMethodSignature *sig, gboolean has_target); gpointer mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_type, MonoDomain *domain, guint32 *code_len) MONO_INTERNAL; +void mono_arch_emit_imt_argument (MonoCompile *cfg, MonoCallInst *call) MONO_INTERNAL; +MonoMethod* mono_arch_find_imt_method (gpointer *regs, guint8 *code) MONO_INTERNAL; +MonoObject* mono_arch_find_this_argument (gpointer *regs, MonoMethod *method) MONO_INTERNAL; +gpointer mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckItem **imt_entries, int count) MONO_INTERNAL; /* Exception handling */ gboolean mono_handle_exception (MonoContext *ctx, gpointer obj, @@ -1065,4 +1094,8 @@ mono_local_cprop (MonoCompile *cfg) MONO_INTERNAL; MonoSecurityFrame* ves_icall_System_Security_SecurityFrame_GetSecurityFrame (gint32 skip) MONO_INTERNAL; MonoArray* ves_icall_System_Security_SecurityFrame_GetSecurityStack (gint32 skip) MONO_INTERNAL; +int mini_wapi_hps (int argc, char **argv); +int mini_wapi_semdel (int argc, char **argv); +int mini_wapi_seminfo (int argc, char **argv); + #endif /* __MONO_MINI_H__ */