Skip to content

[release/7.0] [NativeAOT] correctly initalize CONTEXT before failing fast #81837

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
carlossanlop merged 7 commits into from
Feb 9, 2023
Merged

[release/7.0] [NativeAOT] correctly initalize CONTEXT before failing fast #81837

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b952d5f
[NativeAOT] correctly initalize CONTEXT before failing fast
AustinWise Jan 23, 2023
e779cca
Switch from using GetThreadContext to RtlCaptureContext.
AustinWise Jan 27, 2023
5f4ca4c
Add a better explination of why the function is unimplmented on Unix.
AustinWise Jan 27, 2023
8971146
Update src/coreclr/nativeaot/Runtime/PalRedhawk.h
AustinWise Jan 27, 2023
55915c5
Respond to feedback: unconditionally set CONTEXT_CONTROL
AustinWise Jan 31, 2023
89b4ef1
Respond to feedback: consolidate setting of ContextFlags.
AustinWise Jan 31, 2023
628a023
On second thought, don't add a second layer of ifdef nesting.
AustinWise Jan 31, 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
Prev Previous commit
Next Next commit
Respond to feedback: consolidate setting of ContextFlags.
  • Loading branch information
@AustinWise
AustinWise authored and github-actions committed Feb 8, 2023
commit 89b4ef1d59c4615be940853df522a6ad0390c668
14 changes: 7 additions & 7 deletions src/coreclr/nativeaot/Runtime/EHHelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,18 @@ COOP_PINVOKE_HELPER(int32_t, RhGetModuleFileName, (HANDLE moduleHandle, _Out_ co
COOP_PINVOKE_HELPER(void, RhpCopyContextFromExInfo, (void * pOSContext, int32_t cbOSContext, PAL_LIMITED_CONTEXT * pPalContext))
{
ASSERT((size_t)cbOSContext >= sizeof(CONTEXT));

#ifndef HOST_WASM

memset(pOSContext, 0, cbOSContext);
CONTEXT* pContext = (CONTEXT *)pOSContext;

// Fill in CONTEXT_CONTROL registers that were not captured in PAL_LIMITED_CONTEXT.
PopulateControlSegmentRegisters(pContext);

#if defined(UNIX_AMD64_ABI)
pContext->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER;

#if defined(UNIX_AMD64_ABI)
pContext->Rip = pPalContext->IP;
pContext->Rsp = pPalContext->Rsp;
pContext->Rbp = pPalContext->Rbp;
Expand All @@ -111,7 +115,6 @@ COOP_PINVOKE_HELPER(void, RhpCopyContextFromExInfo, (void * pOSContext, int32_t
pContext->R14 = pPalContext->R14;
pContext->R15 = pPalContext->R15;
#elif defined(HOST_AMD64)
pContext->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER;
pContext->Rip = pPalContext->IP;
pContext->Rsp = pPalContext->Rsp;
pContext->Rbp = pPalContext->Rbp;
Expand All @@ -124,7 +127,6 @@ COOP_PINVOKE_HELPER(void, RhpCopyContextFromExInfo, (void * pOSContext, int32_t
pContext->R14 = pPalContext->R14;
pContext->R15 = pPalContext->R15;
#elif defined(HOST_X86)
pContext->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER;
pContext->Eip = pPalContext->IP;
pContext->Esp = pPalContext->Rsp;
pContext->Ebp = pPalContext->Rbp;
Expand All @@ -133,7 +135,6 @@ COOP_PINVOKE_HELPER(void, RhpCopyContextFromExInfo, (void * pOSContext, int32_t
pContext->Eax = pPalContext->Rax;
pContext->Ebx = pPalContext->Rbx;
#elif defined(HOST_ARM)
pContext->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER;
pContext->R0 = pPalContext->R0;
pContext->R4 = pPalContext->R4;
pContext->R5 = pPalContext->R5;
Expand All @@ -147,7 +148,6 @@ COOP_PINVOKE_HELPER(void, RhpCopyContextFromExInfo, (void * pOSContext, int32_t
pContext->Lr = pPalContext->LR;
pContext->Pc = pPalContext->IP;
#elif defined(HOST_ARM64)
pContext->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER;
pContext->X0 = pPalContext->X0;
pContext->X1 = pPalContext->X1;
// TODO: Copy registers X2-X7 when we start supporting HVA's
Expand All @@ -165,11 +165,11 @@ COOP_PINVOKE_HELPER(void, RhpCopyContextFromExInfo, (void * pOSContext, int32_t
pContext->Sp = pPalContext->SP;
pContext->Lr = pPalContext->LR;
pContext->Pc = pPalContext->IP;
#elif defined(HOST_WASM)
// No registers, no work to do yet
#else
#error Not Implemented for this architecture -- RhpCopyContextFromExInfo
#endif

#endif // !HOST_WASM
}

#if defined(HOST_AMD64) || defined(HOST_ARM) || defined(HOST_X86) || defined(HOST_ARM64)
Expand Down