Delete ProjectN leftovers from the native runtime (#8049)

dotnet · Mar 23, 2020 · f83e42d · f83e42d
1 parent 4cdb69a
commit f83e42d
Show file tree

Hide file tree

Showing 51 changed files with 30 additions and 6,114 deletions.
diff --git a/src/Native/Runtime/AsmOffsetsVerify.cpp b/src/Native/Runtime/AsmOffsetsVerify.cpp
@@ -18,7 +18,6 @@
 #include "RuntimeInstance.h"
 #include "CachedInterfaceDispatch.h"
 #include "shash.h"
-#include "module.h"
 #include "CallDescr.h"
 
 class AsmOffsets

diff --git a/src/Native/Runtime/CMakeLists.txt b/src/Native/Runtime/CMakeLists.txt
@@ -17,7 +17,6 @@ set(COMMON_RUNTIME_SOURCES
     gcrhenv.cpp
     gcrhscan.cpp
     GcStressControl.cpp
-    GenericUnification.cpp
     HandleTableHelpers.cpp
     MathHelpers.cpp
     MiscHelpers.cpp
@@ -30,7 +29,6 @@ set(COMMON_RUNTIME_SOURCES
     RhConfig.cpp
     RuntimeInstance.cpp
     RWLock.cpp
-    SectionMethodList.cpp
     sha1.cpp
     StackFrameIterator.cpp
     startup.cpp
@@ -42,11 +40,6 @@ set(COMMON_RUNTIME_SOURCES
     UniversalTransitionHelpers.cpp
     yieldprocessornormalized.cpp
 
-    # ProjectN only
-    # gcdump.cpp
-    # module.cpp
-    # RHCodeMan.cpp
-
     ../gc/gceventstatus.cpp
     ../gc/gcload.cpp
     ../gc/gcconfig.cpp

diff --git a/src/Native/Runtime/CachedInterfaceDispatch.cpp b/src/Native/Runtime/CachedInterfaceDispatch.cpp
@@ -30,7 +30,7 @@
 #include "gcrhinterface.h"
 #include "shash.h"
 #include "RWLock.h"
-#include "module.h"
+#include "TypeManager.h"
 #include "RuntimeInstance.h"
 #include "eetype.inl"
 

diff --git a/src/Native/Runtime/DebugEventSource.cpp b/src/Native/Runtime/DebugEventSource.cpp
@@ -16,7 +16,6 @@
 #include "RuntimeInstance.h"
 #include "gcrhinterface.h"
 #include "shash.h"
-#include "module.h"
 #include "DebugEventSource.h"
 
 #include "slist.inl"
@@ -33,16 +32,6 @@ bool EventEnabled(DebugEventType eventType)
            ((g_DebuggerEventsFilter & (1 << ((int)eventType-1))) != 0);
 }
 
-void DebugEventSource::SendModuleLoadEvent(Module* pModule)
-{
-    if(!EventEnabled(DEBUG_EVENT_TYPE_LOAD_MODULE))
-        return;
-    DebugEventPayload payload;
-    payload.type = DEBUG_EVENT_TYPE_LOAD_MODULE;
-    payload.ModuleLoadUnload.pModuleHeader = (CORDB_ADDRESS)pModule->GetModuleHeader();
-    SendRawEvent(&payload);
-}
-
 void DebugEventSource::SendModuleLoadEvent(void* pAddressInModule)
 {
     if(!EventEnabled(DEBUG_EVENT_TYPE_LOAD_MODULE))
@@ -53,16 +42,6 @@ void DebugEventSource::SendModuleLoadEvent(void* pAddressInModule)
     SendRawEvent(&payload);
 }
 
-void DebugEventSource::SendModuleUnloadEvent(Module* pModule)
-{
-    if(!EventEnabled(DEBUG_EVENT_TYPE_UNLOAD_MODULE))
-        return;
-    DebugEventPayload payload;
-    payload.type = DEBUG_EVENT_TYPE_UNLOAD_MODULE;
-    payload.ModuleLoadUnload.pModuleHeader = (CORDB_ADDRESS)pModule->GetModuleHeader();
-    SendRawEvent(&payload);
-}
-
 void DebugEventSource::SendExceptionThrownEvent(CORDB_ADDRESS faultingIP, CORDB_ADDRESS faultingFrameSP)
 {
     if(!EventEnabled(DEBUG_EVENT_TYPE_EXCEPTION_THROWN))

diff --git a/src/Native/Runtime/DebugEventSource.h b/src/Native/Runtime/DebugEventSource.h
@@ -20,14 +20,11 @@ typedef UInt64 CORDB_ADDRESS;
 #ifndef DACCESS_COMPILE
 
 struct DebugEventPayload;
-class Module;
 
 class DebugEventSource
 {
 public:
     static void SendModuleLoadEvent(void* addressInModule);
-    static void SendModuleLoadEvent(Module* pModule);
-    static void SendModuleUnloadEvent(Module* pModule);
     static void SendExceptionThrownEvent(CORDB_ADDRESS faultingIP, CORDB_ADDRESS faultingFrameSP);
     static void SendExceptionCatchHandlerFoundEvent(CORDB_ADDRESS handlerIP, CORDB_ADDRESS HandlerFrameSP);
     static void SendExceptionUnhandledEvent();

diff --git a/src/Native/Runtime/EHHelpers.cpp b/src/Native/Runtime/EHHelpers.cpp
@@ -11,7 +11,7 @@
 #include "gcrhinterface.h"
 #include "shash.h"
 #include "RWLock.h"
-#include "module.h"
+#include "TypeManager.h"
 #include "varint.h"
 #include "PalRedhawkCommon.h"
 #include "PalRedhawk.h"
@@ -309,19 +309,8 @@ static bool InWriteBarrierHelper(UIntNative faultingIP)
         (UIntNative)&RhpCheckedAssignRefAVLocation,
         (UIntNative)&RhpCheckedLockCmpXchgAVLocation,
         (UIntNative)&RhpCheckedXchgAVLocation,
-#ifdef PROJECTN
-        (UIntNative)&RhpCopyMultibyteDestAVLocation,
-        (UIntNative)&RhpCopyMultibyteSrcAVLocation,
-        (UIntNative)&RhpCopyMultibyteNoGCRefsDestAVLocation,
-        (UIntNative)&RhpCopyMultibyteNoGCRefsSrcAVLocation,
-        (UIntNative)&RhpCopyMultibyteWithWriteBarrierDestAVLocation,
-        (UIntNative)&RhpCopyMultibyteWithWriteBarrierSrcAVLocation,
-        (UIntNative)&RhpCopyAnyWithWriteBarrierDestAVLocation,
-        (UIntNative)&RhpCopyAnyWithWriteBarrierSrcAVLocation,
-#else
         (UIntNative)&RhpLockCmpXchg32AVLocation,
         (UIntNative)&RhpLockCmpXchg64AVLocation,
-#endif
     };
 
     // compare the IP against the list of known possible AV locations in the write barrier helpers

diff --git a/src/Native/Runtime/FinalizerHelpers.cpp b/src/Native/Runtime/FinalizerHelpers.cpp
@@ -14,7 +14,6 @@
 #include "RWLock.h"
 #include "RuntimeInstance.h"
 #include "shash.h"
-#include "module.h"
 
 #include "regdisplay.h"
 #include "StackFrameIterator.h"
@@ -262,29 +261,3 @@ COOP_PINVOKE_HELPER(OBJECTREF, RhpGetNextFinalizableObject, ())
         return refNext;
     }
 }
-
-// This function walks the list of modules looking for any module that is a class library and has not yet 
-// had its finalizer init callback invoked.  It gets invoked in a loop, so it's technically O(n*m), but the
-// number of classlibs subscribing to this callback is almost certainly going to be 1.
-COOP_PINVOKE_HELPER(void *, RhpGetNextFinalizerInitCallback, ())
-{
-    FOREACH_MODULE(pModule)
-    {
-        if (pModule->IsClasslibModule()
-            && !pModule->IsFinalizerInitComplete())
-        {
-            pModule->SetFinalizerInitComplete();
-            void * retval = pModule->GetClasslibInitializeFinalizerThread();
-
-            // The caller loops until we return null, so we should only be returning null if we've walked all
-            // the modules and found no callbacks yet to be made.
-            if (retval != NULL)
-            {
-                return retval;
-            }
-        }
-    }
-    END_FOREACH_MODULE;
-
-    return NULL;
-}