2005-01-31 Zoltan Varga <vargaz@freemail.hu>
[mono.git] / mono / monograph / monograph.c
index 6c57b700fcb0a5997885e80da99ae07de340b999..11f220226c193c838a00db9c566a7dacbf49038f 100644 (file)
@@ -1,19 +1,19 @@
 #include <glib.h>
 #include <string.h>
-#include "mono/metadata/class.h"
+#include "mono/metadata/class-internals.h"
 #include "mono/metadata/assembly.h"
 #include "mono/metadata/tokentype.h"
 #include "mono/metadata/opcodes.h"
 #include "mono/metadata/tabledefs.h"
-#include "mono/metadata/cil-coff.h" /* MonoCLIImageInfo */
 #include "mono/metadata/mono-endian.h"
 #include "mono/metadata/appdomain.h" /* mono_init */
+#include "mono/metadata/debug-helpers.h"
 
 static FILE *output;
 static int include_namespace = 0;
 static int max_depth = 6;
 static int verbose = 0;
-static char *graph_properties = "\tnode [fontsize=8.0]\n\tedge [len=2,color=red]\n";
+static const char *graph_properties = "\tnode [fontsize=8.0]\n\tedge [len=2,color=red]\n";
 
 static void
 output_type_edge (MonoClass *first, MonoClass *second) {
@@ -25,22 +25,22 @@ output_type_edge (MonoClass *first, MonoClass *second) {
 
 static void
 print_subtypes (MonoImage *image, MonoClass *class, int depth) {
-       int i, index;
+       int i, token;
        MonoTableInfo *t;
        MonoClass *child;
 
        if (depth++ > max_depth)
                return;
 
-       t = &image->tables [MONO_TABLE_TYPEDEF];
+       t = mono_image_get_table_info (image, MONO_TABLE_TYPEDEF);
        
-       index = mono_metadata_token_index (class->type_token);
-       index <<= TYPEDEFORREF_BITS;
-       index |= TYPEDEFORREF_TYPEDEF;
+       token = mono_metadata_token_index (class->type_token);
+       token <<= MONO_TYPEDEFORREF_BITS;
+       token |= MONO_TYPEDEFORREF_TYPEDEF;
 
        /* use a subgraph? */
-       for (i = 0; i < t->rows; ++i) {
-               if (index == mono_metadata_decode_row_col (t, i, MONO_TYPEDEF_EXTENDS)) {
+       for (i = 0; i < mono_table_info_get_rows (t); ++i) {
+               if (token == mono_metadata_decode_row_col (t, i, MONO_TYPEDEF_EXTENDS)) {
                        child = mono_class_get (image, MONO_TOKEN_TYPE_DEF | (i + 1));
                        output_type_edge (class, child);
                        print_subtypes (image, child, depth);
@@ -49,11 +49,11 @@ print_subtypes (MonoImage *image, MonoClass *class, int depth) {
 }
 
 static void
-type_graph (MonoImage *image, char* cname) {
+type_graph (MonoImage *image, const char* cname) {
        MonoClass *class;
        MonoClass *parent;
        MonoClass *child;
-       char *name_space;
+       const char *name_space;
        char *p;
        int depth = 0;
 
@@ -67,8 +67,10 @@ type_graph (MonoImage *image, char* cname) {
                name_space = "";
        }
        class = mono_class_from_name (image, name_space, cname);
-       if (!class)
-               g_error ("class %s.%s not found", name_space, cname);
+       if (!class) {
+               g_print ("class %s.%s not found\n", name_space, cname);
+               exit (1);
+       }
        fprintf (output, "digraph blah {\n");
        fprintf (output, "%s", graph_properties);
        child = class;
@@ -82,73 +84,387 @@ type_graph (MonoImage *image, char* cname) {
 }
 
 static void
-get_type (GString *res, MonoType *type) {
-       switch (type->type) {
-       case MONO_TYPE_VOID:
-               g_string_append (res, "void"); break;
-       case MONO_TYPE_CHAR:
-               g_string_append (res, "char"); break;
-       case MONO_TYPE_BOOLEAN:
-               g_string_append (res, "bool"); break;
-       case MONO_TYPE_U1:
-               g_string_append (res, "byte"); break;
-       case MONO_TYPE_I1:
-               g_string_append (res, "sbyte"); break;
-       case MONO_TYPE_U2:
-               g_string_append (res, "uint16"); break;
-       case MONO_TYPE_I2:
-               g_string_append (res, "int16"); break;
-       case MONO_TYPE_U4:
-               g_string_append (res, "int"); break;
-       case MONO_TYPE_I4:
-               g_string_append (res, "uint"); break;
-       case MONO_TYPE_U8:
-               g_string_append (res, "ulong"); break;
-       case MONO_TYPE_I8:
-               g_string_append (res, "long"); break;
-       case MONO_TYPE_FNPTR: /* who cares for the exact signature? */
-               g_string_append (res, "*()"); break;
-       case MONO_TYPE_U:
-               g_string_append (res, "intptr"); break;
-       case MONO_TYPE_I:
-               g_string_append (res, "uintptr"); break;
-       case MONO_TYPE_R4:
-               g_string_append (res, "single"); break;
-       case MONO_TYPE_R8:
-               g_string_append (res, "double"); break;
-       case MONO_TYPE_STRING:
-               g_string_append (res, "string"); break;
-       case MONO_TYPE_OBJECT:
-               g_string_append (res, "object"); break;
-       case MONO_TYPE_PTR:
-               get_type (res, type->data.type);
-               g_string_append_c (res, '*');
-               break;
-       case MONO_TYPE_ARRAY:
-               get_type (res, type->data.array->type);
-               g_string_append (res, "[,]"); /* not the full array info.. */
-               break;
-       case MONO_TYPE_SZARRAY:
-               get_type (res, type->data.type);
-               g_string_append (res, "[]");
-               break;
-       case MONO_TYPE_CLASS:
-       case MONO_TYPE_VALUETYPE: {
-               MonoClass *class = type->data.klass;
-               if (!class) {
-                       g_string_append (res, "Unknown");
+interface_graph (MonoImage *image, const char* cname) {
+       MonoClass *class;
+       MonoClass *child;
+       const char *name_space;
+       char *p;
+       guint32 cols [MONO_INTERFACEIMPL_SIZE];
+       guint32 token, i, count = 0;
+       MonoTableInfo *intf = mono_image_get_table_info (image, MONO_TABLE_INTERFACEIMPL);
+
+       cname = g_strdup (cname);
+       p = strrchr (cname, '.');
+       if (p) {
+               name_space = cname;
+               *p++ = 0;
+               cname = p;
+       } else {
+               name_space = "";
+       }
+       class = mono_class_from_name (image, name_space, cname);
+       if (!class) {
+               g_print ("interface %s.%s not found\n", name_space, cname);
+               exit (1);
+       }
+       /* chek if it's really an interface... */
+       fprintf (output, "digraph interface {\n");
+       fprintf (output, "%s", graph_properties);
+       /* TODO: handle inetrface defined in one image and class defined in another. */
+       token = mono_metadata_token_index (class->type_token);
+       token <<= MONO_TYPEDEFORREF_BITS;
+       token |= MONO_TYPEDEFORREF_TYPEDEF;
+       for (i = 0; i < mono_table_info_get_rows (intf); ++i) {
+               mono_metadata_decode_row (intf, i, cols, MONO_INTERFACEIMPL_SIZE);
+               /*g_print ("index: %d [%d implements %d]\n", index, cols [MONO_INTERFACEIMPL_CLASS], cols [MONO_INTERFACEIMPL_INTERFACE]);*/
+               if (token == cols [MONO_INTERFACEIMPL_INTERFACE]) {
+                       child = mono_class_get (image, MONO_TOKEN_TYPE_DEF | cols [MONO_INTERFACEIMPL_CLASS]);
+                       output_type_edge (class, child);
+                       count++;
+               }
+       }
+       fprintf (output, "}\n");
+       if (verbose && !count)
+               g_print ("No class implements %s.%s\n", class->name_space, class->name);
+
+}
+
+static int back_branch_waste = 0;
+static int branch_waste = 0;
+static int var_waste = 0;
+static int int_waste = 0;
+static int nop_waste = 0;
+static int has_exceptions = 0;
+static int num_exceptions = 0;
+static int max_exceptions = 0;
+static int has_locals = 0;
+static int num_locals = 0;
+static int max_locals = 0;
+static int has_args = 0;
+static int num_args = 0;
+static int max_args = 0;
+static int has_maxstack = 0;
+static int num_maxstack = 0;
+static int max_maxstack = 0;
+static int has_code = 0;
+static int num_code = 0;
+static int max_code = 0;
+static int has_branch = 0;
+static int num_branch = 0;
+static int max_branch = 0;
+static int has_condbranch = 0;
+static int num_condbranch = 0;
+static int max_condbranch = 0;
+static int has_calls = 0;
+static int num_calls = 0;
+static int max_calls = 0;
+static int has_throw = 0;
+static int num_throw = 0;
+static int max_throw = 0;
+static int has_switch = 0;
+static int num_switch = 0;
+static int max_switch = 0;
+static int cast_sealed = 0;
+static int cast_iface = 0;
+static int total_cast = 0;
+static int nonvirt_callvirt = 0;
+static int total_callvirt = 0;
+
+static void
+method_stats (MonoMethod *method) {
+       const MonoOpcode *opcode;
+       MonoMethodHeader *header;
+       const unsigned char *ip;
+       int i, n;
+       int local_branch = 0, local_condbranch = 0, local_throw = 0, local_calls = 0;
+       gint64 l;
+
+       if (method->iflags & (METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL | METHOD_IMPL_ATTRIBUTE_RUNTIME))
+               return;
+       if (method->flags & (METHOD_ATTRIBUTE_PINVOKE_IMPL | METHOD_ATTRIBUTE_ABSTRACT))
+               return;
+
+       header = mono_method_get_header (method);
+       if (header->num_clauses)
+               has_exceptions++;
+       num_exceptions += header->num_clauses;
+       if (max_exceptions < header->num_clauses)
+               max_exceptions = header->num_clauses;
+       if (header->num_locals)
+               has_locals++;
+       num_locals += header->num_locals;
+       if (max_locals < header->num_locals)
+               max_locals = header->num_locals;
+
+       if (max_maxstack < header->max_stack)
+               max_maxstack = header->max_stack;
+       num_maxstack += header->max_stack;
+       if (header->max_stack != 8) /* just a guess */
+               has_maxstack++;
+
+       n = method->signature->hasthis + method->signature->param_count;
+       if (max_args < n)
+               max_args = n;
+       num_args += n;
+       if (n)
+               has_args++;
+
+       has_code++;
+       if (max_code < header->code_size)
+               max_code = header->code_size;
+       num_code += header->code_size;
+
+       ip = header->code;
+
+       while (ip < (header->code + header->code_size)) {
+               if (*ip == 0xfe) {
+                       ++ip;
+                       i = *ip + 256;
+               } else {
+                       i = *ip;
+               }
+
+               opcode = &mono_opcodes [i];
+
+               switch (opcode->argument) {
+               case MonoInlineNone:
+                       if (i == MONO_CEE_NOP)
+                               nop_waste++;
+                       ++ip;
+                       break;
+               case MonoInlineI:
+                       n = read32 (ip + 1);
+                       if (n >= -1 && n <= 8) {
+                               int_waste += 4;
+                               g_print ("%s %d\n", mono_opcode_name (i), n);
+                       } else if (n < 128 && n >= -128) {
+                               int_waste += 3;
+                               g_print ("%s %d\n", mono_opcode_name (i), n);
+                       }
+                       ip += 5;
+                       break;
+               case MonoInlineType:
+                       if (i == MONO_CEE_CASTCLASS || i == MONO_CEE_ISINST) {
+                               guint32 token = read32 (ip + 1);
+                               MonoClass *k = mono_class_get (method->klass->image, token);
+                               if (k && k->flags & TYPE_ATTRIBUTE_SEALED)
+                                       cast_sealed++;
+                               if (k && k->flags & TYPE_ATTRIBUTE_INTERFACE)
+                                       cast_iface++;
+                               total_cast++;
+                       }
+                       ip += 5;
+                       break;
+               case MonoInlineField:
+               case MonoInlineTok:
+               case MonoInlineString:
+               case MonoInlineSig:
+               case MonoShortInlineR:
+                       ip += 5;
+                       break;
+               case MonoInlineBrTarget:
+                       n = read32 (ip + 1);
+                       if (n < 128 && n >= -128) {
+                               branch_waste += 3;
+                               if (n < 0)
+                                       back_branch_waste += 3;
+                       }
+                       ip += 5;
+                       break;
+               case MonoInlineVar:
+                       n = read16 (ip + 1);
+                       if (n < 256) {
+                               if (n < 4) {
+                                       switch (i) {
+                                       case MONO_CEE_LDARG:
+                                       case MONO_CEE_LDLOC:
+                                       case MONO_CEE_STLOC:
+                                               var_waste += 3;
+                                               g_print ("%s %d\n", mono_opcode_name (i), n);
+                                               break;
+                                       default:
+                                               var_waste += 2;
+                                               g_print ("%s %d\n", mono_opcode_name (i), n);
+                                               break;
+                                       }
+                               } else {
+                                       var_waste += 2;
+                                       g_print ("%s %d\n", mono_opcode_name (i), n);
+                               }
+                       }
+                       ip += 3;
+                       break;
+               case MonoShortInlineVar:
+                       if ((signed char)ip [1] < 4 && (signed char)ip [1] >= 0) {
+                               switch (i) {
+                               case MONO_CEE_LDARG_S:
+                               case MONO_CEE_LDLOC_S:
+                               case MONO_CEE_STLOC_S:
+                                       var_waste++;
+                                       g_print ("%s %d\n", mono_opcode_name (i), (signed char)ip [1]);
+                                       break;
+                               default:
+                                       break;
+                               }
+                       }
+                       ip += 2;
+                       break;
+               case MonoShortInlineI:
+                       if ((signed char)ip [1] <= 8 && (signed char)ip [1] >= -1) {
+                               g_print ("%s %d\n", mono_opcode_name (i), (signed char)ip [1]);
+                               int_waste ++;
+                       }
+                       ip += 2;
+                       break;
+               case MonoShortInlineBrTarget:
+                       ip += 2;
+                       break;
+               case MonoInlineSwitch: {
+                       gint32 n;
+                       ++ip;
+                       n = read32 (ip);
+                       ip += 4;
+                       ip += 4 * n;
+                       num_switch += n;
+                       has_switch++;
+                       if (max_switch < n)
+                               max_switch = n;
+                       break;
+               }
+               case MonoInlineR:
+                       ip += 9;
+                       break;
+               case MonoInlineI8:
+                       l = read64 (ip + 1);
+                       /* should load and convert */
+                       if (l >= -1 && l <= 8) {
+                               int_waste += 7;
+                       } else if (l < 128 && l >= -128) {
+                               int_waste += 6;
+                       } else if (l <= 2147483647 && l >= (-2147483647 -1)) {
+                               int_waste += 3;
+                       }
+                       ip += 9;
+                       break;
+               case MonoInlineMethod:
+                       if (i == MONO_CEE_CALLVIRT) {
+                               MonoMethod *cm = mono_get_method (method->klass->image, read32 (ip + 1), NULL);
+                               if (cm && !(cm->flags & METHOD_ATTRIBUTE_VIRTUAL))
+                                       nonvirt_callvirt++;
+                               total_callvirt++;
+                       }
+                       ip += 5;
+                       break;
+               default:
+                       g_assert_not_reached ();
+               }
+
+               switch (opcode->flow_type) {
+               case MONO_FLOW_BRANCH:
+                       local_branch++;
+                       break;
+               case MONO_FLOW_COND_BRANCH:
+                       local_condbranch++;
+                       break;
+               case MONO_FLOW_CALL:
+                       local_calls++;
+                       break;
+               case MONO_FLOW_ERROR:
+                       local_throw++;
                        break;
                }
-               if (include_namespace && *(class->name_space))
-                       g_string_sprintfa (res, "%s.", class->name_space);
-               g_string_sprintfa (res, "%s", class->name);
-               break;
        }
-       default:
-               break;
+       
+       if (local_branch)
+               has_branch++;
+       if (max_branch < local_branch)
+               max_branch = local_branch;
+       num_branch += local_branch;
+
+       if (local_condbranch)
+               has_condbranch++;
+       if (max_condbranch < local_condbranch)
+               max_condbranch = local_condbranch;
+       num_condbranch += local_condbranch;
+
+       if (local_calls)
+               has_calls++;
+       if (max_calls < local_calls)
+               max_calls = local_calls;
+       num_calls += local_calls;
+
+       if (local_throw)
+               has_throw++;
+       if (max_throw < local_throw)
+               max_throw = local_throw;
+       num_throw += local_throw;
+
+       return;
+}
+
+static int num_pdepth = 0;
+static int max_pdepth = 0;
+static int num_ifaces = 0;
+
+static void
+type_stats (MonoClass *klass) {
+       MonoClass *parent;
+       int depth = 0;
+
+       if (klass->flags & TYPE_ATTRIBUTE_INTERFACE) {
+               num_ifaces++;
+               return;
+       }
+       parent = klass->parent;
+       while (parent) {
+               depth++;
+               parent = parent->parent;
+       }
+       num_pdepth += depth;
+       if (max_pdepth < depth)
+               max_pdepth = depth;
+}
+
+static void
+stats (MonoImage *image, const char *name) {
+       int i, num_methods, num_types;
+       MonoMethod *method;
+       MonoClass *klass;
+       
+       num_methods = mono_image_get_table_rows (image, MONO_TABLE_METHOD);
+       for (i = 0; i < num_methods; ++i) {
+               method = mono_get_method (image, MONO_TOKEN_METHOD_DEF | (i + 1), NULL);
+               method_stats (method);
+       }
+       num_types = mono_image_get_table_rows (image, MONO_TABLE_TYPEDEF);
+       for (i = 0; i < num_types; ++i) {
+               klass = mono_class_get (image, MONO_TOKEN_TYPE_DEF | (i + 1));
+               type_stats (klass);
        }
-       if (type->byref)
-               g_string_append_c (res, '&');
+
+       g_print ("Methods and code stats:\n");
+       g_print ("back branch waste: %d\n", back_branch_waste);
+       g_print ("branch waste: %d\n", branch_waste);
+       g_print ("var waste: %d\n", var_waste);
+       g_print ("int waste: %d\n", int_waste);
+       g_print ("nop waste: %d\n", nop_waste);
+       g_print ("has exceptions: %d/%d, total: %d, max: %d, mean: %f\n", has_exceptions, num_methods, num_exceptions, max_exceptions, num_exceptions/(double)has_exceptions);
+       g_print ("has locals: %d/%d, total: %d, max: %d, mean: %f\n", has_locals, num_methods, num_locals, max_locals, num_locals/(double)has_locals);
+       g_print ("has args: %d/%d, total: %d, max: %d, mean: %f\n", has_args, num_methods, num_args, max_args, num_args/(double)has_args);
+       g_print ("has maxstack: %d/%d, total: %d, max: %d, mean: %f\n", has_maxstack, num_methods, num_maxstack, max_maxstack, num_maxstack/(double)i);
+       g_print ("has code: %d/%d, total: %d, max: %d, mean: %f\n", has_code, num_methods, num_code, max_code, num_code/(double)has_code);
+       g_print ("has branch: %d/%d, total: %d, max: %d, mean: %f\n", has_branch, num_methods, num_branch, max_branch, num_branch/(double)has_branch);
+       g_print ("has condbranch: %d/%d, total: %d, max: %d, mean: %f\n", has_condbranch, num_methods, num_condbranch, max_condbranch, num_condbranch/(double)has_condbranch);
+       g_print ("has switch: %d/%d, total: %d, max: %d, mean: %f\n", has_switch, num_methods, num_switch, max_switch, num_switch/(double)has_switch);
+       g_print ("has calls: %d/%d, total: %d, max: %d, mean: %f\n", has_calls, num_methods, num_calls, max_calls, num_calls/(double)has_calls);
+       g_print ("has throw: %d/%d, total: %d, max: %d, mean: %f\n", has_throw, num_methods, num_throw, max_throw, num_throw/(double)has_throw);
+       g_print ("sealed type cast: %d/%d\n", cast_sealed, total_cast);
+       g_print ("interface type cast: %d/%d\n", cast_iface, total_cast);
+       g_print ("non virtual callvirt: %d/%d\n", nonvirt_callvirt, total_callvirt);
+       
+       g_print ("\nType stats:\n");
+       g_print ("interface types: %d/%d\n", num_ifaces, num_types);
+       g_print ("parent depth: max: %d, mean: %d\n", max_pdepth, num_pdepth/(num_types - num_ifaces));
 }
 
 static char *
@@ -156,7 +472,6 @@ get_signature (MonoMethod *method) {
        GString *res;
        static GHashTable *hash = NULL;
        char *result;
-       int i;
 
        if (!hash)
                hash = g_hash_table_new (g_direct_hash, g_direct_equal);
@@ -166,13 +481,9 @@ get_signature (MonoMethod *method) {
        res = g_string_new ("");
        if (include_namespace && *(method->klass->name_space))
                g_string_sprintfa (res, "%s.", method->klass->name_space);
-       g_string_sprintfa (res, "%s:%s(", method->klass->name, method->name);
-       for (i = 0; i < method->signature->param_count; ++i) {
-               if (i > 0)
-                       g_string_append_c (res, ',');
-               get_type (res, method->signature->params [i]);
-       }
-       g_string_sprintfa (res, ")");
+       result = mono_signature_get_desc (method->signature, include_namespace);
+       g_string_sprintfa (res, "%s:%s(%s)", method->klass->name, method->name, result);
+       g_free (result);
        g_hash_table_insert (hash, method, res->str);
 
        result = res->str;
@@ -217,7 +528,7 @@ print_method (MonoMethod *method, int depth) {
        if (method->flags & (METHOD_ATTRIBUTE_PINVOKE_IMPL | METHOD_ATTRIBUTE_ABSTRACT))
                return;
 
-       header = ((MonoMethodNormal *)method)->header;
+       header = mono_method_get_header (method);
        ip = header->code;
 
        hash = g_hash_table_new (g_direct_hash, g_direct_equal);
@@ -290,101 +601,387 @@ print_method (MonoMethod *method, int depth) {
 }
 
 static void
-method_graph (MonoImage *image, char *name) {
+method_graph (MonoImage *image, const char *name) {
        int depth = 0;
        MonoMethod *method = NULL;
        
        if (!name) {
-               method = mono_get_method (image, ((MonoCLIImageInfo*)image->image_info)->cli_cli_header.ch_entry_point, NULL);
-               if (!method)
-                       g_error ("Cannot find entry point");
+               guint32 token = mono_image_get_entry_point (image);
+               if (!token || !(method = mono_get_method (image, token, NULL))) {
+                       g_print ("Cannot find entry point in %s: specify an explict method name.\n", mono_image_get_filename (image));
+                       exit (1);
+               }
        } else {
                /* search the method */
-               MonoTableInfo *tdef = &image->tables [MONO_TABLE_TYPEDEF];
-               MonoTableInfo *methods = &image->tables [MONO_TABLE_METHOD];
-               char *class_name, *class_nspace, *method_name, *use_args;
-               int use_namespace, i;
-               
-               class_nspace = g_strdup (name);
-               use_args = strchr (class_nspace, '(');
-               if (use_args)
-                       *use_args++ = 0;
-               method_name = strrchr (class_nspace, ':');
-               if (!method_name)
-                       g_error ("Invalid method name %s", name);
-               *method_name++ = 0;
-               class_name = strrchr (class_nspace, '.');
-               if (class_name) {
-                       *class_name++ = 0;
-                       use_namespace = 1;
+               MonoMethodDesc *desc;
+
+               desc = mono_method_desc_new (name, include_namespace);
+               if (!desc) {
+                       g_print ("Invalid method name %s\n", name);
+                       exit (1);
+               }
+               method = mono_method_desc_search_in_image (desc, image);
+               if (!method) {
+                       g_print ("Cannot find method %s\n", name);
+                       exit (1);
+               }
+       }
+       fprintf (output, "digraph blah {\n");
+       fprintf (output, "%s", graph_properties);
+
+       print_method (method, depth);
+       
+       fprintf (output, "}\n");
+}
+
+typedef struct MonoBasicBlock MonoBasicBlock;
+
+struct MonoBasicBlock {
+       const unsigned char* cil_code;
+       gint32 cil_length;
+       gint dfn;
+       GList *in_bb;
+       GList *out_bb;
+};
+
+static const unsigned char *debug_start;
+
+static void
+link_bblock (MonoBasicBlock *from, MonoBasicBlock* to)
+{
+       from->out_bb = g_list_prepend (from->out_bb, to);
+       to->in_bb = g_list_prepend (to->in_bb, from);
+       /*fprintf (stderr, "linking IL_%04x to IL_%04x\n", from->cil_code-debug_start, to->cil_code-debug_start);*/
+}
+
+static int
+compare_bblock (const void *a, const void *b)
+{
+       MonoBasicBlock * const *ab = a;
+       MonoBasicBlock * const *bb = b;
+
+       return (*ab)->cil_code - (*bb)->cil_code;
+}
+
+static GPtrArray*
+mono_method_find_bblocks (MonoMethodHeader *header)
+{
+       const unsigned char *ip, *end, *start;
+       const MonoOpcode *opcode;
+       int i, block_end = 0;
+       GPtrArray *result = g_ptr_array_new ();
+       GHashTable *table = g_hash_table_new (g_direct_hash, g_direct_equal);
+       MonoBasicBlock *entry_bb, *end_bb, *bb, *target;
+
+       ip = header->code;
+       end = ip + header->code_size;
+       debug_start = ip;
+
+       entry_bb = g_new0 (MonoBasicBlock, 1);
+       end_bb = g_new0 (MonoBasicBlock, 1);
+       g_ptr_array_add (result, entry_bb);
+       g_ptr_array_add (result, end_bb);
+
+       bb = g_new0 (MonoBasicBlock, 1);
+       bb->cil_code = ip;
+       g_ptr_array_add (result, bb);
+       link_bblock (entry_bb, bb);
+       g_hash_table_insert (table, (char*)ip, bb);
+       block_end = TRUE;
+
+       /* handle exception code blocks... */
+       while (ip < end) {
+               start = ip;
+               if ((target = g_hash_table_lookup (table, ip)) && target != bb) {
+                       if (!block_end)
+                               link_bblock (bb, target);
+                       bb = target;
+                       block_end = FALSE;
+               }
+               if (block_end) {
+                       /*fprintf (stderr, "processing bbclok at IL_%04x\n", ip - header->code);*/
+                       if (!(bb = g_hash_table_lookup (table, ip))) {
+                               bb = g_new0 (MonoBasicBlock, 1);
+                               bb->cil_code = ip;
+                               g_ptr_array_add (result, bb);
+                               g_hash_table_insert (table, (char*)ip, bb);
+                       }
+                       block_end = FALSE;
+               }
+               if (*ip == 0xfe) {
+                       ++ip;
+                       i = *ip + 256;
                } else {
-                       class_name = class_nspace;
-                       use_namespace = 0;
+                       i = *ip;
+               }
+
+               opcode = &mono_opcodes [i];
+               switch (opcode->flow_type) {
+               case MONO_FLOW_RETURN:
+                       link_bblock (bb, end_bb);
+               case MONO_FLOW_ERROR:
+                       block_end = 1;
+                       break;
+               case MONO_FLOW_BRANCH: /* we handle branch when checking the argument type */
+               case MONO_FLOW_COND_BRANCH:
+               case MONO_FLOW_CALL:
+               case MONO_FLOW_NEXT:
+               case MONO_FLOW_META:
+                       break;
+               default:
+                       g_assert_not_reached ();
                }
-               for (i = 0; i < methods->rows; ++i) {
-                       guint32 index = mono_metadata_decode_row_col (methods, i, MONO_METHOD_NAME);
-                       guint32 idx;
-                       const char *n = mono_metadata_string_heap (image, index);
-
-                       if (strcmp (n, method_name))
-                               continue;
-                       index = mono_metadata_typedef_from_method (image, i + 1);
-                       idx = mono_metadata_decode_row_col (tdef, index - 1, MONO_TYPEDEF_NAME);
-                       n = mono_metadata_string_heap (image, idx);
-                       if (strcmp (n, class_name))
-                               continue;
-                       if (use_namespace) {
-                               idx = mono_metadata_decode_row_col (tdef, index - 1, MONO_TYPEDEF_NAMESPACE);
-                               n = mono_metadata_string_heap (image, idx);
-                               if (strcmp (n, class_nspace))
-                                       continue;
+               switch (opcode->argument) {
+               case MonoInlineNone:
+                       ++ip;
+                       break;
+               case MonoInlineType:
+               case MonoInlineField:
+               case MonoInlineMethod:
+               case MonoInlineTok:
+               case MonoInlineString:
+               case MonoInlineSig:
+               case MonoShortInlineR:
+               case MonoInlineI:
+                       ip += 5;
+                       break;
+               case MonoInlineVar:
+                       ip += 3;
+                       break;
+               case MonoShortInlineVar:
+               case MonoShortInlineI:
+                       ip += 2;
+                       break;
+               case MonoShortInlineBrTarget:
+               case MonoInlineBrTarget:
+                       ip++;
+                       if (opcode->argument == MonoShortInlineBrTarget) {
+                               i = (signed char)*ip;
+                               ip++;
+                       } else {
+                               i = (gint32) read32 (ip);
+                               ip += 4;
                        }
-                       method = mono_get_method (image, MONO_TOKEN_METHOD_DEF | (i + 1), NULL);
-                       if (use_args) {
-                               /* check the signature */
-                               n = get_signature (method);
-                               if (strcmp (n, name) == 0)
-                                       break;
-                               if (verbose)
-                                       g_print ("signature check failed: '%s' != '%s'.\n", n, name);
-                               method = NULL;
+                       if (opcode->flow_type == MONO_FLOW_COND_BRANCH) {
+                               if (!(target = g_hash_table_lookup (table, ip))) {
+                                       target = g_new0 (MonoBasicBlock, 1);
+                                       target->cil_code = ip;
+                                       g_ptr_array_add (result, target);
+                                       g_hash_table_insert (table, (char*)ip, target);
+                               }
+                               link_bblock (bb, target);
                        }
+                       if (!(target = g_hash_table_lookup (table, ip + i))) {
+                               target = g_new0 (MonoBasicBlock, 1);
+                               target->cil_code = ip + i;
+                               g_ptr_array_add (result, target);
+                               g_hash_table_insert (table, (char*)ip + i, target);
+                       }
+                       link_bblock (bb, target);
+                       block_end = 1;
+                       break;
+               case MonoInlineSwitch: {
+                       gint32 n;
+                       const char *itarget, *st;
+                       ++ip;
+                       n = read32 (ip);
+                       ip += 4;
+                       st = (const char*)ip + 4 * n;
+
+                       for (i = 0; i < n; i++) {
+                               itarget = st + read32 (ip);
+                               ip += 4;
+                               if (!(target = g_hash_table_lookup (table, itarget))) {
+                                       target = g_new0 (MonoBasicBlock, 1);
+                                       target->cil_code = itarget;
+                                       g_ptr_array_add (result, target);
+                                       g_hash_table_insert (table, (gpointer) itarget, target);
+                               }
+                               link_bblock (bb, target);
+                       }
+                       /*
+                        * Note: the code didn't set block_end in switch.
+                        */
+                       break;
+               }
+               case MonoInlineR:
+               case MonoInlineI8:
+                       ip += 9;
+                       break;
+               default:
+                       g_assert_not_reached ();
+               }
+
+       }
+       g_hash_table_destroy (table);
+       qsort (result->pdata, result->len, sizeof (gpointer), compare_bblock);
+       /* skip entry and end */
+       bb = target = NULL;
+       for (i = 2; i < result->len; ++i) {
+               bb = (MonoBasicBlock*)g_ptr_array_index (result, i);
+               if (target)
+                       target->cil_length = bb->cil_code - target->cil_code;
+               target = bb;
+               /*fprintf (stderr, "bblock %d at IL_%04x:\n", i, bb->cil_code - header->code);*/
+       }
+       bb->cil_length = header->code + header->code_size - bb->cil_code;
+       return result;
+}
+
+static char*
+indenter (MonoDisHelper *dh, MonoMethod *method, guint32 ip_offset)
+{
+       return g_strdup (" ");
+}
+
+static MonoDisHelper graph_dh = {
+       "\\l",
+       NULL,
+       "IL_%04x",
+       indenter, 
+       NULL,
+       NULL
+};
+
+static void
+df_visit (MonoBasicBlock *bb, int *dfn, const unsigned char* code)
+{
+       GList *tmp;
+       MonoBasicBlock *next;
+       
+       if (bb->dfn)
+               return;
+       ++(*dfn);
+       bb->dfn = *dfn;
+       for (tmp = bb->out_bb; tmp; tmp = tmp->next) {
+               next = tmp->data;
+               if (!next->dfn) {
+                       if (!bb->cil_code)
+                               fprintf (output, "\t\"DF entry\" -> \"IL_%04x (%d)\"\n", next->cil_code - code, *dfn + 1);
+                       else
+                               fprintf (output, "\t\"IL_%04x (%d)\" -> \"IL_%04x (%d)\"\n", bb->cil_code - code, bb->dfn, next->cil_code - code, *dfn + 1);
+                       df_visit (next, dfn, code);
+               }
+       }
+}
+
+static void
+print_method_cfg (MonoMethod *method) {
+       GPtrArray *bblocks;
+       GList *tmp;
+       MonoBasicBlock *bb, *target;
+       MonoMethodHeader *header;
+       int i, dfn;
+       char *code;
+
+       header = mono_method_get_header (method);
+       bblocks = mono_method_find_bblocks (header);
+       for (i = 0; i < bblocks->len; ++i) {
+               bb = (MonoBasicBlock*)g_ptr_array_index (bblocks, i);
+               if (i == 0)
+                       fprintf (output, "\tB%p [shape=record,label=\"entry\"]\n", bb);
+               else if (i == 1)
+                       fprintf (output, "\tB%p [shape=record,label=\"end\"]\n", bb);
+               else {
+                       code = mono_disasm_code (&graph_dh, method, bb->cil_code, bb->cil_code + bb->cil_length);
+                       fprintf (output, "\tB%p [shape=record,label=\"IL_%04x\\n%s\"]\n", bb, bb->cil_code - header->code, code);
+                       g_free (code);
+               }
+       }
+       for (i = 0; i < bblocks->len; ++i) {
+               bb = (MonoBasicBlock*)g_ptr_array_index (bblocks, i);
+               for (tmp = bb->out_bb; tmp; tmp = tmp->next) {
+                       target = tmp->data;
+                       fprintf (output, "\tB%p -> B%p\n", bb, target);
+               }
+       }
+#if 1
+       for (i = 0; i < bblocks->len; ++i) {
+               bb = (MonoBasicBlock*)g_ptr_array_index (bblocks, i);
+               bb->dfn = 0;
+       }
+       dfn = 0;
+       for (i = 0; i < bblocks->len; ++i) {
+               bb = (MonoBasicBlock*)g_ptr_array_index (bblocks, i);
+               df_visit (bb, &dfn, header->code);
+       }
+#endif
+}
+
+/*
+ * TODO: change to create the DF tree, dominance relation etc.
+ */
+static void
+method_cfg (MonoImage *image, const char *name) {
+       MonoMethod *method = NULL;
+       const static char *cfg_graph_properties = "\tnode [fontsize=8.0]\n\tedge [len=1.5,color=red]\n";
+       
+       if (!name) {
+               guint32 token = mono_image_get_entry_point (image);
+               if (!token || !(method = mono_get_method (image, token, NULL))) {
+                       g_print ("Cannot find entry point in %s: specify an explict method name.\n", mono_image_get_filename (image));
+                       exit (1);
+               }
+       } else {
+               /* search the method */
+               MonoMethodDesc *desc;
+
+               desc = mono_method_desc_new (name, include_namespace);
+               if (!desc) {
+                       g_print ("Invalid method name %s\n", name);
+                       exit (1);
+               }
+               method = mono_method_desc_search_in_image (desc, image);
+               if (!method) {
+                       g_print ("Cannot find method %s\n", name);
+                       exit (1);
                }
-               if (!method)
-                       g_error ("Cannot find method %s", name);
-               g_free (class_nspace);
        }
        fprintf (output, "digraph blah {\n");
-       fprintf (output, "%s", graph_properties);
+       fprintf (output, "%s", cfg_graph_properties);
 
-       print_method (method, depth);
+       print_method_cfg (method);
        
        fprintf (output, "}\n");
 }
 
 static void
-usage () {
-       printf ("monograph 0.1 Copyright (c) 2002 Ximian, Inc\n");
+usage (void) {
+       printf ("monograph 0.2 Copyright (c) 2002 Ximian, Inc\n");
        printf ("Create call graph or type hierarchy information from CIL assemblies.\n");
-       printf ("Usage: monograph [options] [assembly [typename|methodname]]\n");
+       printf ("Usage: monograph [options] [assembly [typename|methodname]]\n\n");
        printf ("Valid options are:\n");
        printf ("\t-c|--call             output call graph instead of type hierarchy\n");
+       printf ("\t-C|--control-flow     output control flow of methodname\n");
+       printf ("\t--stats               output some statistics about the assembly\n");
        printf ("\t-d|--depth num        max depth recursion (default: 6)\n");
        printf ("\t-o|--output filename  write graph to file filename (default: stdout)\n");
        printf ("\t-f|--fullname         include namespace in type and method names\n");
        printf ("\t-n|--neato            invoke neato directly\n");
-       printf ("\t-v|--verbose          verbose operation\n");
-       printf ("The default assembly is corlib.dll. The default method for\n");
-       printf ("the --call option is the entrypoint.\n");
+       printf ("\t-v|--verbose          verbose operation\n\n");
+       printf ("The default assembly is mscorlib.dll. The default method for\n");
+       printf ("the --call and --control-flow options is the entrypoint.\n\n");
        printf ("When the --neato option is used the output type info is taken\n");
-       printf ("from the output filename extension.\n");
+       printf ("from the output filename extension. You need the graphviz package\n");
+       printf ("installed to be able to use this option and build bitmap files.\n");
+       printf ("Without --neato, monograph will create .dot files, a description\n");
+       printf ("file for a graph.\n\n");
        printf ("Sample runs:\n");
-       printf ("\tmonograph -n -o vt.png corlib.dll System.ValueType\n");
+       printf ("\tmonograph -n -o vt.png mscorlib.dll System.ValueType\n");
        printf ("\tmonograph -n -o expr.png mcs.exe Mono.CSharp.Expression\n");
+       printf ("\tmonograph -n -o cfg.png -C mcs.exe Driver:Main\n");
        printf ("\tmonograph -d 3 -n -o callgraph.png -c mis.exe\n");
        exit (1);
 }
 
+enum {
+       GRAPH_TYPES,
+       GRAPH_CALL,
+       GRAPH_INTERFACE,
+       GRAPH_CONTROL_FLOW,
+       GRAPH_STATS
+};
+
 /*
  * TODO:
  * * virtual method calls as explained above
@@ -397,14 +994,16 @@ usage () {
  * * make --neato option the default?
  * * use multiple classes/method roots?
  * * write a manpage
+ * * reverse call graph: given a method what methods call it?
  */
 int
 main (int argc, char *argv[]) {
        MonoAssembly *assembly;
-       char *cname = NULL;
-       char *aname = NULL;
+       MonoImage *image;
+       const char *cname = NULL;
+       const char *aname = NULL;
        char *outputfile = NULL;
-       int callgraph = 0;
+       int graphtype = GRAPH_TYPES;
        int callneato = 0;
        int i;
        
@@ -415,7 +1014,13 @@ main (int argc, char *argv[]) {
                if (argv [i] [0] != '-')
                        break;
                if (strcmp (argv [i], "--call") == 0 || strcmp (argv [i], "-c") == 0) {
-                       callgraph = 1;
+                       graphtype = GRAPH_CALL;
+               } else if (strcmp (argv [i], "--control-flow") == 0 || strcmp (argv [i], "-C") == 0) {
+                       graphtype = GRAPH_CONTROL_FLOW;
+               } else if (strcmp (argv [i], "--interface") == 0 || strcmp (argv [i], "-i") == 0) {
+                       graphtype = GRAPH_INTERFACE;
+               } else if (strcmp (argv [i], "--stats") == 0) {
+                       graphtype = GRAPH_STATS;
                } else if (strcmp (argv [i], "--fullname") == 0 || strcmp (argv [i], "-f") == 0) {
                        include_namespace = 1;
                } else if (strcmp (argv [i], "--neato") == 0 || strcmp (argv [i], "-n") == 0) {
@@ -440,13 +1045,15 @@ main (int argc, char *argv[]) {
        if (argc > i + 1)
                cname = argv [i + 1];
        if (!aname)
-               aname = "corlib.dll";
-       if (!cname && !callgraph)
+               aname = "mscorlib";
+       if (!cname && (graphtype == GRAPH_TYPES))
                cname = "System.Object";
 
-       assembly = mono_assembly_open (aname, NULL, NULL);
-       if (!assembly)
-               g_error ("cannot open assembly %s", aname);
+       assembly = mono_assembly_open (aname, NULL);
+       if (!assembly) {
+               g_print ("cannot open assembly %s\n", aname);
+               exit (1);
+       }
 
        if (callneato) {
                GString *command = g_string_new ("neato");
@@ -459,21 +1066,42 @@ main (int argc, char *argv[]) {
                if (type)
                        g_string_sprintfa (command, " -T%s", type + 1);
                output = popen (command->str, "w");
-               if (!output)
-                       g_error ("Cannot run neato");
+               if (!output) {
+                       g_print ("Cannot run neato: you may need to install the graphviz package.\n");
+                       exit (1);
+               }
        } else if (outputfile) {
                output = fopen (outputfile, "w");
-               if (!output)
-                       g_error ("Cannot open file: %s", outputfile);
+               if (!output) {
+                       g_print ("Cannot open file: %s\n", outputfile);
+                       exit (1);
+               }
        }
        /* if it looks like a method name, we want a callgraph. */
-       if (cname && strchr (cname, ':'))
-               callgraph = 1;
+       if (cname && strchr (cname, ':') && graphtype == GRAPH_TYPES)
+               graphtype = GRAPH_CALL;
 
-       if (callgraph)
-               method_graph (assembly->image, cname);
-       else
-               type_graph (assembly->image, cname);
+       image = mono_assembly_get_image (assembly);
+       switch (graphtype) {
+       case GRAPH_TYPES:
+               type_graph (image, cname);
+               break;
+       case GRAPH_CALL:
+               method_graph (image, cname);
+               break;
+       case GRAPH_INTERFACE:
+               interface_graph (image, cname);
+               break;
+       case GRAPH_CONTROL_FLOW:
+               method_cfg (image, cname);
+               break;
+       case GRAPH_STATS:
+               stats (image, cname);
+               break;
+       default:
+               g_error ("wrong graph type");
+       }
+       
        if (callneato) {
                if (verbose)
                        g_print ("waiting for neato.\n");