diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2017-09-26 03:31:09 +0300 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2017-09-26 06:14:34 +0300 |
| commit | 94f2d8ea3943f7e90cda86ae7b7cb47d3da5a53a (patch) | |
| tree | 941c381b0df93a9a335bf7d40c31c3ab94bd95f0 /src/Native/Runtime/EHHelpers.cpp | |
| parent | 351d113aaa275354213aeb31bdc0709b56774508 (diff) | |
[tfs-changeset: 1676255]
Diffstat (limited to 'src/Native/Runtime/EHHelpers.cpp')
| -rw-r--r-- | src/Native/Runtime/EHHelpers.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Native/Runtime/EHHelpers.cpp b/src/Native/Runtime/EHHelpers.cpp index 9401e915d..85d2b6649 100644 --- a/src/Native/Runtime/EHHelpers.cpp +++ b/src/Native/Runtime/EHHelpers.cpp @@ -190,7 +190,13 @@ COOP_PINVOKE_HELPER(void, RhpCopyContextFromExInfo, pContext->Lr = pPalContext->LR; pContext->Pc = pPalContext->IP; #elif defined(_ARM64_) - PORTABILITY_ASSERT("@TODO: FIXME:ARM64"); + for (int i = 0; i < GEN_REG_COUNT; ++i) { + pContext->X[i] = pPalContext->X[i]; + } + pContext->Fp = pPalContext->FP; + pContext->Sp = pPalContext->SP; + pContext->Lr = pPalContext->LR; + pContext->Pc = pPalContext->IP; #else #error Not Implemented for this architecture -- RhpCopyContextFromExInfo #endif @@ -284,7 +290,7 @@ EXTERN_C Int32 RhpPInvokeExceptionGuard() } #endif -#if defined(_AMD64_) || defined(_ARM_) || defined(_X86_) +#if defined(_AMD64_) || defined(_ARM_) || defined(_X86_) || defined(_ARM64_) EXTERN_C REDHAWK_API void __fastcall RhpThrowHwEx(); #else COOP_PINVOKE_HELPER(void, RhpThrowHwEx, ()) |