-#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>
+#include <mono/metadata/reflection.h>
+#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>
#include <ctype.h>
/*
(list) = g_slist_prepend ((list), vinfo); \
} while (0)
-static const char*
+static const char* const
valid_cultures[] = {
"ar-SA", "ar-IQ", "ar-EG", "ar-LY",
"ar-DZ", "ar-MA", "ar-TN", "ar-OM",
}
static int
-is_valid_blob (MonoImage *image, guint32 index, int notnull)
+is_valid_blob (MonoImage *image, guint32 blob_index, int notnull)
{
guint32 size;
- const char *p, *send;
+ const char *p, *blob_end;
- if (index >= image->heap_blob.size)
+ if (blob_index >= image->heap_blob.size)
return 0;
- p = mono_metadata_blob_heap (image, index);
- size = mono_metadata_decode_blob_size (p, &send);
- if (index + size + (send-p) >= image->heap_blob.size)
+ p = mono_metadata_blob_heap (image, blob_index);
+ size = mono_metadata_decode_blob_size (p, &blob_end);
+ if (blob_index + size + (blob_end-p) > image->heap_blob.size)
return 0;
if (notnull && !size)
return 0;
}
static const char*
-is_valid_string (MonoImage *image, guint32 index, int notnull)
+is_valid_string (MonoImage *image, guint32 str_index, int notnull)
{
- const char *p, *send, *res;
+ const char *p, *blob_end, *res;
- if (index >= image->heap_strings.size)
+ if (str_index >= image->heap_strings.size)
return NULL;
- res = p = mono_metadata_string_heap (image, index);
- send = mono_metadata_string_heap (image, image->heap_strings.size - 1);
+ res = p = mono_metadata_string_heap (image, str_index);
+ blob_end = mono_metadata_string_heap (image, image->heap_strings.size - 1);
if (notnull && !*p)
return 0;
/*
* FIXME: should check it's a valid utf8 string, too.
*/
- while (p <= send) {
+ while (p <= blob_end) {
if (!*p)
return res;
++p;
MonoTableInfo *t = &image->tables [MONO_TABLE_CONSTANT];
guint32 cols [MONO_CONSTANT_SIZE];
guint32 value, i;
- GHashTable *dups = g_hash_table_new (g_direct_hash, g_direct_equal);
+ GHashTable *dups = g_hash_table_new (NULL, NULL);
for (i = 0; i < t->rows; ++i) {
mono_metadata_decode_row (t, i, cols, MONO_CONSTANT_SIZE);
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;
MonoTableInfo *t = &image->tables [MONO_TABLE_EVENTMAP];
guint32 cols [MONO_EVENT_MAP_SIZE];
guint32 i, last_event;
- GHashTable *dups = g_hash_table_new (g_direct_hash, g_direct_equal);
+ GHashTable *dups = g_hash_table_new (NULL, NULL);
last_event = 0;
}
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;
}
enum {
- TYPE_INVALID = 0, /* leave at 0. */
- TYPE_INT32 = 1,
- TYPE_INT64 = 2,
- TYPE_NINT = 3,
- TYPE_FLOAT = 4,
- TYPE_MANP = 5,
- TYPE_OBJREF = 6,
- TYPE_MAX = 7
+ TYPE_INV = 0, /* leave at 0. */
+ TYPE_I4 = 1,
+ TYPE_I8 = 2,
+ TYPE_PTR = 3,
+ TYPE_R8 = 4,
+ TYPE_MP = 5,
+ TYPE_OBJ = 6,
+ TYPE_VT = 7,
+ TYPE_MAX = 8
+};
+
+static const char* const
+arg_name [TYPE_MAX] = {
+ "Invalid",
+ "Int32",
+ "Int64",
+ "IntPtr",
+ "Double",
+ "Managed Pointer",
+ "ObjRef",
+ "ValueType"
};
-const static unsigned char
-valid_binops [TYPE_MAX] [TYPE_MAX] = {
- {TYPE_INVALID},
- {TYPE_INVALID, TYPE_INT32, TYPE_INVALID, TYPE_NINT, TYPE_INVALID, TYPE_MANP},
- {TYPE_INVALID, TYPE_INVALID, TYPE_INT64, TYPE_INVALID},
- {TYPE_INVALID, TYPE_NINT, TYPE_INVALID, TYPE_NINT, TYPE_INVALID, TYPE_MANP},
- {TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_FLOAT},
- {TYPE_INVALID, TYPE_MANP, TYPE_INVALID, TYPE_MANP, TYPE_INVALID, TYPE_NINT},
- {TYPE_INVALID}
- /* int32 */ /* int64 */ /* native */ /* float */ /* managed p */ /* objref */
+static const char
+bin_num_table [TYPE_MAX] [TYPE_MAX] = {
+ {TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_I4, TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_MP, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_INV, TYPE_I8, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_MP, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_R8, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_MP, TYPE_INV, TYPE_MP, TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV}
};
-const static unsigned char
-valid_unnops [TYPE_MAX] = {
- TYPE_INVALID, TYPE_INT32, TYPE_INT64, TYPE_NINT, TYPE_FLOAT, TYPE_INVALID
- /* int32 */ /* int64 */ /* native */ /* float */ /* managed p */ /* objref */
+static const char
+neg_table [] = {
+ TYPE_INV, TYPE_I4, TYPE_I8, TYPE_PTR, TYPE_R8, TYPE_INV, TYPE_INV, TYPE_INV
};
-/* note: the resulting type is always a boolean */
-const static unsigned char
-valid_bincomp [TYPE_MAX] [TYPE_MAX] = {
- {TYPE_INVALID},
- {TYPE_INVALID, TYPE_INT32, TYPE_INVALID, TYPE_INT32, TYPE_INVALID},
- {TYPE_INVALID, TYPE_INVALID, TYPE_INT32, TYPE_INVALID},
- {TYPE_INVALID, TYPE_INT32, TYPE_INVALID, TYPE_INT32, TYPE_INVALID, TYPE_INT32},
- {TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INT32},
- {TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INT32, TYPE_INVALID, TYPE_INT32},
- {TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INT32}
- /* int32 */ /* int64 */ /* native */ /* float */ /* managed p */ /* objref */
+/* reduce the size of this table */
+static const char
+bin_int_table [TYPE_MAX] [TYPE_MAX] = {
+ {TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_I4, TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_INV, TYPE_I8, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV}
};
-const static unsigned char
-valid_intops [TYPE_MAX] [TYPE_MAX] = {
- {TYPE_INVALID},
- {TYPE_INVALID, TYPE_INT32, TYPE_INVALID, TYPE_NINT},
- {TYPE_INVALID, TYPE_INVALID, TYPE_INT64},
- {TYPE_INVALID, TYPE_NINT, TYPE_INVALID, TYPE_NINT},
- {TYPE_INVALID}
+static const char
+bin_comp_table [TYPE_MAX] [TYPE_MAX] = {
+ {0},
+ {0, 1, 0, 1, 0, 0, 0, 0},
+ {0, 0, 1, 0, 0, 0, 0, 0},
+ {0, 1, 0, 1, 0, 2, 0, 0},
+ {0, 0, 0, 0, 1, 0, 0, 0},
+ {0, 0, 0, 2, 0, 1, 0, 0},
+ {0, 0, 0, 0, 0, 0, 3, 0},
+ {0, 0, 0, 0, 0, 0, 0, 0},
};
-const static unsigned char
-valid_shiftops [TYPE_MAX] [TYPE_MAX] = {
- {TYPE_INVALID},
- {TYPE_INVALID, TYPE_INT32, TYPE_INVALID, TYPE_INT32},
- {TYPE_INVALID, TYPE_INT64, TYPE_INVALID, TYPE_INT64},
- {TYPE_INVALID, TYPE_NINT, TYPE_INVALID, TYPE_NINT},
- {TYPE_INVALID}
+/* reduce the size of this table */
+static const char
+shift_table [TYPE_MAX] [TYPE_MAX] = {
+ {TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_I4, TYPE_INV, TYPE_I4, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_I8, TYPE_INV, TYPE_I8, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+ {TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV}
+};
+
+static const char
+ldind_type [] = {
+ TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I8, TYPE_PTR, TYPE_R8, TYPE_R8, TYPE_OBJ
+};
+
+static const char
+ldelem_type [] = {
+ TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I8, TYPE_PTR, TYPE_R8, TYPE_R8, TYPE_OBJ
};
#define ADD_INVALID(list,msg) \
vinfo->status = MONO_VERIFY_ERROR; \
vinfo->message = (msg); \
(list) = g_slist_prepend ((list), vinfo); \
- G_BREAKPOINT (); \
+ /*G_BREAKPOINT ();*/ \
goto invalid_cil; \
} while (0)
#define CHECK_STACK_UNDERFLOW(num) \
do { \
if (cur_stack < (num)) \
- ADD_INVALID (list, g_strdup_printf ("Stack underflow at 0x%04x", ip_offset)); \
+ ADD_INVALID (list, g_strdup_printf ("Stack underflow at 0x%04x (%d items instead of %d)", ip_offset, cur_stack, (num))); \
} while (0)
#define CHECK_STACK_OVERFLOW() \
};
typedef struct {
- MonoClass *klass;
- int type;
+ MonoType *type;
+ int stype;
} ILStackDesc;
typedef struct {
guint16 flags;
} ILCodeDesc;
+static void
+type_to_eval_stack_type (MonoType *type, ILStackDesc *stack, int take_addr) {
+ int t = type->type;
+
+ stack->type = type;
+ if (type->byref || take_addr) { /* fix double addr issue */
+ stack->stype = TYPE_MP;
+ return;
+ }
+
+handle_enum:
+ switch (t) {
+ case MONO_TYPE_I1:
+ case MONO_TYPE_U1:
+ case MONO_TYPE_BOOLEAN:
+ case MONO_TYPE_I2:
+ case MONO_TYPE_U2:
+ case MONO_TYPE_CHAR:
+ case MONO_TYPE_I4:
+ case MONO_TYPE_U4:
+ stack->stype = TYPE_I4;
+ return;
+ case MONO_TYPE_I:
+ case MONO_TYPE_U:
+ case MONO_TYPE_PTR:
+ stack->stype = TYPE_PTR;
+ return;
+ case MONO_TYPE_CLASS:
+ case MONO_TYPE_STRING:
+ case MONO_TYPE_OBJECT:
+ case MONO_TYPE_SZARRAY:
+ case MONO_TYPE_ARRAY:
+ stack->stype = TYPE_OBJ;
+ return;
+ case MONO_TYPE_I8:
+ case MONO_TYPE_U8:
+ stack->stype = TYPE_I8;
+ return;
+ case MONO_TYPE_R4:
+ case MONO_TYPE_R8:
+ stack->stype = TYPE_R8;
+ return;
+ case MONO_TYPE_VALUETYPE:
+ if (type->data.klass->enumtype) {
+ t = type->data.klass->enum_basetype->type;
+ goto handle_enum;
+ } else {
+ stack->stype = TYPE_VT;
+ return;
+ }
+ default:
+ g_error ("unknown type %02x in eval stack type", type->type);
+ }
+ return;
+}
+
+static int
+type_from_op (int ins, ILStackDesc *arg) {
+ switch (ins) {
+ /* binops */
+ case CEE_ADD:
+ case CEE_SUB:
+ case CEE_MUL:
+ case CEE_DIV:
+ case CEE_REM:
+ /* FIXME: check unverifiable args for TYPE_MP */
+ return arg->stype = bin_num_table [arg->stype] [arg [1].stype];
+ case CEE_DIV_UN:
+ case CEE_REM_UN:
+ case CEE_AND:
+ case CEE_OR:
+ case CEE_XOR:
+ return arg->stype = bin_int_table [arg->stype] [arg [1].stype];
+ case CEE_SHL:
+ case CEE_SHR:
+ case CEE_SHR_UN:
+ return arg->stype = shift_table [arg->stype] [arg [1].stype];
+ case CEE_BEQ_S:
+ case CEE_BGE_S:
+ case CEE_BGT_S:
+ case CEE_BLE_S:
+ case CEE_BLT_S:
+ case CEE_BNE_UN_S:
+ case CEE_BGE_UN_S:
+ case CEE_BGT_UN_S:
+ case CEE_BLE_UN_S:
+ case CEE_BLT_UN_S:
+ case CEE_BEQ:
+ case CEE_BGE:
+ case CEE_BGT:
+ case CEE_BLE:
+ case CEE_BLT:
+ case CEE_BNE_UN:
+ case CEE_BGE_UN:
+ case CEE_BGT_UN:
+ case CEE_BLE_UN:
+ case CEE_BLT_UN:
+ /* FIXME: handle some specifics with ins->next->type */
+ return bin_comp_table [arg->stype] [arg [1].stype] ? TYPE_I4: TYPE_INV;
+ case 256+CEE_CEQ:
+ case 256+CEE_CGT:
+ case 256+CEE_CGT_UN:
+ case 256+CEE_CLT:
+ case 256+CEE_CLT_UN:
+ return arg->stype = bin_comp_table [arg->stype] [arg [1].stype] ? TYPE_I4: TYPE_INV;
+ /* unops */
+ case CEE_NEG:
+ return arg->stype = neg_table [arg->stype];
+ case CEE_NOT:
+ if (arg->stype >= TYPE_I4 && arg->stype <= TYPE_PTR)
+ return arg->stype;
+ else
+ return arg->stype = TYPE_INV;
+ case CEE_CONV_I1:
+ case CEE_CONV_U1:
+ case CEE_CONV_I2:
+ case CEE_CONV_U2:
+ case CEE_CONV_I4:
+ case CEE_CONV_U4:
+ case CEE_CONV_OVF_I1:
+ case CEE_CONV_OVF_U1:
+ case CEE_CONV_OVF_I2:
+ case CEE_CONV_OVF_U2:
+ case CEE_CONV_OVF_I4:
+ case CEE_CONV_OVF_U4:
+ case CEE_CONV_OVF_I1_UN:
+ case CEE_CONV_OVF_U1_UN:
+ case CEE_CONV_OVF_I2_UN:
+ case CEE_CONV_OVF_U2_UN:
+ case CEE_CONV_OVF_I4_UN:
+ case CEE_CONV_OVF_U4_UN:
+ if (arg->stype == TYPE_INV || arg->stype >= TYPE_MP)
+ return arg->stype = TYPE_INV;
+ return arg->stype = TYPE_I4;
+ case CEE_CONV_I:
+ case CEE_CONV_U:
+ case CEE_CONV_OVF_I:
+ case CEE_CONV_OVF_U:
+ case CEE_CONV_OVF_I_UN:
+ case CEE_CONV_OVF_U_UN:
+ if (arg->stype == TYPE_INV || arg->stype == TYPE_VT)
+ return arg->stype = TYPE_INV;
+ return arg->stype = TYPE_PTR;
+ case CEE_CONV_I8:
+ case CEE_CONV_U8:
+ case CEE_CONV_OVF_I8:
+ case CEE_CONV_OVF_U8:
+ case CEE_CONV_OVF_I8_UN:
+ case CEE_CONV_OVF_U8_UN:
+ return arg->stype = TYPE_I8;
+ case CEE_CONV_R4:
+ case CEE_CONV_R8:
+ return arg->stype = TYPE_R8;
+ default:
+ g_error ("opcode 0x%04x not handled in type from op", ins);
+ break;
+ }
+ return FALSE;
+}
+
static int
in_any_block (MonoMethodHeader *header, guint offset)
{
return 1;
}
+static int
+is_valid_bool_arg (ILStackDesc *arg)
+{
+ switch (arg->stype) {
+ case TYPE_I4:
+ case TYPE_I8:
+ case TYPE_PTR:
+ case TYPE_MP:
+ case TYPE_OBJ:
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
+
+static int
+can_store_type (ILStackDesc *arg, MonoType *type)
+{
+ int t = type->type;
+ if (type->byref && arg->stype != TYPE_MP)
+ return FALSE;
+handle_enum:
+ switch (t) {
+ case MONO_TYPE_VOID:
+ return FALSE;
+ case MONO_TYPE_I1:
+ case MONO_TYPE_U1:
+ case MONO_TYPE_BOOLEAN:
+ case MONO_TYPE_I2:
+ case MONO_TYPE_U2:
+ case MONO_TYPE_CHAR:
+ case MONO_TYPE_I4:
+ case MONO_TYPE_U4:
+ if (arg->stype == TYPE_I4 || arg->stype == TYPE_PTR)
+ return TRUE;
+ return FALSE;
+ case MONO_TYPE_I:
+ case MONO_TYPE_U:
+ case MONO_TYPE_PTR:
+ return TRUE;
+ case MONO_TYPE_CLASS:
+ case MONO_TYPE_STRING:
+ case MONO_TYPE_OBJECT:
+ case MONO_TYPE_SZARRAY:
+ case MONO_TYPE_ARRAY:
+ return TRUE; /* FIXME */
+ case MONO_TYPE_I8:
+ case MONO_TYPE_U8:
+ if (arg->stype == TYPE_I8)
+ return TRUE;
+ return FALSE;
+ case MONO_TYPE_R4:
+ case MONO_TYPE_R8:
+ if (arg->stype == TYPE_R8)
+ return TRUE;
+ return FALSE;
+ case MONO_TYPE_VALUETYPE:
+ if (type->data.klass->enumtype) {
+ t = type->data.klass->enum_basetype->type;
+ goto handle_enum;
+ } else {
+ if (arg->type->data.klass != type->data.klass)
+ return FALSE;
+ return TRUE;
+ }
+ default:
+ g_error ("unknown type %02x in store type", type->type);
+ }
+ return FALSE;
+}
+
+static int
+stind_type (int op, int type) {
+ switch (op) {
+ case CEE_STIND_REF:
+ return type == TYPE_OBJ;
+ case CEE_STIND_I1:
+ case CEE_STIND_I2:
+ case CEE_STIND_I4:
+ return type == TYPE_I4;
+ case CEE_STIND_I8:
+ return type == TYPE_I8;
+ case CEE_STIND_R4:
+ case CEE_STIND_R8:
+ return type == TYPE_R8;
+ default:
+ g_assert_not_reached ();
+ }
+ return FALSE;
+}
+
/*
* FIXME: need to distinguish between valid and verifiable.
* Need to keep track of types on the stack.
{
MonoMethodHeader *header;
MonoMethodSignature *signature, *csig;
+ MonoGenericContext *generic_context = NULL;
MonoMethod *cmethod;
+ MonoClassField *field;
+ MonoClass *klass;
MonoImage *image;
+ MonoType **params;
+ 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;
ILCodeDesc *code;
- signature = method->signature;
- header = ((MonoMethodNormal *)method)->header;
+ if (method->iflags & (METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL | METHOD_IMPL_ATTRIBUTE_RUNTIME) ||
+ (method->flags & (METHOD_ATTRIBUTE_PINVOKE_IMPL | METHOD_ATTRIBUTE_ABSTRACT))) {
+ return NULL;
+ }
+ signature = mono_method_signature (method);
+ header = mono_method_get_header (method);
ip = header->code;
end = ip + header->code_size;
- max_args = method->signature->param_count + method->signature->hasthis;
+ max_args = signature->param_count + signature->hasthis;
max_stack = header->max_stack;
need_merge = cur_stack = 0;
start = 1;
image = method->klass->image;
code = g_new0 (ILCodeDesc, header->code_size);
+ stack = g_new0 (ILStackDesc, max_stack);
+ if (signature->hasthis) {
+ params = g_new0 (MonoType*, max_args);
+ params [0] = &method->klass->this_arg;
+ memcpy (params + 1, signature->params, sizeof (MonoType*) * signature->param_count);
+ } else {
+ 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);
}
- g_print ("Method %s.%s::%s\n", method->klass->name_space, method->klass->name, method->name);
+ /*g_print ("Method %s.%s::%s\n", method->klass->name_space, method->klass->name, method->name);*/
+
+ for (i = 0; i < header->num_clauses; ++i) {
+ MonoExceptionClause *clause = &header->clauses [i];
+ /* catch blocks have the exception on the stack. */
+ if (clause->flags == MONO_EXCEPTION_CLAUSE_NONE) {
+ code [clause->handler_offset].stack_count = 1;
+ code [clause->handler_offset].flags |= CODE_SEEN;
+ }
+ }
while (ip < end) {
ip_offset = ip - header->code;
- g_print ("IL_%04x: %02x\n", ip_offset, *ip);
if (start || !(code [ip_offset].flags & CODE_SEEN)) {
if (start) {
- code [ip_offset].stack_count = 0;
- start = 0;
+ /* g_print ("setting stack of IL_%04x to %d\n", ip_offset, 0); */
+ cur_stack = code [ip_offset].stack_count;
} else {
code [ip_offset].stack_count = cur_stack;
}
if (code [ip_offset].stack_count != cur_stack)
ADD_INVALID (list, g_strdup_printf ("Cannot merge stack states at 0x%04x", ip_offset));
}
+ start = 0;
if (need_merge) {
if (!can_merge_stack (&code [ip_offset], &code [target - header->code]))
ADD_INVALID (list, g_strdup_printf ("Cannot merge stack states at 0x%04x", ip_offset));
need_merge = 0;
}
+#if 0
+ {
+ char *discode;
+ discode = mono_disasm_code_one (NULL, method, ip, NULL);
+ discode [strlen (discode) - 1] = 0; /* no \n */
+ g_print ("%-29s (%d)\n", discode, cur_stack);
+ g_free (discode);
+ }
+#endif
switch (*ip) {
case CEE_NOP:
if (*ip - CEE_LDARG_0 >= max_args)
ADD_INVALID (list, g_strdup_printf ("Method doesn't have argument %d at 0x%04x", *ip - CEE_LDARG_0, ip_offset));
CHECK_STACK_OVERFLOW ();
+ type_to_eval_stack_type (params [*ip - CEE_LDARG_0], stack + cur_stack, FALSE);
++cur_stack;
++ip;
break;
case CEE_LDLOC_3:
if (*ip - CEE_LDLOC_0 >= header->num_locals)
ADD_INVALID (list, g_strdup_printf ("Method doesn't have local var %d at 0x%04x", *ip - CEE_LDLOC_0, ip_offset));
- if (!local_state [*ip - CEE_LDLOC_0])
+ if (0 && !local_state [*ip - CEE_LDLOC_0])
ADD_INVALID (list, g_strdup_printf ("Local var %d is initialized at 0x%04x", *ip - CEE_LDLOC_0, ip_offset));
CHECK_STACK_OVERFLOW ();
+ type_to_eval_stack_type (header->locals [*ip - CEE_LDLOC_0], stack + cur_stack, FALSE);
++cur_stack;
++ip;
break;
local_state [*ip - CEE_STLOC_0] = 1;
CHECK_STACK_UNDERFLOW (1);
--cur_stack;
+ if (!can_store_type (stack + cur_stack, header->locals [*ip - CEE_STLOC_0]))
+ ADD_INVALID (list, g_strdup_printf ("Incompatible type %s in store at 0x%04x", arg_name [stack [cur_stack].stype], ip_offset));
++ip;
break;
case CEE_LDARG_S:
if (ip [1] >= max_args)
ADD_INVALID (list, g_strdup_printf ("Method doesn't have argument %d at 0x%04x", ip [1], ip_offset));
CHECK_STACK_OVERFLOW ();
+ type_to_eval_stack_type (params [ip [1]], stack + cur_stack, *ip == CEE_LDARGA_S);
++cur_stack;
ip += 2;
break;
if (ip [1] >= header->num_locals)
ADD_INVALID (list, g_strdup_printf ("Method doesn't have local var %d at 0x%04x", ip [1], ip_offset));
/* no need to check if the var is initialized if the address is taken */
- if (*ip == CEE_LDLOC_S && !local_state [ip [1]])
+ if (0 && *ip == CEE_LDLOC_S && !local_state [ip [1]])
ADD_INVALID (list, g_strdup_printf ("Local var %d is initialized at 0x%04x", ip [1], ip_offset));
CHECK_STACK_OVERFLOW ();
+ type_to_eval_stack_type (header->locals [ip [1]], stack + cur_stack, *ip == CEE_LDLOCA_S);
++cur_stack;
ip += 2;
break;
local_state [ip [1]] = 1;
CHECK_STACK_UNDERFLOW (1);
--cur_stack;
+ if (!can_store_type (stack + cur_stack, header->locals [ip [1]]))
+ ADD_INVALID (list, g_strdup_printf ("Incompatible type %s in store at 0x%04x", arg_name [stack [cur_stack].stype], ip_offset));
ip += 2;
break;
case CEE_LDNULL:
CHECK_STACK_OVERFLOW ();
+ stack [cur_stack].type = &mono_defaults.object_class->byval_arg;
+ stack [cur_stack].stype = TYPE_OBJ;
++cur_stack;
++ip;
break;
case CEE_LDC_I4_7:
case CEE_LDC_I4_8:
CHECK_STACK_OVERFLOW ();
+ stack [cur_stack].type = &mono_defaults.int_class->byval_arg;
+ stack [cur_stack].stype = TYPE_I4;
++cur_stack;
++ip;
break;
case CEE_LDC_I4_S:
CHECK_STACK_OVERFLOW ();
+ stack [cur_stack].type = &mono_defaults.int_class->byval_arg;
+ stack [cur_stack].stype = TYPE_I4;
++cur_stack;
ip += 2;
break;
case CEE_LDC_I4:
CHECK_STACK_OVERFLOW ();
+ stack [cur_stack].type = &mono_defaults.int_class->byval_arg;
+ stack [cur_stack].stype = TYPE_I4;
++cur_stack;
ip += 5;
break;
case CEE_LDC_I8:
CHECK_STACK_OVERFLOW ();
+ stack [cur_stack].type = &mono_defaults.int64_class->byval_arg;
+ stack [cur_stack].stype = TYPE_I8;
++cur_stack;
ip += 9;
break;
case CEE_LDC_R4:
CHECK_STACK_OVERFLOW ();
+ stack [cur_stack].type = &mono_defaults.double_class->byval_arg;
+ stack [cur_stack].stype = TYPE_R8;
++cur_stack;
ip += 5;
break;
case CEE_LDC_R8:
CHECK_STACK_OVERFLOW ();
+ stack [cur_stack].type = &mono_defaults.double_class->byval_arg;
+ stack [cur_stack].stype = TYPE_R8;
++cur_stack;
ip += 9;
break;
case CEE_DUP:
CHECK_STACK_UNDERFLOW (1);
CHECK_STACK_OVERFLOW ();
+ stack [cur_stack] = stack [cur_stack - 1];
++cur_stack;
++ip;
break;
/*
* 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) {
CHECK_STACK_OVERFLOW ();
+ type_to_eval_stack_type (csig->ret, stack + cur_stack, FALSE);
++cur_stack;
}
ip += 5;
break;
case CEE_RET:
if (signature->ret->type != MONO_TYPE_VOID) {
- if (cur_stack != 1)
- ADD_INVALID (list, g_strdup_printf ("Stack not empty after ret at 0x%04x", ip_offset));
+ CHECK_STACK_UNDERFLOW (1);
--cur_stack;
- } else {
- if (cur_stack)
- ADD_INVALID (list, g_strdup_printf ("Stack not empty after ret at 0x%04x", ip_offset));
- cur_stack = 0;
+ if (!can_store_type (stack + cur_stack, signature->ret))
+ ADD_INVALID (list, g_strdup_printf ("Incompatible type %s in ret at 0x%04x", arg_name [stack [cur_stack].stype], ip_offset));
}
+ if (cur_stack)
+ ADD_INVALID (list, g_strdup_printf ("Stack not empty (%d) after ret at 0x%04x", cur_stack, ip_offset));
+ cur_stack = 0;
if (in_any_block (header, ip_offset))
ADD_INVALID (list, g_strdup_printf ("ret cannot escape exception blocks at 0x%04x", ip_offset));
++ip;
+ start = 1;
break;
case CEE_BR_S:
target = ip + (signed char)ip [1] + 2;
ADD_INVALID (list, g_strdup_printf ("Branch target escapes out of exception block at 0x%04x", ip_offset));
CHECK_STACK_UNDERFLOW (1);
--cur_stack;
+ if (!is_valid_bool_arg (stack + cur_stack))
+ ADD_INVALID (list, g_strdup_printf ("Argument type %s not valid for brtrue/brfalse at 0x%04x", arg_name [stack [cur_stack].stype], ip_offset));
ip += 2;
need_merge = 1;
break;
ADD_INVALID (list, g_strdup_printf ("Branch target escapes out of exception block at 0x%04x", ip_offset));
CHECK_STACK_UNDERFLOW (2);
cur_stack -= 2;
+ if (type_from_op (*ip, stack + cur_stack) == TYPE_INV)
+ ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0x%02x at 0x%04x", *ip, ip_offset));
ip += 2;
need_merge = 1;
break;
ADD_INVALID (list, g_strdup_printf ("Branch target escapes out of exception block at 0x%04x", ip_offset));
CHECK_STACK_UNDERFLOW (1);
--cur_stack;
+ if (!is_valid_bool_arg (stack + cur_stack))
+ ADD_INVALID (list, g_strdup_printf ("Argument type %s not valid for brtrue/brfalse at 0x%04x", arg_name [stack [cur_stack].stype], ip_offset));
ip += 5;
need_merge = 1;
break;
ADD_INVALID (list, g_strdup_printf ("Branch target escapes out of exception block at 0x%04x", ip_offset));
CHECK_STACK_UNDERFLOW (2);
cur_stack -= 2;
+ if (type_from_op (*ip, stack + cur_stack) == TYPE_INV)
+ ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0x%02x at 0x%04x", *ip, ip_offset));
ip += 5;
need_merge = 1;
break;
ADD_INVALID (list, g_strdup_printf ("Branch target out of code at 0x%04x", ip_offset));
CHECK_STACK_UNDERFLOW (1);
--cur_stack;
+ if (stack [cur_stack].stype != TYPE_I4)
+ ADD_INVALID (list, g_strdup_printf ("Invalid argument to switch at 0x%04x", ip_offset));
ip += 5 + sizeof (guint32) * n;
break;
case CEE_LDIND_I1:
case CEE_LDIND_R8:
case CEE_LDIND_REF:
CHECK_STACK_UNDERFLOW (1);
+ if (stack [cur_stack - 1].stype != TYPE_PTR && stack [cur_stack - 1].stype != TYPE_MP)
+ ADD_INVALID (list, g_strdup_printf ("Invalid argument to ldind at 0x%04x", ip_offset));
+ stack [cur_stack - 1].stype = ldind_type [*ip - CEE_LDIND_I1];
++ip;
break;
case CEE_STIND_REF:
case CEE_STIND_R8:
CHECK_STACK_UNDERFLOW (2);
cur_stack -= 2;
+ if (stack [cur_stack].stype != TYPE_PTR && stack [cur_stack].stype != TYPE_MP)
+ ADD_INVALID (list, g_strdup_printf ("Invalid pointer argument to stind at 0x%04x", ip_offset));
+ if (!stind_type (*ip, stack [cur_stack + 1].stype))
+ ADD_INVALID (list, g_strdup_printf ("Incompatible value argument to stind at 0x%04x", ip_offset));
++ip;
break;
case CEE_ADD:
case CEE_SHR_UN:
CHECK_STACK_UNDERFLOW (2);
--cur_stack;
+ if (type_from_op (*ip, stack + cur_stack - 1) == TYPE_INV)
+ ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0x%02x at 0x%04x", *ip, ip_offset));
++ip;
break;
case CEE_NEG:
case CEE_CONV_U4:
case CEE_CONV_U8:
CHECK_STACK_UNDERFLOW (1);
+ if (type_from_op (*ip, stack + cur_stack - 1) == TYPE_INV)
+ ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0x%02x at 0x%04x", *ip, ip_offset));
++ip;
break;
case CEE_CPOBJ:
case CEE_LDOBJ:
token = read32 (ip + 1);
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_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)
+ ADD_INVALID (list, g_strdup_printf ("Class is not a valuetype at 0x%04x", ip_offset));
+ stack [cur_stack - 1].stype = TYPE_VT;
+ stack [cur_stack - 1].type = &klass->byval_arg;
ip += 5;
break;
case CEE_LDSTR:
token = read32 (ip + 1);
CHECK_STACK_OVERFLOW ();
+ stack [cur_stack].type = &mono_defaults.string_class->byval_arg;
+ stack [cur_stack].stype = TYPE_OBJ;
++cur_stack;
ip += 5;
break;
/*
* 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 ();
+ stack [cur_stack].type = &cmethod->klass->byval_arg;
+ stack [cur_stack].stype = cmethod->klass->valuetype? TYPE_VT: TYPE_OBJ;
++cur_stack;
ip += 5;
break;
case CEE_UNBOX:
token = read32 (ip + 1);
CHECK_STACK_UNDERFLOW (1);
+ if (stack [cur_stack - 1].stype != TYPE_OBJ)
+ ADD_INVALID (list, g_strdup_printf ("Invalid argument %s to unbox at 0x%04x", arg_name [stack [cur_stack - 1].stype], ip_offset));
+ stack [cur_stack - 1].stype = TYPE_MP;
+ stack [cur_stack - 1].type = NULL;
ip += 5;
break;
case CEE_THROW:
CHECK_STACK_UNDERFLOW (1);
--cur_stack;
++ip;
+ start = 1;
break;
case CEE_LDFLD:
CHECK_STACK_UNDERFLOW (1);
+ 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, 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);
ip += 5;
break;
case CEE_LDFLDA:
CHECK_STACK_UNDERFLOW (1);
+ 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, 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);
ip += 5;
break;
case CEE_STFLD:
CHECK_STACK_UNDERFLOW (2);
cur_stack -= 2;
+ 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, 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 */
ip += 5;
break;
case CEE_LDSFLD:
CHECK_STACK_OVERFLOW ();
token = read32 (ip + 1);
+ 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);
++cur_stack;
ip += 5;
break;
case CEE_LDSFLDA:
CHECK_STACK_OVERFLOW ();
token = read32 (ip + 1);
+ 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);
++cur_stack;
ip += 5;
break;
CHECK_STACK_UNDERFLOW (1);
--cur_stack;
token = read32 (ip + 1);
+ 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 */
ip += 5;
break;
case CEE_STOBJ:
case CEE_CONV_OVF_I_UN:
case CEE_CONV_OVF_U_UN:
CHECK_STACK_UNDERFLOW (1);
+ if (type_from_op (*ip, stack + cur_stack - 1) == TYPE_INV)
+ ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0x%02x at 0x%04x", *ip, ip_offset));
++ip;
break;
case CEE_BOX:
CHECK_STACK_UNDERFLOW (1);
token = read32 (ip + 1);
+ if (stack [cur_stack - 1].stype == TYPE_OBJ)
+ ADD_INVALID (list, g_strdup_printf ("Invalid argument %s to box at 0x%04x", arg_name [stack [cur_stack - 1].stype], ip_offset));
+ stack [cur_stack - 1].stype = TYPE_OBJ;
ip += 5;
break;
case CEE_NEWARR:
CHECK_STACK_UNDERFLOW (1);
token = read32 (ip + 1);
+ stack [cur_stack - 1].stype = TYPE_OBJ;
ip += 5;
break;
case CEE_LDLEN:
CHECK_STACK_UNDERFLOW (1);
+ if (stack [cur_stack - 1].stype != TYPE_OBJ)
+ ADD_INVALID (list, g_strdup_printf ("Invalid argument to ldlen at 0x%04x", ip_offset));
+ stack [cur_stack - 1].type = &mono_defaults.int_class->byval_arg; /* FIXME: use a native int type */
+ stack [cur_stack - 1].stype = TYPE_PTR;
++ip;
break;
case CEE_LDELEMA:
CHECK_STACK_UNDERFLOW (2);
--cur_stack;
+ if (stack [cur_stack - 1].stype != TYPE_OBJ)
+ ADD_INVALID (list, g_strdup_printf ("Invalid array argument to ldelema at 0x%04x", ip_offset));
+ if (stack [cur_stack].stype != TYPE_I4 && stack [cur_stack].stype != TYPE_PTR)
+ ADD_INVALID (list, g_strdup_printf ("Array index needs to be Int32 or IntPtr at 0x%04x", ip_offset));
+ stack [cur_stack - 1].stype = TYPE_MP;
token = read32 (ip + 1);
ip += 5;
break;
case CEE_LDELEM_REF:
CHECK_STACK_UNDERFLOW (2);
--cur_stack;
+ if (stack [cur_stack - 1].stype != TYPE_OBJ)
+ ADD_INVALID (list, g_strdup_printf ("Invalid array argument to ldelem at 0x%04x", ip_offset));
+ if (stack [cur_stack].stype != TYPE_I4 && stack [cur_stack].stype != TYPE_PTR)
+ ADD_INVALID (list, g_strdup_printf ("Array index needs to be Int32 or IntPtr at 0x%04x", ip_offset));
+ stack [cur_stack - 1].stype = ldelem_type [*ip - CEE_LDELEM_I1];
++ip;
break;
case CEE_STELEM_I:
cur_stack -= 3;
++ip;
break;
- case CEE_UNUSED2:
- case CEE_UNUSED3:
- case CEE_UNUSED4:
+ case CEE_LDELEM_ANY:
+ case CEE_STELEM_ANY:
+ case CEE_UNBOX_ANY:
case CEE_UNUSED5:
case CEE_UNUSED6:
case CEE_UNUSED7:
case CEE_CONV_OVF_I8:
case CEE_CONV_OVF_U8:
CHECK_STACK_UNDERFLOW (1);
+ if (type_from_op (*ip, stack + cur_stack - 1) == TYPE_INV)
+ ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0x%02x at 0x%04x", *ip, ip_offset));
++ip;
break;
case CEE_UNUSED50:
case CEE_CONV_OVF_I:
case CEE_CONV_OVF_U:
CHECK_STACK_UNDERFLOW (1);
+ if (type_from_op (*ip, stack + cur_stack - 1) == TYPE_INV)
+ ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0x%02x at 0x%04x", *ip, ip_offset));
++ip;
break;
case CEE_ADD_OVF:
case CEE_CLT_UN:
CHECK_STACK_UNDERFLOW (2);
--cur_stack;
+ if (type_from_op (256 + *ip, stack + cur_stack - 1) == TYPE_INV)
+ ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0xFE 0x%02x at 0x%04x", *ip, ip_offset));
++ip;
break;
case CEE_LDFTN:
CHECK_STACK_OVERFLOW ();
token = read32 (ip + 1);
ip += 5;
+ stack [cur_stack].stype = TYPE_PTR;
+ cur_stack++;
break;
case CEE_LDVIRTFTN:
CHECK_STACK_UNDERFLOW (1);
token = read32 (ip + 1);
ip += 5;
+ if (stack [cur_stack - 1].stype != TYPE_OBJ)
+ ADD_INVALID (list, g_strdup_printf ("Invalid argument to ldvirtftn at 0x%04x", ip_offset));
+ stack [cur_stack - 1].stype = TYPE_PTR;
break;
case CEE_UNUSED56:
++ip;
break;
case CEE_LDLOC:
case CEE_LDLOCA:
- if (read16 (ip + 1) >= header->num_locals)
- ADD_INVALID (list, g_strdup_printf ("Method doesn't have local var %d at 0x%04x", read16 (ip + 1), ip_offset));
+ n = read16 (ip + 1);
+ if (n >= header->num_locals)
+ ADD_INVALID (list, g_strdup_printf ("Method doesn't have local var %d at 0x%04x", n, ip_offset));
/* no need to check if the var is initialized if the address is taken */
- if (*ip == CEE_LDLOC && !local_state [read16 (ip + 1)])
- ADD_INVALID (list, g_strdup_printf ("Local var %d is initialized at 0x%04x", read16 (ip + 1), ip_offset));
+ if (0 && *ip == CEE_LDLOC && !local_state [n])
+ ADD_INVALID (list, g_strdup_printf ("Local var %d is initialized at 0x%04x", n, ip_offset));
CHECK_STACK_OVERFLOW ();
+ type_to_eval_stack_type (header->locals [n], stack + cur_stack, *ip == CEE_LDLOCA);
++cur_stack;
ip += 3;
break;
case CEE_STLOC:
- if (read16 (ip + 1) >= header->num_locals)
- ADD_INVALID (list, g_strdup_printf ("Method doesn't have local var %d at 0x%04x", read16 (ip + 1), ip_offset));
- local_state [read16 (ip + 1)] = 1;
+ n = read16 (ip + 1);
+ if (n >= header->num_locals)
+ ADD_INVALID (list, g_strdup_printf ("Method doesn't have local var %d at 0x%04x", n, ip_offset));
+ local_state [n] = 1;
CHECK_STACK_UNDERFLOW (1);
--cur_stack;
+ if (!can_store_type (stack + cur_stack, header->locals [n]))
+ ADD_INVALID (list, g_strdup_printf ("Incompatible type %s in store at 0x%04x", arg_name [stack [cur_stack].stype], ip_offset));
ip += 3;
break;
case CEE_LOCALLOC:
if (cur_stack != 1)
ADD_INVALID (list, g_strdup_printf ("Stack must have only size item in localloc at 0x%04x", ip_offset));
+ if (stack [cur_stack -1].stype != TYPE_I4 && stack [cur_stack -1].stype != TYPE_PTR)
+ ADD_INVALID (list, g_strdup_printf ("Invalid argument to localloc at 0x%04x", ip_offset));
+ stack [cur_stack -1].stype = TYPE_MP;
++ip;
break;
case CEE_UNUSED57:
CHECK_STACK_UNDERFLOW (1);
token = read32 (ip + 1);
ip += 5;
+ --cur_stack;
break;
- case CEE_UNUSED68:
- ++ip;
+ case CEE_CONSTRAINED_:
+ token = read32 (ip + 1);
+ ip += 5;
break;
case CEE_CPBLK:
CHECK_STACK_UNDERFLOW (3);
CHECK_STACK_UNDERFLOW (3);
ip++;
break;
- case CEE_UNUSED69:
- ++ip;
+ case CEE_NO_:
+ ip += 2;
break;
case CEE_RETHROW:
++ip;
CHECK_STACK_OVERFLOW ();
token = read32 (ip + 1);
ip += 5;
+ stack [cur_stack].type = &mono_defaults.uint_class->byval_arg;
+ stack [cur_stack].stype = TYPE_I4;
+ cur_stack++;
break;
case CEE_REFANYTYPE:
CHECK_STACK_UNDERFLOW (1);
++ip;
break;
- case CEE_UNUSED52:
case CEE_UNUSED53:
case CEE_UNUSED54:
case CEE_UNUSED55:
}
}
/*
- * FIXME: if ip != end we overflowed: mark as error.
+ * if ip != end we overflowed: mark as error.
*/
+ if (ip != end || !start) {
+ ADD_INVALID (list, g_strdup_printf ("Run ahead of method code at 0x%04x", ip_offset));
+ }
invalid_cil:
g_free (local_state);
g_free (code);
+ g_free (stack);
+ if (signature->hasthis)
+ g_free (params);
return list;
}
+
+typedef struct {
+ const char *name;
+ guint64 offset;
+} FieldDesc;
+
+typedef struct {
+ const char *name;
+ const FieldDesc *fields;
+} ClassDesc;
+
+static const FieldDesc
+typebuilder_fields[] = {
+ {"tname", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, name)},
+ {"nspace", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, nspace)},
+ {"parent", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, parent)},
+ {"interfaces", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, interfaces)},
+ {"methods", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, methods)},
+ {"properties", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, properties)},
+ {"fields", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, fields)},
+ {"attrs", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, attrs)},
+ {"table_idx", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, table_idx)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+modulebuilder_fields[] = {
+ {"types", G_STRUCT_OFFSET (MonoReflectionModuleBuilder, types)},
+ {"cattrs", G_STRUCT_OFFSET (MonoReflectionModuleBuilder, cattrs)},
+ {"guid", G_STRUCT_OFFSET (MonoReflectionModuleBuilder, guid)},
+ {"table_idx", G_STRUCT_OFFSET (MonoReflectionModuleBuilder, table_idx)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+assemblybuilder_fields[] = {
+ {"entry_point", G_STRUCT_OFFSET (MonoReflectionAssemblyBuilder, entry_point)},
+ {"modules", G_STRUCT_OFFSET (MonoReflectionAssemblyBuilder, modules)},
+ {"name", G_STRUCT_OFFSET (MonoReflectionAssemblyBuilder, name)},
+ {"resources", G_STRUCT_OFFSET (MonoReflectionAssemblyBuilder, resources)},
+ {"version", G_STRUCT_OFFSET (MonoReflectionAssemblyBuilder, version)},
+ {"culture", G_STRUCT_OFFSET (MonoReflectionAssemblyBuilder, culture)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+ctorbuilder_fields[] = {
+ {"ilgen", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, ilgen)},
+ {"parameters", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, parameters)},
+ {"attrs", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, attrs)},
+ {"iattrs", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, iattrs)},
+ {"table_idx", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, table_idx)},
+ {"call_conv", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, call_conv)},
+ {"type", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, type)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+methodbuilder_fields[] = {
+ {"mhandle", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, mhandle)},
+ {"rtype", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, rtype)},
+ {"parameters", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, parameters)},
+ {"attrs", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, attrs)},
+ {"iattrs", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, iattrs)},
+ {"name", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, name)},
+ {"table_idx", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, table_idx)},
+ {"code", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, code)},
+ {"ilgen", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, ilgen)},
+ {"type", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, type)},
+ {"pinfo", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, pinfo)},
+ {"pi_dll", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, dll)},
+ {"pi_entry", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, dllentry)},
+ {"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}
+};
+
+static const FieldDesc
+fieldbuilder_fields[] = {
+ {"attrs", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, attrs)},
+ {"type", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, type)},
+ {"name", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, name)},
+ {"def_value", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, def_value)},
+ {"offset", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, offset)},
+ {"table_idx", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, table_idx)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+propertybuilder_fields[] = {
+ {"attrs", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, attrs)},
+ {"name", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, name)},
+ {"type", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, type)},
+ {"parameters", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, parameters)},
+ {"def_value", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, def_value)},
+ {"set_method", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, set_method)},
+ {"get_method", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, get_method)},
+ {"table_idx", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, table_idx)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+ilgenerator_fields[] = {
+ {"code", G_STRUCT_OFFSET (MonoReflectionILGen, code)},
+ {"code_len", G_STRUCT_OFFSET (MonoReflectionILGen, code_len)},
+ {"max_stack", G_STRUCT_OFFSET (MonoReflectionILGen, max_stack)},
+ {"cur_stack", G_STRUCT_OFFSET (MonoReflectionILGen, cur_stack)},
+ {"locals", G_STRUCT_OFFSET (MonoReflectionILGen, locals)},
+ {"ex_handlers", G_STRUCT_OFFSET (MonoReflectionILGen, ex_handlers)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+ilexinfo_fields[] = {
+ {"handlers", G_STRUCT_OFFSET (MonoILExceptionInfo, handlers)},
+ {"start", G_STRUCT_OFFSET (MonoILExceptionInfo, start)},
+ {"len", G_STRUCT_OFFSET (MonoILExceptionInfo, len)},
+ {"end", G_STRUCT_OFFSET (MonoILExceptionInfo, label)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+ilexblock_fields[] = {
+ {"extype", G_STRUCT_OFFSET (MonoILExceptionBlock, extype)},
+ {"type", G_STRUCT_OFFSET (MonoILExceptionBlock, type)},
+ {"start", G_STRUCT_OFFSET (MonoILExceptionBlock, start)},
+ {"len", G_STRUCT_OFFSET (MonoILExceptionBlock, len)},
+ {"filter_offset", G_STRUCT_OFFSET (MonoILExceptionBlock, filter_offset)},
+ {NULL, 0}
+};
+
+static const ClassDesc
+emit_classes_to_check [] = {
+ {"TypeBuilder", typebuilder_fields},
+ {"ModuleBuilder", modulebuilder_fields},
+ {"AssemblyBuilder", assemblybuilder_fields},
+ {"ConstructorBuilder", ctorbuilder_fields},
+ {"MethodBuilder", methodbuilder_fields},
+ {"FieldBuilder", fieldbuilder_fields},
+ {"PropertyBuilder", propertybuilder_fields},
+ {"ILGenerator", ilgenerator_fields},
+ {"ILExceptionBlock", ilexblock_fields},
+ {"ILExceptionInfo", ilexinfo_fields},
+ {NULL, NULL}
+};
+
+static const FieldDesc
+monoevent_fields[] = {
+ {"klass", G_STRUCT_OFFSET (MonoReflectionEvent, klass)},
+ {"handle", G_STRUCT_OFFSET (MonoReflectionEvent, event)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+monoproperty_fields[] = {
+ {"klass", G_STRUCT_OFFSET (MonoReflectionProperty, klass)},
+ {"prop", G_STRUCT_OFFSET (MonoReflectionProperty, property)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+monofield_fields[] = {
+ {"klass", G_STRUCT_OFFSET (MonoReflectionField, klass)},
+ {"fhandle", G_STRUCT_OFFSET (MonoReflectionField, field)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+monomethodinfo_fields[] = {
+ {"parent", G_STRUCT_OFFSET (MonoMethodInfo, parent)},
+ {"ret", G_STRUCT_OFFSET (MonoMethodInfo, ret)},
+ {"attrs", G_STRUCT_OFFSET (MonoMethodInfo, attrs)},
+ {"iattrs", G_STRUCT_OFFSET (MonoMethodInfo, implattrs)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+monopropertyinfo_fields[] = {
+ {"parent", G_STRUCT_OFFSET (MonoPropertyInfo, parent)},
+ {"name", G_STRUCT_OFFSET (MonoPropertyInfo, name)},
+ {"get_method", G_STRUCT_OFFSET (MonoPropertyInfo, get)},
+ {"set_method", G_STRUCT_OFFSET (MonoPropertyInfo, set)},
+ {"attrs", G_STRUCT_OFFSET (MonoPropertyInfo, attrs)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+monomethod_fields[] = {
+ {"mhandle", G_STRUCT_OFFSET (MonoReflectionMethod, method)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+monocmethod_fields[] = {
+ {"mhandle", G_STRUCT_OFFSET (MonoReflectionMethod, method)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+pinfo_fields[] = {
+ {"ClassImpl", G_STRUCT_OFFSET (MonoReflectionParameter, ClassImpl)},
+ {"DefaultValueImpl", G_STRUCT_OFFSET (MonoReflectionParameter, DefaultValueImpl)},
+ {"MemberImpl", G_STRUCT_OFFSET (MonoReflectionParameter, MemberImpl)},
+ {"NameImpl", G_STRUCT_OFFSET (MonoReflectionParameter, NameImpl)},
+ {"PositionImpl", G_STRUCT_OFFSET (MonoReflectionParameter, PositionImpl)},
+ {"AttrsImpl", G_STRUCT_OFFSET (MonoReflectionParameter, AttrsImpl)},
+ {NULL, 0}
+};
+
+static const ClassDesc
+reflection_classes_to_check [] = {
+ {"MonoEvent", monoevent_fields},
+ {"MonoProperty", monoproperty_fields},
+ {"MonoField", monofield_fields},
+ {"MonoMethodInfo", monomethodinfo_fields},
+ {"MonoPropertyInfo", monopropertyinfo_fields},
+ {"MonoMethod", monomethod_fields},
+ {"MonoCMethod", monocmethod_fields},
+ {"ParameterInfo", pinfo_fields},
+ {NULL, NULL}
+};
+
+static FieldDesc
+enuminfo_fields[] = {
+ {"utype", G_STRUCT_OFFSET (MonoEnumInfo, utype)},
+ {"values", G_STRUCT_OFFSET (MonoEnumInfo, values)},
+ {"names", G_STRUCT_OFFSET (MonoEnumInfo, names)},
+ {NULL, 0}
+};
+
+static FieldDesc
+delegate_fields[] = {
+ {"target_type", G_STRUCT_OFFSET (MonoDelegate, target_type)},
+ {"m_target", G_STRUCT_OFFSET (MonoDelegate, target)},
+ {"method_name", G_STRUCT_OFFSET (MonoDelegate, method_name)},
+ {"method_ptr", G_STRUCT_OFFSET (MonoDelegate, method_ptr)},
+ {"delegate_trampoline", G_STRUCT_OFFSET (MonoDelegate, delegate_trampoline)},
+ {"method_info", G_STRUCT_OFFSET (MonoDelegate, method_info)},
+ {NULL, 0}
+};
+
+static FieldDesc
+multicast_delegate_fields[] = {
+ {"prev", G_STRUCT_OFFSET (MonoMulticastDelegate, prev)},
+ {NULL, 0}
+};
+
+static FieldDesc
+async_result_fields[] = {
+ {"async_state", G_STRUCT_OFFSET (MonoAsyncResult, async_state)},
+ {"handle", G_STRUCT_OFFSET (MonoAsyncResult, handle)},
+ {"async_delegate", G_STRUCT_OFFSET (MonoAsyncResult, async_delegate)},
+ {"data", G_STRUCT_OFFSET (MonoAsyncResult, data)},
+ {"sync_completed", G_STRUCT_OFFSET (MonoAsyncResult, sync_completed)},
+ {"completed", G_STRUCT_OFFSET (MonoAsyncResult, completed)},
+ {"endinvoke_called", G_STRUCT_OFFSET (MonoAsyncResult, endinvoke_called)},
+ {"async_callback", G_STRUCT_OFFSET (MonoAsyncResult, async_callback)},
+ {NULL, 0}
+};
+
+static FieldDesc
+exception_fields[] = {
+ {"trace_ips", G_STRUCT_OFFSET (MonoException, trace_ips)},
+ {"inner_exception", G_STRUCT_OFFSET (MonoException, inner_ex)},
+ {"message", G_STRUCT_OFFSET (MonoException, message)},
+ {"help_link", G_STRUCT_OFFSET (MonoException, help_link)},
+ {"class_name", G_STRUCT_OFFSET (MonoException, class_name)},
+ {"stack_trace", G_STRUCT_OFFSET (MonoException, stack_trace)},
+ {"remote_stack_trace", G_STRUCT_OFFSET (MonoException, remote_stack_trace)},
+ {"remote_stack_index", G_STRUCT_OFFSET (MonoException, remote_stack_index)},
+ {"hresult", G_STRUCT_OFFSET (MonoException, hresult)},
+ {"source", G_STRUCT_OFFSET (MonoException, source)},
+ {NULL, 0}
+};
+
+static const ClassDesc
+system_classes_to_check [] = {
+ {"Exception", exception_fields},
+ {"MonoEnumInfo", enuminfo_fields},
+ {"Delegate", delegate_fields},
+ {"MulticastDelegate", multicast_delegate_fields},
+ {NULL, NULL}
+};
+
+static FieldDesc
+stack_frame_fields [] = {
+ {"ilOffset", G_STRUCT_OFFSET (MonoStackFrame, il_offset)},
+ {"nativeOffset", G_STRUCT_OFFSET (MonoStackFrame, native_offset)},
+ {"methodBase", G_STRUCT_OFFSET (MonoStackFrame, method)},
+ {"fileName", G_STRUCT_OFFSET (MonoStackFrame, filename)},
+ {"lineNumber", G_STRUCT_OFFSET (MonoStackFrame, line)},
+ {"columnNumber", G_STRUCT_OFFSET (MonoStackFrame, column)},
+ {NULL, 0}
+};
+
+static const ClassDesc
+system_diagnostics_classes_to_check [] = {
+ {"StackFrame", stack_frame_fields},
+ {NULL, NULL}
+};
+
+static FieldDesc
+mono_method_message_fields[] = {
+ {"method", G_STRUCT_OFFSET (MonoMethodMessage, method)},
+ {"args", G_STRUCT_OFFSET (MonoMethodMessage, args)},
+ {"names", G_STRUCT_OFFSET (MonoMethodMessage, names)},
+ {"arg_types", G_STRUCT_OFFSET (MonoMethodMessage, arg_types)},
+ {"ctx", G_STRUCT_OFFSET (MonoMethodMessage, ctx)},
+ {"rval", G_STRUCT_OFFSET (MonoMethodMessage, rval)},
+ {"exc", G_STRUCT_OFFSET (MonoMethodMessage, exc)},
+ {NULL, 0}
+};
+
+static const ClassDesc
+messaging_classes_to_check [] = {
+ {"AsyncResult", async_result_fields},
+ {"MonoMethodMessage", mono_method_message_fields},
+ {NULL, NULL}
+};
+
+static FieldDesc
+transparent_proxy_fields[] = {
+ {"_rp", G_STRUCT_OFFSET (MonoTransparentProxy, rp)},
+ {"_class", G_STRUCT_OFFSET (MonoTransparentProxy, remote_class)},
+ {NULL, 0}
+};
+
+static FieldDesc
+real_proxy_fields[] = {
+ {"class_to_proxy", G_STRUCT_OFFSET (MonoRealProxy, class_to_proxy)},
+ {NULL, 0}
+};
+
+static const ClassDesc
+proxy_classes_to_check [] = {
+ {"TransparentProxy", transparent_proxy_fields},
+ {"RealProxy", real_proxy_fields},
+ {NULL, NULL}
+};
+
+static FieldDesc
+wait_handle_fields[] = {
+ {"os_handle", G_STRUCT_OFFSET (MonoWaitHandle, handle)},
+ {"disposed", G_STRUCT_OFFSET (MonoWaitHandle, disposed)},
+ {NULL, 0}
+};
+
+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)},
+ {"abort_state", G_STRUCT_OFFSET (MonoThread, abort_state)},
+ {"thread_id", G_STRUCT_OFFSET (MonoThread, tid)},
+ {NULL, 0}
+};
+
+static const ClassDesc
+threading_classes_to_check [] = {
+ {"Thread", thread_fields},
+ {"WaitHandle", wait_handle_fields},
+ {NULL, NULL}
+};
+
+static const FieldDesc
+cinfo_fields[] = {
+ {"datetime_format", G_STRUCT_OFFSET (MonoCultureInfo, datetime_format)},
+ {"number_format", G_STRUCT_OFFSET (MonoCultureInfo, number_format)},
+ {"textinfo", G_STRUCT_OFFSET (MonoCultureInfo, textinfo)},
+ {"name", G_STRUCT_OFFSET (MonoCultureInfo, name)},
+ {"displayname", G_STRUCT_OFFSET (MonoCultureInfo, displayname)},
+ {"englishname", G_STRUCT_OFFSET (MonoCultureInfo, englishname)},
+ {"nativename", G_STRUCT_OFFSET (MonoCultureInfo, nativename)},
+ {"iso3lang", G_STRUCT_OFFSET (MonoCultureInfo, iso3lang)},
+ {"iso2lang", G_STRUCT_OFFSET (MonoCultureInfo, iso2lang)},
+ {"icu_name", G_STRUCT_OFFSET (MonoCultureInfo, icu_name)},
+ {"win3lang", G_STRUCT_OFFSET (MonoCultureInfo, win3lang)},
+ {"compareinfo", G_STRUCT_OFFSET (MonoCultureInfo, compareinfo)},
+ {NULL, 0}
+};
+
+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)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+nfinfo_fields[] = {
+ {"decimalFormats", G_STRUCT_OFFSET (MonoNumberFormatInfo, decimalFormats)},
+ {"currencySymbol", G_STRUCT_OFFSET (MonoNumberFormatInfo, currencySymbol)},
+ {"percentSymbol", G_STRUCT_OFFSET (MonoNumberFormatInfo, percentSymbol)},
+ {"positiveSign", G_STRUCT_OFFSET (MonoNumberFormatInfo, positiveSign)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+compinfo_fields[] = {
+ {"lcid", G_STRUCT_OFFSET (MonoCompareInfo, lcid)},
+ {"ICU_collator", G_STRUCT_OFFSET (MonoCompareInfo, ICU_collator)},
+ {NULL, 0}
+};
+
+static const FieldDesc
+sortkey_fields[] = {
+ {"str", G_STRUCT_OFFSET (MonoSortKey, str)},
+ {"options", G_STRUCT_OFFSET (MonoSortKey, options)},
+ {"key", G_STRUCT_OFFSET (MonoSortKey, key)},
+ {"lcid", G_STRUCT_OFFSET (MonoSortKey, lcid)},
+ {NULL, 0}
+};
+
+static const ClassDesc
+globalization_classes_to_check [] = {
+ {"CultureInfo", cinfo_fields},
+ {"DateTimeFormatInfo", dtfinfo_fields},
+ {"NumberFormatInfo", nfinfo_fields},
+ {"CompareInfo", compinfo_fields},
+ {"SortKey", sortkey_fields},
+ {NULL, NULL}
+};
+
+typedef struct {
+ const char *name;
+ const ClassDesc *types;
+} NameSpaceDesc;
+
+static const NameSpaceDesc
+namespaces_to_check[] = {
+ {"System.Runtime.Remoting.Proxies", proxy_classes_to_check},
+ {"System.Runtime.Remoting.Messaging", messaging_classes_to_check},
+ {"System.Reflection.Emit", emit_classes_to_check},
+ {"System.Reflection", reflection_classes_to_check},
+ {"System.Threading", threading_classes_to_check},
+ {"System.Diagnostics", system_diagnostics_classes_to_check},
+ {"System", system_classes_to_check},
+ {"System.Globalization", globalization_classes_to_check},
+ {NULL, NULL}
+};
+
+static char*
+check_corlib (MonoImage *corlib)
+{
+ MonoClass *klass;
+ MonoClassField *field;
+ const FieldDesc *fdesc;
+ const ClassDesc *cdesc;
+ const NameSpaceDesc *ndesc;
+ gint struct_offset;
+ GString *result = NULL;
+
+ for (ndesc = namespaces_to_check; ndesc->name; ++ndesc) {
+ for (cdesc = ndesc->types; cdesc->name; ++cdesc) {
+ klass = mono_class_from_name (corlib, ndesc->name, cdesc->name);
+ if (!klass) {
+ if (!result)
+ result = g_string_new ("");
+ g_string_append_printf (result, "Cannot find class %s\n", cdesc->name);
+ continue;
+ }
+ mono_class_init (klass);
+ /*
+ * FIXME: we should also check the size of valuetypes, or
+ * we're going to have trouble when we access them in arrays.
+ */
+ if (klass->valuetype)
+ struct_offset = sizeof (MonoObject);
+ else
+ struct_offset = 0;
+ for (fdesc = cdesc->fields; fdesc->name; ++fdesc) {
+ field = mono_class_get_field_from_name (klass, fdesc->name);
+ if (!field || (field->offset != (fdesc->offset + struct_offset))) {
+ if (!result)
+ result = g_string_new ("");
+ g_string_append_printf (result, "field `%s' mismatch in class %s (%ld + %ld != %ld)\n", fdesc->name, cdesc->name, (long) fdesc->offset, (long)struct_offset, (long) (field?field->offset:-1));
+ }
+ }
+ }
+ }
+ if (result)
+ return g_string_free (result, FALSE);
+ return NULL;
+}
+
+char*
+mono_verify_corlib () {
+ return check_corlib (mono_defaults.corlib);
+}
+
+
projects / mono.git / blobdiff