diff options
Diffstat (limited to 'src/inc/corcompile.h')
-rw-r--r-- | src/inc/corcompile.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/inc/corcompile.h b/src/inc/corcompile.h index 70db9f162b..3b517ae212 100644 --- a/src/inc/corcompile.h +++ b/src/inc/corcompile.h @@ -72,6 +72,7 @@ typedef DPTR(struct CORCOMPILE_IMPORT_SECTION) PTR_CORCOMPILE_IMPORT_SECTION; #ifdef _TARGET_X86_ +#ifndef FEATURE_PAL // // x86 ABI does not define RUNTIME_FUNCTION. Define our own to allow unification between x86 and other platforms. // @@ -80,14 +81,15 @@ typedef struct _RUNTIME_FUNCTION { DWORD UnwindData; } RUNTIME_FUNCTION, *PRUNTIME_FUNCTION; +#endif // !FEATURE_PAL + typedef DPTR(RUNTIME_FUNCTION) PTR_RUNTIME_FUNCTION; -#define RUNTIME_FUNCTION__BeginAddress(prf) (prf)->BeginAddress // Chained unwind info. Used for cold methods. #define RUNTIME_FUNCTION_INDIRECT 0x80000000 -#endif +#endif // _TARGET_X86_ // The stride is choosen as maximum value that still gives good page locality of RUNTIME_FUNCTION table touches (only one page of // RUNTIME_FUNCTION table is going to be touched during most IP2MD lookups). @@ -1164,7 +1166,7 @@ enum CorCompileILRegion class ICorCompilePreloader { public: - typedef void (__stdcall *CORCOMPILE_CompileStubCallback)(LPVOID pContext, CORINFO_METHOD_HANDLE hStub, DWORD dwJitFlags); + typedef void (__stdcall *CORCOMPILE_CompileStubCallback)(LPVOID pContext, CORINFO_METHOD_HANDLE hStub, CORJIT_FLAGS jitFlags); // // Map methods are available after Serialize() is called @@ -1849,7 +1851,7 @@ class ICorCompileInfo // Get the compilation flags that are shared between JIT and NGen virtual HRESULT GetBaseJitFlags( IN CORINFO_METHOD_HANDLE hMethod, - OUT DWORD *pFlags) = 0; + OUT CORJIT_FLAGS *pFlags) = 0; // needed for stubs to obtain the number of bytes to copy into the native image // return the beginning of the stub and the size to copy (in bytes) @@ -1887,16 +1889,16 @@ class ICorCompileInfo /*****************************************************************************/ // This function determines the compile flags to use for a generic intatiation // since only the open instantiation can be verified. -// See the comment associated with CORJIT_FLG_SKIP_VERIFICATION for details. +// See the comment associated with CORJIT_FLAG_SKIP_VERIFICATION for details. // // On return: // if *raiseVerificationException=TRUE, the caller should raise a VerificationException. // if *unverifiableGenericCode=TRUE, the method is a generic instantiation with // unverifiable code -CorJitFlag GetCompileFlagsIfGenericInstantiation( +CORJIT_FLAGS GetCompileFlagsIfGenericInstantiation( CORINFO_METHOD_HANDLE method, - CorJitFlag compileFlags, + CORJIT_FLAGS compileFlags, ICorJitInfo * pCorJitInfo, BOOL * raiseVerificationException, BOOL * unverifiableGenericCode); |