diff options
| author | Konstantin Baladurin <k.baladurin@samsung.com> | 2019-09-26 20:06:57 +0300 |
|---|---|---|
| committer | Gleb Balykov <g.balykov@samsung.com> | 2020-03-25 15:29:41 +0300 |
| commit | b241dc76c28557e15aef1a78f9bae5bd67134c7e (patch) | |
| tree | af593f6ab85ff166e598aaa1664b9203ab71667c /src/inc | |
| parent | 23cdca9f2be22904d196f69f0d64a1278cb73b44 (diff) | |
| download | coreclr-b241dc76c28557e15aef1a78f9bae5bd67134c7e.tar.gz coreclr-b241dc76c28557e15aef1a78f9bae5bd67134c7e.tar.bz2 coreclr-b241dc76c28557e15aef1a78f9bae5bd67134c7e.zip | |
[Linux/x86] Use ebp from current context during unwinding (#26789)
pCurrentContextPointers in REGDISPLAY can contain NULLs so we need to use
ebp value from pCurrentContext. This patch contains following changes:
- GetRegdisplayFP returns ebp from pCurrentContext
- GetRegdisplayFP is used instead of *GetEbpLocation()
- Set##reg##Location also updates register value in pCurrentContext
Diffstat (limited to 'src/inc')
| -rw-r--r-- | src/inc/regdisp.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/inc/regdisp.h b/src/inc/regdisp.h index 546ce2831a..e43bd0013e 100644 --- a/src/inc/regdisp.h +++ b/src/inc/regdisp.h @@ -95,7 +95,11 @@ struct REGDISPLAY : public REGDISPLAY_BASE { #define REG_METHODS(reg) \ inline PDWORD Get##reg##Location(void) { return pCurrentContextPointers->reg; } \ - inline void Set##reg##Location(PDWORD p##reg) { pCurrentContextPointers->reg = p##reg; } + inline void Set##reg##Location(PDWORD p##reg) \ + { \ + pCurrentContextPointers->reg = p##reg; \ + pCurrentContext->reg = *p##reg; \ + } #endif // WIN64EXCEPTIONS @@ -115,8 +119,11 @@ struct REGDISPLAY : public REGDISPLAY_BASE { inline TADDR GetRegdisplayFP(REGDISPLAY *display) { LIMITED_METHOD_DAC_CONTRACT; - +#ifdef WIN64EXCEPTIONS + return (TADDR)display->pCurrentContext->Ebp; +#else return (TADDR)*display->GetEbpLocation(); +#endif } inline LPVOID GetRegdisplayFPAddress(REGDISPLAY *display) { |