diff options
Diffstat (limited to 'src/inc/zapper.h')
| -rw-r--r-- | src/inc/zapper.h | 116 |
1 files changed, 8 insertions, 108 deletions
diff --git a/src/inc/zapper.h b/src/inc/zapper.h index 1018505faa..a55ddbe75f 100644 --- a/src/inc/zapper.h +++ b/src/inc/zapper.h @@ -18,9 +18,6 @@ #include "shash.h" #include "utilcode.h" #include "corjit.h" -#ifdef FEATURE_FUSION -#include "binderngen.h" -#endif #include "corcompile.h" #include "corhlprpriv.h" #include "ngen.h" @@ -115,22 +112,20 @@ class Zapper BOOL m_failed; CorInfoRegionKind m_currentRegionKind; -#if defined(FEATURE_CORECLR) || defined(CROSSGEN_COMPILE) SString m_platformAssembliesPaths; SString m_trustedPlatformAssemblies; SString m_platformResourceRoots; SString m_appPaths; SString m_appNiPaths; SString m_platformWinmdPaths; -#endif // FEATURE_CORECLR || CROSSGEN_COMPILE -#if defined(FEATURE_CORECLR) && !defined(FEATURE_MERGE_JIT_AND_ENGINE) +#if !defined(FEATURE_MERGE_JIT_AND_ENGINE) SString m_CLRJITPath; bool m_fDontLoadJit; -#endif // defined(FEATURE_CORECLR) && !defined(FEATURE_MERGE_JIT_AND_ENGINE) -#if defined(FEATURE_CORECLR) && !defined(NO_NGENPDB) +#endif // !defined(FEATURE_MERGE_JIT_AND_ENGINE) +#if !defined(NO_NGENPDB) SString m_DiasymreaderPath; -#endif // defined(FEATURE_CORECLR) && !defined(NO_NGENPDB) +#endif // !defined(NO_NGENPDB) bool m_fForceFullTrust; SString m_outputFilename; @@ -270,65 +265,6 @@ class Zapper } } m_assemblyDependencies; -#ifndef FEATURE_CORECLR // No load lists on CoreCLR - struct loadLists - { - loadLists() : - m_loadAlwaysList(NULL), - m_loadSometimesList(NULL), - m_loadNeverList(NULL) - { - } - - SAFEARRAY *m_loadAlwaysList; - SAFEARRAY *m_loadSometimesList; - SAFEARRAY *m_loadNeverList; - - void SetLoadLists(SAFEARRAY *loadAlwaysList, SAFEARRAY *loadSometimesList, SAFEARRAY *loadNeverList) - { - m_loadAlwaysList = loadAlwaysList; - m_loadSometimesList = loadSometimesList; - m_loadNeverList = loadNeverList; - } - - } m_loadLists; - - void SetLoadLists(SAFEARRAY *loadAlwaysList, SAFEARRAY *loadSometimesList, SAFEARRAY *loadNeverList) - { - m_loadLists.SetLoadLists(loadAlwaysList, loadSometimesList, loadNeverList); - } - - void SetAssemblyHardBindList() - { - SAFEARRAY *loadAlwaysList = m_loadLists.m_loadAlwaysList; - if (loadAlwaysList == NULL) - { - return; - } - - LONG ubound = 0; - IfFailThrow(SafeArrayGetUBound(loadAlwaysList, 1, &ubound)); - - BSTR *pArrBstr = NULL; - IfFailThrow(SafeArrayAccessData(loadAlwaysList, reinterpret_cast<void **>(&pArrBstr))); - - EX_TRY - { - _ASSERTE((ubound + 1) >= 0); - m_pEECompileInfo->SetAssemblyHardBindList(reinterpret_cast<LPWSTR *>(pArrBstr), ubound + 1); - } - EX_CATCH - { - // If something went wrong, try to unlock the OLE array - // Do not verify the outcome, as we can do nothing about it - SafeArrayUnaccessData(loadAlwaysList); - EX_RETHROW; - } - EX_END_CATCH_UNREACHABLE; - - IfFailThrow(SafeArrayUnaccessData(loadAlwaysList)); - } -#endif // !FEATURE_CORECLR public: @@ -355,30 +291,6 @@ class Zapper void InitEE(BOOL fForceDebug, BOOL fForceProfile, BOOL fForceInstrument); void LoadAndInitializeJITForNgen(LPCWSTR pwzJitName, OUT HINSTANCE* phJit, OUT ICorJitCompiler** ppICorJitCompiler); -#ifdef FEATURE_FUSION - HRESULT TryEnumerateFusionCache(LPCWSTR assemblyName, bool fPrint, bool fDelete); - int EnumerateFusionCache(LPCWSTR assemblyName, bool fPrint, bool fDelete, - CORCOMPILE_NGEN_SIGNATURE * pNativeImageSig = NULL); - void PrintFusionCacheEntry(CorSvcLogLevel logLevel, IAssemblyName *pZapAssemblyName); - void DeleteFusionCacheEntry(IAssemblyName *pZapAssemblyName); - void DeleteFusionCacheEntry(LPCWSTR assemblyName, CORCOMPILE_NGEN_SIGNATURE *pNativeImageSig); - - void PrintDependencies( - IMetaDataAssemblyImport * pAssemblyImport, - CORCOMPILE_DEPENDENCY * pDependencies, - COUNT_T cDependencies, - SString &s); - BOOL VerifyDependencies( - IMDInternalImport * pAssemblyImport, - CORCOMPILE_DEPENDENCY * pDependencies, - COUNT_T cDependencies); - - void PrintAssemblyVersionInfo(IAssemblyName *pZapAssemblyName, SString &s); - - IAssemblyName *GetAssemblyFusionName(IMetaDataAssemblyImport *pImport); - IAssemblyName *GetAssemblyRefFusionName(IMetaDataAssemblyImport *pImport, - mdAssemblyRef ar); -#endif //FEATURE_FUSION BOOL IsAssembly(LPCWSTR path); @@ -398,14 +310,6 @@ class Zapper void CompileAssembly(CORCOMPILE_NGEN_SIGNATURE * pNativeImageSig); ZapImage * CompileModule(CORINFO_MODULE_HANDLE hModule, IMetaDataAssemblyEmit *pEmit); -#ifdef FEATURE_MULTIMODULE_ASSEMBLIES - void CompileNonManifestModules(ULONG hashAlgId, SArray<HANDLE> &hFiles); - static void * GetMapViewOfFile( - HANDLE hFile, - DWORD * pdwFileLen); - static void ComputeHashValue(HANDLE hFile, int hashAlg, - BYTE **ppHashValue, DWORD *cbHashValue); -#endif // FEATURE_MULTIMODULE_ASSEMBLIES void InstallCompiledAssembly(LPCWSTR szAssemblyName, LPCWSTR szNativeImagePath, HANDLE hFile, SArray<HANDLE> &hFiles); HRESULT GetExceptionHR(); @@ -442,7 +346,6 @@ class Zapper void GetOutputFolder(); -#if defined(FEATURE_CORECLR) || defined(CROSSGEN_COMPILE) void SetPlatformAssembliesPaths(LPCWSTR pwzPlatformAssembliesPaths); void SetTrustedPlatformAssemblies(LPCWSTR pwzTrustedPlatformAssemblies); void SetPlatformResourceRoots(LPCWSTR pwzPlatformResourceRoots); @@ -450,16 +353,15 @@ class Zapper void SetAppNiPaths(LPCWSTR pwzAppNiPaths); void SetPlatformWinmdPaths(LPCWSTR pwzPlatformWinmdPaths); void SetForceFullTrust(bool val); -#endif // FEATURE_CORECLR || CROSSGEN_COMPILE -#if defined(FEATURE_CORECLR) && !defined(FEATURE_MERGE_JIT_AND_ENGINE) +#if !defined(FEATURE_MERGE_JIT_AND_ENGINE) void SetCLRJITPath(LPCWSTR pwszCLRJITPath); void SetDontLoadJit(); -#endif // defined(FEATURE_CORECLR) && !defined(FEATURE_MERGE_JIT_AND_ENGINE) +#endif // !defined(FEATURE_MERGE_JIT_AND_ENGINE) -#if defined(FEATURE_CORECLR) && !defined(NO_NGENPDB) +#if !defined(NO_NGENPDB) void SetDiasymreaderPath(LPCWSTR pwzDiasymreaderPath); -#endif // defined(FEATURE_CORECLR) && !defined(NO_NGENPDB) +#endif // !defined(NO_NGENPDB) void SetOutputFilename(LPCWSTR pwszOutputFilename); SString GetOutputFileName(); @@ -544,9 +446,7 @@ class ZapperOptions bool m_legacyMode; // true if the zapper was invoked using legacy mode -#ifdef FEATURE_CORECLR bool m_fNoMetaData; // Do not copy metadata and IL to native image -#endif ZapperOptions(); ~ZapperOptions(); |