Remove mscorpe cruft

src/dlls/mscorpe/CMakeLists.txt

@@ -7,13 +7,9 @@ set(MSCORPE_SOURCES
   ceefilegenwriter.cpp
   pewriter.cpp
   ceefilegenwritertokens.cpp
-  utilcodeinit.cpp
 )
 
 if(WIN32)
-  list(APPEND MSCORPE_SOURCES
-    Native.rc
-  )
 else()
   add_compile_options(-Wno-delete-non-virtual-dtor)
 endif(WIN32)

src/dlls/mscorpe/ceefilegenwritertokens.cpp

@@ -10,9 +10,6 @@
 //*****************************************************************************
 #include "stdafx.h"
 #include "ceegen.h"
-#ifndef FEATURE_CORECLR
-#define DECLARE_DATA
-#endif
 #include "../../ildasm/dasmenum.hpp"
 #define MAX_CLASSNAME_LENGTH    1024
 

src/ilasm/assem.cpp

@@ -15,15 +15,11 @@
 #define DECLARE_DATA
 
 #include "assembler.h"
-#ifdef FEATURE_CORECLR
 #ifdef FEATURE_PAL
 #include "coreclrloader.h"
 CoreCLRLoader *g_loader;
 #endif // FEATURE_PAL
 MetaDataGetDispenserFunc metaDataGetDispenser;
-#else
-#include "MscorpeSxS.h"
-#endif // FEATURE_CORECLR
 
 void indexKeywords(Indx* indx); // defined in asmparse.y
 
@@ -197,11 +193,9 @@ Assembler::~Assembler()
     if (m_pCeeFileGen != NULL) {
         if (m_pCeeFile)
             m_pCeeFileGen->DestroyCeeFile(&m_pCeeFile);
-#ifdef FEATURE_CORECLR
+
         DestroyICeeFileGen(&m_pCeeFileGen);
-#else
-        MscorpeSxS::DestroyICeeFileGen(&m_pCeeFileGen);
-#endif
+
         m_pCeeFileGen = NULL;
     }
 
@@ -276,18 +270,14 @@ BOOL Assembler::Init()
     if (m_pCeeFileGen != NULL) {
         if (m_pCeeFile)
             m_pCeeFileGen->DestroyCeeFile(&m_pCeeFile);
-#ifdef FEATURE_CORECLR
+        
         DestroyICeeFileGen(&m_pCeeFileGen);
-#else
-        MscorpeSxS::DestroyICeeFileGen(&m_pCeeFileGen);
-#endif
+
         m_pCeeFileGen = NULL;
     }
-#ifdef FEATURE_CORECLR
+
     if (FAILED(CreateICeeFileGen(&m_pCeeFileGen))) return FALSE;
-#else
-    if (FAILED(MscorpeSxS::CreateICeeFileGen(&m_pCeeFileGen))) return FALSE;
-#endif
+
     if (FAILED(m_pCeeFileGen->CreateCeeFileEx(&m_pCeeFile,(ULONG)m_dwCeeFileFlags))) return FALSE;
 
     if (FAILED(m_pCeeFileGen->GetSectionCreate(m_pCeeFile, ".il", sdReadOnly, &m_pILSection))) return FALSE;

src/inc/ceegen.h

@@ -45,9 +45,6 @@ typedef DWORD StringRef;
                 Has a bunch of methods to emit signatures, tokens, methods,
                 etc which are not implemented. These are left over from before
 
-  CeeFileGenWriter, PEWriter and ICeeFileGen are implemented in mscorpe.dll.
-  The other types live in mscorwks.dll (src\md\CeeFileGen)
-
                                                      +----------------------------+
                                                      |       ICeeGen              |
                                                      |                            |

src/inc/iceefilegen.h

@@ -10,8 +10,6 @@
  ** This will typically be used by compilers to generate their compiled     **
  ** output executable.                                                      **
  **                                                                         **
- ** The implemenation lives in mscorpe.dll                                  **
- **                                                                         **
  *****************************************************************************/
 
 /*
@@ -27,15 +25,8 @@
   ICLRRuntimeInfo * pCLRRuntimeInfo;
   pMetaHost->GetRuntime(wszClrVersion, IID_ICLRRuntimeInfo, &pCLRRuntimeInfo);
 
-  // Step #2 ... Load mscorpe.dll and get its entrypoints
-  HMODULE hModule;
-  pCLRRuntimeInfo->LoadLibrary(L"mscorpe.dll", &hModule);
-
-  PFN_CreateICeeFileGen pfnCreateICeeFileGen = (PFN_CreateICeeFileGen)::GetProcAddress("CreateICeeFileGen"); // Windows API
-  PFN_DestroyICeeFileGen pfnDestroyICeeFileGen = (PFN_DestroyICeeFileGen)::GetProcAddress("DestroyICeeFileGen"); // Windows API
-
-  // Step #3 ... Use mscorpe.dll APIs
-  pfnCreateICeeFileGen(...);    // Get a ICeeFileGen
+  // Step #2 ... use mscorpe APIs to create a file generator
+  CreateICeeFileGen(...);       // Get a ICeeFileGen
 
   CreateCeeFile(...);           // Get a HCEEFILE (called for every output file needed)
   SetOutputFileName(...);       // Set the name for the output file
@@ -44,7 +35,7 @@
   EmitMetaDataEx(pEmit);        // Write out the metadata
   GenerateCeeFile(...);         // Write out the file. Implicitly calls LinkCeeFile and FixupCeeFile
 
-  pfnDestroyICeeFileGen(...);   // Release the ICeeFileGen object
+  DestroyICeeFileGen(...);      // Release the ICeeFileGen object
 */
 
 
@@ -58,10 +49,8 @@ class ICeeFileGen;
 
 typedef void *HCEEFILE;
 
-#ifdef FEATURE_CORECLR
 EXTERN_C HRESULT __stdcall CreateICeeFileGen(ICeeFileGen** pCeeFileGen);
 EXTERN_C HRESULT __stdcall DestroyICeeFileGen(ICeeFileGen ** ppCeeFileGen);
-#endif
 
 typedef HRESULT (__stdcall * PFN_CreateICeeFileGen)(ICeeFileGen ** ceeFileGen);  // call this to instantiate an ICeeFileGen interface
 typedef HRESULT (__stdcall * PFN_DestroyICeeFileGen)(ICeeFileGen ** ceeFileGen); // call this to delete an ICeeFileGen