projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2006-11-03 Dick Porter <dick@ximian.com>
[mono.git] / mono / metadata / verify.c
diff --git a/mono/metadata/verify.c b/mono/metadata/verify.c
index fecda6801c541d4a223a1c1d4ba9fa5e479ea201..4c8a8ed54614739d1bccf35c80197d38d044b60d 100644 (file)
--- a/mono/metadata/verify.c
+++ b/mono/metadata/verify.c
@@ -1,5 +1,5 @@
 
-#include <mono/metadata/object.h>
+#include <mono/metadata/object-internals.h>
 #include <mono/metadata/verify.h>
 #include <mono/metadata/opcodes.h>
 #include <mono/metadata/tabledefs.h>
@@ -7,6 +7,8 @@
 #include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/mono-endian.h>
 #include <mono/metadata/metadata.h>
+#include <mono/metadata/metadata-internals.h>
+#include <mono/metadata/class-internals.h>
 #include <mono/metadata/tokentype.h>
 #include <string.h>
 #include <signal.h>
@@ -54,8 +56,8 @@ mono_free_verify_list (GSList *list)
                (list) = g_slist_prepend ((list), vinfo);       \
        } while (0)
 
-static const char* const
-valid_cultures[] = {
+static const char
+valid_cultures[][9] = {
        "ar-SA", "ar-IQ", "ar-EG", "ar-LY",
        "ar-DZ", "ar-MA", "ar-TN", "ar-OM",
        "ar-YE", "ar-SY", "ar-JO", "ar-LB",
@@ -90,8 +92,7 @@ valid_cultures[] = {
        "Lt-uz-UZ", "Cy-uz-UZ", "tt-TA", "pa-IN",
        "gu-IN", "ta-IN", "te-IN", "kn-IN",
        "mr-IN", "sa-IN", "mn-MN", "gl-ES",
-       "kok-IN", "syr-SY", "div-MV",
-       NULL
+       "kok-IN", "syr-SY", "div-MV"
 };
 
 static int
@@ -101,9 +102,11 @@ is_valid_culture (const char *cname)
        int found;
                        
        found = *cname == 0;
-       for (i = 0; !found && valid_cultures [i]; ++i) {
-               if (g_strcasecmp (valid_cultures [i], cname))
+       for (i = 0; i < G_N_ELEMENTS (valid_cultures); ++i) {
+               if (g_strcasecmp (valid_cultures [i], cname)) {
                        found = 1;
+                       break;
+               }
        }
        return found;
 }
@@ -354,17 +357,17 @@ verify_constant_table (MonoImage *image, GSList *list, int level)
                                ADD_ERROR (list, g_strdup_printf ("Type 0x%x is invalid in Constant row %d", cols [MONO_CONSTANT_TYPE], i + 1));
                }
                if (level & MONO_VERIFY_ERROR) {
-                       value = cols [MONO_CONSTANT_PARENT] >> HASCONSTANT_BITS;
-                       switch (cols [MONO_CONSTANT_PARENT] & HASCONSTANT_MASK) {
-                       case HASCONSTANT_FIEDDEF:
+                       value = cols [MONO_CONSTANT_PARENT] >> MONO_HASCONSTANT_BITS;
+                       switch (cols [MONO_CONSTANT_PARENT] & MONO_HASCONSTANT_MASK) {
+                       case MONO_HASCONSTANT_FIEDDEF:
                                if (value > image->tables [MONO_TABLE_FIELD].rows)
                                        ADD_ERROR (list, g_strdup_printf ("Parent (field) is invalid in Constant row %d", i + 1));
                                break;
-                       case HASCONSTANT_PARAM:
+                       case MONO_HASCONSTANT_PARAM:
                                if (value > image->tables [MONO_TABLE_PARAM].rows)
                                        ADD_ERROR (list, g_strdup_printf ("Parent (param) is invalid in Constant row %d", i + 1));
                                break;
-                       case HASCONSTANT_PROPERTY:
+                       case MONO_HASCONSTANT_PROPERTY:
                                if (value > image->tables [MONO_TABLE_PROPERTY].rows)
                                        ADD_ERROR (list, g_strdup_printf ("Parent (property) is invalid in Constant row %d", i + 1));
                                break;
@@ -443,17 +446,17 @@ verify_event_table (MonoImage *image, GSList *list, int level)
                }
                
                if (level & MONO_VERIFY_ERROR && cols [MONO_EVENT_TYPE]) {
-                       value = cols [MONO_EVENT_TYPE] >> TYPEDEFORREF_BITS;
-                       switch (cols [MONO_EVENT_TYPE] & TYPEDEFORREF_MASK) {
-                       case TYPEDEFORREF_TYPEDEF:
+                       value = cols [MONO_EVENT_TYPE] >> MONO_TYPEDEFORREF_BITS;
+                       switch (cols [MONO_EVENT_TYPE] & MONO_TYPEDEFORREF_MASK) {
+                       case MONO_TYPEDEFORREF_TYPEDEF:
                                if (!value || value > image->tables [MONO_TABLE_TYPEDEF].rows)
                                        ADD_ERROR (list, g_strdup_printf ("Type invalid in Event row %d", i + 1));
                                break;
-                       case TYPEDEFORREF_TYPEREF:
+                       case MONO_TYPEDEFORREF_TYPEREF:
                                if (!value || value > image->tables [MONO_TABLE_TYPEREF].rows)
                                        ADD_ERROR (list, g_strdup_printf ("Type invalid in Event row %d", i + 1));
                                break;
-                       case TYPEDEFORREF_TYPESPEC:
+                       case MONO_TYPEDEFORREF_TYPESPEC:
                                if (!value || value > image->tables [MONO_TABLE_TYPESPEC].rows)
                                        ADD_ERROR (list, g_strdup_printf ("Type invalid in Event row %d", i + 1));
                                break;
@@ -684,7 +687,7 @@ enum {
        TYPE_MAX = 8
 };
 
-static const char* 
+static const char*  const
 arg_name [TYPE_MAX] = {
        "Invalid",
        "Int32",
@@ -1134,6 +1137,7 @@ mono_method_verify (MonoMethod *method, int level)
 {
        MonoMethodHeader *header;
        MonoMethodSignature *signature, *csig;
+       MonoGenericContext *generic_context = NULL;
        MonoMethod *cmethod;
        MonoClassField *field;
        MonoClass *klass;
@@ -1142,9 +1146,9 @@ mono_method_verify (MonoMethod *method, int level)
        ILStackDesc *stack;
        register const unsigned char *ip;
        register const unsigned char *end;
-       const unsigned char *target; /* branch target */
+       const unsigned char *target = NULL; /* branch target */
        int max_args, max_stack, cur_stack, i, n, need_merge, start;
-       guint32 token, ip_offset;
+       guint32 token, ip_offset = 0;
        char *local_state = NULL;
        GSList *list = NULL;
        guint prefix = 0;
@@ -1154,8 +1158,8 @@ mono_method_verify (MonoMethod *method, int level)
                        (method->flags & (METHOD_ATTRIBUTE_PINVOKE_IMPL | METHOD_ATTRIBUTE_ABSTRACT))) {
                return NULL;
        }
-       signature = method->signature;
-       header = ((MonoMethodNormal *)method)->header;
+       signature = mono_method_signature (method);
+       header = mono_method_get_header (method);
        ip = header->code;
        end = ip + header->code_size;
        max_args = signature->param_count + signature->hasthis;
@@ -1173,6 +1177,9 @@ mono_method_verify (MonoMethod *method, int level)
                params = signature->params;
        }
 
+       if (signature->is_inflated)
+               generic_context = ((MonoMethodInflated *) method)->context;
+
        if (header->num_locals) {
                local_state = g_new (char, header->num_locals);
                memset (local_state, header->init_locals, header->num_locals);
@@ -1387,10 +1394,15 @@ mono_method_verify (MonoMethod *method, int level)
                        /*
                         * FIXME: we could just load the signature ...
                         */
-                       cmethod = mono_get_method (image, token, NULL);
+                       cmethod = mono_get_method_full (image, token, NULL, generic_context);
                        if (!cmethod)
                                ADD_INVALID (list, g_strdup_printf ("Method 0x%08x not found at 0x%04x", token, ip_offset));
-                       csig = cmethod->signature;
+                       if (mono_method_signature (cmethod)) {
+                               csig = mono_method_signature (cmethod);
+                       } else {
+                               csig = mono_method_get_signature (cmethod, image, token);
+                       }
+
                        CHECK_STACK_UNDERFLOW (csig->param_count + csig->hasthis);
                        cur_stack -= csig->param_count + csig->hasthis;
                        if (csig->ret->type != MONO_TYPE_VOID) {
@@ -1602,7 +1614,7 @@ mono_method_verify (MonoMethod *method, int level)
                        CHECK_STACK_UNDERFLOW (1);
                        if (stack [cur_stack - 1].stype != TYPE_MP)
                                ADD_INVALID (list, g_strdup_printf ("Invalid argument to ldobj at 0x%04x", ip_offset));
-                       klass = mono_class_get (image, token);
+                       klass = mono_class_get_full (image, token, generic_context);
                        if (!klass)
                                ADD_INVALID (list, g_strdup_printf ("Cannot load class from token 0x%08x at 0x%04x", token, ip_offset));
                        if (!klass->valuetype)
@@ -1624,10 +1636,10 @@ mono_method_verify (MonoMethod *method, int level)
                        /*
                         * FIXME: we could just load the signature ...
                         */
-                       cmethod = mono_get_method (image, token, NULL);
+                       cmethod = mono_get_method_full (image, token, NULL, generic_context);
                        if (!cmethod)
                                ADD_INVALID (list, g_strdup_printf ("Constructor 0x%08x not found at 0x%04x", token, ip_offset));
-                       csig = cmethod->signature;
+                       csig = mono_method_signature (cmethod);
                        CHECK_STACK_UNDERFLOW (csig->param_count);
                        cur_stack -= csig->param_count;
                        CHECK_STACK_OVERFLOW ();
@@ -1670,7 +1682,7 @@ mono_method_verify (MonoMethod *method, int level)
                        if (stack [cur_stack - 1].stype != TYPE_OBJ && stack [cur_stack - 1].stype != TYPE_MP)
                                ADD_INVALID (list, g_strdup_printf ("Invalid argument %s to ldfld at 0x%04x", arg_name [stack [cur_stack].stype], ip_offset));
                        token = read32 (ip + 1);
-                       field = mono_field_from_token (image, token, &klass);
+                       field = mono_field_from_token (image, token, &klass, generic_context);
                        if (!field)
                                ADD_INVALID (list, g_strdup_printf ("Cannot load field from token 0x%08x at 0x%04x", token, ip_offset));
                        type_to_eval_stack_type (field->type, stack + cur_stack - 1, FALSE);
@@ -1681,7 +1693,7 @@ mono_method_verify (MonoMethod *method, int level)
                        if (stack [cur_stack - 1].stype != TYPE_OBJ && stack [cur_stack - 1].stype != TYPE_MP)
                                ADD_INVALID (list, g_strdup_printf ("Invalid argument to ldflda at 0x%04x", ip_offset));
                        token = read32 (ip + 1);
-                       field = mono_field_from_token (image, token, &klass);
+                       field = mono_field_from_token (image, token, &klass, generic_context);
                        if (!field)
                                ADD_INVALID (list, g_strdup_printf ("Cannot load field from token 0x%08x at 0x%04x", token, ip_offset));
                        type_to_eval_stack_type (field->type, stack + cur_stack - 1, TRUE);
@@ -1693,7 +1705,7 @@ mono_method_verify (MonoMethod *method, int level)
                        if (stack [cur_stack].stype != TYPE_OBJ && stack [cur_stack].stype != TYPE_MP)
                                ADD_INVALID (list, g_strdup_printf ("Invalid argument to stfld at 0x%04x", ip_offset));
                        token = read32 (ip + 1);
-                       field = mono_field_from_token (image, token, &klass);
+                       field = mono_field_from_token (image, token, &klass, generic_context);
                        if (!field)
                                ADD_INVALID (list, g_strdup_printf ("Cannot load field from token 0x%08x at 0x%04x", token, ip_offset));
                        /* can_store */
@@ -1702,7 +1714,7 @@ mono_method_verify (MonoMethod *method, int level)
                case CEE_LDSFLD:
                        CHECK_STACK_OVERFLOW ();
                        token = read32 (ip + 1);
-                       field = mono_field_from_token (image, token, &klass);
+                       field = mono_field_from_token (image, token, &klass, generic_context);
                        if (!field)
                                ADD_INVALID (list, g_strdup_printf ("Cannot load field from token 0x%08x at 0x%04x", token, ip_offset));
                        type_to_eval_stack_type (field->type, stack + cur_stack, FALSE);
@@ -1712,7 +1724,7 @@ mono_method_verify (MonoMethod *method, int level)
                case CEE_LDSFLDA:
                        CHECK_STACK_OVERFLOW ();
                        token = read32 (ip + 1);
-                       field = mono_field_from_token (image, token, &klass);
+                       field = mono_field_from_token (image, token, &klass, generic_context);
                        if (!field)
                                ADD_INVALID (list, g_strdup_printf ("Cannot load field from token 0x%08x at 0x%04x", token, ip_offset));
                        type_to_eval_stack_type (field->type, stack + cur_stack, TRUE);
@@ -1723,7 +1735,7 @@ mono_method_verify (MonoMethod *method, int level)
                        CHECK_STACK_UNDERFLOW (1);
                        --cur_stack;
                        token = read32 (ip + 1);
-                       field = mono_field_from_token (image, token, &klass);
+                       field = mono_field_from_token (image, token, &klass, generic_context);
                        if (!field)
                                ADD_INVALID (list, g_strdup_printf ("Cannot load field from token 0x%08x at 0x%04x", token, ip_offset));
                        /* can store */
@@ -1815,8 +1827,8 @@ mono_method_verify (MonoMethod *method, int level)
                        cur_stack -= 3;
                        ++ip;
                        break;
-               case CEE_LDELEM:
-               case CEE_STELEM:
+               case CEE_LDELEM_ANY:
+               case CEE_STELEM_ANY:
                case CEE_UNBOX_ANY:
                case CEE_UNUSED5:
                case CEE_UNUSED6:
@@ -2214,7 +2226,8 @@ methodbuilder_fields[] = {
        {"pinfo", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, pinfo)},
        {"pi_dll", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, dll)},
        {"pi_entry", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, dllentry)},
-       {"ncharset", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, charset)},
+       {"charset", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, charset)},
+       {"extra_flags", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, extra_flags)},
        {"native_cc", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, native_cc)},
        {"call_conv", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, call_conv)},
        {NULL, 0}
@@ -2466,7 +2479,7 @@ messaging_classes_to_check [] = {
 static FieldDesc 
 transparent_proxy_fields[] = {
        {"_rp", G_STRUCT_OFFSET (MonoTransparentProxy, rp)},
-       {"_class", G_STRUCT_OFFSET (MonoTransparentProxy, klass)},
+       {"_class", G_STRUCT_OFFSET (MonoTransparentProxy, remote_class)},
        {NULL, 0}
 };
 
@@ -2493,7 +2506,6 @@ wait_handle_fields[] = {
 static FieldDesc 
 thread_fields[] = {
        {"system_thread_handle", G_STRUCT_OFFSET (MonoThread, handle)},
-       {"current_culture", G_STRUCT_OFFSET (MonoThread, culture_info)},
        {"threadpool_thread", G_STRUCT_OFFSET (MonoThread, threadpool_thread)},
        {"state", G_STRUCT_OFFSET (MonoThread, state)},
        {"abort_exc", G_STRUCT_OFFSET (MonoThread, abort_exc)},
@@ -2528,10 +2540,10 @@ cinfo_fields[] = {
 
 static const FieldDesc
 dtfinfo_fields[] = {
-       {"_AMDesignator", G_STRUCT_OFFSET (MonoDateTimeFormatInfo, AMDesignator)},
-       {"_PMDesignator", G_STRUCT_OFFSET (MonoDateTimeFormatInfo, PMDesignator)},
-       {"_DayNames", G_STRUCT_OFFSET (MonoDateTimeFormatInfo, DayNames)},
-       {"_MonthNames", G_STRUCT_OFFSET (MonoDateTimeFormatInfo, MonthNames)},
+       {"amDesignator", G_STRUCT_OFFSET (MonoDateTimeFormatInfo, AMDesignator)},
+       {"pmDesignator", G_STRUCT_OFFSET (MonoDateTimeFormatInfo, PMDesignator)},
+       {"dayNames", G_STRUCT_OFFSET (MonoDateTimeFormatInfo, DayNames)},
+       {"monthNames", G_STRUCT_OFFSET (MonoDateTimeFormatInfo, MonthNames)},
        {NULL, 0}
 };
 
my mono mirror. check out Moved to http://github.com/mono/mono