summaryrefslogtreecommitdiff
path: root/src/vm/arm64/stubs.cpp
diff options
context:
space:
mode:
authorSwaroop Sridhar <swaroops@microsoft.com>2016-04-28 14:50:40 -0700
committerSwaroop Sridhar <swaroops@microsoft.com>2016-04-28 14:50:40 -0700
commitc738dd88c4f29684d4b75afccb87be6ce8a196af (patch)
tree9e141d971e9814b827ad7571cafd285985d80fff /src/vm/arm64/stubs.cpp
parentc4767162f22398e553d70c8099d25bfe478a439a (diff)
downloadcoreclr-c738dd88c4f29684d4b75afccb87be6ce8a196af.tar.gz
coreclr-c738dd88c4f29684d4b75afccb87be6ce8a196af.tar.bz2
coreclr-c738dd88c4f29684d4b75afccb87be6ce8a196af.zip
ARM64: Update FP-context-pointer in ExceptionFrame
Update the CurrentContextPointers for FP and LR registers in FaultingExceptionFrame::UpdateRegDisplay() This change fixes a few GCStress=0xC failures on ARM64.
Diffstat (limited to 'src/vm/arm64/stubs.cpp')
-rw-r--r--src/vm/arm64/stubs.cpp6
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.