diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-01-24 15:50:20 +0900 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-01-23 22:50:20 -0800 |
| commit | 7a1185d4abce994bebb1aaa604730c79dce70186 (patch) | |
| tree | 8e78fc4d6a960975571475575c5f8724dbe65526 /src/debug | |
| parent | 378a73e9d09fae6224c406754e2df171d2236593 (diff) | |
| download | coreclr-7a1185d4abce994bebb1aaa604730c79dce70186.tar.gz coreclr-7a1185d4abce994bebb1aaa604730c79dce70186.tar.bz2 coreclr-7a1185d4abce994bebb1aaa604730c79dce70186.zip | |
Rename Esp in x86 REGDISPLAY as SP (#9070)
* Rename Esp in x86 REGDISPLAY as SP
* Fix x86/Windows build error
Diffstat (limited to 'src/debug')
| -rw-r--r-- | src/debug/daccess/dacdbiimplstackwalk.cpp | 2 | ||||
| -rw-r--r-- | src/debug/ee/debugger.inl | 2 | ||||
| -rw-r--r-- | src/debug/ee/i386/x86walker.cpp | 2 | ||||
| -rw-r--r-- | src/debug/shared/i386/primitives.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/debug/daccess/dacdbiimplstackwalk.cpp b/src/debug/daccess/dacdbiimplstackwalk.cpp index d3a2a63bbc..7ab7ac7f95 100644 --- a/src/debug/daccess/dacdbiimplstackwalk.cpp +++ b/src/debug/daccess/dacdbiimplstackwalk.cpp @@ -1163,7 +1163,7 @@ void DacDbiInterfaceImpl::UpdateContextFromRegDisp(REGDISPLAY * pRegDisp, pContext->Eax = *pRegDisp->pEax; pContext->Ecx = *pRegDisp->pEcx; pContext->Edx = *pRegDisp->pEdx; - pContext->Esp = pRegDisp->Esp; + pContext->Esp = pRegDisp->SP; pContext->Eip = pRegDisp->ControlPC; // If we still have the pointer to the leaf CONTEXT, and the leaf CONTEXT is the same as the CONTEXT for diff --git a/src/debug/ee/debugger.inl b/src/debug/ee/debugger.inl index dbd5479a69..54ac8b9316 100644 --- a/src/debug/ee/debugger.inl +++ b/src/debug/ee/debugger.inl @@ -242,7 +242,7 @@ inline void FuncEvalFrame::UpdateRegDisplay(const PREGDISPLAY pRD) pRD->pEcx = &(pDE->m_context.Ecx); pRD->pEax = &(pDE->m_context.Eax); pRD->pEbp = &(pDE->m_context.Ebp); - pRD->Esp = (DWORD)GetSP(&pDE->m_context); + pRD->SP = (DWORD)GetSP(&pDE->m_context); pRD->PCTAddr = GetReturnAddressPtr(); pRD->ControlPC = *PTR_PCODE(pRD->PCTAddr); diff --git a/src/debug/ee/i386/x86walker.cpp b/src/debug/ee/i386/x86walker.cpp index dd0346889f..5266668c3f 100644 --- a/src/debug/ee/i386/x86walker.cpp +++ b/src/debug/ee/i386/x86walker.cpp @@ -304,7 +304,7 @@ DWORD NativeWalker::GetRegisterValue(int registerNumber) return *m_registers->pEbx; break; case 4: - return m_registers->Esp; + return m_registers->SP; break; case 5: return *m_registers->pEbp; diff --git a/src/debug/shared/i386/primitives.cpp b/src/debug/shared/i386/primitives.cpp index e47f3e731e..d3c7c76b8d 100644 --- a/src/debug/shared/i386/primitives.cpp +++ b/src/debug/shared/i386/primitives.cpp @@ -113,7 +113,7 @@ void SetDebuggerREGDISPLAYFromREGDISPLAY(DebuggerREGDISPLAY* pDRD, REGDISPLAY* p pDRD->pEax = NULL; #endif // !USE_REMOTE_REGISTER_ADDRESS - pDRD->SP = pRD->Esp; + pDRD->SP = pRD->SP; pDRD->PC = pRD->ControlPC; // Please leave EBP, ESP, EIP at the front so I don't have to scroll |