Skip to content

[RISC-V] Fix floating point #88311

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
jkotas merged 3 commits into from
Jul 6, 2023
Merged

[RISC-V] Fix floating point #88311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3e6946
[RISC-V] Fix: passing struct in regs
clamp03 Jun 28, 2023
e18b88c
Fix a typo in CallDescrWorkerInternal
clamp03 Jun 29, 2023
738417c
[RISC-V] Update floating points
clamp03 Jun 30, 2023
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
6 changes: 3 additions & 3 deletions src/coreclr/vm/argdestination.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ArgDestination
LIMITED_METHOD_CONTRACT;
#if defined(UNIX_AMD64_ABI)
_ASSERTE((argLocDescForStructInRegs != NULL) || (offset != TransitionBlock::StructInRegsOffset));
#elif defined(TARGET_ARM64) || defined(TARGET_LOONGARCH64)
#elif defined(TARGET_ARM64) || defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
// This assert is not interesting on arm64/loongarch64. argLocDescForStructInRegs could be
// initialized if the args are being enregistered.
#else
Expand Down Expand Up @@ -83,7 +83,7 @@ class ArgDestination
#endif // !DACCESS_COMPILE
#endif // defined(TARGET_ARM64)

#if defined(TARGET_LOONGARCH64)
#if defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
bool IsStructPassedInRegs()
{
return m_argLocDescForStructInRegs != NULL;
Expand Down Expand Up @@ -174,7 +174,7 @@ class ArgDestination
int argOfs = TransitionBlock::GetOffsetOfArgumentRegisters() + m_argLocDescForStructInRegs->m_idxGenReg * 8;
return dac_cast<PTR_VOID>(dac_cast<TADDR>(m_base) + argOfs);
}
#endif // defined(TARGET_LOONGARCH64)
#endif // defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)

#if defined(UNIX_AMD64_ABI)

Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/vm/callhelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,19 +459,19 @@ void MethodDescCallSite::CallTargetWorker(const ARG_SLOT *pArguments, ARG_SLOT *
argDest.CopyStructToRegisters(pSrc, th.AsMethodTable()->GetNumInstanceFieldBytes(), 0);
}
else
#elif defined(TARGET_LOONGARCH64)
#elif defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
if (argDest.IsStructPassedInRegs())
{
argDest.CopyStructToRegisters(pSrc, stackSize, 0);
}
else
#endif // TARGET_LOONGARCH64
#endif // TARGET_LOONGARCH64 || TARGET_RISCV64
{
PVOID pDest = argDest.GetDestinationAddress();

switch (stackSize)
{
#if defined(TARGET_LOONGARCH64)
#if defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
case 1:
if (m_argIt.GetArgType() == ELEMENT_TYPE_U1 || m_argIt.GetArgType() == ELEMENT_TYPE_BOOLEAN)
*((INT64*)pDest) = (UINT8)pArguments[arg];
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/vm/object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ void STDCALL CopyValueClassArgUnchecked(ArgDestination *argDest, void* src, Meth
return;
}

#elif defined(TARGET_LOONGARCH64)
#elif defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)

if (argDest->IsStructPassedInRegs())
{
Expand Down Expand Up @@ -425,7 +425,7 @@ void InitValueClassArg(ArgDestination *argDest, MethodTable *pMT)

#endif

#if defined(TARGET_LOONGARCH64)
#if defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
if (argDest->IsStructPassedInRegs())
{
*(UINT64*)(argDest->GetStructGenRegDestinationAddress()) = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/riscv64/calldescrworkerriscv64.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ LOCAL_LABEL(NotCorrectReturn):
EMIT_BREAKPOINT // Unreachable

LOCAL_LABEL(FloatReturn):
fsw f0, CallDescrData__returnValue(s1)
fsw fa0, CallDescrData__returnValue(s1)
j LOCAL_LABEL(ReturnDone)

LOCAL_LABEL(DoubleReturn):
Expand Down