Revert "Merge branch 'master' of https://github.com/mono/mono"

[mono.git] / mono / mini / mini-ops.h

diff --git a/mono/mini/mini-ops.h b/mono/mini/mini-ops.h
index e7a7844a0f84adc91075bb98bcf7c0706e0478d2..bccdb295d44e363a3d6ea038531d1a05f8b6821c 100644 (file)
--- a/mono/mini/mini-ops.h
+++ b/mono/mini/mini-ops.h
@@ -64,6 +64,10 @@ MINI_OP(OP_ICONST,   "iconst", IREG, NONE, NONE)
 MINI_OP(OP_I8CONST,    "i8const", LREG, NONE, NONE)
 MINI_OP(OP_R4CONST,    "r4const", FREG, NONE, NONE)
 MINI_OP(OP_R8CONST,    "r8const", FREG, NONE, NONE)
+MINI_OP(OP_DUMMY_ICONST, "dummy_iconst", IREG, NONE, NONE)
+MINI_OP(OP_DUMMY_I8CONST, "dummy_i8const", LREG, NONE, NONE)
+MINI_OP(OP_DUMMY_R8CONST, "dummy_r8const", FREG, NONE, NONE)
+MINI_OP(OP_DUMMY_VZERO, "dummy_vzero", VREG, NONE, NONE)
 MINI_OP(OP_REGVAR,     "regvar", NONE, NONE, NONE)
 MINI_OP(OP_REGOFFSET,  "regoffset", NONE, NONE, NONE)
 MINI_OP(OP_VTARG_ADDR, "vtarg_addr", NONE, NONE, NONE)
@@ -162,7 +166,7 @@ MINI_OP(OP_LOADI8_MEM,"loadi8_mem", IREG, NONE, NONE)
 MINI_OP(OP_STORE_MEM_IMM, "store_mem_imm", NONE, NONE, NONE)
 
 MINI_OP(OP_MOVE,       "move", IREG, IREG, NONE)
-MINI_OP(OP_LMOVE,      "lmove", IREG, IREG, NONE)
+MINI_OP(OP_LMOVE,      "lmove", LREG, LREG, NONE)
 MINI_OP(OP_FMOVE,      "fmove", FREG, FREG, NONE)
 MINI_OP(OP_VMOVE,   "vmove", VREG, VREG, NONE)
 
@@ -1241,3 +1245,6 @@ MINI_OP(OP_LLVM_OUTARG_VT,        "llvm_outarg_vt", IREG, VREG, NONE)
 
 MINI_OP(OP_OBJC_GET_SELECTOR, "objc_get_selector", IREG, NONE, NONE)
 
+MINI_OP(OP_GET_SP, "get_sp", IREG, NONE, NONE)
+MINI_OP(OP_SET_SP, "set_sp", NONE, IREG, NONE)
+