[interp] basic filter clause support

[mono.git] / mono / mini / interp / mintops.def

diff --git a/mono/mini/interp/mintops.def b/mono/mini/interp/mintops.def
index f6ff2fac25072204f64b9da769fb288ae731b12b..39330d479f7eea4098161b4560d21350b6d289db 100644 (file)
--- a/mono/mini/interp/mintops.def
+++ b/mono/mini/interp/mintops.def
@@ -76,7 +76,6 @@ OPDEF(MINT_STINARG_P, "stinarg.p", 2, MintOpUShortInt)
 OPDEF(MINT_STINARG_VT, "stinarg.vt", 4, MintOpShortAndInt)
 
 OPDEF(MINT_LDARGA, "ldarga", 2, MintOpUShortInt)
-OPDEF(MINT_LDTHISA, "ldthisa", 1, MintOpNoArgs)
 
 OPDEF(MINT_LDFLD_I1, "ldfld.i1", 2, MintOpUShortInt)
 OPDEF(MINT_LDFLD_U1, "ldfld.u1", 2, MintOpUShortInt)
@@ -94,6 +93,7 @@ OPDEF(MINT_LDRMFLD, "ldrmfld", 2, MintOpFieldToken)
 OPDEF(MINT_LDRMFLD_VT, "ldrmfld.vt", 4, MintOpShortAndInt)
 
 OPDEF(MINT_LDFLDA, "ldflda", 2, MintOpUShortInt)
+OPDEF(MINT_LDFLDA_UNSAFE, "ldflda.unsafe", 2, MintOpUShortInt)
 
 OPDEF(MINT_STFLD_I1, "stfld.i1", 2, MintOpUShortInt)
 OPDEF(MINT_STFLD_U1, "stfld.u1", 2, MintOpUShortInt)
@@ -266,6 +266,8 @@ OPDEF(MINT_JMP, "jmp", 2, MintOpMethodToken)
 
 OPDEF(MINT_CALLRUN, "callrun", 1, MintOpNoArgs)
 
+OPDEF(MINT_ENDFILTER, "endfilter", 1, MintOpNoArgs)
+
 OPDEF(MINT_NEWOBJ, "newobj", 2, MintOpMethodToken) 
 OPDEF(MINT_INITOBJ, "initobj", 3, MintOpInt) 
 OPDEF(MINT_CASTCLASS, "castclass", 2, MintOpClassToken) 
@@ -276,6 +278,7 @@ OPDEF(MINT_UNBOX, "unbox", 2, MintOpClassToken)
 OPDEF(MINT_LDTOKEN, "ldtoken", 2, MintOpClassToken) /* not really */
 OPDEF(MINT_LDFTN, "ldftn", 2, MintOpMethodToken) 
 OPDEF(MINT_LDVIRTFTN, "ldvirtftn", 2, MintOpMethodToken) 
+OPDEF(MINT_CPOBJ, "cpobj", 2, MintOpClassToken)
 OPDEF(MINT_LDOBJ, "ldobj", 2, MintOpClassToken) 
 OPDEF(MINT_STOBJ, "stobj", 2, MintOpClassToken) 
 OPDEF(MINT_STOBJ_VT, "stobj.vt", 2, MintOpClassToken) 
@@ -297,11 +300,12 @@ OPDEF(MINT_LDELEM_R8, "ldelem.r8", 1, MintOpNoArgs)
 OPDEF(MINT_LDELEM_REF, "ldelem.ref", 1, MintOpNoArgs)
 OPDEF(MINT_LDELEM_VT, "ldelem.vt", 4, MintOpShortAndInt)
 
-OPDEF(MINT_LDELEMA, "ldelema", 2, MintOpClassToken)
-OPDEF(MINT_LDELEMA_TC, "ldelema.tc", 2, MintOpClassToken)
+OPDEF(MINT_LDELEMA, "ldelema", 3, MintOpTwoShorts)
+OPDEF(MINT_LDELEMA_TC, "ldelema.tc", 3, MintOpTwoShorts)
 
 OPDEF(MINT_STELEM_I, "stelem.i", 1, MintOpNoArgs)
 OPDEF(MINT_STELEM_I1, "stelem.i1", 1, MintOpNoArgs)
+OPDEF(MINT_STELEM_U1, "stelem.u1", 1, MintOpNoArgs)
 OPDEF(MINT_STELEM_I2, "stelem.i2", 1, MintOpNoArgs)
 OPDEF(MINT_STELEM_I4, "stelem.i4", 1, MintOpNoArgs)
 OPDEF(MINT_STELEM_I8, "stelem.i8", 1, MintOpNoArgs)
@@ -443,6 +447,7 @@ OPDEF(MINT_CONV_OVF_U2_R8, "conv.ovf.u2.r8", 1, MintOpNoArgs)
 
 OPDEF(MINT_CONV_OVF_I4_U4, "conv.ovf.i4.u4", 1, MintOpNoArgs)
 OPDEF(MINT_CONV_OVF_I4_I8, "conv.ovf.i4.i8", 1, MintOpNoArgs)
+OPDEF(MINT_CONV_OVF_I4_U8, "conv.ovf.i4.u8", 1, MintOpNoArgs)
 OPDEF(MINT_CONV_OVF_I4_R8, "conv.ovf.i4.r8", 1, MintOpNoArgs)
 
 OPDEF(MINT_CONV_OVF_I4_UN_I8, "conv.ovf.i4.un.i8", 1, MintOpNoArgs)
@@ -452,11 +457,13 @@ OPDEF(MINT_CONV_OVF_U4_I4, "conv.ovf.u4.i4", 1, MintOpNoArgs)
 OPDEF(MINT_CONV_OVF_U4_I8, "conv.ovf.u4.i8", 1, MintOpNoArgs)
 OPDEF(MINT_CONV_OVF_U4_R8, "conv.ovf.u4.r8", 1, MintOpNoArgs)
 
+OPDEF(MINT_CONV_OVF_I8_U8, "conv.ovf.i8.u8", 1, MintOpNoArgs)
 OPDEF(MINT_CONV_OVF_I8_R8, "conv.ovf.i8.r8", 1, MintOpNoArgs)
 
 OPDEF(MINT_CONV_OVF_I8_UN_R8, "conv.ovf.i8.un.r8", 1, MintOpNoArgs)
 
 OPDEF(MINT_CONV_OVF_U8_I4, "conv.ovf.u8.i4", 1, MintOpNoArgs)
+OPDEF(MINT_CONV_OVF_U8_I8, "conv.ovf.u8.i8", 1, MintOpNoArgs)
 OPDEF(MINT_CONV_OVF_U8_R8, "conv.ovf.u8.r8", 1, MintOpNoArgs)
 
 OPDEF(MINT_CEQ_I4, "ceq.i4", 1, MintOpNoArgs)
@@ -504,4 +511,5 @@ OPDEF(MINT_MONO_NEWOBJ, "mono_newobj", 2, MintOpClassToken)
 OPDEF(MINT_MONO_RETOBJ, "mono_retobj", 1, MintOpNoArgs)
 OPDEF(MINT_MONO_FREE, "mono_free", 1, MintOpNoArgs)
 
-
+// FIXME: MintOp
+OPDEF(MINT_JIT_CALL, "mono_jit_call", 2, MintOpNoArgs)