Thu May 29 12:52:40 CEST 2003 Paolo Molaro <lupus@ximian.com>

	* opcode.def, cil-opcodes.xml: fix opcode entries.

svn path=/trunk/mono/; revision=14990

diff --git a/mono/cil/ChangeLog b/mono/cil/ChangeLog
index 8d7c0a09b8fb59def484bdb19dae17ab079419ee..68691a5600eb6442915a03fd8b53659a3af080fe 100644 (file)
--- a/mono/cil/ChangeLog
+++ b/mono/cil/ChangeLog
@@ -1,4 +1,8 @@
 
+Thu May 29 12:52:40 CEST 2003 Paolo Molaro <lupus@ximian.com>
+
+       * opcode.def, cil-opcodes.xml: fix opcode entries.
+
 Wed Sep 5 15:54:47 CEST 2001 Paolo Molaro <lupus@ximian.com>
 
        * opcode.def: cvs add to reduce build dependencies for

diff --git a/mono/cil/cil-opcodes.xml b/mono/cil/cil-opcodes.xml
index 0a8813feff299f38c0c3a0192bd331f4cbe3a86c..9cb5235c3e05b98d69f37d2bccb1864e7697b228 100644 (file)
--- a/mono/cil/cil-opcodes.xml
+++ b/mono/cil/cil-opcodes.xml
@@ -162,9 +162,9 @@
 <opcode name="stelem.r4" input="PopRef+PopI+PopR4" output="Push0" args="InlineNone" o1="0xFF" o2="0xA0" flow="next"/>\r
 <opcode name="stelem.r8" input="PopRef+PopI+PopR8" output="Push0" args="InlineNone" o1="0xFF" o2="0xA1" flow="next"/>\r
 <opcode name="stelem.ref" input="PopRef+PopI+PopRef" output="Push0" args="InlineNone" o1="0xFF" o2="0xA2" flow="next"/>\r
-<opcode name="unused2" input="Pop0" output="Push0" args="InlineNone" o1="0xFF" o2="0xA3" flow="next"/>\r
-<opcode name="unused3" input="Pop0" output="Push0" args="InlineNone" o1="0xFF" o2="0xA4" flow="next"/>\r
-<opcode name="unused4" input="Pop0" output="Push0" args="InlineNone" o1="0xFF" o2="0xA5" flow="next"/>\r
+<opcode name="ldelem" input="PopRef+PopI" output="Push1" args="InlineType" o1="0xFF" o2="0xA3" flow="next"/>\r
+<opcode name="stelem" input="PopRef+PopI+Pop1" output="Push0" args="InlineType" o1="0xFF" o2="0xA4" flow="next"/>\r
+<opcode name="unbox.any" input="PopRef" output="Push1" args="InlineType" o1="0xFF" o2="0xA5" flow="next"/>\r
 <opcode name="unused5" input="Pop0" output="Push0" args="InlineNone" o1="0xFF" o2="0xA6" flow="next"/>\r
 <opcode name="unused6" input="Pop0" output="Push0" args="InlineNone" o1="0xFF" o2="0xA7" flow="next"/>\r
 <opcode name="unused7" input="Pop0" output="Push0" args="InlineNone" o1="0xFF" o2="0xA8" flow="next"/>\r
@@ -303,5 +303,6 @@
 <opcode name="mono_vtaddr" input="Pop1" output="PushI" args="InlineNone" o1="0xF0" o2="0x06" flow="next"/>\r
 <opcode name="mono_newobj" input="Pop0" output="PushRef" args="InlineType" o1="0xF0" o2="0x07" flow="next"/>\r
 <opcode name="mono_retobj" input="PopI" output="Push0" args="InlineType" o1="0xF0" o2="0x08" flow="return"/>\r
+<opcode name="mono_ldnativeobj" input="PopI" output="Push1" args="InlineType" o1="0xF0" o2="0x09" flow="return"/>\r
 \r
 </opdesc>\r

