summaryrefslogtreecommitdiff
path: root/src/vm
diff options
context:
space:
mode:
authorJonghyun Park <parjong@gmail.com>2017-05-16 00:47:55 +0900
committerJan Kotas <jkotas@microsoft.com>2017-05-15 08:47:55 -0700
commit38ae7da0e46c0ea4ccbbadf60d64ba91074f0e69 (patch)
treee86e76094a9851b76637875ee5403b1b39e446e6 /src/vm
parent1cf39a4e686668f35aec3f336615c422e3cc9fec (diff)
downloadcoreclr-38ae7da0e46c0ea4ccbbadf60d64ba91074f0e69.tar.gz
coreclr-38ae7da0e46c0ea4ccbbadf60d64ba91074f0e69.tar.bz2
coreclr-38ae7da0e46c0ea4ccbbadf60d64ba91074f0e69.zip
Remove unused code from excepx86.cpp (#11602)
Diffstat (limited to 'src/vm')
-rw-r--r--src/vm/i386/excepx86.cpp33
1 files changed, 0 insertions, 33 deletions
diff --git a/src/vm/i386/excepx86.cpp b/src/vm/i386/excepx86.cpp
index 8c65db75a7..7925e1ca37 100644
--- a/src/vm/i386/excepx86.cpp
+++ b/src/vm/i386/excepx86.cpp
@@ -370,7 +370,6 @@ CPFH_AdjustContextForThreadSuspensionRace(CONTEXT *pContext, Thread *pThread)
{
WRAPPER_NO_CONTRACT;
-#ifndef FEATURE_PAL
PCODE f_IP = GetIP(pContext);
if (Thread::IsAddrOfRedirectFunc((PVOID)f_IP)) {
@@ -427,9 +426,6 @@ CPFH_AdjustContextForThreadSuspensionRace(CONTEXT *pContext, Thread *pThread)
SetIP(pContext, GetIP(pThread->m_OSContext) - 1);
STRESS_LOG1(LF_EH, LL_INFO100, "CPFH_AdjustContextForThreadSuspensionRace: Case 4 setting IP = %x\n", pContext->Eip);
}
-#else
- PORTABILITY_ASSERT("CPFH_AdjustContextForThreadSuspensionRace");
-#endif
}
#endif // FEATURE_HIJACK
@@ -1147,7 +1143,6 @@ CPFH_RealFirstPassHandler( // ExceptionContinueSearch, etc.
pExInfo->m_pExceptionPointers = &exceptionPointers;
-#ifndef FEATURE_PAL
if (bRethrownException || bNestedException)
{
_ASSERTE(pExInfo->m_pPrevNestedInfo != NULL);
@@ -1156,7 +1151,6 @@ CPFH_RealFirstPassHandler( // ExceptionContinueSearch, etc.
SetStateForWatsonBucketing(bRethrownException, pExInfo->GetPreviousExceptionTracker()->GetThrowableAsHandle());
END_SO_INTOLERANT_CODE;
}
-#endif
#ifdef DEBUGGING_SUPPORTED
//
@@ -1971,17 +1965,10 @@ PTR_CONTEXT GetCONTEXTFromRedirectedStubStackFrame(CONTEXT * pContext)
}
#if !defined(DACCESS_COMPILE)
-#ifdef FEATURE_PAL
-static PEXCEPTION_REGISTRATION_RECORD CurrentSEHRecord = EXCEPTION_CHAIN_END;
-#endif
-
PEXCEPTION_REGISTRATION_RECORD GetCurrentSEHRecord()
{
WRAPPER_NO_CONTRACT;
-#ifdef FEATURE_PAL
- LPVOID fs0 = CurrentSEHRecord;
-#else // FEATURE_PAL
LPVOID fs0 = (LPVOID)__readfsdword(0);
#if 0 // This walk is too expensive considering we hit it every time we a CONTRACT(NOTHROW)
@@ -2013,24 +2000,18 @@ PEXCEPTION_REGISTRATION_RECORD GetCurrentSEHRecord()
}
#endif
#endif // 0
-#endif // FEATURE_PAL
return (EXCEPTION_REGISTRATION_RECORD*) fs0;
}
PEXCEPTION_REGISTRATION_RECORD GetFirstCOMPlusSEHRecord(Thread *pThread) {
WRAPPER_NO_CONTRACT;
-#ifndef FEATURE_PAL
EXCEPTION_REGISTRATION_RECORD *pEHR = *(pThread->GetExceptionListPtr());
if (pEHR == EXCEPTION_CHAIN_END || IsUnmanagedToManagedSEHHandler(pEHR)) {
return pEHR;
} else {
return GetNextCOMPlusSEHRecord(pEHR);
}
-#else // FEATURE_PAL
- PORTABILITY_ASSERT("GetFirstCOMPlusSEHRecord");
- return NULL;
-#endif // FEATURE_PAL
}
@@ -2056,11 +2037,7 @@ PEXCEPTION_REGISTRATION_RECORD GetPrevSEHRecord(EXCEPTION_REGISTRATION_RECORD *n
VOID SetCurrentSEHRecord(EXCEPTION_REGISTRATION_RECORD *pSEH)
{
WRAPPER_NO_CONTRACT;
-#ifndef FEATURE_PAL
*GetThread()->GetExceptionListPtr() = pSEH;
-#else // FEATURE_PAL
- _ASSERTE("NYI");
-#endif // FEATURE_PAL
}
@@ -2097,7 +2074,6 @@ BOOL PopNestedExceptionRecords(LPVOID pTargetSP, BOOL bCheckForUnknownHandlers)
STATIC_CONTRACT_GC_NOTRIGGER;
STATIC_CONTRACT_SO_TOLERANT;
-#ifndef FEATURE_PAL
PEXCEPTION_REGISTRATION_RECORD pEHR = GetCurrentSEHRecord();
while ((LPVOID)pEHR < pTargetSP)
@@ -2153,10 +2129,6 @@ BOOL PopNestedExceptionRecords(LPVOID pTargetSP, BOOL bCheckForUnknownHandlers)
SetCurrentSEHRecord(pEHR);
}
return FALSE;
-#else // FEATURE_PAL
- PORTABILITY_ASSERT("PopNestedExceptionRecords");
- return FALSE;
-#endif // FEATURE_PAL
}
//
@@ -2261,7 +2233,6 @@ int COMPlusThrowCallbackHelper(IJitManager *pJitManager,
int iFilt = 0;
-#ifndef FEATURE_PAL
EX_TRY
{
GCPROTECT_BEGIN (throwable);
@@ -2290,10 +2261,6 @@ int COMPlusThrowCallbackHelper(IJitManager *pJitManager,
EX_END_CATCH(SwallowAllExceptions)
return iFilt;
-#else // FEATURE_PAL
- PORTABILITY_ASSERT("COMPlusThrowCallbackHelper");
- return EXCEPTION_CONTINUE_SEARCH;
-#endif // FEATURE_PAL
}
//******************************************************************************