Skip to content

Fix interpreter Unix x64 call stub generator #121942

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 2 commits into from
Nov 25, 2025
Merged

Fix interpreter Unix x64 call stub generator #121942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
415eadb
Fix interpreter Unix x64 call stub generator
janvorli Nov 24, 2025
a23a4c1
Apply suggestions from code review
janvorli Nov 25, 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
39 changes: 35 additions & 4 deletions src/coreclr/vm/amd64/asmhelpers.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ END_PROLOGUE
ret
NESTED_END InterpreterStubRetDoubleI8, _TEXT

NESTED_ENTRY InterpreterStubRetBuff, _TEXT, NoHandler
NESTED_ENTRY InterpreterStubRetBuffRDI, _TEXT, NoHandler
push_register rax // stack alignment
END_PROLOGUE
mov rdi, rax // pTransitionBlock*
Expand All @@ -586,7 +586,21 @@ END_PROLOGUE
mov rax, qword ptr [rsp + 8 + 8 + __InterpreterStubArgumentRegistersOffset]
pop_register rcx
ret
NESTED_END InterpreterStubRetBuff, _TEXT
NESTED_END InterpreterStubRetBuffRDI, _TEXT

NESTED_ENTRY InterpreterStubRetBuffRSI, _TEXT, NoHandler
push_register rax // stack alignment
END_PROLOGUE
mov rdi, rax // pTransitionBlock*
mov rsi, rbx // the IR bytecode pointer
// Load the return buffer address
// The 8 + 8 is for the push and the return address slot
mov rdx, qword ptr [rsp + 8 + 8 + __InterpreterStubArgumentRegistersOffset + 8]
Comment thread
AaronRobinsonMSFT marked this conversation as resolved.
call C_FUNC(ExecuteInterpretedMethod)
mov rax, qword ptr [rsp + 8 + 8 + __InterpreterStubArgumentRegistersOffset + 8]
pop_register rcx
ret
NESTED_END InterpreterStubRetBuffRSI, _TEXT

// Routines for passing value type arguments by reference in general purpose registers RDI, RSI, RDX, RCX, R8, R9
// from native code to the interpreter
Expand Down Expand Up @@ -1732,7 +1746,7 @@ END_PROLOGUE
ret
NESTED_END CallJittedMethodRetVoid, _TEXT

NESTED_ENTRY CallJittedMethodRetBuff, _TEXT, NoHandler
NESTED_ENTRY CallJittedMethodRetBuffRDI, _TEXT, NoHandler
push_nonvol_reg rbp
mov rbp, rsp
alloc_stack 0x10
Expand All @@ -1747,7 +1761,24 @@ END_PROLOGUE
mov rsp, rbp
pop rbp
ret
NESTED_END CallJittedMethodRetBuff, _TEXT
NESTED_END CallJittedMethodRetBuffRDI, _TEXT

NESTED_ENTRY CallJittedMethodRetBuffRSI, _TEXT, NoHandler
push_nonvol_reg rbp
mov rbp, rsp
alloc_stack 0x10
save_reg_postrsp r10, 0
END_PROLOGUE
sub rsp, rcx // total stack space
mov r11, rdi // The routines list
mov r10, rsi // interpreter stack args
mov rsi, rdx // return buffer
call qword ptr [r11]
mov r10, [rsp]
mov rsp, rbp
pop rbp
ret
NESTED_END CallJittedMethodRetBuffRSI, _TEXT

NESTED_ENTRY CallJittedMethodRetDouble, _TEXT, NoHandler
push_nonvol_reg rbp
Expand Down
44 changes: 33 additions & 11 deletions src/coreclr/vm/callstubgenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1975,15 +1975,22 @@ extern "C" void InterpreterStubRetVoid();
extern "C" void InterpreterStubRetDouble();
extern "C" void InterpreterStubRetI8();

#if defined(TARGET_WINDOWS) && defined(TARGET_AMD64)
#ifdef TARGET_AMD64
#ifdef TARGET_WINDOWS
extern "C" void CallJittedMethodRetBuffRCX(PCODE *routines, int8_t*pArgs, int8_t*pRet, int totalStackSize);
extern "C" void CallJittedMethodRetBuffRDX(PCODE *routines, int8_t*pArgs, int8_t*pRet, int totalStackSize);
extern "C" void InterpreterStubRetBuffRCX();
extern "C" void InterpreterStubRetBuffRDX();
#else // TARGET_WINDOWS && TARGET_AMD64
#else // TARGET_WINDOWS
extern "C" void CallJittedMethodRetBuffRDI(PCODE *routines, int8_t*pArgs, int8_t*pRet, int totalStackSize);
extern "C" void CallJittedMethodRetBuffRSI(PCODE *routines, int8_t*pArgs, int8_t*pRet, int totalStackSize);
extern "C" void InterpreterStubRetBuffRDI();
extern "C" void InterpreterStubRetBuffRSI();
#endif // TARGET_WINDOWS
Comment thread
AaronRobinsonMSFT marked this conversation as resolved.
#else // TARGET_AMD64
extern "C" void CallJittedMethodRetBuff(PCODE *routines, int8_t*pArgs, int8_t*pRet, int totalStackSize);
extern "C" void InterpreterStubRetBuff();
#endif // TARGET_WINDOWS && TARGET_AMD64
#endif // TARGET_AMD64

