diff options
| author | Kyungwoo Lee <kyulee@microsoft.com> | 2016-04-06 20:52:10 -0700 |
|---|---|---|
| committer | Kyungwoo Lee <kyulee@microsoft.com> | 2016-04-06 20:52:10 -0700 |
| commit | 083181f8e1743080893495cf1229e2f60f3d3542 (patch) | |
| tree | 0409dcd8d4451c92c69b183b5931fbc7bfc3c04f /src | |
| parent | 8d11e0bf15df0833a900334d60f16deb4db6cb1e (diff) | |
| parent | 87434bb371ab0700241f07d6e637e16eb29fcfd8 (diff) | |
| download | coreclr-083181f8e1743080893495cf1229e2f60f3d3542.tar.gz coreclr-083181f8e1743080893495cf1229e2f60f3d3542.tar.bz2 coreclr-083181f8e1743080893495cf1229e2f60f3d3542.zip | |
Merge pull request #4099 from ramarag/gcstackwalk
[ARM64] Fixes Updating Registers for managed frames in GC stack walks
Diffstat (limited to 'src')
| -rw-r--r-- | src/vm/arm64/stubs.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/vm/arm64/stubs.cpp b/src/vm/arm64/stubs.cpp index 943adb9765..18c1f5f091 100644 --- a/src/vm/arm64/stubs.cpp +++ b/src/vm/arm64/stubs.cpp @@ -641,6 +641,8 @@ void UpdateRegDisplayFromCalleeSavedRegisters(REGDISPLAY * pRD, CalleeSavedRegis pRD->pCurrentContext->X26 = pCalleeSaved->x26; pRD->pCurrentContext->X27 = pCalleeSaved->x27; pRD->pCurrentContext->X28 = pCalleeSaved->x28; + pRD->pCurrentContext->Fp = pCalleeSaved->x29; + pRD->pCurrentContext->Lr = pCalleeSaved->x30; T_KNONVOLATILE_CONTEXT_POINTERS * pContextPointers = pRD->pCurrentContextPointers; pContextPointers->X19 = (PDWORD64)&pCalleeSaved->x19; @@ -653,6 +655,8 @@ void UpdateRegDisplayFromCalleeSavedRegisters(REGDISPLAY * pRD, CalleeSavedRegis pContextPointers->X26 = (PDWORD64)&pCalleeSaved->x26; pContextPointers->X27 = (PDWORD64)&pCalleeSaved->x27; pContextPointers->X28 = (PDWORD64)&pCalleeSaved->x28; + pContextPointers->Fp = (PDWORD64)&pCalleeSaved->x29; + pContextPointers->Lr = (PDWORD64)&pCalleeSaved->x30; } #ifndef CROSSGEN_COMPILE |