2009-07-27 Rodrigo Kumpera <rkumpera@novell.com>

	OpCode.cs: HashCode is meant to be calculated based on Name.

	OpCodeNames.cs: Fix some names.

	OpCodes.cs: Fix Stelem, Constrained and Readonly specs.

svn path=/trunk/mcs/; revision=138776

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index cb050929c850aca5895613f0dcdb48fe2e6b0597..365f26461725089fe8acdd8d34feb9d29aed930c 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-27 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       OpCode.cs: HashCode is meant to be calculated based on Name. 
+
+       OpCodeNames.cs: Fix some names.
+
+       OpCodes.cs: Fix Stelem, Constrained and Readonly specs.
+
 2009-07-26  Miguel de Icaza  <miguel@novell.com>
 
        * ILGenerator.cs: Fix the exception thrown when LocalBuilders are

diff --git a/mcs/class/corlib/System.Reflection.Emit/OpCode.cs b/mcs/class/corlib/System.Reflection.Emit/OpCode.cs
index 75ab332dfdf41cf175c5087dc0258cfe093ac3ff..8b1b4390e301c1b430a1da13d50f74f9c9e1b11a 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/OpCode.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/OpCode.cs
@@ -63,7 +63,7 @@ namespace System.Reflection.Emit {
 
                public override int GetHashCode ()
                {
-                       return Value;
+                       return Name.GetHashCode ();
                }
 
                public override bool Equals (Object obj)

diff --git a/mcs/class/corlib/System.Reflection.Emit/OpCodeNames.cs b/mcs/class/corlib/System.Reflection.Emit/OpCodeNames.cs
index 04a2b8b93d83eecfc6d7324e83faf1a55db8e683..f3d717529ff20bbcb2ae1f606dc814961b3143ae 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/OpCodeNames.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/OpCodeNames.cs
@@ -164,8 +164,8 @@ namespace System.Reflection.Emit {
                        "stelem.r4",
                        "stelem.r8",
                        "stelem.ref",
-                       "ldelem.any",
-                       "stelem.any",
+                       "ldelem",
+                       "stelem",
                        "unbox.any",
                        null,
                        null,
@@ -287,7 +287,7 @@ namespace System.Reflection.Emit {
                        null,
                        "sizeof",
                        "refanytype",
-                       null,
+                       "readonly.",
                        null,
                        null,
                        null,

diff --git a/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs b/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs
index 24962fdf0079e3b5b596866e586eded47ce2d4df..5975bbe334517f05bbc4ab0389131b93734c2bfd 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs
@@ -662,7 +662,7 @@ namespace System.Reflection.Emit {
                        1 << 0 | (byte) OpCodeType.Objmodel << 8 | (byte) OperandType.InlineType << 16 | (byte) FlowControl.Next << 24);
 
                public static readonly OpCode Stelem = new OpCode (
-                       0xFF << 0 | 0xA4 << 8 | (byte) StackBehaviour.Push0 << 16 | (byte) StackBehaviour.Popref_popi_popref << 24,
+                       0xFF << 0 | 0xA4 << 8 | (byte) StackBehaviour.Push0 << 16 | (byte) StackBehaviour.Popref_popi_pop1 << 24,
                        1 << 0 | (byte) OpCodeType.Objmodel << 8 | (byte) OperandType.InlineType << 16 | (byte) FlowControl.Next << 24);
 
                public static readonly OpCode Unbox_Any = new OpCode (
@@ -895,7 +895,7 @@ namespace System.Reflection.Emit {
 #if NET_2_0 || BOOTSTRAP_NET_2_0
                public static readonly OpCode Constrained = new OpCode (
                        0xFE << 0 | 0x16 << 8 | (byte) StackBehaviour.Push0 << 16 | (byte) StackBehaviour.Pop0 << 24,
-                       2 << 0 | (byte) OpCodeType.Prefix << 8 | (byte) OperandType.InlineType << 16 | (byte) FlowControl.Next << 24);
+                       2 << 0 | (byte) OpCodeType.Prefix << 8 | (byte) OperandType.InlineType << 16 | (byte) FlowControl.Meta << 24);
 #endif
                public static readonly OpCode Cpblk = new OpCode (
                        0xFE << 0 | 0x17 << 8 | (byte) StackBehaviour.Push0 << 16 | (byte) StackBehaviour.Popi_popi_popi << 24,
@@ -920,7 +920,7 @@ namespace System.Reflection.Emit {
 #if NET_2_0 || BOOTSTRAP_NET_2_0
                public static readonly OpCode Readonly = new OpCode (
                        0xFE << 0 | 0x1E << 8 | (byte) StackBehaviour.Push0 << 16 | (byte) StackBehaviour.Pop0 << 24,
-                       2 << 0 | (byte) OpCodeType.Primitive << 8 | (byte) OperandType.InlineNone << 16 | (byte) FlowControl.Next << 24);
+                       2 << 0 | (byte) OpCodeType.Prefix << 8 | (byte) OperandType.InlineNone << 16 | (byte) FlowControl.Meta << 24);
 #endif
 
                 public static bool TakesSingleByteArgument (OpCode inst)