diff options
| author | Swaroop Sridhar <Swaroop.Sridhar@microsoft.com> | 2016-04-29 13:11:48 -0700 |
|---|---|---|
| committer | Swaroop Sridhar <Swaroop.Sridhar@microsoft.com> | 2016-04-29 13:11:48 -0700 |
| commit | 23d0b7a74a67094c070af3477d06677bf19173d0 (patch) | |
| tree | f54cc3cebbab2e8e960e4c240aa73b6da3d67b9a /src/vm | |
| parent | f03813fa76903cac9cd9db50b15d5903efdcd3e8 (diff) | |
| parent | c738dd88c4f29684d4b75afccb87be6ce8a196af (diff) | |
| download | coreclr-23d0b7a74a67094c070af3477d06677bf19173d0.tar.gz coreclr-23d0b7a74a67094c070af3477d06677bf19173d0.tar.bz2 coreclr-23d0b7a74a67094c070af3477d06677bf19173d0.zip | |
Merge pull request #4655 from swaroop-sridhar/aagc3
ARM64: Update FP-context-pointer in ExceptionFrame
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/arm64/stubs.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/vm/arm64/stubs.cpp b/src/vm/arm64/stubs.cpp index c50fdca7f7..eef079158f 100644 --- a/src/vm/arm64/stubs.cpp +++ b/src/vm/arm64/stubs.cpp @@ -734,10 +734,8 @@ void FaultingExceptionFrame::UpdateRegDisplay(const PREGDISPLAY pRD) pRD->pCurrentContextPointers->X26 = (PDWORD64)&m_ctx.X26; pRD->pCurrentContextPointers->X27 = (PDWORD64)&m_ctx.X27; pRD->pCurrentContextPointers->X28 = (PDWORD64)&m_ctx.X28; - pRD->pCurrentContextPointers->Fp = NULL; - pRD->pCurrentContextPointers->Lr = NULL; - - + pRD->pCurrentContextPointers->Fp = (PDWORD64)&m_ctx.Fp; + pRD->pCurrentContextPointers->Lr = (PDWORD64)&m_ctx.Lr; pRD->IsCallerContextValid = FALSE; pRD->IsCallerSPValid = FALSE; // Don't add usage of this field. This is only temporary. |