Merge branch '507-GC' into 508-GC

tgiphil · Oct 20, 2024 · e4a7a72 · e4a7a72
2 parents 726cf59 + 5ab8bcc
commit e4a7a72
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Source/Data/IR-Instructions.json b/Source/Data/IR-Instructions.json
@@ -1494,7 +1494,7 @@
 			"IgnoreInstructionBasicBlockTargets": "true"
 		},
 		{
-			"Name": "GCPoint",
+			"Name": "SafePoint",
 			"FamilyName": "IR",
 			"ResultCount": 0,
 			"OperandCount": 0,

diff --git a/Source/Mosa.Compiler.Framework/Compiler.cs b/Source/Mosa.Compiler.Framework/Compiler.cs
@@ -198,7 +198,7 @@ public sealed class Compiler
 		new DeadBlockStage(),
 		new AdvancedBlockOrderingStage(),
 
-		//new PreciseGCStage(),
+		new SafePointStage(),
 
 		new CodeGenerationStage(),
 		mosaSettings.EmitBinary ? new ProtectedRegionLayoutStage() : null,

diff --git a/Source/Mosa.Compiler.Framework/IR.cs b/Source/Mosa.Compiler.Framework/IR.cs
@@ -224,7 +224,7 @@ public static class IR
 	public static readonly BaseInstruction Truncate64x32 = new Truncate64x32();
 	public static readonly BaseInstruction TryEnd = new TryEnd();
 	public static readonly BaseInstruction TryStart = new TryStart();
-	public static readonly BaseInstruction GCPoint = new GCPoint();
+	public static readonly BaseInstruction SafePoint = new SafePoint();
 	public static readonly BaseInstruction Rethrow = new Rethrow();
 	public static readonly BaseInstruction GetVirtualFunctionPtr = new GetVirtualFunctionPtr();
 	public static readonly BaseInstruction MemoryCopy = new MemoryCopy();

diff --git a/...ompiler.Framework/Instructions/GCPoint.cs → ...piler.Framework/Instructions/SafePoint.cs b/...ompiler.Framework/Instructions/GCPoint.cs → ...piler.Framework/Instructions/SafePoint.cs
@@ -5,11 +5,11 @@
 namespace Mosa.Compiler.Framework.Instructions;
 
 /// <summary>
-/// GCPoint
+/// SafePoint
 /// </summary>
-public sealed class GCPoint : BaseIRInstruction
+public sealed class SafePoint : BaseIRInstruction
 {
-	public GCPoint()
+	public SafePoint()
 		: base(0, 0)
 	{
 	}

diff --git a/...mpiler.Framework/Stages/PreciseGCStage.cs → ...mpiler.Framework/Stages/SafePointStage.cs b/...mpiler.Framework/Stages/PreciseGCStage.cs → ...mpiler.Framework/Stages/SafePointStage.cs
@@ -3,9 +3,9 @@
 namespace Mosa.Compiler.Framework.Stages;
 
 /// <summary>
-/// This stage determines were object references are located in code.
+/// This stage inserts the GC safe points.
 /// </summary>
-public class PreciseGCStage : BaseMethodCompilerStage
+public class SafePointStage : BaseMethodCompilerStage
 {
 	private TraceLog trace;