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/inc/regdisp.h | |
| 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/inc/regdisp.h')
| -rw-r--r-- | src/inc/regdisp.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/inc/regdisp.h b/src/inc/regdisp.h index 68060007d1..a1c9fe2ac0 100644 --- a/src/inc/regdisp.h +++ b/src/inc/regdisp.h @@ -54,7 +54,7 @@ struct REGDISPLAY { DWORD * pEax; DWORD * pEbp; - DWORD Esp; // (Esp) Stack Pointer + DWORD SP; // Stack Pointer PCODE ControlPC; TADDR PCTAddr; @@ -63,13 +63,13 @@ struct REGDISPLAY { inline TADDR GetRegdisplaySP(REGDISPLAY *display) { LIMITED_METHOD_DAC_CONTRACT; - return (TADDR)display->Esp; + return (TADDR)display->SP; } inline void SetRegdisplaySP(REGDISPLAY *display, LPVOID sp ) { LIMITED_METHOD_DAC_CONTRACT; - (display->Esp) = (DWORD)(size_t)sp; + (display->SP) = (DWORD)(size_t)sp; } inline TADDR GetRegdisplayFP(REGDISPLAY *display) { @@ -379,7 +379,7 @@ inline void SyncRegDisplayToCurrentContext(REGDISPLAY* pRD) pRD->SP = (DWORD)GetSP(pRD->pCurrentContext); pRD->ControlPC = (DWORD)GetIP(pRD->pCurrentContext); #elif defined(_TARGET_X86_) // _TARGET_ARM_ - pRD->Esp = (DWORD)GetSP(pRD->pCurrentContext); + pRD->SP = (DWORD)GetSP(pRD->pCurrentContext); pRD->ControlPC = (DWORD)GetIP(pRD->pCurrentContext); #else // _TARGET_X86_ PORTABILITY_ASSERT("SyncRegDisplayToCurrentContext"); @@ -407,7 +407,7 @@ inline void FillRegDisplay(const PREGDISPLAY pRD, PT_CONTEXT pctx, PT_CONTEXT pC pRD->pEax = &(pctx->Eax); pRD->pEcx = &(pctx->Ecx); pRD->pEdx = &(pctx->Edx); - pRD->Esp = pctx->Esp; + pRD->SP = pctx->Esp; pRD->ControlPC = (PCODE)(pctx->Eip); pRD->PCTAddr = (UINT_PTR)&(pctx->Eip); #else // _TARGET_X86_ @@ -499,7 +499,7 @@ inline void CopyRegDisplay(const PREGDISPLAY pInRD, PREGDISPLAY pOutRD, T_CONTEX if (pInRD->pEax != NULL) {pOutCtx->Eax = *pInRD->pEax;} else {pInRD->pEax = NULL;} if (pInRD->pEcx != NULL) {pOutCtx->Ecx = *pInRD->pEcx;} else {pInRD->pEcx = NULL;} if (pInRD->pEdx != NULL) {pOutCtx->Edx = *pInRD->pEdx;} else {pInRD->pEdx = NULL;} - pOutCtx->Esp = pInRD->Esp; + pOutCtx->Esp = pInRD->SP; pOutCtx->Eip = pInRD->ControlPC; #else // _TARGET_X86_ PORTABILITY_ASSERT("CopyRegDisplay"); @@ -591,7 +591,7 @@ inline void UpdateContextFromRegDisp(PREGDISPLAY pRegDisp, PT_CONTEXT pContext) pContext->Eax = *pRegDisp->pEax; pContext->Ecx = *pRegDisp->pEcx; pContext->Edx = *pRegDisp->pEdx; - pContext->Esp = pRegDisp->Esp; + pContext->Esp = pRegDisp->SP; pContext->Eip = pRegDisp->ControlPC; #else // _TARGET_X86_ PORTABILITY_ASSERT("UpdateContextFromRegDisp"); |