diff options
Diffstat (limited to 'src/inc')
| -rw-r--r-- | src/inc/corcompile.h | 4 | ||||
| -rw-r--r-- | src/inc/corpriv.h | 3 | ||||
| -rw-r--r-- | src/inc/daccess.h | 4 | ||||
| -rw-r--r-- | src/inc/jithelpers.h | 4 | ||||
| -rw-r--r-- | src/inc/pedecoder.h | 10 |
5 files changed, 9 insertions, 16 deletions
diff --git a/src/inc/corcompile.h b/src/inc/corcompile.h index 38ae5c1ede..5f39c65f79 100644 --- a/src/inc/corcompile.h +++ b/src/inc/corcompile.h @@ -18,10 +18,6 @@ #ifndef _COR_COMPILE_H_ #define _COR_COMPILE_H_ -#ifndef FEATURE_PREJIT -#error FEATURE_PREJIT is required for this file -#endif // FEATURE_PREJIT - #if !defined(_TARGET_X86_) || defined(FEATURE_PAL) #ifndef WIN64EXCEPTIONS #define WIN64EXCEPTIONS diff --git a/src/inc/corpriv.h b/src/inc/corpriv.h index 81143e6019..07be47c38c 100644 --- a/src/inc/corpriv.h +++ b/src/inc/corpriv.h @@ -96,10 +96,7 @@ enum MDInternalImportFlags MDInternalImport_TrustedNativeImage = 2, // The image is a native image, and so its format can be trusted MDInternalImport_ILMetaData = 4, // Open the IL metadata, even if this is a native image MDInternalImport_TrustedNativeImage_and_IL = MDInternalImport_TrustedNativeImage | MDInternalImport_ILMetaData, - MDInternalImport_NativeImageInstall = 0x100, // The image is a native image that is being installed into NIC #endif - MDInternalImport_CheckLongPath =8, // also check long version of the path - MDInternalImport_CheckShortPath =0x10, // also check long version of the path MDInternalImport_OnlyLookInCache =0x20, // Only look in the cache. (If the cache does not have the image already loaded, return NULL) }; // enum MDInternalImportFlags diff --git a/src/inc/daccess.h b/src/inc/daccess.h index 71a7d01344..e4deab9207 100644 --- a/src/inc/daccess.h +++ b/src/inc/daccess.h @@ -620,8 +620,10 @@ typedef struct _DacGlobals ULONG fn__ThePreStubPatchLabel; ULONG fn__PrecodeFixupThunk; +#ifdef FEATURE_PREJIT ULONG fn__StubDispatchFixupStub; - ULONG fn__StubDispatchFixupPatchLabel;; + ULONG fn__StubDispatchFixupPatchLabel; +#endif #ifdef FEATURE_COMINTEROP ULONG fn__Unknown_AddRef; ULONG fn__Unknown_AddRefSpecial; diff --git a/src/inc/jithelpers.h b/src/inc/jithelpers.h index 2b362a779f..d7a82286ca 100644 --- a/src/inc/jithelpers.h +++ b/src/inc/jithelpers.h @@ -298,7 +298,11 @@ JITHELPER(CORINFO_HELP_EE_PINVOKE_FIXUP, NDirectImportThunk, CORINFO_HELP_SIG_NO_ALIGN_STUB) +#ifdef FEATURE_PREJIT JITHELPER(CORINFO_HELP_EE_VSD_FIXUP, StubDispatchFixupStub, CORINFO_HELP_SIG_NO_ALIGN_STUB) +#else + JITHELPER(CORINFO_HELP_EE_VSD_FIXUP, NULL, CORINFO_HELP_SIG_NO_ALIGN_STUB) +#endif JITHELPER(CORINFO_HELP_EE_EXTERNAL_FIXUP, ExternalMethodFixupStub, CORINFO_HELP_SIG_NO_ALIGN_STUB) JITHELPER(CORINFO_HELP_EE_VTABLE_FIXUP, VirtualMethodFixupStub, CORINFO_HELP_SIG_NO_ALIGN_STUB) diff --git a/src/inc/pedecoder.h b/src/inc/pedecoder.h index 91990d2892..37051d96fd 100644 --- a/src/inc/pedecoder.h +++ b/src/inc/pedecoder.h @@ -38,14 +38,7 @@ #include "cor.h" #include "corhdr.h" -#ifdef FEATURE_PREJIT #include "corcompile.h" -#else // FEATURE_PREJIT -typedef DPTR(struct COR_ILMETHOD) PTR_COR_ILMETHOD; -struct CORCOMPILE_HEADER { int dummy_field; }; -typedef DPTR(struct CORCOMPILE_HEADER) PTR_CORCOMPILE_HEADER; -#define CORCOMPILE_IS_POINTER_TAGGED(fixup) (false) -#endif // FEATURE_PREJIT #include "readytorun.h" typedef DPTR(struct READYTORUN_HEADER) PTR_READYTORUN_HEADER; @@ -305,6 +298,8 @@ class PEDecoder // Debug directory access, returns NULL if no such entry PTR_IMAGE_DEBUG_DIRECTORY GetDebugDirectoryEntry(UINT index) const; + PTR_CVOID GetNativeManifestMetadata(COUNT_T* pSize = NULL) const; + #ifdef FEATURE_PREJIT CHECK CheckNativeHeaderVersion() const; @@ -322,7 +317,6 @@ class PEDecoder PCODE GetNativeColdCode(COUNT_T * pSize = NULL) const; CORCOMPILE_METHOD_PROFILE_LIST *GetNativeProfileDataList(COUNT_T *pSize = NULL) const; - PTR_CVOID GetNativeManifestMetadata(COUNT_T *pSize = NULL) const; const void *GetNativePreferredBase() const; BOOL GetNativeILHasSecurityDirectory() const; BOOL GetNativeILIsIbcOptimized() const; |