From ff178f079a36225fd01a214d047e009c0c89c858 Mon Sep 17 00:00:00 2001 From: Egor Bogatov Date: Wed, 21 Aug 2019 13:35:40 +0300 Subject: [PATCH] Improve MONO_VERBOSE_METHOD Commit migrated from https://github.com/mono/mono/commit/b0b3743f3643da390c3624f59dd2e1659acf6fb7 --- src/mono/mono/mini/mini-llvm.c | 6 +++++- src/mono/mono/mini/mini.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/mono/mono/mini/mini-llvm.c b/src/mono/mono/mini/mini-llvm.c index 0d96eb8..f4c8950 100644 --- a/src/mono/mono/mini/mini-llvm.c +++ b/src/mono/mono/mini/mini-llvm.c @@ -8204,8 +8204,12 @@ after_codegen: g_ptr_array_add (ctx->module->callsite_list, g_ptr_array_index (ctx->callsite_list, i)); } - if (cfg->verbose_level > 1) + if (cfg->verbose_level > 1) { + char *id = mono_method_full_name (cfg->method, FALSE); + g_print ("\n*** LLVM IR for %s ***\n", id); mono_llvm_dump_value (method); + g_print ("***\n\n", id); + } if (cfg->compile_aot && !cfg->llvm_only) mark_as_used (ctx->module, method); diff --git a/src/mono/mono/mini/mini.c b/src/mono/mono/mini/mini.c index 8d28e50..b2f35a3 100644 --- a/src/mono/mono/mini/mini.c +++ b/src/mono/mono/mini/mini.c @@ -3363,7 +3363,9 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl for (i = 0; verbose_method_names [i] != NULL; i++){ const char *name = verbose_method_names [i]; - if ((strchr (name, '.') > name) || strchr (name, ':')) { + if (name && *name == '*') { + cfg->verbose_level = 4; + } if ((strchr (name, '.') > name) || strchr (name, ':')) { MonoMethodDesc *desc; desc = mono_method_desc_new (name, TRUE); @@ -3863,7 +3865,9 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl if (cfg->verbose_level >= 2) { char *id = mono_method_full_name (cfg->method, FALSE); + g_print ("\n*** ASM for %s ***\n", id); mono_disassemble_code (cfg, cfg->native_code, cfg->code_len, id + 3); + g_print ("***\n\n", id); g_free (id); } -- 2.7.4