diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-02-13 14:14:10 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-02-13 14:14:10 -0800 |
| commit | cdbd0286f8663db4942f3c945e935facc0d53f46 (patch) | |
| tree | 90beb3e2cc8266b6b392c0edc7f9d31ed367c312 /src/inc/regdisp.h | |
| parent | 4db682246f6950ffe0cb4fe306690e404c405326 (diff) | |
| download | coreclr-cdbd0286f8663db4942f3c945e935facc0d53f46.tar.gz coreclr-cdbd0286f8663db4942f3c945e935facc0d53f46.tar.bz2 coreclr-cdbd0286f8663db4942f3c945e935facc0d53f46.zip | |
Simplify platform ifdefs
Simplify platform ifdefs like #if defined(_WIN64) || defined(_TARGET_ARM_) to #if !defined(_TARGET_X86_) based on @BruceForstall suggestion
Diffstat (limited to 'src/inc/regdisp.h')
| -rw-r--r-- | src/inc/regdisp.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/inc/regdisp.h b/src/inc/regdisp.h index 9da1abed97..601137ddf9 100644 --- a/src/inc/regdisp.h +++ b/src/inc/regdisp.h @@ -489,14 +489,12 @@ inline void CopyRegDisplay(const PREGDISPLAY pInRD, PREGDISPLAY pOutRD, T_CONTEX if (pInRD->pEdx != NULL) {pOutCtx->Edx = *pInRD->pEdx;} else {pInRD->pEdx = NULL;} pOutCtx->Esp = pInRD->Esp; pOutCtx->Eip = pInRD->ControlPC; -#elif defined(_WIN64) || defined(_TARGET_ARM_) +#else *pOutCtx = *(pInRD->pCurrentContext); if (pInRD->IsCallerContextValid) { pOutCallerCtx = pInRD->pCallerContext; } -#else - PORTABILITY_ASSERT("@NYI Platform - CopyRegDisplay (Threads.cpp)"); #endif if (pOutRD) @@ -575,15 +573,9 @@ inline void UpdateContextFromRegDisp(PREGDISPLAY pRegDisp, PT_CONTEXT pContext) pContext->Edx = *pRegDisp->pEdx; pContext->Esp = pRegDisp->Esp; pContext->Eip = pRegDisp->ControlPC; - -#elif defined(_WIN64) || defined(_TARGET_ARM_) +#else *pContext = *pRegDisp->pCurrentContext; - -#else // !_TARGET_X86_ && !_WIN64 && !_TARGET_ARM_ - _ASSERTE(!"DDII::UpdateContextFromRegDisplay() - NYI on this platform\n"); - ThrowHR(E_NOTIMPL); - -#endif // !_TARGET_X86_ && !_WIN64 && !_TARGET_ARM_ +#endif } |