From: Jan Kotas Date: Sat, 14 Sep 2019 01:04:16 +0000 (-0700) Subject: More PAL cleanup (dotnet/coreclr#26709) X-Git-Tag: submit/tizen/20210909.063632~11030^2~608 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=636b8ef0a4e0d7fb5176f935e43ec4cfcc2a7b38;p=platform%2Fupstream%2Fdotnet%2Fruntime.git More PAL cleanup (dotnet/coreclr#26709) * Delete more unused methods from PAL * Delete PAL_EntryPoint * Delete always defined FEATURE_PAL_SXS and related code Commit migrated from https://github.com/dotnet/coreclr/commit/59002f56b5a2a4e13d4adee9f21942855c0955d3 --- diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake index 084e0b46a84..92d5cdf73dc 100644 --- a/src/coreclr/clrdefinitions.cmake +++ b/src/coreclr/clrdefinitions.cmake @@ -163,12 +163,8 @@ if(FEATURE_MERGE_JIT_AND_ENGINE) add_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE) endif(FEATURE_MERGE_JIT_AND_ENGINE) add_definitions(-DFEATURE_MULTICOREJIT) -if (FEATURE_NI_BIND_FALLBACK) - add_definitions(-DFEATURE_NI_BIND_FALLBACK) -endif(FEATURE_NI_BIND_FALLBACK) if(CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_PAL) - add_definitions(-DFEATURE_PAL_SXS) add_definitions(-DFEATURE_PAL_ANSI) endif(CLR_CMAKE_PLATFORM_UNIX) if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD) diff --git a/src/coreclr/src/binder/assemblybinder.cpp b/src/coreclr/src/binder/assemblybinder.cpp index 2ad127652bb..e3f9b5165c9 100644 --- a/src/coreclr/src/binder/assemblybinder.cpp +++ b/src/coreclr/src/binder/assemblybinder.cpp @@ -659,11 +659,6 @@ namespace BINDER_SPACE sCoreLib = sCoreLibDir; sCoreLib.Append(CoreLibName_IL_W); BOOL fExplicitBindToNativeImage = (fBindToNativeImage == true)? TRUE:FALSE; -#ifdef FEATURE_NI_BIND_FALLBACK - // Some non-Windows platforms do not automatically generate the NI image as CoreLib.dll. - // If those platforms also do not support automatic fallback from NI to IL, bind as IL. - fExplicitBindToNativeImage = FALSE; -#endif // FEATURE_NI_BIND_FALLBACK IF_FAIL_GO(AssemblyBinder::GetAssembly(sCoreLib, TRUE /* fIsInGAC */, fExplicitBindToNativeImage, diff --git a/src/coreclr/src/debug/ee/debugger.cpp b/src/coreclr/src/debug/ee/debugger.cpp index de1783643b3..f0eea729247 100644 --- a/src/coreclr/src/debug/ee/debugger.cpp +++ b/src/coreclr/src/debug/ee/debugger.cpp @@ -1990,10 +1990,6 @@ HRESULT Debugger::Startup(void) } #endif - #ifdef FEATURE_PAL - PAL_InitializeDebug(); - #endif // FEATURE_PAL - // Lazily initialize the interop-safe heap // Must be done before the RC thread is initialized. diff --git a/src/coreclr/src/pal/inc/pal.h b/src/coreclr/src/pal/inc/pal.h index 82ebc84d0d0..86319ec5ebf 100644 --- a/src/coreclr/src/pal/inc/pal.h +++ b/src/coreclr/src/pal/inc/pal.h @@ -151,15 +151,6 @@ typedef PVOID NATIVE_LIBRARY_HANDLE; #endif // !_MSC_VER #endif // !THROW_DECL -#ifndef _MSC_VER -#if defined(CORECLR) -// Define this if the underlying platform supports true 2-pass EH. -// At the same time, this enables running several PAL instances -// side-by-side. -#define FEATURE_PAL_SXS 1 -#endif // CORECLR -#endif // !_MSC_VER - #if defined(_MSC_VER) #define DECLSPEC_ALIGN(x) __declspec(align(x)) #else @@ -395,13 +386,6 @@ PALAPI PAL_InitializeCoreCLR( const char *szExePath); -PALIMPORT -DWORD_PTR -PALAPI -PAL_EntryPoint( - IN LPTHREAD_START_ROUTINE lpStartAddress, - IN LPVOID lpParameter); - /// /// This function shuts down PAL WITHOUT exiting the current process. /// @@ -501,12 +485,6 @@ PAL_GetTransportPipeName( IN const char *applicationGroupId, IN const char *suffix); -PALIMPORT -void -PALAPI -PAL_InitializeDebug( - void); - PALIMPORT void PALAPI @@ -3024,8 +3002,6 @@ PAL_BindResources(IN LPCSTR lpDomain); #define EXCEPTION_NONCONTINUABLE 0x1 #define EXCEPTION_UNWINDING 0x2 -#ifdef FEATURE_PAL_SXS - #define EXCEPTION_EXIT_UNWIND 0x4 // Exit unwind is in progress (not used by PAL SEH) #define EXCEPTION_NESTED_CALL 0x10 // Nested exception handler call #define EXCEPTION_TARGET_UNWIND 0x20 // Target unwind in progress @@ -3039,8 +3015,6 @@ PAL_BindResources(IN LPCSTR lpDomain); #define IS_UNWINDING(Flag) ((Flag & EXCEPTION_UNWIND) != 0) #define IS_TARGET_UNWIND(Flag) (Flag & EXCEPTION_TARGET_UNWIND) -#endif // FEATURE_PAL_SXS - #define EXCEPTION_IS_SIGNAL 0x100 #define EXCEPTION_MAXIMUM_PARAMETERS 15 @@ -3064,8 +3038,6 @@ typedef struct _EXCEPTION_POINTERS { PCONTEXT ContextRecord; } EXCEPTION_POINTERS, *PEXCEPTION_POINTERS, *LPEXCEPTION_POINTERS; -#ifdef FEATURE_PAL_SXS - typedef LONG EXCEPTION_DISPOSITION; enum { @@ -3075,8 +3047,6 @@ enum { ExceptionCollidedUnwind, }; -#endif // FEATURE_PAL_SXS - // // A function table entry is generated for each frame function. // @@ -3273,25 +3243,9 @@ PALAPI PAL_nanosleep( IN long timeInNs); -#ifndef FEATURE_PAL_SXS - -typedef LONG (PALAPI_NOEXPORT *PTOP_LEVEL_EXCEPTION_FILTER)( - struct _EXCEPTION_POINTERS *ExceptionInfo); -typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER; - -PALIMPORT -LPTOP_LEVEL_EXCEPTION_FILTER -PALAPI -SetUnhandledExceptionFilter( - IN LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter); - -#else // FEATURE_PAL_SXS - typedef EXCEPTION_DISPOSITION (PALAPI_NOEXPORT *PVECTORED_EXCEPTION_HANDLER)( struct _EXCEPTION_POINTERS *ExceptionPointers); -#endif // FEATURE_PAL_SXS - // Define BitScanForward64 and BitScanForward // Per MSDN, BitScanForward64 will search the mask data from LSB to MSB for a set bit. // If one is found, its bit position is stored in the out PDWORD argument and 1 is returned; @@ -4458,18 +4412,6 @@ PALIMPORT DLLEXPORT void * __cdecl bsearch(const void *, const void *, size_t, s PALIMPORT time_t __cdecl time(time_t *); -struct tm { - int tm_sec; /* seconds after the minute - [0,59] */ - int tm_min; /* minutes after the hour - [0,59] */ - int tm_hour; /* hours since midnight - [0,23] */ - int tm_mday; /* day of the month - [1,31] */ - int tm_mon; /* months since January - [0,11] */ - int tm_year; /* years since 1900 */ - int tm_wday; /* days since Sunday - [0,6] */ - int tm_yday; /* days since January 1 - [0,365] */ - int tm_isdst; /* daylight savings time flag */ - }; - #endif // !PAL_STDCPP_COMPAT PALIMPORT int __cdecl _open_osfhandle(INT_PTR, int); @@ -4815,8 +4757,6 @@ public: #define HardwareExceptionHolder #endif // FEATURE_ENABLE_HARDWARE_EXCEPTIONS -#ifdef FEATURE_PAL_SXS - class NativeExceptionHolderBase; PALIMPORT @@ -5027,8 +4967,6 @@ public: } // extern "C++" -#endif // FEATURE_PAL_SXS - #define PAL_CPP_THROW(type, obj) { throw obj; } #define PAL_CPP_RETHROW { throw; } #define PAL_CPP_TRY try { HardwareExceptionHolder @@ -5046,32 +4984,8 @@ public: #pragma warning(disable:4611) // interaction between '_setjmp' and C++ object destruction is non-portable #endif -#ifdef FEATURE_PAL_SXS - #define PAL_TRY_FOR_DLLMAIN(ParamType, paramDef, paramRef, _reason) PAL_TRY(ParamType, paramDef, paramRef) -#else // FEATURE_PAL_SXS - -#define PAL_TRY(ParamType, paramDef, paramRef) \ - { \ - ParamType __param = paramRef; \ - ParamType paramDef; paramDef = __param; \ - try { \ - HardwareExceptionHolder - -#define PAL_TRY_FOR_DLLMAIN(ParamType, paramDef, paramRef, _reason) \ - { \ - ParamType __param = paramRef; \ - ParamType paramDef; paramDef = __param; \ - try { \ - HardwareExceptionHolder - -#define PAL_ENDTRY \ - } \ - } - -#endif // FEATURE_PAL_SXS - #endif // __cplusplus // Platform-specific library naming diff --git a/src/coreclr/src/pal/inc/pal_unwind.h b/src/coreclr/src/pal/inc/pal_unwind.h index 2931488e3b8..93ba64432ab 100644 --- a/src/coreclr/src/pal/inc/pal_unwind.h +++ b/src/coreclr/src/pal/inc/pal_unwind.h @@ -12,8 +12,6 @@ #ifndef __PAL_UNWIND_H__ #define __PAL_UNWIND_H__ -#if FEATURE_PAL_SXS - #ifdef __cplusplus extern "C" { @@ -86,6 +84,4 @@ extern "C" }; #endif // __cplusplus -#endif // FEATURE_PAL_SXS - #endif // __PAL_UNWIND_H__ diff --git a/src/coreclr/src/pal/inc/rt/palrt.h b/src/coreclr/src/pal/inc/rt/palrt.h index d236dd11589..54e5ad765d7 100644 --- a/src/coreclr/src/pal/inc/rt/palrt.h +++ b/src/coreclr/src/pal/inc/rt/palrt.h @@ -1281,8 +1281,6 @@ typedef OUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK *POUT_OF_PROCESS_FUNCTION_TABLE_C #define OUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK_EXPORT_NAME \ "OutOfProcessFunctionTableCallback" -#if defined(FEATURE_PAL_SXS) - // #if !defined(_TARGET_MAC64) // typedef LONG (*PEXCEPTION_ROUTINE)( // IN PEXCEPTION_POINTERS pExceptionPointers, @@ -1403,8 +1401,6 @@ typedef DISPATCHER_CONTEXT *PDISPATCHER_CONTEXT; #define ExceptionStackUnwind EXCEPTION_EXECUTE_HANDLER #define ExceptionContinueExecution EXCEPTION_CONTINUE_EXECUTION -#endif // FEATURE_PAL_SXS - typedef struct _EXCEPTION_REGISTRATION_RECORD EXCEPTION_REGISTRATION_RECORD; typedef EXCEPTION_REGISTRATION_RECORD *PEXCEPTION_REGISTRATION_RECORD; diff --git a/src/coreclr/src/pal/src/exception/machexception.cpp b/src/coreclr/src/pal/src/exception/machexception.cpp index c24faad5d8e..251e8c59489 100644 --- a/src/coreclr/src/pal/src/exception/machexception.cpp +++ b/src/coreclr/src/pal/src/exception/machexception.cpp @@ -47,8 +47,6 @@ using namespace CorUnix; // The port we use to handle exceptions and to set the thread context mach_port_t s_ExceptionPort; -static BOOL s_DebugInitialized = FALSE; - static DWORD s_PalInitializeFlags = 0; static const char * PAL_MACH_EXCEPTION_MODE = "PAL_MachExceptionMode"; @@ -198,7 +196,6 @@ GetExceptionMask() } if (!(exMode & MachException_SuppressDebugging) && (s_PalInitializeFlags & PAL_INITIALIZE_DEBUGGER_EXCEPTIONS)) { -#ifdef FEATURE_PAL_SXS // Always hook exception ports for breakpoint exceptions. // The reason is that we don't know when a managed debugger // will attach, so we have to be prepared. We don't want @@ -206,12 +203,6 @@ GetExceptionMask() // ports for exactly those threads that currently are in // this PAL. machExceptionMask |= PAL_EXC_DEBUGGING_MASK; -#else // FEATURE_PAL_SXS - if (s_DebugInitialized) - { - machExceptionMask |= PAL_EXC_DEBUGGING_MASK; - } -#endif // FEATURE_PAL_SXS } if (!(exMode & MachException_SuppressManaged)) { @@ -222,8 +213,6 @@ GetExceptionMask() return machExceptionMask; } -#ifdef FEATURE_PAL_SXS - /*++ Function : CPalThread::EnableMachExceptions @@ -367,78 +356,6 @@ PAL_ERROR CorUnix::CPalThread::DisableMachExceptions() return palError; } -#else // FEATURE_PAL_SXS - -/*++ -Function : - SEHEnableMachExceptions - - Enable SEH-related stuff related to mach exceptions - - (no parameters) - -Return value : - TRUE if enabling succeeded - FALSE otherwise ---*/ -BOOL SEHEnableMachExceptions() -{ - exception_mask_t machExceptionMask = GetExceptionMask(); - if (machExceptionMask != 0) - { - kern_return_t MachRet; - MachRet = task_set_exception_ports(mach_task_self(), - machExceptionMask, - s_ExceptionPort, - EXCEPTION_DEFAULT, - MACHINE_THREAD_STATE); - - if (MachRet != KERN_SUCCESS) - { - ASSERT("task_set_exception_ports failed: %d\n", MachRet); - UTIL_SetLastErrorFromMach(MachRet); - return FALSE; - } - } - return TRUE; -} - -/*++ -Function : - SEHDisableMachExceptions - - Disable SEH-related stuff related to mach exceptions - - (no parameters) - -Return value : - TRUE if enabling succeeded - FALSE otherwise ---*/ -BOOL SEHDisableMachExceptions() -{ - exception_mask_t machExceptionMask = GetExceptionMask(); - if (machExceptionMask != 0) - { - kern_return_t MachRet; - MachRet = task_set_exception_ports(mach_task_self(), - machExceptionMask, - MACH_PORT_NULL, - EXCEPTION_DEFAULT, - MACHINE_THREAD_STATE); - - if (MachRet != KERN_SUCCESS) - { - ASSERT("task_set_exception_ports failed: %d\n", MachRet); - UTIL_SetLastErrorFromMach(MachRet); - return FALSE; - } - } - return TRUE; -} - -#endif // FEATURE_PAL_SXS - #if !defined(_AMD64_) extern "C" void PAL_DispatchException(PCONTEXT pContext, PEXCEPTION_RECORD pExRecord, MachExceptionInfo *pMachExceptionInfo) @@ -1049,7 +966,6 @@ Function : Entry point for the thread that will listen for exception in any other thread. -#ifdef FEATURE_PAL_SXS NOTE: This thread is not a PAL thread, and it must not be one. If it was, exceptions on this thread would be delivered to the port this thread itself is listening on. @@ -1065,7 +981,6 @@ Function : This means: no printf, no TRACE, no PAL allocation, no ExitProcess, no LastError in this function and its helpers. To report fatal failure, use NONPAL_RETAIL_ASSERT. -#endif // FEATURE_PAL_SXS Parameters : void *args - not used @@ -1436,13 +1351,6 @@ SEHInitializeMachExceptions(DWORD flags) } } #endif // _DEBUG - -#ifndef FEATURE_PAL_SXS - if (!SEHEnableMachExceptions()) - { - return FALSE; - } -#endif // !FEATURE_PAL_SXS } // Tell the system to ignore SIGPIPE signals rather than use the default @@ -1456,60 +1364,6 @@ SEHInitializeMachExceptions(DWORD flags) return TRUE; } -/*++ -Function : - MachExceptionInitializeDebug - - Initialize the mach exception handlers necessary for a managed debugger - to work - -Return value : - None ---*/ -void MachExceptionInitializeDebug(void) -{ - if (s_DebugInitialized == FALSE) - { -#ifndef FEATURE_PAL_SXS - kern_return_t MachRet; - MachRet = task_set_exception_ports(mach_task_self(), - PAL_EXC_DEBUGGING_MASK, - s_ExceptionPort, - EXCEPTION_DEFAULT, - MACHINE_THREAD_STATE); - if (MachRet != KERN_SUCCESS) - { - ASSERT("task_set_exception_ports failed: %d\n", MachRet); - TerminateProcess(GetCurrentProcess(), (UINT)(-1)); - } -#endif // !FEATURE_PAL_SXS - s_DebugInitialized = TRUE; - } -} - -/*++ -Function : - SEHCleanupExceptionPort - - Restore default exception port handler - - (no parameters, no return value) - -Note : -During PAL_Terminate, we reach a point where SEH isn't possible any more -(handle manager is off, etc). Past that point, we can't avoid crashing on -an exception. ---*/ -void -SEHCleanupExceptionPort(void) -{ - TRACE("Restoring default exception ports\n"); -#ifndef FEATURE_PAL_SXS - SEHDisableMachExceptions(); -#endif // !FEATURE_PAL_SXS - s_DebugInitialized = FALSE; -} - extern "C" void ActivationHandler(CONTEXT* context) diff --git a/src/coreclr/src/pal/src/exception/machexception.h b/src/coreclr/src/pal/src/exception/machexception.h index e2f8ee7a861..98512ff6d5f 100644 --- a/src/coreclr/src/pal/src/exception/machexception.h +++ b/src/coreclr/src/pal/src/exception/machexception.h @@ -34,7 +34,6 @@ extern "C" // Process and thread initialization/cleanup/context routines BOOL SEHInitializeMachExceptions(DWORD flags); -void SEHCleanupExceptionPort (void); void MachExceptionInitializeDebug(void); PAL_NORETURN void MachSetThreadContext(CONTEXT *lpContext); diff --git a/src/coreclr/src/pal/src/exception/seh-unwind.cpp b/src/coreclr/src/pal/src/exception/seh-unwind.cpp index 3f40057d889..646620fc494 100644 --- a/src/coreclr/src/pal/src/exception/seh-unwind.cpp +++ b/src/coreclr/src/pal/src/exception/seh-unwind.cpp @@ -19,10 +19,6 @@ Abstract: --*/ -#ifndef FEATURE_PAL_SXS -#error FEATURE_PAL_SXS needs to be defined for this file. -#endif // !FEATURE_PAL_SXS - #include "pal/context.h" #include "pal.h" #include diff --git a/src/coreclr/src/pal/src/exception/seh.cpp b/src/coreclr/src/pal/src/exception/seh.cpp index 1d3960519cc..8aefe5a10e6 100644 --- a/src/coreclr/src/pal/src/exception/seh.cpp +++ b/src/coreclr/src/pal/src/exception/seh.cpp @@ -108,9 +108,6 @@ SEHCleanup() { TRACE("Cleaning up SEH\n"); -#if HAVE_MACH_EXCEPTIONS - SEHCleanupExceptionPort(); -#endif SEHCleanupSignals(); } diff --git a/src/coreclr/src/pal/src/include/pal/dbgmsg.h b/src/coreclr/src/pal/src/include/pal/dbgmsg.h index a0c23fd7d32..c27330b2a0d 100644 --- a/src/coreclr/src/pal/src/include/pal/dbgmsg.h +++ b/src/coreclr/src/pal/src/include/pal/dbgmsg.h @@ -190,9 +190,7 @@ typedef enum DCI_POLL, DCI_CRYPT, DCI_SHFOLDER, -#ifdef FEATURE_PAL_SXS DCI_SXS, -#endif // FEATURE_PAL_SXS DCI_NUMA, // Please make sure to update dbg_channel_names when adding entries here. diff --git a/src/coreclr/src/pal/src/include/pal/palinternal.h b/src/coreclr/src/pal/src/include/pal/palinternal.h index 9fc5eff381d..2c84f28ca8b 100644 --- a/src/coreclr/src/pal/src/include/pal/palinternal.h +++ b/src/coreclr/src/pal/src/include/pal/palinternal.h @@ -206,7 +206,6 @@ function_name() to call the system's implementation #define srand DUMMY_srand #define atoi DUMMY_atoi #define atof DUMMY_atof -#define tm PAL_tm #define size_t DUMMY_size_t #define time_t PAL_time_t #define va_list DUMMY_va_list @@ -412,7 +411,6 @@ function_name() to call the system's implementation #undef qsort #undef bsearch #undef time -#undef tm #undef FILE #undef fclose #undef fopen diff --git a/src/coreclr/src/pal/src/include/pal/seh.hpp b/src/coreclr/src/pal/src/include/pal/seh.hpp index 1498761a84b..b1a4286e644 100644 --- a/src/coreclr/src/pal/src/include/pal/seh.hpp +++ b/src/coreclr/src/pal/src/include/pal/seh.hpp @@ -114,7 +114,6 @@ void SEHHandleControlEvent(DWORD event, LPVOID eip); extern "C" { -#ifdef FEATURE_PAL_SXS /*++ Function : SEHEnable @@ -145,8 +144,6 @@ Return value : --*/ CorUnix::PAL_ERROR SEHDisable(CorUnix::CPalThread *pthrCurrent); -#endif // FEATURE_PAL_SXS - } #endif /* _PAL_SEH_HPP_ */ diff --git a/src/coreclr/src/pal/src/include/pal/thread.hpp b/src/coreclr/src/pal/src/include/pal/thread.hpp index ea8a5f45cad..f26052361d3 100644 --- a/src/coreclr/src/pal/src/include/pal/thread.hpp +++ b/src/coreclr/src/pal/src/include/pal/thread.hpp @@ -110,7 +110,6 @@ namespace CorUnix OUT LPFILETIME lpKernelTime, OUT LPFILETIME lpUserTime); -#ifdef FEATURE_PAL_SXS #if HAVE_MACH_EXCEPTIONS // Structure used to return data about a single handler to a caller. @@ -153,7 +152,6 @@ namespace CorUnix int GetIndexOfHandler(exception_mask_t bmExceptionMask); }; #endif // HAVE_MACH_EXCEPTIONS -#endif // FEATURE_PAL_SXS class CThreadCRTInfo : public CThreadInfoInitializer { @@ -297,8 +295,7 @@ namespace CorUnix // static void* ThreadEntry(void * pvParam); - -#ifdef FEATURE_PAL_SXS + // // Data for PAL side-by-side support // @@ -309,7 +306,6 @@ namespace CorUnix // specific handlers. CThreadMachExceptionHandlers m_sMachExceptionHandlers; #endif // HAVE_MACH_EXCEPTIONS -#endif // FEATURE_PAL_SXS public: @@ -667,9 +663,7 @@ namespace CorUnix #endif // HAVE_MACH_EXCEPTIONS }; -#if defined(FEATURE_PAL_SXS) extern "C" CPalThread *CreateCurrentThreadData(); -#endif // FEATURE_PAL_SXS inline CPalThread *GetCurrentPalThread() { @@ -679,10 +673,8 @@ namespace CorUnix inline CPalThread *InternalGetCurrentThread() { CPalThread *pThread = GetCurrentPalThread(); -#if defined(FEATURE_PAL_SXS) if (pThread == nullptr) pThread = CreateCurrentThreadData(); -#endif // FEATURE_PAL_SXS return pThread; } diff --git a/src/coreclr/src/pal/src/init/pal.cpp b/src/coreclr/src/pal/src/init/pal.cpp index 1184904efc0..977f226392a 100644 --- a/src/coreclr/src/pal/src/init/pal.cpp +++ b/src/coreclr/src/pal/src/init/pal.cpp @@ -884,40 +884,6 @@ PAL_IsDebuggerPresent() #endif } -/*++ -Function: - PAL_EntryPoint - -Abstract: - This function should be used to wrap code that uses PAL library on thread that was not created by PAL. ---*/ -PALIMPORT -DWORD_PTR -PALAPI -PAL_EntryPoint( - IN LPTHREAD_START_ROUTINE lpStartAddress, - IN LPVOID lpParameter) -{ - CPalThread *pThread; - DWORD_PTR retval = (DWORD) -1; - - ENTRY("PAL_EntryPoint(lpStartAddress=%p, lpParameter=%p)\n", lpStartAddress, lpParameter); - - pThread = InternalGetCurrentThread(); - if (NULL == pThread) - { - /* This function works only for thread that called PAL_Initialize for now. */ - ERROR( "Unable to get the thread object.\n" ); - goto done; - } - - retval = (*lpStartAddress)(lpParameter); - -done: - LOGEXIT("PAL_EntryPoint returns int %d\n", retval); - return retval; -} - /*++ Function: PAL_Shutdown @@ -980,27 +946,6 @@ PAL_TerminateEx( exit(exitCode); } -/*++ -Function: - PAL_InitializeDebug - -Abstract: - This function is the called when cordbg attaches to the process. ---*/ -void -PALAPI -PAL_InitializeDebug( - void) -{ - PERF_ENTRY(PAL_InitializeDebug); - ENTRY("PAL_InitializeDebug()\n"); -#if HAVE_MACH_EXCEPTIONS - MachExceptionInitializeDebug(); -#endif - LOGEXIT("PAL_InitializeDebug returns\n"); - PERF_EXIT(PAL_InitializeDebug); -} - /*++ Function: PALIsThreadDataInitialized diff --git a/src/coreclr/src/pal/src/init/sxs.cpp b/src/coreclr/src/pal/src/init/sxs.cpp index ef265f1897c..b7bca204373 100644 --- a/src/coreclr/src/pal/src/init/sxs.cpp +++ b/src/coreclr/src/pal/src/init/sxs.cpp @@ -20,8 +20,6 @@ using namespace CorUnix; -#ifdef FEATURE_PAL_SXS - SET_DEFAULT_DEBUG_CHANNEL(SXS); PAL_ERROR AllocatePalThread(CPalThread **ppThread); @@ -98,5 +96,3 @@ exit: *ppThread = pThread; return palError; } - -#endif // FEATURE_PAL_SXS diff --git a/src/coreclr/src/pal/src/misc/dbgmsg.cpp b/src/coreclr/src/pal/src/misc/dbgmsg.cpp index 72e131cef58..c6757740ace 100644 --- a/src/coreclr/src/pal/src/misc/dbgmsg.cpp +++ b/src/coreclr/src/pal/src/misc/dbgmsg.cpp @@ -98,9 +98,7 @@ static const char *dbg_channel_names[]= "POLL", "CRYPT", "SHFOLDER" -#ifdef FEATURE_PAL_SXS , "SXS" -#endif // FEATURE_PAL_SXS , "DCI_NUMA" }; @@ -420,7 +418,6 @@ void DBG_close_channels() } -#ifdef FEATURE_PAL_SXS static const void *DBG_get_module_id() { static const void *s_module_id = NULL; @@ -441,10 +438,6 @@ static const void *DBG_get_module_id() #define MODULE_ID DBG_get_module_id, #define MODULE_FORMAT "-%p" -#else -#define MODULE_ID -#define MODULE_FORMAT -#endif // FEATURE_PAL_SXS /*++ Function : diff --git a/src/coreclr/src/pal/src/safecrt/internal.h b/src/coreclr/src/pal/src/safecrt/internal.h index 1a2fb6f57d9..3b3b3e65f44 100644 --- a/src/coreclr/src/pal/src/safecrt/internal.h +++ b/src/coreclr/src/pal/src/safecrt/internal.h @@ -193,10 +193,6 @@ extern int _lpdays[]; extern __time32_t __cdecl __loctotime32_t(int, int, int, int, int, int, int); extern __time64_t __cdecl __loctotime64_t(int, int, int, int, int, int, int); -#ifdef _TM_DEFINED -extern int __cdecl _isindst(__in struct tm * _Time); -#endif /* _TM_DEFINED */ - extern void __cdecl __tzset(void); extern int __cdecl _validdrive(unsigned); @@ -209,11 +205,6 @@ extern int __cdecl _validdrive(unsigned); #define IS_LEAP_YEAR(y) (((y) % 4 == 0 && (y) % 100 != 0) || (y) % 400 == 0) -/* - * get the buffer used by gmtime - */ -struct tm * __cdecl __getgmtimebuf (); - /* * This variable is in the C start-up; the length must be kept synchronized * It is used by the *cenvarg.c modules diff --git a/src/coreclr/src/pal/src/thread/context.cpp b/src/coreclr/src/pal/src/thread/context.cpp index cd2fe41bc46..7fff5365400 100644 --- a/src/coreclr/src/pal/src/thread/context.cpp +++ b/src/coreclr/src/pal/src/thread/context.cpp @@ -340,10 +340,9 @@ CONTEXT_SetThreadContext( if (dwProcessId == GetCurrentProcessId()) { -#ifdef FEATURE_PAL_SXS // Need to implement SetThreadContext(current thread) for the IX architecture; look at common_signal_handler. _ASSERT(FALSE); -#endif // FEATURE_PAL_SXS + ASSERT("SetThreadContext should be called for cross-process only.\n"); SetLastError(ERROR_INVALID_PARAMETER); goto EXIT; diff --git a/src/coreclr/src/pal/src/thread/thread.cpp b/src/coreclr/src/pal/src/thread/thread.cpp index b4e973104c7..962797df7c2 100644 --- a/src/coreclr/src/pal/src/thread/thread.cpp +++ b/src/coreclr/src/pal/src/thread/thread.cpp @@ -953,54 +953,34 @@ CorUnix::InternalEndCurrentThread( ASSERT("Unable to obtain state controller for thread"); } -#ifndef FEATURE_PAL_SXS - // If this is the last thread then delete the process' data, - // but don't exit because the application hosting the PAL - // might have its own threads. - if (PROCGetNumberOfThreads() == 1) - { - TRACE("Last thread is exiting\n"); - TerminateCurrentProcessNoExit(FALSE); - } - else -#endif // !FEATURE_PAL_SXS - { - /* Do this ONLY if we aren't the last thread -> otherwise - it gets done by TerminateProcess-> - PROCCleanupProcess->PALShutdown->PAL_Terminate */ - - // - // Add a reference to the thread data before releasing the - // thread object, so we can still use it - // + // + // Add a reference to the thread data before releasing the + // thread object, so we can still use it + // - pThread->AddThreadReference(); + pThread->AddThreadReference(); - // - // Release the reference to the IPalObject for this thread - // - - pThread->GetThreadObject()->ReleaseReference(pThread); + // + // Release the reference to the IPalObject for this thread + // - /* Remove thread for the thread list of the process - (don't do if this is the last thread -> gets handled by - TerminateProcess->PROCCleanupProcess->PROCTerminateOtherThreads) */ + pThread->GetThreadObject()->ReleaseReference(pThread); - PROCRemoveThread(pThread, pThread); + /* Remove thread for the thread list of the process + (don't do if this is the last thread -> gets handled by + TerminateProcess->PROCCleanupProcess->PROCTerminateOtherThreads) */ -#ifdef FEATURE_PAL_SXS - // Ensure that EH is disabled on the current thread - SEHDisable(pThread); -#endif // FEATURE_PAL_SXS + PROCRemoveThread(pThread, pThread); + // Ensure that EH is disabled on the current thread + SEHDisable(pThread); - // - // Now release our reference to the thread data. We cannot touch - // it after this point - // + // + // Now release our reference to the thread data. We cannot touch + // it after this point + // - pThread->ReleaseThreadReference(); - } + pThread->ReleaseThreadReference(); } /*++ @@ -2260,13 +2240,11 @@ CPalThread::RunPostCreateInitializers( goto RunPostCreateInitializersExit; } -#ifdef FEATURE_PAL_SXS palError = SEHEnable(this); if (NO_ERROR != palError) { goto RunPostCreateInitializersExit; } -#endif // FEATURE_PAL_SXS RunPostCreateInitializersExit: diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/CMakeLists.txt index d0de335427a..d1e66c6ded0 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/CMakeLists.txt +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/CMakeLists.txt @@ -9,5 +9,4 @@ add_subdirectory(pal_sxs) #add_subdirectory(PAL_TRY_EXCEPT_EX) #add_subdirectory(PAL_TRY_LEAVE_FINALLY) add_subdirectory(RaiseException) -#add_subdirectory(SetUnhandledExceptionFilter) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/CMakeLists.txt deleted file mode 100644 index f6aa0cb2d9d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/CMakeLists.txt deleted file mode 100644 index bff5e893e5b..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test1.cpp -) - -add_executable(paltest_setunhandledexceptionfilter_test1 - ${SOURCES} -) - -add_dependencies(paltest_setunhandledexceptionfilter_test1 coreclrpal) - -target_link_libraries(paltest_setunhandledexceptionfilter_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/test1.cpp b/src/coreclr/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/test1.cpp deleted file mode 100644 index 5a067f9354c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/test1.cpp +++ /dev/null @@ -1,82 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*============================================================= -** -** Source: test1.c -** -** Purpose: Sets up a new unhandled exception filter, and makes sure it -** returns the previous filter. Raises an unhandled exception and -** makes sure this reaches the filter. -** -** -**============================================================*/ - - -#include - -/* This isn't defined in the pal, so copied from win32 */ -#define EXCEPTION_EXECUTE_HANDLER 1 -#define EXCEPTION_CONTINUE_EXECUTION -1 - - -int InFilter = FALSE; - -LONG PALAPI FirstFilter(LPEXCEPTION_POINTERS p) -{ - return EXCEPTION_EXECUTE_HANDLER; -} - -LONG PALAPI ContinueFilter(LPEXCEPTION_POINTERS p) -{ - InFilter = TRUE; - - Trace("This test has succeeded as far at the automated checks can " - "tell. Manual verification is now required to be completely sure.\n"); - Trace("Now the PAL's handling of application errors will be tested " - "with an exception code of %u.\n", - p->ExceptionRecord->ExceptionCode); - Trace("Please verify that the actions that the PAL now takes are " - "as specified for it.\n"); - - return EXCEPTION_CONTINUE_SEARCH; -} - -int __cdecl main(int argc, char *argv[]) -{ - LPTOP_LEVEL_EXCEPTION_FILTER OldFilter; - - if(0 != (PAL_Initialize(argc, argv))) - { - return FAIL; - } - - - SetUnhandledExceptionFilter(FirstFilter); - - OldFilter = SetUnhandledExceptionFilter(ContinueFilter); - if (OldFilter != FirstFilter) - { - Fail("SetUnhandledExceptionFilter did not return a pointer to the " - "previous filter!\n"); - } - - /* - * Raise an unhandled exception. This should cause our filter to be - * excecuted and the program to exit with a code the same as the - * exception code. - */ - RaiseException(3,0,0,0); - - - /* - * This code should not be executed because the toplevelhandler is - * expected to "just" set the exit code and abend the program - */ - Fail("An unhandled exception did not cause the program to abend with" - "the exit code == the ExceptionCode!\n"); - - PAL_Terminate(); - return FAIL; -} diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/testinfo.dat deleted file mode 100644 index 2af29a299a7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = exception_handling -Function = SetUnhandledExceptionFilter -Name = SetUnhandledExceptionFilter test #1 -TYPE = DEFAULT -EXE1 = test1 -LANG = cpp -Description -=Sets up a new unhandled exception filter, and makes sure it -=returns the previous filter. Raises an unhandled exception and -=makes sure this reaches the filter. diff --git a/src/coreclr/src/pal/tests/palsuite/manual-unautomatable.dat b/src/coreclr/src/pal/tests/palsuite/manual-unautomatable.dat index 0a9a7a1b63f..e60ab279b62 100644 --- a/src/coreclr/src/pal/tests/palsuite/manual-unautomatable.dat +++ b/src/coreclr/src/pal/tests/palsuite/manual-unautomatable.dat @@ -13,8 +13,6 @@ debug_api/debugbreak/test1,1 # dialog debug_api/outputdebugstringw/test1,1 debug_api/outputdebugstringa/test1,1 -# The return code on success is NOT the usual 0, instead it's 3 -exception_handling/setunhandledexceptionfilter/test1,1 # These tests require user intervention and cannot be automated pal_specific/pal_get_stdin/test1,1 threading/setconsolectrlhandler/test1,1 diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/CMakeLists.txt index aaf1f27182a..aae2a917614 100644 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/CMakeLists.txt +++ b/src/coreclr/src/pal/tests/palsuite/pal_specific/CMakeLists.txt @@ -5,9 +5,7 @@ cmake_minimum_required(VERSION 2.8.12.2) # add_subdirectory(PAL_get_stdin) # add_subdirectory(PAL_get_stdout) -add_subdirectory(pal_entrypoint) add_subdirectory(PAL_errno) add_subdirectory(PAL_GetPALDirectoryW) -add_subdirectory(pal_initializedebug) add_subdirectory(PAL_Initialize_Terminate) diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/CMakeLists.txt deleted file mode 100644 index f6aa0cb2d9d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/CMakeLists.txt deleted file mode 100644 index 154791c20d7..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - pal_entrypoint.cpp -) - -add_executable(paltest_pal_entrypoint_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_entrypoint_test1 coreclrpal) - -target_link_libraries(paltest_pal_entrypoint_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/pal_entrypoint.cpp b/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/pal_entrypoint.cpp deleted file mode 100644 index c1b66944aaa..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/pal_entrypoint.cpp +++ /dev/null @@ -1,54 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*============================================================= -** -** Source: pal_entrypoint.c -** -** Purpose: Positive test the PAL_EntryPoint API. -** -** Test the PAL_EntryPoint, Call a PAL function, and let main return -** as expected.. -** - -** -**============================================================*/ - -#include "palstartup.h" - -/* Test case copied and stream lined from isalpha\test1*/ -struct testCase -{ - int CorrectResult; - int character; -}; - -int __cdecl main(int argc, char *argv[]) -{ - int result; - int i; - - struct testCase testCases[] = - { - {1, 'a'} - }; - - - i = 0; - result = isalpha(testCases[i].character); - /* The return value is 'non-zero' for success. This if condition - * will still work if that non-zero isn't just 1 - */ - if ( ((testCases[i].CorrectResult == 1) && (result == 0)) || - ( (testCases[i].CorrectResult == 0) && (result != 0) )) - { - Fail("ERROR: isalpha returned %i instead of %i for character " - "%c.\n", - result, - testCases[i].CorrectResult, - testCases[i].character); - } - - return PASS; -} diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/palstartup.h b/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/palstartup.h deleted file mode 100644 index a40885ee6da..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/palstartup.h +++ /dev/null @@ -1,52 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. -// =========================================================================== -// File: palstartup.h -// -// An implementation of startup code for Rotor's Unix PAL. This file should -// be included by any file in a PAL application that defines main. -// we have added palsuite.h to include test related macros etc... -// =========================================================================== - -#ifndef __PALSTARTUP_H__ -#define __PALSTARTUP_H__ - -#include - -int __cdecl PAL_startup_main(int argc, char **argv); - -struct _mainargs -{ - int argc; - char ** argv; -}; - -static DWORD run_main(struct _mainargs *args) -{ - return (DWORD) PAL_startup_main(args->argc, args->argv); -} - -static void terminate(void) -{ - PAL_Terminate(); -} - -int __cdecl main(int argc, char **argv) { - struct _mainargs mainargs; - - if (PAL_Initialize(argc, argv)) { - return FAIL;; - } - - atexit(terminate); - - mainargs.argc = argc; - mainargs.argv = argv; - exit((int)PAL_EntryPoint((PTHREAD_START_ROUTINE)run_main, &mainargs)); - return 0; // Quiet a compiler warning -} - -#define main PAL_startup_main - -#endif // __PALSTARTUP_H__ diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/testinfo.dat deleted file mode 100644 index 01ac3d6f9f6..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = PAL_Specific -Function = PAL_entrypoint -Name = Positive test entrypoint API -TYPE = DEFAULT -EXE1 = pal_errno -Description -=Test the PAL_entrypoint to call a PAL api diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_initializedebug/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_initializedebug/CMakeLists.txt deleted file mode 100644 index f6aa0cb2d9d..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_initializedebug/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -add_subdirectory(test1) - diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/CMakeLists.txt deleted file mode 100644 index 198e582ec86..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - pal_initializedebug.cpp -) - -add_executable(paltest_pal_initializedebug_test1 - ${SOURCES} -) - -add_dependencies(paltest_pal_initializedebug_test1 coreclrpal) - -target_link_libraries(paltest_pal_initializedebug_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/pal_initializedebug.cpp b/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/pal_initializedebug.cpp deleted file mode 100644 index d14c316013c..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/pal_initializedebug.cpp +++ /dev/null @@ -1,36 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*============================================================= -** -** Source: pal_initializedebug.c -** -** Purpose: Positive test the PAL_InitializeDebug API. -** -** Test the PAL_InitializeDebug, it will be NOPs for all -** platforms other than Mac. There is no other way of testing it -** currently -** - -** -**============================================================*/ -#include - -int __cdecl main(int argc, char *argv[]) -{ - int err; - - /* Initialize the PAL environment */ - err = PAL_Initialize(argc, argv); - - if(0 != err) - { - return FAIL; - } - - PAL_InitializeDebug(); - - PAL_Terminate(); - return 0; -} diff --git a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/testinfo.dat b/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/testinfo.dat deleted file mode 100644 index 45c40e50d2a..00000000000 --- a/src/coreclr/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = PAL_Specific -Function = PAL_InitializeDebug -Name = Positive test for PAL_InitializeDebug -TYPE = DEFAULT -EXE1 = pal_initializedebug -Description -=Test the PAL_InitializeDebug, it will be NOPs for all -=platforms other than Mac diff --git a/src/coreclr/src/pal/tests/palsuite/paltestlist.txt b/src/coreclr/src/pal/tests/palsuite/paltestlist.txt index 2406e1c66ed..3a00f0cb8f5 100644 --- a/src/coreclr/src/pal/tests/palsuite/paltestlist.txt +++ b/src/coreclr/src/pal/tests/palsuite/paltestlist.txt @@ -673,9 +673,7 @@ miscellaneous/SetEnvironmentVariableW/test3/paltest_setenvironmentvariablew_test miscellaneous/SetEnvironmentVariableW/test4/paltest_setenvironmentvariablew_test4 miscellaneous/SetLastError/test1/paltest_setlasterror_test1 miscellaneous/_i64tow/test1/paltest_i64tow_test1 -pal_specific/pal_entrypoint/test1/paltest_pal_entrypoint_test1 pal_specific/PAL_errno/test1/paltest_pal_errno_test1 -pal_specific/pal_initializedebug/test1/paltest_pal_initializedebug_test1 pal_specific/PAL_Initialize_Terminate/test1/paltest_pal_initialize_terminate_test1 pal_specific/PAL_Initialize_Terminate/test2/paltest_pal_initialize_terminate_test2 samples/test1/paltest_samples_test1 diff --git a/src/coreclr/src/pal/tests/palsuite/paltestlist_to_be_reviewed.txt b/src/coreclr/src/pal/tests/palsuite/paltestlist_to_be_reviewed.txt index e630ee57c22..fa6b09aa8fd 100644 --- a/src/coreclr/src/pal/tests/palsuite/paltestlist_to_be_reviewed.txt +++ b/src/coreclr/src/pal/tests/palsuite/paltestlist_to_be_reviewed.txt @@ -53,7 +53,6 @@ exception_handling/PAL_TRY_EXCEPT_EX/test1/paltest_pal_try_except_ex_test1 exception_handling/PAL_TRY_EXCEPT_EX/test2/paltest_pal_try_except_ex_test2 exception_handling/PAL_TRY_EXCEPT_EX/test3/paltest_pal_try_except_ex_test3 exception_handling/PAL_TRY_LEAVE_FINALLY/test1/paltest_pal_try_leave_finally_test1 -exception_handling/SetUnhandledExceptionFilter/test1/paltest_setunhandledexceptionfilter_test1 filemapping_memmgt/CreateFileMappingA/test5/paltest_createfilemappinga_test5 filemapping_memmgt/CreateFileMappingA/test6/paltest_createfilemappinga_test6 filemapping_memmgt/CreateFileMappingA/test7/paltest_createfilemappinga_test7