wrong error number

[mono.git] / mono / metadata / verify.c

diff --git a/mono/metadata/verify.c b/mono/metadata/verify.c
index ebafe2e0b38dd0fff51a53b1aecf423a77387e70..05fcfbeadd6d40fa3335174261279b6823b11d9e 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>
@@ -8,6 +8,7 @@
 #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>
@@ -355,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;
@@ -444,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;
@@ -1144,9 +1145,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;
@@ -1157,7 +1158,7 @@ mono_method_verify (MonoMethod *method, int level)
                return NULL;
        }
        signature = method->signature;
-       header = ((MonoMethodNormal *)method)->header;
+       header = mono_method_get_header (method);
        ip = header->code;
        end = ip + header->code_size;
        max_args = signature->param_count + signature->hasthis;
@@ -1825,8 +1826,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: