Skip to content

Fix ARM64 floating point registers unwinding in PAL #56919

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
davidwrighton merged 4 commits into from
Aug 8, 2021
Merged

Fix ARM64 floating point registers unwinding in PAL #56919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f03f50
Fix ARM64 floating point registers unwinding in PAL
janvorli Aug 5, 2021
904a883
Fix non-OSX arm64, remove test csproj patch
janvorli Aug 5, 2021
91b7bef
Fix Linux arm64
janvorli Aug 6, 2021
352f66b
Fix Linux arm64 - now really
janvorli Aug 6, 2021
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
118 changes: 116 additions & 2 deletions src/coreclr/pal/src/exception/seh-unwind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,31 @@ enum
UNW_AARCH64_X27 = UNW_ARM64_X27,
UNW_AARCH64_X28 = UNW_ARM64_X28,
UNW_AARCH64_X29 = UNW_ARM64_X29,
UNW_AARCH64_X30 = UNW_ARM64_X30
UNW_AARCH64_X30 = UNW_ARM64_X30,
UNW_AARCH64_V8 = UNW_ARM64_D8,
UNW_AARCH64_V9 = UNW_ARM64_D9,
UNW_AARCH64_V10 = UNW_ARM64_D10,
UNW_AARCH64_V11 = UNW_ARM64_D11,
UNW_AARCH64_V12 = UNW_ARM64_D12,
UNW_AARCH64_V13 = UNW_ARM64_D13,
UNW_AARCH64_V14 = UNW_ARM64_D14,
UNW_AARCH64_V15 = UNW_ARM64_D15,
UNW_AARCH64_V16 = UNW_ARM64_D16,
UNW_AARCH64_V17 = UNW_ARM64_D17,
UNW_AARCH64_V18 = UNW_ARM64_D18,
UNW_AARCH64_V19 = UNW_ARM64_D19,
UNW_AARCH64_V20 = UNW_ARM64_D20,
UNW_AARCH64_V21 = UNW_ARM64_D21,
UNW_AARCH64_V22 = UNW_ARM64_D22,
UNW_AARCH64_V23 = UNW_ARM64_D23,
UNW_AARCH64_V24 = UNW_ARM64_D24,
UNW_AARCH64_V25 = UNW_ARM64_D25,
UNW_AARCH64_V26 = UNW_ARM64_D26,
UNW_AARCH64_V27 = UNW_ARM64_D27,
UNW_AARCH64_V28 = UNW_ARM64_D28,
UNW_AARCH64_V29 = UNW_ARM64_D29,
UNW_AARCH64_V30 = UNW_ARM64_D30,
UNW_AARCH64_V31 = UNW_ARM64_D31
};
#endif // defined(TARGET_OSX) && defined(TARGET_ARM64)

Expand Down Expand Up @@ -106,7 +130,31 @@ enum
ASSIGN_REG(X25) \
ASSIGN_REG(X26) \
ASSIGN_REG(X27) \
ASSIGN_REG(X28)
ASSIGN_REG(X28) \
ASSIGN_FP_REG(8) \
ASSIGN_FP_REG(9) \
ASSIGN_FP_REG(10) \
ASSIGN_FP_REG(11) \
ASSIGN_FP_REG(12) \
ASSIGN_FP_REG(13) \
ASSIGN_FP_REG(14) \
ASSIGN_FP_REG(15) \
ASSIGN_FP_REG(16) \
ASSIGN_FP_REG(17) \
ASSIGN_FP_REG(18) \
ASSIGN_FP_REG(19) \
ASSIGN_FP_REG(20) \
ASSIGN_FP_REG(21) \
ASSIGN_FP_REG(22) \
ASSIGN_FP_REG(23) \
ASSIGN_FP_REG(24) \
ASSIGN_FP_REG(25) \
ASSIGN_FP_REG(26) \
ASSIGN_FP_REG(27) \
ASSIGN_FP_REG(28) \
ASSIGN_FP_REG(29) \
ASSIGN_FP_REG(30) \
ASSIGN_FP_REG(31)
#elif (defined(HOST_UNIX) && defined(HOST_X86)) || (defined(HOST_WINDOWS) && defined(TARGET_X86))
#define ASSIGN_UNWIND_REGS \
ASSIGN_REG(Eip) \
Expand Down Expand Up @@ -134,9 +182,14 @@ enum

static void WinContextToUnwindContext(CONTEXT *winContext, unw_context_t *unwContext)
{
#if (defined(HOST_UNIX) && defined(HOST_ARM64)) || (defined(HOST_WINDOWS) && defined(TARGET_ARM64))
fpsimd_context* fp = GetNativeSigSimdContext(unwContext);
#define ASSIGN_FP_REG(fp, reg) if (fp) *(NEON128*) &fp->vregs[reg] = winContext->V[reg];
#endif
#define ASSIGN_REG(reg) MCREG_##reg(unwContext->uc_mcontext) = winContext->reg;
ASSIGN_UNWIND_REGS
#undef ASSIGN_REG
#undef ASSIGN_FP_REG
}
#else
static void WinContextToUnwindContext(CONTEXT *winContext, unw_context_t *unwContext)
Expand Down Expand Up @@ -179,6 +232,11 @@ static void WinContextToUnwindContext(CONTEXT *winContext, unw_context_t *unwCon
unwContext->uc_mcontext.regs[26] = winContext->X26;
unwContext->uc_mcontext.regs[27] = winContext->X27;
unwContext->uc_mcontext.regs[28] = winContext->X28;
unw_fpsimd_context_t *fp = (unw_fpsimd_context_t *)&unwContext->uc_mcontext.__reserved;
for (int i = 0; i < 32; i++)
{
*(NEON128*) &fp->vregs[i] = winContext->V[i];
}
#endif
}

Expand Down Expand Up @@ -218,6 +276,30 @@ static void WinContextToUnwindCursor(CONTEXT *winContext, unw_cursor_t *cursor)
unw_set_reg(cursor, UNW_AARCH64_X26, winContext->X26);
unw_set_reg(cursor, UNW_AARCH64_X27, winContext->X27);
unw_set_reg(cursor, UNW_AARCH64_X28, winContext->X28);
unw_set_fpreg(cursor, UNW_AARCH64_V8, *(unw_fpreg_t *)&winContext->V[8].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V9, *(unw_fpreg_t *)&winContext->V[9].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V10, *(unw_fpreg_t *)&winContext->V[10].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V11, *(unw_fpreg_t *)&winContext->V[11].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V12, *(unw_fpreg_t *)&winContext->V[12].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V13, *(unw_fpreg_t *)&winContext->V[13].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V14, *(unw_fpreg_t *)&winContext->V[14].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V15, *(unw_fpreg_t *)&winContext->V[15].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V16, *(unw_fpreg_t *)&winContext->V[16].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V17, *(unw_fpreg_t *)&winContext->V[17].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V18, *(unw_fpreg_t *)&winContext->V[18].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V19, *(unw_fpreg_t *)&winContext->V[19].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V20, *(unw_fpreg_t *)&winContext->V[20].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V21, *(unw_fpreg_t *)&winContext->V[21].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V22, *(unw_fpreg_t *)&winContext->V[22].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V23, *(unw_fpreg_t *)&winContext->V[23].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V24, *(unw_fpreg_t *)&winContext->V[24].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V25, *(unw_fpreg_t *)&winContext->V[25].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V26, *(unw_fpreg_t *)&winContext->V[26].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V27, *(unw_fpreg_t *)&winContext->V[27].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V28, *(unw_fpreg_t *)&winContext->V[28].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V29, *(unw_fpreg_t *)&winContext->V[29].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V30, *(unw_fpreg_t *)&winContext->V[30].Low);
unw_set_fpreg(cursor, UNW_AARCH64_V31, *(unw_fpreg_t *)&winContext->V[31].Low);
#endif
}
#endif
Expand Down Expand Up @@ -267,6 +349,30 @@ void UnwindContextToWinContext(unw_cursor_t *cursor, CONTEXT *winContext)
unw_get_reg(cursor, UNW_AARCH64_X26, (unw_word_t *) &winContext->X26);
unw_get_reg(cursor, UNW_AARCH64_X27, (unw_word_t *) &winContext->X27);
unw_get_reg(cursor, UNW_AARCH64_X28, (unw_word_t *) &winContext->X28);
unw_get_fpreg(cursor, UNW_AARCH64_V8, (unw_fpreg_t*)&winContext->V[8].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V9, (unw_fpreg_t*)&winContext->V[9].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V10, (unw_fpreg_t*)&winContext->V[10].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V11, (unw_fpreg_t*)&winContext->V[11].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V12, (unw_fpreg_t*)&winContext->V[12].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V13, (unw_fpreg_t*)&winContext->V[13].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V14, (unw_fpreg_t*)&winContext->V[14].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V15, (unw_fpreg_t*)&winContext->V[15].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V16, (unw_fpreg_t*)&winContext->V[16].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V17, (unw_fpreg_t*)&winContext->V[17].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V18, (unw_fpreg_t*)&winContext->V[18].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V19, (unw_fpreg_t*)&winContext->V[19].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V20, (unw_fpreg_t*)&winContext->V[20].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V21, (unw_fpreg_t*)&winContext->V[21].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V22, (unw_fpreg_t*)&winContext->V[22].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V23, (unw_fpreg_t*)&winContext->V[23].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V24, (unw_fpreg_t*)&winContext->V[24].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V25, (unw_fpreg_t*)&winContext->V[25].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V26, (unw_fpreg_t*)&winContext->V[26].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V27, (unw_fpreg_t*)&winContext->V[27].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V28, (unw_fpreg_t*)&winContext->V[28].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V29, (unw_fpreg_t*)&winContext->V[29].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V30, (unw_fpreg_t*)&winContext->V[30].Low);
unw_get_fpreg(cursor, UNW_AARCH64_V31, (unw_fpreg_t*)&winContext->V[31].Low);

