diff options
author | danmosemsft <danmose@microsoft.com> | 2017-02-14 21:07:49 -0800 |
---|---|---|
committer | danmosemsft <danmose@microsoft.com> | 2017-02-14 21:24:05 -0800 |
commit | 16eb7551d9f5ea8ec593dc86b789df4db2198a4b (patch) | |
tree | efec4968d631de26b785b962770e50c5874a83e8 /src/vm/peimage.h | |
parent | 1c1cc23cddad0eb765752d774a48dc686ae1d61f (diff) | |
download | coreclr-16eb7551d9f5ea8ec593dc86b789df4db2198a4b.tar.gz coreclr-16eb7551d9f5ea8ec593dc86b789df4db2198a4b.tar.bz2 coreclr-16eb7551d9f5ea8ec593dc86b789df4db2198a4b.zip |
Remove never defined FEATURE_MIXEDMODE
Diffstat (limited to 'src/vm/peimage.h')
-rw-r--r-- | src/vm/peimage.h | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/src/vm/peimage.h b/src/vm/peimage.h index 2c8f834036..3245621610 100644 --- a/src/vm/peimage.h +++ b/src/vm/peimage.h @@ -290,9 +290,6 @@ private: }; static BOOL CompareImage(UPTR image1, UPTR image2); -#ifdef FEATURE_MIXEDMODE - static BOOL CompareIJWDataBase(UPTR base, UPTR mapping); -#endif // FEATURE_MIXEDMODE void DECLSPEC_NORETURN ThrowFormat(HRESULT hr); @@ -364,49 +361,6 @@ private: BOOL m_bSignatureInfoCached; HRESULT m_hrSignatureInfoStatus; DWORD m_dwSignatureInfo; -#ifdef FEATURE_MIXEDMODE - //@TODO:workaround: Remove this when we have one PEImage per mapped image, - //@TODO:workaround: and move the lock there - // This is for IJW thunk initialization, as it is no longer guaranteed - // that the initialization will occur under the loader lock. - static CrstStatic s_ijwHashLock; - static PtrHashMap *s_ijwFixupDataHash; - -public: - class IJWFixupData - { - private: - Crst m_lock; - void *m_base; - DWORD m_flags; - PTR_LoaderHeap m_DllThunkHeap; - - // the fixup for the next iteration in FixupVTables - // we use it to make sure that we do not try to fix up the same entry twice - // if there was a pass that was aborted in the middle - COUNT_T m_iNextFixup; - COUNT_T m_iNextMethod; - - enum { - e_FIXED_UP = 0x1 - }; - - public: - IJWFixupData(void *pBase); - ~IJWFixupData(); - void *GetBase() { LIMITED_METHOD_CONTRACT; return m_base; } - Crst *GetLock() { LIMITED_METHOD_CONTRACT; return &m_lock; } - BOOL IsFixedUp() { LIMITED_METHOD_CONTRACT; return m_flags & e_FIXED_UP; } - void SetIsFixedUp() { LIMITED_METHOD_CONTRACT; m_flags |= e_FIXED_UP; } - PTR_LoaderHeap GetThunkHeap(); - void MarkMethodFixedUp(COUNT_T iFixup, COUNT_T iMethod); - BOOL IsMethodFixedUp(COUNT_T iFixup, COUNT_T iMethod); - }; - - static IJWFixupData *GetIJWData(void *pBase); - static PTR_LoaderHeap GetDllThunkHeap(void *pBase); - static void UnloadIJWModule(void *pBase); -#endif //FEATURE_MIXEDMODE private: DWORD m_dwPEKind; DWORD m_dwMachine; |