Skip to content

Implement CEE_JMP for the interpreter #121130

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
janvorli merged 5 commits into from
Oct 31, 2025
Merged

Implement CEE_JMP for the interpreter #121130

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5cbe663
Implement CEE_JMP for the interpreter
janvorli Oct 28, 2025
218b7b2
Fix the opcode definition and few other details
janvorli Oct 28, 2025
a900ae5
Change the implementation to emulate CEE_JMP via tailcall
janvorli Oct 30, 2025
71d08eb
Remove forgotten usage of INTOP_JMP
janvorli Oct 30, 2025
94ff2e2
Reflect feedback
janvorli Oct 31, 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
24 changes: 22 additions & 2 deletions src/coreclr/interpreter/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,8 @@ void ValidateEmittedSequenceTermination(InterpInst *lastIns)
(lastIns->opcode == INTOP_CALLVIRT_TAIL) ||
(lastIns->opcode == INTOP_RETHROW) ||
(lastIns->opcode == INTOP_LEAVE_FILTER) ||
(lastIns->opcode == INTOP_LEAVE_CATCH))
(lastIns->opcode == INTOP_LEAVE_CATCH) ||
(lastIns->opcode == INTOP_JMP))
Comment thread
janvorli marked this conversation as resolved.
Outdated
{
// Valid terminating instruction
return;
Expand Down Expand Up @@ -2233,7 +2234,7 @@ void InterpCompiler::CreateBasicBlocks(CORINFO_METHOD_INFO* methodInfo)
default:
assert(0);
}
if (opcode == CEE_THROW || opcode == CEE_ENDFINALLY || opcode == CEE_RETHROW)
if (opcode == CEE_THROW || opcode == CEE_ENDFINALLY || opcode == CEE_RETHROW || opcode == CEE_JMP)
GetBB((int32_t)(ip - codeStart));
}
}
Expand Down Expand Up @@ -3900,6 +3901,7 @@ void InterpCompiler::EmitCall(CORINFO_RESOLVED_TOKEN* pConstrainedToken, bool re

bool isVirtual = (*m_ip == CEE_CALLVIRT);
bool isDelegateInvoke = false;
bool isJmp = (*m_ip == CEE_JMP);

CORINFO_RESOLVED_TOKEN resolvedCallToken;
CORINFO_CALL_INFO callInfo;
Expand Down Expand Up @@ -4031,6 +4033,16 @@ void InterpCompiler::EmitCall(CORINFO_RESOLVED_TOKEN* pConstrainedToken, bool re
CORINFO_ARG_LIST_HANDLE args;
args = callInfo.sig.args;

if (isJmp)
{
assert(tailcall);
// CEE_JMP is simulated as a tail call, so we need to load the current method's args
for (int i = 0; i < numArgsFromStack; i++)
{
EmitLoadVar(i);
}
}

for (int iActualArg = 0, iLogicalArg = 0; iActualArg < numArgs; iActualArg++)
{
if (iActualArg == extraParamArgLocation)
Expand All @@ -4046,6 +4058,7 @@ void InterpCompiler::EmitCall(CORINFO_RESOLVED_TOKEN* pConstrainedToken, bool re
else
{
int iCurrentStackArg = iLogicalArg - numArgsFromStack;

if (iLogicalArg != 0 || !callInfo.sig.hasThis() || newObj)
{
CORINFO_CLASS_HANDLE classHandle;
Expand Down Expand Up @@ -6929,6 +6942,13 @@ void InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
EmitUnaryArithmeticOp(INTOP_NOT_I4);
m_ip++;
break;
case CEE_JMP:
{
CHECK_STACK(0);
EmitCall(pConstrainedToken, readonly, true /* tailcall */, false /*newObj*/, false /*isCalli*/);
linkBBlocks = false;
break;
}
case CEE_CALLVIRT:
case CEE_CALL:
EmitCall(pConstrainedToken, readonly, tailcall, false /*newObj*/, false /*isCalli*/);
Expand Down
Loading