Skip to content

[wasm][coreclr] Fix GetOffsetOfArgumentRegisters #120665

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
merged 2 commits into from
Oct 13, 2025
Merged

[wasm][coreclr] Fix GetOffsetOfArgumentRegisters #120665

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
931c0bd
[wasm][coreclr] Fix GetOffsetOfArgumentRegisters
radekdoulik Oct 13, 2025
a243a39
Update src/coreclr/vm/callingconvention.h
radekdoulik Oct 13, 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
33 changes: 21 additions & 12 deletions src/coreclr/vm/callingconvention.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ struct ArgLocDesc
}
};

#ifdef TARGET_WASM
#define TARGET_REGISTER_SIZE INTERP_STACK_SLOT_SIZE
#else
#define TARGET_REGISTER_SIZE TARGET_POINTER_SIZE
#endif

//
// TransitionBlock is layout of stack frame of method call, saved argument registers and saved callee saved registers. Even though not
// all fields are used all the time, we use uniform form for simplicity.
Expand Down Expand Up @@ -243,7 +249,10 @@ struct TransitionBlock
{
LIMITED_METHOD_CONTRACT;
int offs;
#if defined(TARGET_AMD64) && !defined(UNIX_AMD64_ABI)
// on wasm we don't have registers, so instead we put the arguments
// which would be in registers on other architectures
// on the stack right after the transition block
#if (defined(TARGET_AMD64) && !defined(UNIX_AMD64_ABI)) || defined(TARGET_WASM)
offs = sizeof(TransitionBlock);
#else
offs = offsetof(TransitionBlock, m_argumentRegisters);
Expand Down Expand Up @@ -281,15 +290,15 @@ struct TransitionBlock
_ASSERTE(offset != TransitionBlock::StructInRegsOffset);
#endif
offset -= GetOffsetOfArgumentRegisters();
_ASSERTE((offset % TARGET_POINTER_SIZE) == 0);
return offset / TARGET_POINTER_SIZE;
_ASSERTE((offset % TARGET_REGISTER_SIZE) == 0);
return offset / TARGET_REGISTER_SIZE;
}

static UINT GetStackArgumentIndexFromOffset(int offset)
{
LIMITED_METHOD_CONTRACT;

return (offset - TransitionBlock::GetOffsetOfArgs()) / TARGET_POINTER_SIZE;
return (offset - TransitionBlock::GetOffsetOfArgs()) / TARGET_REGISTER_SIZE;
}

static UINT GetStackArgumentByteIndexFromOffset(int offset)
Expand Down Expand Up @@ -1082,7 +1091,7 @@ int ArgIteratorTemplate<ARGITERATOR_BASE>::GetRetBuffArgOffset()
ret = TransitionBlock::GetOffsetOfRetBuffArgReg();
#else
if (this->HasThis())
ret += TARGET_POINTER_SIZE;
ret += TARGET_REGISTER_SIZE;
#endif

return ret;
Expand All @@ -1104,12 +1113,12 @@ int ArgIteratorTemplate<ARGITERATOR_BASE>::GetVASigCookieOffset()

if (this->HasThis())
{
ret += TARGET_POINTER_SIZE;
ret += TARGET_REGISTER_SIZE;
}

if (this->HasRetBuffArg() && IsRetBuffPassedAsFirstArg())
{
ret += TARGET_POINTER_SIZE;
ret += TARGET_REGISTER_SIZE;
}

return ret;
Expand Down Expand Up @@ -1157,12 +1166,12 @@ int ArgIteratorTemplate<ARGITERATOR_BASE>::GetParamTypeArgOffset()

if (this->HasThis())
{
ret += TARGET_POINTER_SIZE;
ret += TARGET_REGISTER_SIZE;
}

if (this->HasRetBuffArg() && IsRetBuffPassedAsFirstArg())
{
ret += TARGET_POINTER_SIZE;
ret += TARGET_REGISTER_SIZE;
}

return ret;
Expand Down Expand Up @@ -1214,17 +1223,17 @@ int ArgIteratorTemplate<ARGITERATOR_BASE>::GetAsyncContinuationArgOffset()

if (this->HasThis())
{
ret += TARGET_POINTER_SIZE;
ret += TARGET_REGISTER_SIZE;
}

if (this->HasRetBuffArg() && IsRetBuffPassedAsFirstArg())
{
ret += TARGET_POINTER_SIZE;
ret += TARGET_REGISTER_SIZE;
}

if (this->HasParamType())
{
ret += TARGET_POINTER_SIZE;
ret += TARGET_REGISTER_SIZE;
}

return ret;
Expand Down
Loading