diff --git a/mono/cil/opcode.def b/mono/cil/opcode.def
index d43d0a4006068d6adc9677b6322ede0e82501a9a..8588e6f847e7d51423c5052b1e036c13c2c5f6e1 100644 (file)
--- a/mono/cil/opcode.def
+++ b/mono/cil/opcode.def
@@ -161,9 +161,9 @@ OPDEF(CEE_STELEM_I8, "stelem.i8", PopRef+PopI+PopI8, Push0, InlineNone, X, 1, 0x
 OPDEF(CEE_STELEM_R4, "stelem.r4", PopRef+PopI+PopR4, Push0, InlineNone, X, 1, 0xFF, 0xA0, NEXT)
 OPDEF(CEE_STELEM_R8, "stelem.r8", PopRef+PopI+PopR8, Push0, InlineNone, X, 1, 0xFF, 0xA1, NEXT)
 OPDEF(CEE_STELEM_REF, "stelem.ref", PopRef+PopI+PopRef, Push0, InlineNone, X, 1, 0xFF, 0xA2, NEXT)
-OPDEF(CEE_UNUSED2, "unused2", Pop0, Push0, InlineNone, X, 1, 0xFF, 0xA3, NEXT)
-OPDEF(CEE_UNUSED3, "unused3", Pop0, Push0, InlineNone, X, 1, 0xFF, 0xA4, NEXT)
-OPDEF(CEE_UNUSED4, "unused4", Pop0, Push0, InlineNone, X, 1, 0xFF, 0xA5, NEXT)
+OPDEF(CEE_LDELEM, "ldelem", PopRef+PopI, Push1, InlineType, X, 1, 0xFF, 0xA3, NEXT)
+OPDEF(CEE_STELEM, "stelem", PopRef+PopI+Pop1, Push0, InlineType, X, 1, 0xFF, 0xA4, NEXT)
+OPDEF(CEE_UNBOX_ANY, "unbox.any", PopRef, Push1, InlineType, X, 1, 0xFF, 0xA5, NEXT)
 OPDEF(CEE_UNUSED5, "unused5", Pop0, Push0, InlineNone, X, 1, 0xFF, 0xA6, NEXT)
 OPDEF(CEE_UNUSED6, "unused6", Pop0, Push0, InlineNone, X, 1, 0xFF, 0xA7, NEXT)
 OPDEF(CEE_UNUSED7, "unused7", Pop0, Push0, InlineNone, X, 1, 0xFF, 0xA8, NEXT)
@@ -300,7 +300,7 @@ OPDEF(CEE_MONO_LDPTR, "mono_ldptr", Pop0, PushI, InlineI, X, 2, 0xF0, 0x05, NEXT
 OPDEF(CEE_MONO_VTADDR, "mono_vtaddr", Pop1, PushI, InlineNone, X, 2, 0xF0, 0x06, NEXT)
 OPDEF(CEE_MONO_NEWOBJ, "mono_newobj", Pop0, PushRef, InlineType, X, 2, 0xF0, 0x07, NEXT)
 OPDEF(CEE_MONO_RETOBJ, "mono_retobj", PopI, Push0, InlineType, X, 2, 0xF0, 0x08, RETURN)
-OPDEF(CEE_MONO_LDNATIVEOBJ, "mono_ldnativeobj", PopI, Push1, InlineType, X, 2, 0xF0, 0x09, NEXT)
+OPDEF(CEE_MONO_LDNATIVEOBJ, "mono_ldnativeobj", PopI, Push1, InlineType, X, 2, 0xF0, 0x09, RETURN)
 #ifndef OPALIAS
 #define _MONO_CIL_OPALIAS_DEFINED_
 #define OPALIAS(a,s,r)

diff --git a/mono/interpreter/interp.c b/mono/interpreter/interp.c
index 95cd4d994e9cd22366aabcc3738a73b3729eb4b2..c520ee633f8b28dc74d481893aa081b9558949c0 100644 (file)
--- a/mono/interpreter/interp.c
+++ b/mono/interpreter/interp.c
@@ -3346,9 +3346,9 @@ array_constructed:
                        ++ip;
                        BREAK;
                }
-               CASE (CEE_UNUSED2) 
-               CASE (CEE_UNUSED3) 
-               CASE (CEE_UNUSED4) 
+               CASE (CEE_LDELEM) 
+               CASE (CEE_STELEM) 
+               CASE (CEE_UNBOX_ANY) 
                CASE (CEE_UNUSED5) 
                CASE (CEE_UNUSED6) 
                CASE (CEE_UNUSED7) 

diff --git a/mono/metadata/verify.c b/mono/metadata/verify.c
index 3aa838f915b85bbdcea67f91b96f7eef4b824566..16c4f5601a4ccdf67894bf0dc7855cdc4130f15f 100644 (file)
--- a/mono/metadata/verify.c
+++ b/mono/metadata/verify.c
@@ -1813,9 +1813,9 @@ mono_method_verify (MonoMethod *method, int level)
                        cur_stack -= 3;
                        ++ip;
                        break;
-               case CEE_UNUSED2:
-               case CEE_UNUSED3:
-               case CEE_UNUSED4:
+               case CEE_LDELEM:
+               case CEE_STELEM:
+               case CEE_UNBOX_ANY:
                case CEE_UNUSED5:
                case CEE_UNUSED6:
                case CEE_UNUSED7:

diff --git a/mono/mini/cpu-g4.md b/mono/mini/cpu-g4.md
index 2e69b5278d98137126dbf19d4451d7f368355b40..c5bc7d07d159c54d73595501abf7aea281ff6f2b 100644 (file)
--- a/mono/mini/cpu-g4.md
+++ b/mono/mini/cpu-g4.md
@@ -207,9 +207,6 @@ stelem.i8:
 stelem.r4:
 stelem.r8:
 stelem.ref:
-unused2:
-unused3:
-unused4:
 unused5:
 unused6:
 unused7:

diff --git a/mono/mini/cpu-pentium.md b/mono/mini/cpu-pentium.md
index 4bd2b400d3eb91af8a3ea1bee099a32b2e7779e9..901b2dac63b64085075453051ea33d9f203fdae2 100644 (file)
--- a/mono/mini/cpu-pentium.md
+++ b/mono/mini/cpu-pentium.md
@@ -212,9 +212,6 @@ stelem.i8:
 stelem.r4:
 stelem.r8:
 stelem.ref:
-unused2:
-unused3:
-unused4:
 unused5:
 unused6:
 unused7: