diff options
author | Jonghyun Park <parjong@gmail.com> | 2017-03-04 08:57:35 +0900 |
---|---|---|
committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-03-04 00:57:35 +0100 |
commit | 3834e6b27cbd32ebb7433e6a15f320c77c3074c6 (patch) | |
tree | 38cc9b3ab98a01f79739b40cd40306bdc7514ec9 /src/debug/ee | |
parent | ad9153147dcc2045041c178a49a69cc441758c79 (diff) | |
download | coreclr-3834e6b27cbd32ebb7433e6a15f320c77c3074c6.tar.gz coreclr-3834e6b27cbd32ebb7433e6a15f320c77c3074c6.tar.bz2 coreclr-3834e6b27cbd32ebb7433e6a15f320c77c3074c6.zip |
[x86/Linux] Clean up pContext access (#9933)
* [x86/Linux] Clean up pContext access
* Fix ARM/Windows build error
Diffstat (limited to 'src/debug/ee')
-rw-r--r-- | src/debug/ee/debugger.h | 4 | ||||
-rw-r--r-- | src/debug/ee/debugger.inl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/debug/ee/debugger.h b/src/debug/ee/debugger.h index 9cdf546290..278bef7ecd 100644 --- a/src/debug/ee/debugger.h +++ b/src/debug/ee/debugger.h @@ -397,9 +397,9 @@ inline LPVOID PushedRegAddr(REGDISPLAY* pRD, LPVOID pAddr) { LIMITED_METHOD_CONTRACT; -#if defined(_TARGET_AMD64_) +#ifdef WIN64EXCEPTIONS if ( ((UINT_PTR)(pAddr) >= (UINT_PTR)pRD->pCurrentContextPointers) && - ((UINT_PTR)(pAddr) <= ((UINT_PTR)pRD->pCurrentContextPointers + sizeof(_KNONVOLATILE_CONTEXT_POINTERS))) ) + ((UINT_PTR)(pAddr) <= ((UINT_PTR)pRD->pCurrentContextPointers + sizeof(T_KNONVOLATILE_CONTEXT_POINTERS))) ) #else if ( ((UINT_PTR)(pAddr) >= (UINT_PTR)pRD->pContext) && ((UINT_PTR)(pAddr) <= ((UINT_PTR)pRD->pContext + sizeof(T_CONTEXT))) ) diff --git a/src/debug/ee/debugger.inl b/src/debug/ee/debugger.inl index 57372868c0..612aacd609 100644 --- a/src/debug/ee/debugger.inl +++ b/src/debug/ee/debugger.inl @@ -225,7 +225,7 @@ inline void FuncEvalFrame::UpdateRegDisplay(const PREGDISPLAY pRD) return; } -#if !defined(_WIN64) +#ifndef WIN64EXCEPTIONS // Reset pContext; it's only valid for active (top-most) frame. pRD->pContext = NULL; #endif // !_WIN64 |