diff options
| author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-02-10 20:35:12 +0900 |
|---|---|---|
| committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-02-10 20:35:12 +0900 |
| commit | 4b11dc566a5bbfa1378d6266525c281b028abcc8 (patch) | |
| tree | b48831a898906734f8884d08b6e18f1144ee2b82 /src/vm/excep.h | |
| parent | db20f3f1bb8595633a7e16c8900fd401a453a6b5 (diff) | |
| download | coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.gz coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.bz2 coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.zip | |
Imported Upstream version 1.0.0.9910upstream/1.0.0.9910
Diffstat (limited to 'src/vm/excep.h')
| -rw-r--r-- | src/vm/excep.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/vm/excep.h b/src/vm/excep.h index 7ef1921593..53fa20160a 100644 --- a/src/vm/excep.h +++ b/src/vm/excep.h @@ -88,11 +88,6 @@ struct ThrowCallbackType MethodDesc * pProfilerNotify; // Context for profiler callbacks -- see COMPlusFrameHandler(). BOOL bReplaceStack; // Used to pass info to SaveStackTrace call BOOL bSkipLastElement;// Used to pass info to SaveStackTrace call -#ifndef FEATURE_PAL - HANDLE hCallerToken; - HANDLE hImpersonationToken; - BOOL bImpersonationTokenSet; -#endif // !FEATURE_PAL #ifdef _DEBUG void * pCurrentExceptionRecord; void * pPrevExceptionRecord; @@ -116,12 +111,6 @@ struct ThrowCallbackType pProfilerNotify = NULL; bReplaceStack = FALSE; bSkipLastElement = FALSE; -#ifndef FEATURE_PAL - hCallerToken = NULL; - hImpersonationToken = NULL; - bImpersonationTokenSet = FALSE; -#endif // !FEATURE_PAL - #ifdef _DEBUG pCurrentExceptionRecord = 0; pPrevExceptionRecord = 0; @@ -426,7 +415,7 @@ VOID DECLSPEC_NORETURN RealCOMPlusThrowInvalidCastException(TypeHandle thCastFro VOID DECLSPEC_NORETURN RealCOMPlusThrowInvalidCastException(OBJECTREF *pObj, TypeHandle thCastTo); -#ifdef _TARGET_X86_ +#ifndef WIN64EXCEPTIONS #include "eexcp.h" #include "exinfo.h" @@ -465,7 +454,7 @@ struct NestedHandlerExRecord : public FrameHandlerExRecord } }; -#endif // _TARGET_X86_ +#endif // !WIN64EXCEPTIONS #if defined(ENABLE_CONTRACTS_IMPL) @@ -531,10 +520,6 @@ extern "C" BOOL ExceptionIsOfRightType(TypeHandle clauseType, TypeHandle thrownT // The stuff below is what works "behind the scenes" of the public macros. //========================================================================== -#ifdef _TARGET_X86_ -LPVOID COMPlusEndCatchWorker(Thread *pCurThread); -EXTERN_C LPVOID STDCALL COMPlusEndCatch(LPVOID ebp, DWORD ebx, DWORD edi, DWORD esi, LPVOID* pRetAddress); -#endif // Specify NULL for uTryCatchResumeAddress when not checking for a InducedThreadRedirectAtEndOfCatch EXTERN_C LPVOID COMPlusCheckForAbort(UINT_PTR uTryCatchResumeAddress = NULL); @@ -957,9 +942,9 @@ public: #ifndef DACCESS_COMPILE -#if defined(_TARGET_X86_) +#ifndef WIN64EXCEPTIONS void ResetThreadAbortState(PTR_Thread pThread, void *pEstablisherFrame); -#elif defined(WIN64EXCEPTIONS) +#else void ResetThreadAbortState(PTR_Thread pThread, CrawlFrame *pCf, StackFrame sfCurrentStackFrame); #endif |