Skip to content

Implement CONV_OVF_xxx in the Interpreter #116356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kg merged 8 commits into from
Jun 10, 2025
Merged

Implement CONV_OVF_xxx in the Interpreter #116356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3adb73f
Implement CONV_OVF_U1
kg Jun 6, 2025
36baf76
Cleanup
kg Jun 9, 2025
4df3526
Fix backwards conditional
kg Jun 9, 2025
ae7387f
Fix boundary values
kg Jun 9, 2025
5b08d73
Apply suggestions from code review
kg Jun 10, 2025
b5637cc
Address PR feedback
kg Jun 10, 2025
fd7f113
Remove outdated comments
kg Jun 10, 2025
97d10e3
Fix musl build
kg Jun 10, 2025
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
251 changes: 251 additions & 0 deletions src/coreclr/interpreter/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1287,6 +1287,8 @@ void InterpCompiler::EmitConv(StackInfo *sp, StackType type, InterpOpcode convOp
int32_t var = CreateVarExplicit(g_interpTypeFromStackType[type], NULL, INTERP_STACK_SLOT_SIZE);
sp->var = var;
newInst->SetDVar(var);

// NOTE: We rely on m_pLastNewIns == newInst upon return from this function. Make sure you preserve that if you change anything.
}

static InterpType GetInterpType(CorInfoType corInfoType)
Expand Down Expand Up @@ -2120,6 +2122,7 @@ int32_t InterpCompiler::GetMethodDataItemIndex(CORINFO_METHOD_HANDLE mHandle)

