Author: kumpera
Date: 2007-09-25 17:40:18 -0400 (Tue, 25 Sep 2007)
New Revision: 86358

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/verify.c
Log:
2007-09-25  Rodrigo Kumpera  <[EMAIL PROTECTED]>

        * verify.c: Support for verifying VAR and MVAR types, 



Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2007-09-25 21:38:03 UTC (rev 86357)
+++ trunk/mono/mono/metadata/ChangeLog  2007-09-25 21:40:18 UTC (rev 86358)
@@ -1,3 +1,7 @@
+2007-09-25  Rodrigo Kumpera  <[EMAIL PROTECTED]>
+
+       * verify.c: Support for verifying VAR and MVAR types, 
+
 2007-09-25  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * icall.c (ves_icall_get_property_info): Set the reflected type of the

Modified: trunk/mono/mono/metadata/verify.c
===================================================================
--- trunk/mono/mono/metadata/verify.c   2007-09-25 21:38:03 UTC (rev 86357)
+++ trunk/mono/mono/metadata/verify.c   2007-09-25 21:40:18 UTC (rev 86358)
@@ -1497,6 +1497,12 @@
                        case MONO_TYPE_GENERICINST:
                                printf ("complex] (inst of %s )", 
value->type->data.generic_class->container_class->name);
                                return;
+                       case MONO_TYPE_VAR:
+                               printf ("complex] (type generic param !%d - %s) 
", value->type->data.generic_param->num, value->type->data.generic_param->name);
+                               return;
+                       case MONO_TYPE_MVAR:
+                               printf ("complex] (method generic param !!%d - 
%s) ", value->type->data.generic_param->num, 
value->type->data.generic_param->name);
+                               return;
                        default:
                                printf ("unknown complex %d type]\n", 
value->type->type);
                                g_assert_not_reached ();
@@ -1667,6 +1673,8 @@
        case MONO_TYPE_ARRAY:
 
        case MONO_TYPE_GENERICINST:
+       case MONO_TYPE_VAR:
+       case MONO_TYPE_MVAR: 
                stack->stype = TYPE_COMPLEX | mask;
                return;
        case MONO_TYPE_I8:
@@ -1983,7 +1991,17 @@
                                return FALSE;
                        return target->data.klass == candidate->data.klass;
                }
+               
+       case MONO_TYPE_VAR:
+               if (candidate->type != MONO_TYPE_VAR)
+                       return FALSE;
+               return candidate->data.generic_param->num == 
target->data.generic_param->num;
 
+       case MONO_TYPE_MVAR:
+               if (candidate->type != MONO_TYPE_MVAR)
+                       return FALSE;
+               return candidate->data.generic_param->num == 
target->data.generic_param->num;
+
        default:
                VERIFIER_DEBUG ( printf ("unknown store type %d\n", 
target->type); );
                g_assert_not_reached ();
@@ -2130,6 +2148,22 @@
                        return stack->type->data.klass == type->data.klass;
                }
 
+       case MONO_TYPE_VAR:
+               if (stack_type != TYPE_COMPLEX)
+                       return FALSE;
+               g_assert (stack->type);
+               if (stack->type->type != MONO_TYPE_VAR)
+                       return FALSE;
+               return stack->type->data.generic_param->num == 
type->data.generic_param->num;
+
+       case MONO_TYPE_MVAR:
+               if (stack_type != TYPE_COMPLEX)
+                       return FALSE;
+               g_assert (stack->type);
+               if (stack->type->type != MONO_TYPE_MVAR)
+                       return FALSE;
+               return stack->type->data.generic_param->num == 
type->data.generic_param->num;
+
        default:
                printf("unknown store type %d\n", type->type);
                g_assert_not_reached ();

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to