Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
213 changes: 208 additions & 5 deletions src/coreclr/interpreter/compiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4131,6 +4131,7 @@ void InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U4_R8);
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U4_I4);
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U4_I8);
Expand Down Expand Up @@ -4171,9 +4172,10 @@ void InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
EmitConv(m_pStackPointer - 1, StackTypeI8, INTOP_CONV_OVF_U8_R8);
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI8, INTOP_CONV_I8_U4);
EmitConv(m_pStackPointer - 1, StackTypeI8, INTOP_CONV_OVF_U8_I4);
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI8, INTOP_CONV_OVF_U8_I8);
break;
default:
assert(0);
Expand Down Expand Up @@ -4237,17 +4239,218 @@ void InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
break;
case StackTypeI4:
#ifdef TARGET_64BIT
// FIXME: Is this the right conv opcode?
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_I8_I4);
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_U8_I4);
#else
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_MOV_4);
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_U4_I4);
#endif
break;
case StackTypeI8:
#ifdef TARGET_64BIT
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_MOV_8);
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_U8_I8);
#else
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_U4_I8);
#endif
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_I1_UN:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
case StackTypeR8:
assert(!"Floating point unsigned conversions");
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I1_U4);
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I1_U8);
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_U1_UN:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
case StackTypeR8:
assert(!"Floating point unsigned conversions");
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U1_U4);
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U1_U8);
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_I2_UN:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
case StackTypeR8:
assert(!"Floating point unsigned conversions");
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I2_U4);
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I2_U8);
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_U2_UN:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
case StackTypeR8:
assert(!"Floating point unsigned conversions");
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U2_U4);
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U2_U8);
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_I4_UN:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
case StackTypeR8:
assert(!"Floating point unsigned conversions");
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I4_U4);
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I4_U8);
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_U4_UN:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
case StackTypeR8:
assert(!"Floating point unsigned conversions");
break;
case StackTypeI4:
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U4_U8);
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_I8_UN:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
case StackTypeR8:
assert(!"Floating point unsigned conversions");
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI8, INTOP_CONV_I8_U4);
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI8, INTOP_CONV_OVF_I8_U8);
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_U8_UN:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
case StackTypeR8:
assert(!"Floating point unsigned conversions");
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI8, INTOP_CONV_U8_U4);
break;
case StackTypeI8:
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_I_UN:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
case StackTypeR8:
assert(!"Floating point unsigned conversions");
break;
case StackTypeI4:
#ifdef TARGET_64BIT
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_I8_U4);
#else
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_I4_U4);
#endif
break;
case StackTypeI8:
#ifdef TARGET_64BIT
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_I8_U8);
#else
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_I4_U8);
#endif
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_U_UN:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
case StackTypeR8:
assert(!"Floating point unsigned conversions");
break;
case StackTypeI4:
#ifdef TARGET_64BIT
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_U8_U4);
#else
#endif
break;
case StackTypeI8:
#ifdef TARGET_64BIT
#else
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_U4_U8);
#endif
break;
default:
Expand Down
22 changes: 22 additions & 0 deletions src/coreclr/interpreter/intops.def
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ OPDEF(INTOP_CONV_R8_I4, "conv.r8.i4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_R8_I8, "conv.r8.i8", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_R8_R4, "conv.r8.r4", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_U8_U4, "conv.u8.u4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_U8_R4, "conv.u8.r4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_U8_R8, "conv.u8.r8", 3, 1, 1, InterpOpNoArgs)

Expand All @@ -191,20 +192,41 @@ OPDEF(INTOP_CONV_OVF_U2_I8, "conv.ovf.u2.i8", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_U2_R4, "conv.ovf.u2.r4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_U2_R8, "conv.ovf.u2.r8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_OVF_I4_U4, "conv.ovf.i4.u4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_I4_I8, "conv.ovf.i4.i8", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_I4_R4, "conv.ovf.i4.r4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_I4_R8, "conv.ovf.i4.r8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_OVF_U4_I4, "conv.ovf.u4.i4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_U4_I8, "conv.ovf.u4.i8", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_U4_R4, "conv.ovf.u4.r4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_U4_R8, "conv.ovf.u4.r8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_OVF_I8_U8, "conv.ovf.i8.u8", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_I8_R4, "conv.ovf.i8.r4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_I8_R8, "conv.ovf.i8.r8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_OVF_U8_I4, "conv.ovf.u8.i4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_U8_I8, "conv.ovf.u8.i8", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_U8_R4, "conv.ovf.u8.r4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_U8_R8, "conv.ovf.u8.r8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_OVF_I1_U4, "conv.ovf.i1.u4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_I1_U8, "conv.ovf.i1.u8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_OVF_U1_U4, "conv.ovf.u1.u4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_U1_U8, "conv.ovf.u1.u8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_OVF_I2_U4, "conv.ovf.i2.u4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_I2_U8, "conv.ovf.i2.u8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_OVF_U2_U4, "conv.ovf.u2.u4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_U2_U8, "conv.ovf.u2.u8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_OVF_I4_U8, "conv.ovf.i4.u8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_OVF_U4_U8, "conv.ovf.u4.u8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_UNBOX_ANY, "unbox.any", 5, 1, 1, InterpOpHelperFtn) // [class handle data item] [helper data item]
OPDEF(INTOP_UNBOX_ANY_GENERIC, "unbox.any.generic", 6, 1, 2, InterpOpGenericHelperFtn) // [class handle data item] [helper data item]
// Unary operations end
Expand Down
Loading
Loading