Author: kumpera
Date: 2007-07-19 17:46:55 -0400 (Thu, 19 Jul 2007)
New Revision: 82327
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/verify.c
Log:
* verify.c: a typo slipped in and the code wont compile
2007-07-19 Rodrigo Kumpera <[EMAIL PROTECTED]>
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2007-07-19 21:00:08 UTC (rev 82326)
+++ trunk/mono/mono/metadata/ChangeLog 2007-07-19 21:46:55 UTC (rev 82327)
@@ -1,5 +1,9 @@
2007-07-19 Rodrigo Kumpera <[EMAIL PROTECTED]>
+ * verify.c: a typo slipped in and the code wont compile
+
+2007-07-19 Rodrigo Kumpera <[EMAIL PROTECTED]>
+
* verify.c: now all code use IS_MANAGED_POINTER and UNMASK_TYPE macros.
disabled box instruction as it is doing the wrong thing
improved stack dump messages, now it is easier to debug type related
issues
Modified: trunk/mono/mono/metadata/verify.c
===================================================================
--- trunk/mono/mono/metadata/verify.c 2007-07-19 21:00:08 UTC (rev 82326)
+++ trunk/mono/mono/metadata/verify.c 2007-07-19 21:46:55 UTC (rev 82327)
@@ -1822,7 +1822,6 @@
*/
static gboolean
verify_stack_type_compatibility (VerifyContext *ctx, MonoType *target,
MonoType *candidate, gboolean strict) {
- int stack_type;
#define IS_ONE_OF3(T, A, B, C) (T == A || T == B || T == C)
#define IS_ONE_OF2(T, A, B) (T == A || T == B)
@@ -2202,9 +2201,7 @@
ctx->eval.size--;
if (res == TYPE_INV) {
- CODE_NOT_VERIFIABLE (ctx, g_strdup_printf (
- "Binary instruction applyed to ill formed stack (%s x
%s)",
- type_names [UNMASK_TYPE (idxa &)], type_names
[UNMASK_TYPE (idxb)]));
+ CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Binary instruction
applyed to ill formed stack (%s x %s)", type_names [UNMASK_TYPE (idxa)],
type_names [UNMASK_TYPE (idxb)]));
return;
}
@@ -2330,11 +2327,11 @@
a = stack_pop (ctx);
idxa = a->stype;
- if (IS_MANAGED_POINTER (idxa)
+ if (IS_MANAGED_POINTER (idxa))
idxa = TYPE_PTR;
idxb = b->stype;
- if (IS_MANAGED_POINTER (idxb)
+ if (IS_MANAGED_POINTER (idxb))
idxb = TYPE_PTR;
--idxa;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches