projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mini]Add test for PtrToStruct<T>
[mono.git]
/
mono
/
mini
/
interp
/
mintops.def
diff --git
a/mono/mini/interp/mintops.def
b/mono/mini/interp/mintops.def
index 54c5422b27e6a373ef880710555ab56c134bfd02..190c6647d08adef26aee2599bfc0bbe2c2be21e1 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_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)
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_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)
OPDEF(MINT_STFLD_I1, "stfld.i1", 2, MintOpUShortInt)
OPDEF(MINT_STFLD_U1, "stfld.u1", 2, MintOpUShortInt)
@@
-172,7
+172,7
@@
OPDEF(MINT_LEAVE_S, "leave.s", 2, MintOpShortBranch)
OPDEF(MINT_THROW, "throw", 1, MintOpNoArgs)
OPDEF(MINT_RETHROW, "rethrow", 1, MintOpNoArgs)
OPDEF(MINT_THROW, "throw", 1, MintOpNoArgs)
OPDEF(MINT_RETHROW, "rethrow", 1, MintOpNoArgs)
-OPDEF(MINT_ENDFINALLY, "endfinally",
1
, MintOpNoArgs)
+OPDEF(MINT_ENDFINALLY, "endfinally",
2
, MintOpNoArgs)
OPDEF(MINT_BRFALSE_I4, "brfalse.i4", 3, MintOpBranch)
OPDEF(MINT_BRFALSE_I8, "brfalse.i8", 3, MintOpBranch)
OPDEF(MINT_BRFALSE_I4, "brfalse.i4", 3, MintOpBranch)
OPDEF(MINT_BRFALSE_I8, "brfalse.i8", 3, MintOpBranch)
@@
-266,6
+266,8
@@
OPDEF(MINT_JMP, "jmp", 2, MintOpMethodToken)
OPDEF(MINT_CALLRUN, "callrun", 1, MintOpNoArgs)
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)
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_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)
OPDEF(MINT_LDOBJ, "ldobj", 2, MintOpClassToken)
OPDEF(MINT_STOBJ, "stobj", 2, MintOpClassToken)
OPDEF(MINT_STOBJ_VT, "stobj.vt", 2, MintOpClassToken)
@@
-297,11
+300,14
@@
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_LDELEM_REF, "ldelem.ref", 1, MintOpNoArgs)
OPDEF(MINT_LDELEM_VT, "ldelem.vt", 4, MintOpShortAndInt)
-OPDEF(MINT_LDELEMA, "ldelema", 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_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_I2, "stelem.i2", 1, MintOpNoArgs)
+OPDEF(MINT_STELEM_U2, "stelem.u2", 1, MintOpNoArgs)
OPDEF(MINT_STELEM_I4, "stelem.i4", 1, MintOpNoArgs)
OPDEF(MINT_STELEM_I8, "stelem.i8", 1, MintOpNoArgs)
OPDEF(MINT_STELEM_R4, "stelem.r4", 1, MintOpNoArgs)
OPDEF(MINT_STELEM_I4, "stelem.i4", 1, MintOpNoArgs)
OPDEF(MINT_STELEM_I8, "stelem.i8", 1, MintOpNoArgs)
OPDEF(MINT_STELEM_R4, "stelem.r4", 1, MintOpNoArgs)
@@
-442,6
+448,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_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)
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)
@@
-451,11
+458,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_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_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)
OPDEF(MINT_CONV_OVF_U8_R8, "conv.ovf.u8.r8", 1, MintOpNoArgs)
OPDEF(MINT_CEQ_I4, "ceq.i4", 1, MintOpNoArgs)
@@
-481,6
+490,9
@@
OPDEF(MINT_CLT_UN_I8, "clt.un.i8", 1, MintOpNoArgs)
OPDEF(MINT_CLT_UN_R8, "clt.un.r8", 1, MintOpNoArgs)
OPDEF(MINT_CKFINITE, "ckfinite", 1, MintOpNoArgs)
OPDEF(MINT_CLT_UN_R8, "clt.un.r8", 1, MintOpNoArgs)
OPDEF(MINT_CKFINITE, "ckfinite", 1, MintOpNoArgs)
+OPDEF(MINT_MKREFANY, "mkrefany", 2, MintOpClassToken)
+OPDEF(MINT_REFANYTYPE, "refanytype", 1, MintOpNoArgs)
+OPDEF(MINT_REFANYVAL, "refanyval", 1, MintOpNoArgs)
OPDEF(MINT_CKNULL, "cknull", 1, MintOpNoArgs)
OPDEF(MINT_CKNULL, "cknull", 1, MintOpNoArgs)
@@
-499,8
+511,13
@@
OPDEF(MINT_ICALL_PI_P, "mono_icall_pi_p", 2, MintOpClassToken)
OPDEF(MINT_ICALL_PPP_V, "mono_icall_ppp_v", 2, MintOpClassToken)
OPDEF(MINT_ICALL_PPI_V, "mono_icall_ppi_v", 2, MintOpClassToken)
OPDEF(MINT_MONO_LDPTR, "mono_ldptr", 2, MintOpClassToken)
OPDEF(MINT_ICALL_PPP_V, "mono_icall_ppp_v", 2, MintOpClassToken)
OPDEF(MINT_ICALL_PPI_V, "mono_icall_ppi_v", 2, MintOpClassToken)
OPDEF(MINT_MONO_LDPTR, "mono_ldptr", 2, MintOpClassToken)
+OPDEF(MINT_MONO_TLS, "mono_tls", 2, MintOpInt)
OPDEF(MINT_MONO_NEWOBJ, "mono_newobj", 2, MintOpClassToken)
OPDEF(MINT_MONO_RETOBJ, "mono_retobj", 1, MintOpNoArgs)
OPDEF(MINT_MONO_FREE, "mono_free", 1, MintOpNoArgs)
OPDEF(MINT_MONO_NEWOBJ, "mono_newobj", 2, MintOpClassToken)
OPDEF(MINT_MONO_RETOBJ, "mono_retobj", 1, MintOpNoArgs)
OPDEF(MINT_MONO_FREE, "mono_free", 1, MintOpNoArgs)
+OPDEF(MINT_MONO_ATOMIC_STORE_I4, "mono_atomic.store.i4", 1, MintOpNoArgs)
+OPDEF(MINT_MONO_JIT_ATTACH, "mono_jit_attach", 1, MintOpNoArgs)
+OPDEF(MINT_MONO_JIT_DETACH, "mono_jit_detach", 1, MintOpNoArgs)
-
+// FIXME: MintOp
+OPDEF(MINT_JIT_CALL, "mono_jit_call", 2, MintOpNoArgs)