int32_t InterpCompiler::GetDataItemIndexForHelperFtn(CorInfoHelpFunc ftn)
{
// Interpreter-TODO: Find an existing data item index for this helper if possible and reuse it
void *indirect;
void *direct = m_compHnd->getHelperFtn(ftn, &indirect);
size_t data = !direct
Expand Down Expand Up @@ -3526,6 +3529,245 @@ int InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
}
m_ip++;
break;
case CEE_CONV_OVF_I1:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I1_R4);
break;
case StackTypeR8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I1_R8);
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I1_I4);
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I1_I8);
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_U1:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U1_R4);
break;
case StackTypeR8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U1_R8);
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U1_I4);
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U1_I8);
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_I2:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I2_R4);
break;
case StackTypeR8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I2_R8);
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I2_I4);
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I2_I8);
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_U2:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U2_R4);
break;
case StackTypeR8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U2_R8);
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U2_I4);
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U2_I8);
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_I4:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I4_R4);
break;
case StackTypeR8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I4_R8);
break;
case StackTypeI4:
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_I4_I8);
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_U4:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U4_R4);
break;
case StackTypeR8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U4_R8);
break;
case StackTypeI4:
break;
case StackTypeI8:
EmitConv(m_pStackPointer - 1, StackTypeI4, INTOP_CONV_OVF_U4_I8);
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_I8:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
EmitConv(m_pStackPointer - 1, StackTypeI8, INTOP_CONV_OVF_I8_R4);
break;
case StackTypeR8:
EmitConv(m_pStackPointer - 1, StackTypeI8, INTOP_CONV_OVF_I8_R8);
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI8, INTOP_CONV_I8_I4);
break;
case StackTypeI8:
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_U8:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
EmitConv(m_pStackPointer - 1, StackTypeI8, INTOP_CONV_OVF_U8_R4);
break;
case StackTypeR8:
EmitConv(m_pStackPointer - 1, StackTypeI8, INTOP_CONV_OVF_U8_R8);
break;
case StackTypeI4:
EmitConv(m_pStackPointer - 1, StackTypeI8, INTOP_CONV_I8_U4);
break;
case StackTypeI8:
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_I:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
#ifdef TARGET_64BIT
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_I8_R4);
#else
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_I4_R4);
#endif
break;
case StackTypeR8:
#ifdef TARGET_64BIT
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_I8_R8);
#else
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_I4_R8);
#endif
break;
case StackTypeI4:
#ifdef TARGET_64BIT
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_I8_I4);
#else
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_MOV_4);
#endif
break;
case StackTypeI8:
#ifdef TARGET_64BIT
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_MOV_8);
#else
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_I4_I8);
#endif
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_CONV_OVF_U:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
{
case StackTypeR4:
#ifdef TARGET_64BIT
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_U8_R4);
#else
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_U4_R4);
#endif
break;
case StackTypeR8:
#ifdef TARGET_64BIT
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_U8_R8);
#else
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_U4_R8);
#endif
break;
case StackTypeI4:
#ifdef TARGET_64BIT
// FIXME: Is this the right conv opcode?
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_I8_I4);
#else
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_MOV_4);
#endif
break;
case StackTypeI8:
#ifdef TARGET_64BIT
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_MOV_8);
#else
EmitConv(m_pStackPointer - 1, StackTypeI, INTOP_CONV_OVF_U4_I8);
#endif
break;
default:
assert(0);
}
m_ip++;
break;
case CEE_SWITCH:
{
m_ip++;
Expand Down Expand Up @@ -5009,6 +5251,15 @@ void InterpCompiler::PrintInsData(InterpInst *ins, int32_t insOffset, const int3
PrintClassName(ch);
break;
}
case InterpOpHelperFtn:
{
size_t helperDirectOrIndirect = (size_t)m_dataItems.Get(*pData);
if (helperDirectOrIndirect & INTERP_INDIRECT_HELPER_TAG)
printf(" (indirect) %p", (void*)(helperDirectOrIndirect & ~INTERP_INDIRECT_HELPER_TAG));
else
printf(" (direct) %p", (void*)helperDirectOrIndirect);
break;
}
default:
assert(0);
break;
Expand Down
38 changes: 36 additions & 2 deletions src/coreclr/interpreter/intops.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,40 @@ OPDEF(INTOP_CONV_R8_R4, "conv.r8.r4", 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)

OPDEF(INTOP_CONV_OVF_I1_I4, "conv.ovf.i1.i4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_I1_I8, "conv.ovf.i1.i8", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_I1_R4, "conv.ovf.i1.r4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_I1_R8, "conv.ovf.i1.r8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_OVF_U1_I4, "conv.ovf.u1.i4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_U1_I8, "conv.ovf.u1.i8", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_U1_R4, "conv.ovf.u1.r4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_U1_R8, "conv.ovf.u1.r8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_OVF_I2_I4, "conv.ovf.i2.i4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_I2_I8, "conv.ovf.i2.i8", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_I2_R4, "conv.ovf.i2.r4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_OVF_I2_R8, "conv.ovf.i2.r8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_OVF_U2_I4, "conv.ovf.u2.i4", 3, 1, 1, InterpOpNoArgs)
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_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_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_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_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_BOX, "box", 5, 1, 1, InterpOpClassHandle) // [class handle data item] [helper data item]
OPDEF(INTOP_UNBOX, "unbox", 5, 1, 1, InterpOpClassHandle) // [class handle data item] [helper data item]
OPDEF(INTOP_UNBOX_ANY, "unbox.any", 5, 1, 1, InterpOpClassHandle) // [class handle data item] [helper data item]
Expand Down Expand Up @@ -293,8 +327,8 @@ OPDEF(INTOP_NEWOBJ, "newobj", 5, 1, 1, InterpOpMethodHandle)
OPDEF(INTOP_NEWOBJ_VAR, "newobj.var", 5, 1, 2, InterpOpMethodHandle)
OPDEF(INTOP_NEWOBJ_VT, "newobj.vt", 5, 1, 1, InterpOpMethodHandle)

OPDEF(INTOP_CALL_HELPER_PP, "call.helper.pp", 4, 1, 0, InterpOpTwoInts)
OPDEF(INTOP_CALL_HELPER_PP_2, "call.helper.pp.2", 5, 1, 1, InterpOpTwoInts)
OPDEF(INTOP_CALL_HELPER_PP, "call.helper.pp", 4, 1, 0, InterpOpHelperFtn)
OPDEF(INTOP_CALL_HELPER_PP_2, "call.helper.pp.2", 5, 1, 1, InterpOpHelperFtn)

OPDEF(INTOP_GENERICLOOKUP_METHOD, "generic.method", 4, 1, 1, InterpOpGenericLookup)
OPDEF(INTOP_GENERICLOOKUP_CLASS, "generic.class", 4, 1, 1, InterpOpGenericLookup)
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/interpreter/intops.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ typedef enum
InterpOpClassHandle,
InterpOpGenericLookup,
InterpOpLdPtr,
InterpOpHelperFtn,
} InterpOpArgType;

extern const uint8_t g_interpOpLen[];
Expand Down
Loading