return FALSE;
if (assembly->in_gac || assembly->image == mono_defaults.corlib)
return FALSE;
- if (mono_security_enabled ())
- return FALSE;
return mono_assembly_has_skip_verification (assembly);
}
void
mono_destroy_compile (MonoCompile *cfg)
{
+#ifndef DISABLE_JIT
GSList *l;
if (cfg->header)
g_free (cfg->vars);
g_free (cfg->exception_message);
g_free (cfg);
+#endif
}
#ifndef DISABLE_JIT
int max_epilog_size;
guint8 *code;
MonoDomain *code_domain;
+ guint unwindlen = 0;
if (mono_using_xdebug)
/*
if (cfg->opt & MONO_OPT_PEEPHOLE)
mono_arch_peephole_pass_1 (cfg, bb);
- if (!cfg->globalra)
- mono_local_regalloc (cfg, bb);
+ mono_local_regalloc (cfg, bb);
if (cfg->opt & MONO_OPT_PEEPHOLE)
mono_arch_peephole_pass_2 (cfg, bb);
if (cfg->gen_seq_points && !cfg->gen_sdb_seq_points)
- bb_deduplicate_op_il_seq_points (cfg, bb);
+ mono_bb_deduplicate_op_il_seq_points (cfg, bb);
}
if (cfg->prof_options & MONO_PROFILE_COVERAGE)
#endif
/* fixme: align to MONO_ARCH_CODE_ALIGNMENT */
- if (cfg->method->dynamic) {
- guint unwindlen = 0;
#ifdef MONO_ARCH_HAVE_UNWIND_TABLE
- unwindlen = mono_arch_unwindinfo_get_size (cfg->arch.unwindinfo);
+ unwindlen = mono_arch_unwindinfo_get_size (cfg->arch.unwindinfo);
#endif
+
+ if (cfg->method->dynamic) {
/* Allocate the code into a separate memory pool so it can be freed */
cfg->dynamic_info = g_new0 (MonoJitDynamicMethodInfo, 1);
- cfg->dynamic_info->code_mp = mono_code_manager_new_dynamic (cfg->thunk_area);
+ cfg->dynamic_info->code_mp = mono_code_manager_new_dynamic ();
mono_domain_lock (cfg->domain);
mono_dynamic_code_hash_insert (cfg->domain, cfg->method, cfg->dynamic_info);
mono_domain_unlock (cfg->domain);
if (mono_using_xdebug)
/* See the comment for cfg->code_domain */
- code = mono_domain_code_reserve (code_domain, cfg->code_size + unwindlen);
+ code = mono_domain_code_reserve (code_domain, cfg->code_size + cfg->thunk_area + unwindlen);
else
- code = mono_code_manager_reserve (cfg->dynamic_info->code_mp, cfg->code_size + unwindlen);
+ code = mono_code_manager_reserve (cfg->dynamic_info->code_mp, cfg->code_size + cfg->thunk_area + unwindlen);
} else {
- guint unwindlen = 0;
-#ifdef MONO_ARCH_HAVE_UNWIND_TABLE
- unwindlen = mono_arch_unwindinfo_get_size (cfg->arch.unwindinfo);
-#endif
- code = mono_domain_code_reserve (code_domain, cfg->code_size + unwindlen);
+ code = mono_domain_code_reserve (code_domain, cfg->code_size + cfg->thunk_area + unwindlen);
}
#if defined(__native_client_codegen__) && defined(__native_client__)
nacl_allow_target_modification (TRUE);
#endif
+ if (cfg->thunk_area) {
+ cfg->thunks_offset = cfg->code_size + unwindlen;
+ cfg->thunks = code + cfg->thunks_offset;
+ memset (cfg->thunks, 0, cfg->thunk_area);
+ }
g_assert (code);
memcpy (code, cfg->native_code, cfg->code_len);
mono_nacl_fix_patches (cfg->native_code, cfg->patch_info);
#endif
- mono_arch_patch_code (cfg->method, cfg->domain, cfg->native_code, cfg->patch_info, cfg->dynamic_info ? cfg->dynamic_info->code_mp : NULL, cfg->run_cctors);
+#ifdef MONO_ARCH_HAVE_PATCH_CODE_NEW
+ {
+ MonoJumpInfo *ji;
+ gpointer target;
+
+ for (ji = cfg->patch_info; ji; ji = ji->next) {
+ if (cfg->compile_aot) {
+ switch (ji->type) {
+ case MONO_PATCH_INFO_BB:
+ case MONO_PATCH_INFO_LABEL:
+ break;
+ default:
+ /* No need to patch these */
+ continue;
+ }
+ }
+
+ if (ji->type == MONO_PATCH_INFO_NONE)
+ continue;
+
+ target = mono_resolve_patch_target (cfg->method, cfg->domain, cfg->native_code, ji, cfg->run_cctors);
+ mono_arch_patch_code_new (cfg, cfg->domain, cfg->native_code, ji, target);
+ }
+ }
+#else
+ mono_arch_patch_code (cfg, cfg->method, cfg->domain, cfg->native_code, cfg->patch_info, cfg->run_cctors);
+#endif
if (cfg->method->dynamic) {
if (mono_using_xdebug)
if (cfg->has_unwind_info_for_epilog && !(flags & JIT_INFO_HAS_ARCH_EH_INFO))
flags |= JIT_INFO_HAS_ARCH_EH_INFO;
-
+
+ if (cfg->thunk_area)
+ flags |= JIT_INFO_HAS_THUNK_INFO;
+
if (cfg->try_block_holes) {
for (tmp = cfg->try_block_holes; tmp; tmp = tmp->next) {
TryBlockHole *hole = tmp->data;
printf ("Number of try block holes %d\n", num_holes);
}
- if (mono_security_method_has_declsec (cfg->method_to_register))
- flags |= JIT_INFO_HAS_ARCH_EH_INFO;
-
if (COMPILE_LLVM (cfg))
num_clauses = cfg->llvm_ex_info_len;
else
info->stack_size = stack_size;
}
+ if (cfg->thunk_area) {
+ MonoThunkJitInfo *info;
+
+ info = mono_jit_info_get_thunk_info (jinfo);
+ info->thunks_offset = cfg->thunks_offset;
+ info->thunks_size = cfg->thunk_area;
+ }
+
if (COMPILE_LLVM (cfg)) {
if (num_clauses)
memcpy (&jinfo->clauses [0], &cfg->llvm_ex_info [0], num_clauses * sizeof (MonoJitExceptionInfo));
#ifndef DISABLE_JIT
+#if defined(__native_client_codegen__) || USE_COOP_GC
+
static void
mono_create_gc_safepoint (MonoCompile *cfg, MonoBasicBlock *bblock)
{
-#if defined(__native_client_codegen__) || USE_COOP_GC
-
MonoInst *poll_addr, *ins;
if (cfg->verbose_level)
printf ("ADDING SAFE POINT TO BB %d\n", bblock->block_num);
mono_bblock_insert_before_ins (bblock, NULL, poll_addr);
mono_bblock_insert_after_ins (bblock, poll_addr, ins);
}
-
-#endif
}
/*
static void
mono_insert_safepoints (MonoCompile *cfg)
{
-#if defined(__native_client_codegen__) || defined(USE_COOP_GC)
MonoBasicBlock *bb;
if (cfg->verbose_level)
if (bb->loop_body_start || bb == cfg->bb_entry || bb->flags & BB_EXCEPTION_HANDLER)
mono_create_gc_safepoint (cfg, bb);
}
-#endif
}
+#else
+
+static void
+mono_insert_safepoints (MonoCompile *cfg)
+{
+}
+
+#endif
+
/*
* mini_method_compile:
* @method: the method to compile
g_free (method_name);
}
- if (cfg->opt & (MONO_OPT_ABCREM | MONO_OPT_SSAPRE))
+ if (cfg->opt & MONO_OPT_ABCREM)
cfg->opt |= MONO_OPT_SSA;
- /*
- if ((cfg->method->klass->image != mono_defaults.corlib) || (strstr (cfg->method->klass->name, "StackOverflowException") && strstr (cfg->method->name, ".ctor")) || (strstr (cfg->method->klass->name, "OutOfMemoryException") && strstr (cfg->method->name, ".ctor")))
- cfg->globalra = TRUE;
- */
-
- //cfg->globalra = TRUE;
-
- //if (!strcmp (cfg->method->klass->name, "Tests") && !cfg->method->wrapper_type)
- // cfg->globalra = TRUE;
-
- {
- static int count = 0;
- count ++;
-
- /*
- if (g_getenv ("COUNT2")) {
- cfg->globalra = TRUE;
- if (count == atoi (g_getenv ("COUNT2")))
- printf ("LAST: %s\n", mono_method_full_name (cfg->method, TRUE));
- if (count > atoi (g_getenv ("COUNT2")))
- cfg->globalra = FALSE;
- }
- */
- }
-
- if (header->clauses)
- cfg->globalra = FALSE;
-
- if (cfg->method->wrapper_type == MONO_WRAPPER_NATIVE_TO_MANAGED)
- /* The code in the prolog clobbers caller saved registers */
- cfg->globalra = FALSE;
-
- // FIXME: Disable globalra in case of tracing/profiling
-
- if (cfg->method->save_lmf)
- /* The LMF saving code might clobber caller saved registers */
- cfg->globalra = FALSE;
-
- if (header->code_size > 5000)
- // FIXME:
- /* Too large bblocks could overflow the ins positions */
- cfg->globalra = FALSE;
-
cfg->rs = mono_regstate_new ();
- if (cfg->globalra)
- cfg->rs->next_vreg = MONO_MAX_IREGS + MONO_MAX_FREGS;
cfg->next_vreg = cfg->rs->next_vreg;
/* FIXME: Fix SSA to handle branches inside bblocks */
*/
mono_compile_create_vars (cfg);
- /* SSAPRE is not supported on linear IR */
- cfg->opt &= ~MONO_OPT_SSAPRE;
-
i = mono_method_to_ir (cfg, method_to_compile, NULL, NULL, NULL, NULL, 0, FALSE);
if (i < 0) {
if (!COMPILE_LLVM (cfg))
mono_if_conversion (cfg);
- if ((cfg->opt & MONO_OPT_SSAPRE) || cfg->globalra)
- mono_remove_critical_edges (cfg);
-
/* Depth-first ordering on basic blocks */
cfg->bblocks = mono_mempool_alloc (cfg->mempool, sizeof (MonoBasicBlock*) * (cfg->num_bblocks + 1));
if (cfg->comp_done & MONO_COMP_SSA && !COMPILE_LLVM (cfg)) {
//mono_ssa_strength_reduction (cfg);
- if (cfg->opt & MONO_OPT_SSAPRE) {
- mono_perform_ssapre (cfg);
- //mono_local_cprop (cfg);
- }
-
if (cfg->opt & MONO_OPT_DEADCE)
mono_ssa_deadce (cfg);
if (cfg->opt & MONO_OPT_DEADCE)
mono_local_deadce (cfg);
- if (cfg->opt & MONO_OPT_BRANCH) {
- MonoBasicBlock *bb;
-
+ if (cfg->opt & MONO_OPT_BRANCH)
mono_optimize_branches (cfg);
-
- /* Have to recompute cfg->bblocks and bb->dfn */
- if (cfg->globalra) {
- mono_remove_critical_edges (cfg);
-
- for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
- bb->dfn = 0;
-
- /* Depth-first ordering on basic blocks */
- cfg->bblocks = mono_mempool_alloc (cfg->mempool, sizeof (MonoBasicBlock*) * (cfg->num_bblocks + 1));
-
- dfn = 0;
- df_visit (cfg->bb_entry, &dfn, cfg->bblocks);
- cfg->num_bblocks = dfn + 1;
- }
- }
}
#endif
*/
mono_liveness_handle_exception_clauses (cfg);
- if (cfg->globalra) {
- MonoBasicBlock *bb;
-
- /* Have to do this before regalloc since it can create vregs */
- for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
- mono_arch_lowering_pass (cfg, bb);
-
- mono_global_regalloc (cfg);
- }
-
- if ((cfg->opt & MONO_OPT_LINEARS) && !cfg->globalra) {
+ if (cfg->opt & MONO_OPT_LINEARS) {
GList *vars, *regs, *l;
/* fixme: maybe we can avoid to compute livenesss here if already computed ? */
//print_dfn (cfg);
/* variables are allocated after decompose, since decompose could create temps */
- if (!cfg->globalra && !COMPILE_LLVM (cfg)) {
+ if (!COMPILE_LLVM (cfg)) {
mono_arch_allocate_vars (cfg);
if (cfg->exception_type)
return cfg;
MonoBasicBlock *bb;
gboolean need_local_opts;
- if (!cfg->globalra && !COMPILE_LLVM (cfg)) {
+ if (!COMPILE_LLVM (cfg)) {
mono_spill_global_vars (cfg, &need_local_opts);
if (need_local_opts || cfg->compile_aot) {
}
}
- if (cfg->verbose_level >= 4 && !cfg->globalra) {
+ if (cfg->verbose_level >= 4) {
for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
MonoInst *tree = bb->code;
g_print ("DUMP BLOCK %d:\n", bb->block_num);
*/
return mono_get_addr_from_ftnptr ((gpointer)mono_icall_get_wrapper_full (mi, TRUE));
} else if (*name == 'I' && (strcmp (name, "Invoke") == 0)) {
-#ifdef MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
return mono_create_delegate_trampoline (target_domain, method->klass);
-#else
- nm = mono_marshal_get_delegate_invoke (method, NULL);
- return mono_get_addr_from_ftnptr (mono_compile_method (nm));
-#endif
} else if (*name == 'B' && (strcmp (name, "BeginInvoke") == 0)) {
nm = mono_marshal_get_delegate_begin_invoke (method);
return mono_get_addr_from_ftnptr (mono_compile_method (nm));
else if (cfg->exception_type == MONO_EXCEPTION_TYPE_LOAD)
ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "TypeLoadException", cfg->exception_message);
else if (cfg->exception_type == MONO_EXCEPTION_FILE_NOT_FOUND)
- ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "FileNotFoundException", cfg->exception_message);
+ ex = mono_exception_from_name_msg (mono_defaults.corlib, "System.IO", "FileNotFoundException", cfg->exception_message);
else if (cfg->exception_type == MONO_EXCEPTION_BAD_IMAGE)
ex = mono_get_exception_bad_image_format (cfg->exception_message);
else
case MONO_EXCEPTION_FIELD_ACCESS:
ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "FieldAccessException", cfg->exception_message);
break;
-#ifndef DISABLE_SECURITY
- /* this can only be set if the security manager is active */
- case MONO_EXCEPTION_SECURITY_LINKDEMAND: {
- MonoSecurityManager* secman = mono_security_manager_get_methods ();
- MonoObject *exc = NULL;
- gpointer args [2];
-
- args [0] = &cfg->exception_data;
- args [1] = &method;
- mono_runtime_invoke (secman->linkdemandsecurityexception, NULL, args, &exc);
-
- ex = (MonoException*)exc;
- break;
- }
-#endif
case MONO_EXCEPTION_OBJECT_SUPPLIED: {
MonoException *exp = cfg->exception_ptr;
MONO_GC_UNREGISTER_ROOT (cfg->exception_ptr);
mono_jit_stats.regvars += cfg->stat_n_regvars;
mono_jit_stats.inlineable_methods += cfg->stat_inlineable_methods;
mono_jit_stats.inlined_methods += cfg->stat_inlined_methods;
- mono_jit_stats.cas_demand_generation += cfg->stat_cas_demand_generation;
mono_jit_stats.code_reallocs += cfg->stat_code_reallocs;
mono_destroy_compile (cfg);
/* These patches are applied after a method has been installed, no target munging is needed. */
nacl_allow_target_modification (FALSE);
#endif
+#ifdef MONO_ARCH_HAVE_PATCH_CODE_NEW
+ for (tmp = jlist->list; tmp; tmp = tmp->next) {
+ gpointer target = mono_resolve_patch_target (NULL, target_domain, tmp->data, &patch_info, TRUE);
+ mono_arch_patch_code_new (NULL, target_domain, tmp->data, &patch_info, target);
+ }
+#else
for (tmp = jlist->list; tmp; tmp = tmp->next)
- mono_arch_patch_code (NULL, target_domain, tmp->data, &patch_info, NULL, TRUE);
+ mono_arch_patch_code (NULL, NULL, target_domain, tmp->data, &patch_info, TRUE);
+#endif
#if defined(__native_client_codegen__) && defined(__native_client__)
nacl_allow_target_modification (TRUE);
#endif
projects / mono.git / blobdiff