diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-02-17 18:19:16 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-02-17 10:19:16 +0100 |
| commit | 00fc8f9f212bc00eda9c94707b50e278d9b8d7c4 (patch) | |
| tree | c28efb3b009e5302ec645424d4a7228bae1dbbce /src/vm/i386 | |
| parent | c75fee493ec0eb8b4ac57ac3ff69281531218386 (diff) | |
| download | coreclr-00fc8f9f212bc00eda9c94707b50e278d9b8d7c4.tar.gz coreclr-00fc8f9f212bc00eda9c94707b50e278d9b8d7c4.tar.bz2 coreclr-00fc8f9f212bc00eda9c94707b50e278d9b8d7c4.zip | |
[x86/Linux] Fix GetCallerSp (#9384)
* [x86/Linux] Fix GetCallerSp
* Do NOT pop stack argument for TransitionFrame
* Add ResumeEsp to CONTEXT
Diffstat (limited to 'src/vm/i386')
| -rw-r--r-- | src/vm/i386/cgenx86.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/vm/i386/cgenx86.cpp b/src/vm/i386/cgenx86.cpp index 2444fef027..83bb255de9 100644 --- a/src/vm/i386/cgenx86.cpp +++ b/src/vm/i386/cgenx86.cpp @@ -298,6 +298,7 @@ void TransitionFrame::UpdateRegDisplay(const PREGDISPLAY pRD) MethodDesc * pFunc = GetFunction(); _ASSERTE(pFunc != NULL); + UpdateRegDisplayHelper(pRD, pFunc->CbStackPop()); LOG((LF_GCROOTS, LL_INFO100000, "STACKWALK TransitionFrame::UpdateRegDisplay(ip:%p, sp:%p)\n", pRD->ControlPC, pRD->SP)); @@ -323,11 +324,14 @@ void TransitionFrame::UpdateRegDisplayHelper(const PREGDISPLAY pRD, UINT cbStack #ifdef WIN64EXCEPTIONS + DWORD CallerSP = (DWORD)(pRD->PCTAddr + sizeof(TADDR)); + pRD->IsCallerContextValid = FALSE; pRD->IsCallerSPValid = FALSE; pRD->pCurrentContext->Eip = *PTR_PCODE(pRD->PCTAddr);; - pRD->pCurrentContext->Esp = GetSP(); + pRD->pCurrentContext->Esp = CallerSP; + pRD->pCurrentContext->ResumeEsp = CallerSP + cbStackPop; UpdateRegDisplayFromCalleeSavedRegisters(pRD, regs); ClearRegDisplayArgumentAndScratchRegisters(pRD); @@ -380,7 +384,7 @@ void HelperMethodFrame::UpdateRegDisplay(const PREGDISPLAY pRD) #endif // DACCESS_COMPILE pRD->pCurrentContext->Eip = pRD->ControlPC = m_MachState.GetRetAddr(); - pRD->pCurrentContext->Esp = pRD->SP = (DWORD) m_MachState.esp(); + pRD->pCurrentContext->Esp = pRD->pCurrentContext->ResumeEsp = pRD->SP = (DWORD) m_MachState.esp(); #define CALLEE_SAVED_REGISTER(regname) pRD->pCurrentContext->regname = *((DWORD*) m_MachState.p##regname()); ENUM_CALLEE_SAVED_REGISTERS(); @@ -680,7 +684,8 @@ void InlinedCallFrame::UpdateRegDisplay(const PREGDISPLAY pRD) pRD->IsCallerSPValid = FALSE; // Don't add usage of this field. This is only temporary. pRD->pCurrentContext->Eip = *PTR_PCODE(pRD->PCTAddr); - pRD->pCurrentContext->Esp = (DWORD) dac_cast<TADDR>(m_pCallSiteSP) + stackArgSize; + pRD->pCurrentContext->Esp = (DWORD) dac_cast<TADDR>(m_pCallSiteSP); + pRD->pCurrentContext->ResumeEsp = (DWORD) dac_cast<TADDR>(m_pCallSiteSP) + stackArgSize; pRD->pCurrentContext->Ebp = (DWORD) m_pCalleeSavedFP; ClearRegDisplayArgumentAndScratchRegisters(pRD); @@ -818,7 +823,7 @@ void HijackFrame::UpdateRegDisplay(const PREGDISPLAY pRD) pRD->IsCallerSPValid = FALSE; // Don't add usage of this field. This is only temporary. pRD->pCurrentContext->Eip = *PTR_PCODE(pRD->PCTAddr); - pRD->pCurrentContext->Esp = (DWORD)(pRD->PCTAddr + sizeof(TADDR)); + pRD->pCurrentContext->Esp = pRD->pCurrentContext->ResumeEsp = (DWORD)(pRD->PCTAddr + sizeof(TADDR)); #define RESTORE_REG(reg) { pRD->pCurrentContext->reg = m_Args->reg; pRD->pCurrentContextPointers->reg = &m_Args->reg; } #define CALLEE_SAVED_REGISTER(reg) RESTORE_REG(reg) @@ -895,7 +900,7 @@ void TailCallFrame::UpdateRegDisplay(const PREGDISPLAY pRD) pRD->IsCallerSPValid = FALSE; // Don't add usage of this field. This is only temporary. pRD->pCurrentContext->Eip = *PTR_PCODE(pRD->PCTAddr); - pRD->pCurrentContext->Esp = (DWORD)(pRD->PCTAddr + sizeof(TADDR)); + pRD->pCurrentContext->Esp = pRD->pCurrentContext->ResumeEsp = (DWORD)(pRD->PCTAddr + sizeof(TADDR)); UpdateRegDisplayFromCalleeSavedRegisters(pRD, &m_regs); ClearRegDisplayArgumentAndScratchRegisters(pRD); |