#if defined(TARGET_OSX) && defined(TARGET_ARM64)
// Strip pointer authentication bits which seem to be leaking out of libunwind
Expand Down Expand Up @@ -344,6 +450,14 @@ void GetContextPointers(unw_cursor_t *cursor, unw_context_t *unwContext, KNONVOL
GetContextPointer(cursor, unwContext, UNW_AARCH64_X27, &contextPointers->X27);
GetContextPointer(cursor, unwContext, UNW_AARCH64_X28, &contextPointers->X28);
GetContextPointer(cursor, unwContext, UNW_AARCH64_X29, &contextPointers->Fp);
GetContextPointer(cursor, unwContext, UNW_AARCH64_V8, &contextPointers->D8);
GetContextPointer(cursor, unwContext, UNW_AARCH64_V9, &contextPointers->D9);
GetContextPointer(cursor, unwContext, UNW_AARCH64_V10, &contextPointers->D10);
GetContextPointer(cursor, unwContext, UNW_AARCH64_V11, &contextPointers->D11);
GetContextPointer(cursor, unwContext, UNW_AARCH64_V12, &contextPointers->D12);
GetContextPointer(cursor, unwContext, UNW_AARCH64_V13, &contextPointers->D13);
GetContextPointer(cursor, unwContext, UNW_AARCH64_V14, &contextPointers->D14);
GetContextPointer(cursor, unwContext, UNW_AARCH64_V15, &contextPointers->D15);
#elif (defined(HOST_UNIX) && defined(HOST_S390X))
GetContextPointer(cursor, unwContext, UNW_S390X_R6, &contextPointers->R6);
GetContextPointer(cursor, unwContext, UNW_S390X_R7, &contextPointers->R7);
Expand Down
11 changes: 0 additions & 11 deletions src/tests/JIT/IL_Conformance/Convert/TestConvertFromIntegral.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,6 @@
<DebugType>None</DebugType>
<Optimize>True</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetArchitecture)' == 'arm64'">
<!-- https://github.com/dotnet/runtime/issues/56522 -->
<CLRTestBatchPreCommands><![CDATA[
$(CLRTestBatchPreCommands)
set COMPlus_JitDoValueNumber=0
]]></CLRTestBatchPreCommands>
<BashCLRTestPreCommands><![CDATA[
$(BashCLRTestPreCommands)
export COMPlus_JitDoValueNumber=0
]]></BashCLRTestPreCommands>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).cs" />
</ItemGroup>
Expand Down