projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2004-07-05 Zoltan Varga <vargaz@freemail.hu>
[mono.git] / mono / metadata / verify.c
diff --git a/mono/metadata/verify.c b/mono/metadata/verify.c
index 80e57e51f57d205e91c57a4e116ba61cd877dd6a..1952eb4ed7f3fadc482ad3e7587b3030ea0c51a8 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>
@@ -354,17 +356,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 +445,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;
@@ -1134,6 +1136,7 @@ mono_method_verify (MonoMethod *method, int level)
 {
        MonoMethodHeader *header;
        MonoMethodSignature *signature, *csig;
+       MonoGenericContext *generic_context = NULL;
        MonoMethod *cmethod;
        MonoClassField *field;
        MonoClass *klass;
@@ -1173,6 +1176,9 @@ mono_method_verify (MonoMethod *method, int level)
                params = signature->params;
        }
 
+       if (method->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 +1393,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 (cmethod->signature->pinvoke) {
+                               csig = cmethod->signature;
+                       } 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 +1613,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,7 +1635,7 @@ 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;
@@ -1670,7 +1681,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 +1692,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 +1704,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 +1713,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 +1723,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 +1734,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 */
my mono mirror. check out Moved to http://github.com/mono/mono