Author: kumpera
Date: 2007-06-20 12:02:45 -0400 (Wed, 20 Jun 2007)
New Revision: 80327
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/verify.c
Log:
* verify.c: support for function pointers in the verifier
2007-06-20 Rodrigo Kumpera <[EMAIL PROTECTED]>
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2007-06-20 15:58:01 UTC (rev 80326)
+++ trunk/mono/mono/metadata/ChangeLog 2007-06-20 16:02:45 UTC (rev 80327)
@@ -1,5 +1,9 @@
2007-06-20 Rodrigo Kumpera <[EMAIL PROTECTED]>
+ * verify.c: support for function pointers in the verifier
+
+2007-06-20 Rodrigo Kumpera <[EMAIL PROTECTED]>
+
* verify.c: unmanaged pointer verification checks (loading unmanaged
pointers is unverifiable)
Wed Jun 20 10:22:15 CEST 2007 Paolo Molaro <[EMAIL PROTECTED]>
Modified: trunk/mono/mono/metadata/verify.c
===================================================================
--- trunk/mono/mono/metadata/verify.c 2007-06-20 15:58:01 UTC (rev 80326)
+++ trunk/mono/mono/metadata/verify.c 2007-06-20 16:02:45 UTC (rev 80327)
@@ -1940,15 +1940,16 @@
return stack_type == TYPE_NATIVE_INT;
case MONO_TYPE_PTR:
- if ((stack_type & POINTER_MASK) == 0)
+ if (stack_type != TYPE_PTR || stack->type->type !=
MONO_TYPE_PTR)
return FALSE;
- stack_type &= ~POINTER_MASK;
- if (stack_type != TYPE_COMPLEX) {
- type = type->data.type;
- goto handle_enum;
- }
- return verify_stack_type_compatibility (ctx, type->data.type,
stack->type, TRUE);
+ return verify_stack_type_compatibility (ctx, type->data.type,
stack->type->data.type, TRUE);
+ case MONO_TYPE_FNPTR:
+ if (stack_type != TYPE_PTR || stack->type->type !=
MONO_TYPE_FNPTR)
+ return FALSE;
+
+ return mono_metadata_signature_equal (mono_type_get_signature
(type), mono_type_get_signature (stack->type));
+
case MONO_TYPE_GENERICINST: {
MonoGenericClass *left;
MonoGenericClass *right;
@@ -2391,6 +2392,13 @@
int from_stype = from_slot->stype;
int to_stype = to_slot->stype;
+ /* This is the only case of merging between verification types*/
+ if ((from_stype == TYPE_I4 && to_stype == TYPE_NATIVE_INT) ||
+ (from_stype == TYPE_NATIVE_INT && to_stype == TYPE_I4))
{
+ to_slot->stype = TYPE_NATIVE_INT;
+ continue;
+ }
+
if (from_stype != to_stype) {
VERIFIER_DEBUG ( printf ("diferent stack types %d x
%d\n", from_stype, to_stype); );
CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Could not
merge stacks, diferent verification types (%s x %s)",
@@ -2403,9 +2411,9 @@
to_stype &= ~POINTER_MASK;
if (from_slot->type && !verify_stack_type_compatibility
(ctx, to_slot->type, from_slot->type, TRUE)) {
- CODE_NOT_VERIFIABLE (ctx, g_strdup_printf
("Could not merge stacks, pointer types not compatible"));
+ CODE_NOT_VERIFIABLE (ctx, g_strdup_printf
("Could not merge stacks, managed pointer types not compatible"));
goto end_verify;
- } else
+ } else
copy_stack_value (to_slot, from_slot);
continue;
}
@@ -2726,14 +2734,17 @@
++ip;
break;
- case CEE_DUP:
+ case CEE_DUP: {
+ ILStackDesc * top;
if (!check_underflow (&ctx, 1))
break;
if (!check_overflow (&ctx))
break;
- copy_stack_value (stack_push (&ctx), stack_get (&ctx,
1));
+ top = stack_push (&ctx);
+ copy_stack_value (top, stack_get (&ctx, 1));
++ip;
break;
+ }
case CEE_JMP:
if (ctx.eval.size)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches