2015-12-16 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / metadata / debug-helpers.c

diff --git a/mono/metadata/debug-helpers.c b/mono/metadata/debug-helpers.c
index ef60d033af07236171f6704ca121aae2ffb54f21..35b81fc96ced36802632607b52b7730ae58a9b54 100644 (file)
--- a/mono/metadata/debug-helpers.c
+++ b/mono/metadata/debug-helpers.c
@@ -72,21 +72,21 @@ wrapper_type_to_str (guint32 wrapper_type)
 #endif
 
 static void
-append_class_name (GString *res, MonoClass *class, gboolean include_namespace)
+append_class_name (GString *res, MonoClass *klass, gboolean include_namespace)
 {
-       if (!class) {
+       if (!klass) {
                g_string_append (res, "Unknown");
                return;
        }
-       if (class->nested_in) {
-               append_class_name (res, class->nested_in, include_namespace);
+       if (klass->nested_in) {
+               append_class_name (res, klass->nested_in, include_namespace);
                g_string_append_c (res, '/');
        }
-       if (include_namespace && *(class->name_space)) {
-               g_string_append (res, class->name_space);
+       if (include_namespace && *(klass->name_space)) {
+               g_string_append (res, klass->name_space);
                g_string_append_c (res, '.');
        }
-       g_string_append (res, class->name);
+       g_string_append (res, klass->name);
 }
 
 static MonoClass*
@@ -251,6 +251,31 @@ mono_signature_get_desc (MonoMethodSignature *sig, gboolean include_namespace)
        return result;
 }
 
+char*
+mono_signature_full_name (MonoMethodSignature *sig)
+{
+       int i;
+       char *result;
+       GString *res;
+
+       if (!sig)
+               return g_strdup ("<invalid signature>");
+
+       res = g_string_new ("");
+
+       mono_type_get_desc (res, sig->ret, TRUE);
+       g_string_append_c (res, '(');
+       for (i = 0; i < sig->param_count; ++i) {
+               if (i > 0)
+                       g_string_append_c (res, ',');
+               mono_type_get_desc (res, sig->params [i], TRUE);
+       }
+       g_string_append_c (res, ')');
+       result = res->str;
+       g_string_free (res, FALSE);
+       return result;
+}
+
 static void
 ginst_get_desc (GString *str, MonoGenericInst *ginst)
 {
@@ -956,23 +981,24 @@ print_field_value (const char *field_ptr, MonoClassField *field, int type_offset
 }
 
 static void
-objval_describe (MonoClass *class, const char *addr)
+objval_describe (MonoClass *klass, const char *addr)
 {
        MonoClassField *field;
        MonoClass *p;
        const char *field_ptr;
        gssize type_offset = 0;
-       if (class->valuetype)
+
+       if (klass->valuetype)
                type_offset = -sizeof (MonoObject);
 
-       for (p = class; p != NULL; p = p->parent) {
+       for (p = klass; p != NULL; p = p->parent) {
                gpointer iter = NULL;
                int printed_header = FALSE;
                while ((field = mono_class_get_fields (p, &iter))) {
                        if (field->type->attrs & (FIELD_ATTRIBUTE_STATIC | FIELD_ATTRIBUTE_HAS_FIELD_RVA))
                                continue;
 
-                       if (p != class && !printed_header) {
+                       if (p != klass && !printed_header) {
                                const char *sep;
                                g_print ("In class ");
                                sep = print_name_space (p);
@@ -995,8 +1021,8 @@ objval_describe (MonoClass *class, const char *addr)
 void
 mono_object_describe_fields (MonoObject *obj)
 {
-       MonoClass *class = mono_object_class (obj);
-       objval_describe (class, (char*)obj);
+       MonoClass *klass = mono_object_class (obj);
+       objval_describe (klass, (char*)obj);
 }
 
 /**
@@ -1030,7 +1056,7 @@ mono_class_describe_statics (MonoClass* klass)
 
        if (!vtable)
                return;
-       if (!(addr = mono_vtable_get_static_field_data (vtable)))
+       if (!(addr = (const char *)mono_vtable_get_static_field_data (vtable)))
                return;
 
        for (p = klass; p != NULL; p = p->parent) {
@@ -1040,9 +1066,6 @@ mono_class_describe_statics (MonoClass* klass)
                                continue;
                        if (!(field->type->attrs & (FIELD_ATTRIBUTE_STATIC | FIELD_ATTRIBUTE_HAS_FIELD_RVA)))
                                continue;
-                       // Special static fields don't have a domain-level static slot
-                       if (mono_class_field_is_special_static (field))
-                               continue;
 
                        field_ptr = (const char*)addr + field->offset;