Merge pull request #3066 from alexanderkyte/pedump_sgen

[mono.git] / mono / mini / trace.c

diff --git a/mono/mini/trace.c b/mono/mini/trace.c
index 3d843f3b46bc25f4163dcac47258a9cbd0492220..98f89d63500b7fe89ea677a7bbe041a911dd4a00 100644 (file)
--- a/mono/mini/trace.c
+++ b/mono/mini/trace.c
@@ -7,6 +7,7 @@
  *
  * (C) 2002 Ximian, Inc.
  * Copyright 2011 Xamarin, Inc (http://www.xamarin.com)
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
 #include <config.h>
@@ -158,7 +159,7 @@ static void get_string (void)
        }
        if (value != NULL)
                g_free (value);
-       value = g_malloc (input - start + 1);
+       value = (char *)g_malloc (input - start + 1);
        strncpy (value, start, input-start);
        value [input-start] = 0;
 }
@@ -431,11 +432,11 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
 
        sig = mono_method_signature (method);
 
-       arg_info = alloca (sizeof (MonoJitArgumentInfo) * (sig->param_count + 1));
+       arg_info = (MonoJitArgumentInfo *)alloca (sizeof (MonoJitArgumentInfo) * (sig->param_count + 1));
 
        if (method->is_inflated) {
                /* FIXME: Might be better to pass the ji itself */
-               MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), RETURN_ADDRESS (), NULL);
+               MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), (char *)RETURN_ADDRESS (), NULL);
                if (ji) {
                        gsctx = mono_jit_info_get_generic_sharing_context (ji);
                        if (gsctx && gsctx->is_gsharedvt) {
@@ -455,11 +456,11 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
        }
 
        if (mono_method_signature (method)->hasthis) {
-               gpointer *this = (gpointer *)(ebp + arg_info [0].offset);
+               gpointer *this_obj = (gpointer *)(ebp + arg_info [0].offset);
                if (method->klass->valuetype) {
-                       printf ("value:%p, ", *arg_in_stack_slot(this, gpointer *));
+                       printf ("value:%p, ", *arg_in_stack_slot(this_obj, gpointer *));
                } else {
-                       o = *arg_in_stack_slot(this, MonoObject *);
+                       o = *arg_in_stack_slot(this_obj, MonoObject *);
 
                        if (o) {
                                klass = o->vtable->klass;
@@ -486,7 +487,7 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
                
                if (type->byref) {
                        printf ("[BYREF:%p], ", *arg_in_stack_slot(cpos, gpointer *));
-               } else switch (mono_type_get_underlying_type (type)->type) {
+               } else switch (mini_get_underlying_type (type)->type) {
                        
                case MONO_TYPE_I:
                case MONO_TYPE_U:
@@ -533,7 +534,7 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
                                        g_free (as);
                                } else if (klass == mono_defaults.int32_class) {
                                        printf ("[INT32:%p:%d], ", o, *(gint32 *)((char *)o + sizeof (MonoObject)));
-                               } else if (klass == mono_defaults.monotype_class) {
+                               } else if (klass == mono_defaults.runtimetype_class) {
                                        printf ("[TYPE:%s], ", mono_type_full_name (((MonoReflectionType*)o)->type));
                                } else
                                        printf ("[%s.%s:%p], ", klass->name_space, klass->name, o);
@@ -599,7 +600,7 @@ mono_trace_leave_method (MonoMethod *method, ...)
 
        if (method->is_inflated) {
                /* FIXME: Might be better to pass the ji itself */
-               MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), RETURN_ADDRESS (), NULL);
+               MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), (char *)RETURN_ADDRESS (), NULL);
                if (ji) {
                        gsctx = mono_jit_info_get_generic_sharing_context (ji);
                        if (gsctx && gsctx->is_gsharedvt) {
@@ -610,9 +611,8 @@ mono_trace_leave_method (MonoMethod *method, ...)
                }
        }
 
-       type = mono_method_signature (method)->ret;
+       type = mini_get_underlying_type (mono_method_signature (method)->ret);
 
-handle_enum:
        switch (type->type) {
        case MONO_TYPE_VOID:
                break;
@@ -694,20 +694,16 @@ handle_enum:
                printf ("FP=%f", f);
                break;
        }
-       case MONO_TYPE_VALUETYPE: 
-               if (type->data.klass->enumtype) {
-                       type = mono_class_enum_basetype (type->data.klass);
-                       goto handle_enum;
-               } else {
-                       guint8 *p = va_arg (ap, gpointer);
-                       int j, size, align;
-                       size = mono_type_size (type, &align);
-                       printf ("[");
-                       for (j = 0; p && j < size; j++)
-                               printf ("%02x,", p [j]);
-                       printf ("]");
-               }
+       case MONO_TYPE_VALUETYPE:  {
+               guint8 *p = (guint8 *)va_arg (ap, gpointer);
+               int j, size, align;
+               size = mono_type_size (type, &align);
+               printf ("[");
+               for (j = 0; p && j < size; j++)
+                       printf ("%02x,", p [j]);
+               printf ("]");
                break;
+       }
        default:
                printf ("(unknown return type %x)", mono_method_signature (method)->ret->type);
        }