replace redhawk with nativeaot (#79217)

* replace redhawk with nativeaot

* apply suggestions

Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
---------

Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>

diff --git a/src/coreclr/gc/env/gcenv.base.h b/src/coreclr/gc/env/gcenv.base.h
index c6a73eb..465b1be 100644 (file)
--- a/src/coreclr/gc/env/gcenv.base.h
+++ b/src/coreclr/gc/env/gcenv.base.h
@@ -403,7 +403,7 @@ typedef struct _PROCESSOR_NUMBER {
 
 // -----------------------------------------------------------------------------------------------------------
 //
-// The subset of the contract code required by the GC/HandleTable sources. If Redhawk moves to support
+// The subset of the contract code required by the GC/HandleTable sources. If NativeAOT moves to support
 // contracts these local definitions will disappear and be replaced by real implementations.
 //
 
@@ -485,8 +485,6 @@ class MethodTable;
 class Object;
 class ArrayBase;
 
-// Various types used to refer to object references or handles. This will get more complex if we decide
-// Redhawk wants to wrap object references in the debug build.
 typedef DPTR(Object) PTR_Object;
 typedef DPTR(PTR_Object) PTR_PTR_Object;
 

diff --git a/src/coreclr/gc/env/gcenv.object.h b/src/coreclr/gc/env/gcenv.object.h
index 9bbdbe9..d04445e 100644 (file)
--- a/src/coreclr/gc/env/gcenv.object.h
+++ b/src/coreclr/gc/env/gcenv.object.h
@@ -17,7 +17,7 @@
 //
 
 // Bits stolen from the sync block index that the GC/HandleTable knows about (currently these are at the same
-// positions as the mainline runtime but we can change this below when it becomes apparent how Redhawk will
+// positions as the mainline runtime but we can change this below when it becomes apparent how NativeAOT will
 // handle sync blocks).
 #define BIT_SBLK_GC_RESERVE                 0x20000000
 #define BIT_SBLK_FINALIZER_RUN              0x40000000

diff --git a/src/coreclr/gc/gc.cpp b/src/coreclr/gc/gc.cpp
index eecc2c0..a85d28e 100644 (file)
--- a/src/coreclr/gc/gc.cpp
+++ b/src/coreclr/gc/gc.cpp
@@ -4497,7 +4497,7 @@ public:
 
 #if defined(FEATURE_NATIVEAOT) || defined(BUILD_AS_STANDALONE)
     // The GC expects the following methods that are provided by the Object class in the CLR but not provided
-    // by Redhawk's version of Object.
+    // by NativeAOT's version of Object.
     uint32_t GetNumComponents()
     {
         return ((ArrayBase *)this)->GetNumComponents();
@@ -34775,7 +34775,7 @@ BOOL gc_heap::commit_mark_array_bgc_init()
             {
                 // For ro segments they could always be only partially in range so we'd
                 // be calling this at the beginning of every BGC. We are not making this
-                // more efficient right now - ro segments are currently only used by redhawk.
+                // more efficient right now - ro segments are currently only used by NativeAOT.
                 if (heap_segment_read_only_p (seg))
                 {
                     if ((heap_segment_mem (seg) >= lowest_address) &&
@@ -43968,7 +43968,7 @@ CFinalize*        GCHeap::m_Finalize              = 0;
 BOOL              GCHeap::GcCollectClasses        = FALSE;
 VOLATILE(int32_t) GCHeap::m_GCFLock               = 0;
 
-#ifndef FEATURE_NATIVEAOT // Redhawk forces relocation a different way
+#ifndef FEATURE_NATIVEAOT // NativeAOT forces relocation a different way
 #ifdef STRESS_HEAP
 #ifndef MULTIPLE_HEAPS
 OBJECTHANDLE      GCHeap::m_StressObjs[NUM_HEAP_STRESS_OBJS];
@@ -45607,7 +45607,7 @@ HRESULT GCHeap::Initialize()
         return E_FAIL;
     }
 
-#ifndef FEATURE_NATIVEAOT // Redhawk forces relocation a different way
+#ifndef FEATURE_NATIVEAOT // NativeAOT forces relocation a different way
 #if defined (STRESS_HEAP) && !defined (MULTIPLE_HEAPS)
     if (GCStress<cfg_any>::IsEnabled())
     {
@@ -46171,7 +46171,7 @@ void GCHeap::Relocate (Object** ppObject, ScanContext* sc,
     return size( pObj ) >= loh_size_threshold;
 }
 
-#ifndef FEATURE_NATIVEAOT // Redhawk forces relocation a different way
+#ifndef FEATURE_NATIVEAOT // NativeAOT forces relocation a different way
 #ifdef STRESS_HEAP
 
 void StressHeapDummy ();

diff --git a/src/coreclr/inc/cordebuginfo.h b/src/coreclr/inc/cordebuginfo.h
index 35e0eca..f3bac25 100644 (file)
--- a/src/coreclr/inc/cordebuginfo.h
+++ b/src/coreclr/inc/cordebuginfo.h
@@ -192,11 +192,7 @@ public:
 #elif TARGET_AMD64
         REGNUM_SP = REGNUM_RSP,
 #elif TARGET_ARM
-#ifdef REDHAWK
-        REGNUM_FP = REGNUM_R7,
-#else
         REGNUM_FP = REGNUM_R11,
-#endif //REDHAWK
 #elif TARGET_ARM64
         //Nothing to do here. FP is already alloted.
 #elif TARGET_LOONGARCH64

diff --git a/src/coreclr/nativeaot/Runtime/rheventtrace.cpp b/src/coreclr/nativeaot/Runtime/rheventtrace.cpp
index 919ca7f..dedd831 100644 (file)
--- a/src/coreclr/nativeaot/Runtime/rheventtrace.cpp
+++ b/src/coreclr/nativeaot/Runtime/rheventtrace.cpp
@@ -17,7 +17,6 @@
 #include "shash.h"
 #include "eventtracepriv.h"
 #include "shash.inl"
-#include "palredhawk.h"
 
 #if defined(FEATURE_EVENT_TRACE)
 

diff --git a/src/coreclr/tools/Common/Internal/Runtime/MethodTable.Constants.cs b/src/coreclr/tools/Common/Internal/Runtime/MethodTable.Constants.cs
index ad5e2e8..a25ee7b 100644 (file)
--- a/src/coreclr/tools/Common/Internal/Runtime/MethodTable.Constants.cs
+++ b/src/coreclr/tools/Common/Internal/Runtime/MethodTable.Constants.cs
@@ -197,7 +197,7 @@ namespace Internal.Runtime
         ETF_DynamicThreadStaticOffset,
     }
 
-    // Subset of the managed TypeFlags enum understood by Redhawk.
+    // Subset of the managed TypeFlags enum understood by the runtime.
     // This should match the values in the TypeFlags enum except for the special
     // entry that marks System.Array specifically.
     internal enum EETypeElementType

diff --git a/src/coreclr/vm/eventtrace.cpp b/src/coreclr/vm/eventtrace.cpp
index 3043568..f516a9e 100644 (file)
--- a/src/coreclr/vm/eventtrace.cpp
+++ b/src/coreclr/vm/eventtrace.cpp
@@ -17,7 +17,6 @@
 #include "commontypes.h"
 #include "daccess.h"
 #include "debugmacrosext.h"
-#include "palredhawkcommon.h"
 #include "gcrhenv.h"
 #define Win32EventWrite PalEtwEventWrite
 #define InterlockedExchange64 PalInterlockedExchange64

diff --git a/src/coreclr/vm/gcinfodecoder.cpp b/src/coreclr/vm/gcinfodecoder.cpp
index 67fbb3b..3af2c8d 100644 (file)
--- a/src/coreclr/vm/gcinfodecoder.cpp
+++ b/src/coreclr/vm/gcinfodecoder.cpp
@@ -1375,7 +1375,7 @@ OBJECTREF* GcInfoDecoder::GetRegisterSlot(
 
 #ifdef FEATURE_NATIVEAOT
     PTR_UIntNative* ppRax = &pRD->pRax;
-    if (regNum > 4) regNum--; // rsp is skipped in Redhawk RegDisplay
+    if (regNum > 4) regNum--; // rsp is skipped in NativeAOT RegDisplay
 #else
     // The fields of KNONVOLATILE_CONTEXT_POINTERS are in the same order as
     // the processor encoding numbers.

diff --git a/src/tests/GC/Scenarios/BaseFinal/basefinal.cs b/src/tests/GC/Scenarios/BaseFinal/basefinal.cs
index a4959dd..21d1491 100644 (file)
--- a/src/tests/GC/Scenarios/BaseFinal/basefinal.cs
+++ b/src/tests/GC/Scenarios/BaseFinal/basefinal.cs
@@ -90,8 +90,7 @@ namespace DefaultNamespace {
         {
 
             mv_Obj = new BaseFinal();
-            //Printing GetTotalMemory is commented out so that the test can build on RedHawk
-            //Console.WriteLine("before test started, the heapsize is {0}", GC.GetTotalMemory(false));
+            Console.WriteLine("before starting the test, heap size is {0}", GC.GetTotalMemory(false));
 
             for( int i=1; i< 1000; i++)
             {