#ifdef UNIX_AMD64_ABI
extern "C" void CallJittedMethodRetI8I8(PCODE *routines, int8_t*pArgs, int8_t*pRet, int totalStackSize);
Expand Down Expand Up @@ -2060,15 +2067,22 @@ CallStubHeader::InvokeFunctionPtr CallStubGenerator::GetInvokeFunctionPtr(CallSt
INVOKE_FUNCTION_PTR(CallJittedMethodRetDouble);
case ReturnTypeI8:
INVOKE_FUNCTION_PTR(CallJittedMethodRetI8);
#if defined(TARGET_WINDOWS) && defined(TARGET_AMD64)
#ifdef TARGET_AMD64
#ifdef TARGET_WINDOWS
case ReturnTypeBuffArg1:
INVOKE_FUNCTION_PTR(CallJittedMethodRetBuffRCX);
case ReturnTypeBuffArg2:
INVOKE_FUNCTION_PTR(CallJittedMethodRetBuffRDX);
#else // TARGET_WINDOWS && TARGET_AMD64
#else // TARGET_WINDOWS
case ReturnTypeBuffArg1:
INVOKE_FUNCTION_PTR(CallJittedMethodRetBuffRDI);
case ReturnTypeBuffArg2:
INVOKE_FUNCTION_PTR(CallJittedMethodRetBuffRSI);
#endif // TARGET_WINDOWS
#else // TARGET_AMD64
case ReturnTypeBuff:
INVOKE_FUNCTION_PTR(CallJittedMethodRetBuff);
#endif // TARGET_WINDOWS && TARGET_AMD64
#endif // TARGET_AMD64
#ifdef UNIX_AMD64_ABI
case ReturnTypeI8I8:
INVOKE_FUNCTION_PTR(CallJittedMethodRetI8I8);
Expand Down Expand Up @@ -2147,15 +2161,23 @@ PCODE CallStubGenerator::GetInterpreterReturnTypeHandler(CallStubGenerator::Retu
RETURN_TYPE_HANDLER(InterpreterStubRetDouble);
case ReturnTypeI8:
RETURN_TYPE_HANDLER(InterpreterStubRetI8);
#if defined(TARGET_WINDOWS) && defined(TARGET_AMD64)
#ifdef TARGET_AMD64
case ReturnTypeBuffArg1:
#ifdef TARGET_WINDOWS
RETURN_TYPE_HANDLER(InterpreterStubRetBuffRCX);
#else
RETURN_TYPE_HANDLER(InterpreterStubRetBuffRDI);
#endif
Comment thread
AaronRobinsonMSFT marked this conversation as resolved.
case ReturnTypeBuffArg2:
#ifdef TARGET_WINDOWS
RETURN_TYPE_HANDLER(InterpreterStubRetBuffRDX);
#else // TARGET_WINDOWS && TARGET_AMD64
#else
RETURN_TYPE_HANDLER(InterpreterStubRetBuffRSI);
#endif
Comment thread
AaronRobinsonMSFT marked this conversation as resolved.
#else // TARGET_AMD64
Comment thread
AaronRobinsonMSFT marked this conversation as resolved.
case ReturnTypeBuff:
RETURN_TYPE_HANDLER(InterpreterStubRetBuff);
#endif // TARGET_WINDOWS && TARGET_AMD64
#endif // TARGET_AMD64
#ifdef UNIX_AMD64_ABI
case ReturnTypeI8I8:
RETURN_TYPE_HANDLER(InterpreterStubRetI8I8);
Expand Down Expand Up @@ -2799,7 +2821,7 @@ CallStubGenerator::ReturnType CallStubGenerator::GetReturnType(ArgIterator *pArg
{
if (pArgIt->HasRetBuffArg())
{
#if defined(TARGET_WINDOWS) && defined(TARGET_AMD64)
#ifdef TARGET_AMD64
if (pArgIt->HasThis())
{
return ReturnTypeBuffArg2;
Expand All @@ -2810,7 +2832,7 @@ CallStubGenerator::ReturnType CallStubGenerator::GetReturnType(ArgIterator *pArg
}
#else
return ReturnTypeBuff;
#endif
#endif // TARGET_AMD64
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/callstubgenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class CallStubGenerator
ReturnTypeVoid,
ReturnTypeI8,
ReturnTypeDouble,
#if defined(TARGET_WINDOWS) && defined(TARGET_AMD64)
#ifdef TARGET_AMD64
ReturnTypeBuffArg1,
ReturnTypeBuffArg2,
#else
Expand Down