Refactoring + Bug Fix (#1134)

Source/Mosa.BareMetal.HelloWorld.x86/Boot.cs

@@ -2,7 +2,6 @@
 
 using Mosa.Kernel.BareMetal;
 using Mosa.UnitTests.Basic;
-using Mosa.UnitTests.Primitive;
 
 namespace Mosa.BareMetal.HelloWorld.x86;
 

Source/Mosa.BareMetal.HelloWorld/Apps/Reboot.cs

@@ -19,6 +19,6 @@ public void Execute()
 		var pc = Kernel.BareMetal.Kernel.ServiceManager.GetFirstService<PCService>();
 		pc.Reset();
 
-		for (;;) HAL.Yield();
+		for (; ; ) HAL.Yield();
 	}
 }

Source/Mosa.BareMetal.HelloWorld/Apps/ShowDisks.cs

@@ -1,9 +1,7 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
 using System;
-using Mosa.DeviceDriver.ISA;
 using Mosa.DeviceSystem;
-using Mosa.DeviceSystem.Service;
 
 namespace Mosa.BareMetal.HelloWorld.Apps;
 

Source/Mosa.BareMetal.HelloWorld/Apps/Shutdown.cs

@@ -19,6 +19,6 @@ public void Execute()
 		var pc = Kernel.BareMetal.Kernel.ServiceManager.GetFirstService<PCService>();
 		pc.Shutdown();
 
-		for (;;) HAL.Yield();
+		for (; ; ) HAL.Yield();
 	}
 }

Source/Mosa.Compiler.ARM32/Stages/IRTransformationStage.cs

@@ -13,7 +13,7 @@ public sealed class IRTransformationStage : Compiler.Framework.Stages.BaseTransf
 	public override string Name => "ARM32." + GetType().Name;
 
 	public IRTransformationStage()
-		: base(true, false)
+		: base()
 	{
 		AddTranforms(IRTransforms.List);
 	}

Source/Mosa.Compiler.ARM32/Stages/OptimizationStage.cs

@@ -14,7 +14,7 @@ public sealed class OptimizationStage : Compiler.Framework.Stages.BaseTransformS
 	public override string Name => "ARM32." + GetType().Name;
 
 	public OptimizationStage()
-		: base(true, false)
+		: base()
 	{
 		AddTranforms(AutoTransforms.List);
 		AddTranforms(ManualTransforms.List);

Source/Mosa.Compiler.ARM32/Stages/PlatformTransformationStage.cs

@@ -15,7 +15,7 @@ public sealed class PlatformTransformationStage : Compiler.Framework.Stages.Base
 	public override string Name => "ARM32." + GetType().Name;
 
 	public PlatformTransformationStage()
-		: base(true, false, 0)
+		: base(0)
 	{
 		AddTranforms(TweakTransforms.List);
 		AddTranforms(FixedRegistersTransforms.List);

Source/Mosa.Compiler.ARM32/Stages/RuntimeCallStage.cs

@@ -13,7 +13,7 @@ public sealed class RuntimeCallStage : Compiler.Framework.Stages.BaseTransformSt
 	public override string Name => "ARM32." + GetType().Name;
 
 	public RuntimeCallStage()
-		: base(true, false, 1)
+		: base(1)
 	{
 		AddTranforms(RuntimeCallTransforms.List);
 	}

Source/Mosa.Compiler.ARM64/Stages/IRTransformationStage.cs

@@ -11,7 +11,7 @@ public sealed class IRTransformationStage : Compiler.Framework.Stages.BaseTransf
 	public override string Name => "ARM64." + GetType().Name;
 
 	public IRTransformationStage()
-		: base(true, false)
+		: base()
 	{
 		//AddTranforms(IRTransforms.List);
 	}

Source/Mosa.Compiler.ARM64/Stages/OptimizationStage.cs

@@ -14,7 +14,7 @@ public sealed class OptimizationStage : Compiler.Framework.Stages.BaseTransformS
 	public override string Name => "ARM64." + GetType().Name;
 
 	public OptimizationStage()
-		: base(true, false)
+		: base()
 	{
 		AddTranforms(AutoTransforms.List);
 		AddTranforms(ManualTransforms.List);

Source/Mosa.Compiler.ARM64/Stages/PlatformTransformationStage.cs

@@ -15,7 +15,7 @@ public sealed class PlatformTransformationStage : Compiler.Framework.Stages.Base
 	public override string Name => "ARM64." + GetType().Name;
 
 	public PlatformTransformationStage()
-		: base(true, false, 0)
+		: base(0)
 	{
 		AddTranforms(TweakTransforms.List);
 		AddTranforms(FixedRegistersTransforms.List);

Source/Mosa.Compiler.ARM64/Stages/RuntimeCallStage.cs

@@ -13,7 +13,7 @@ public sealed class RuntimeCallStage : Compiler.Framework.Stages.BaseTransformSt
 	public override string Name => "ARM64." + GetType().Name;
 
 	public RuntimeCallStage()
-		: base(true, false, 1)
+		: base(1)
 	{
 		AddTranforms(RuntimeCallTransforms.List);
 	}

Source/Mosa.Compiler.Framework/BaseBlockTransform.cs

@@ -22,14 +22,14 @@ public BaseBlockTransform(bool log = false)
 	{
 		Log = log;
 
-		Name = GetType().FullName.Replace("Mosa.Compiler.", string.Empty).Replace("Mosa.Compiler.Framework.Transforms", "IR").Replace("Transforms.", string.Empty);
+		Name = GetType().FullName.Replace("Mosa.Compiler.Framework.", string.Empty);
 	}
 
 	#endregion Constructors
 
 	#region Abstract Methods
 
-	public abstract bool Process(TransformContext transformContext);
+	public abstract int Process(TransformContext transformContext);
 
 	#endregion Abstract Methods
 

Source/Mosa.Compiler.Framework/BaseMethodCompilerStage.cs

@@ -624,5 +624,7 @@ protected bool CheckAllPhiInstructions()
 		return true;
 	}
 
+	// FUTURE: Check Block CompletelyEmpty flag
+
 	#endregion Check Methods
 }

Source/Mosa.Compiler.Framework/BasicBlock.cs

@@ -364,6 +364,17 @@ public bool HasPhiInstruction()
 		return false;
 	}
 
+	public void RemoveNops()
+	{
+		for (var node = AfterFirst; !node.IsBlockEndInstruction; node = node.Next)
+		{
+			if (node.IsEmpty || !node.IsNop)
+				continue;
+
+			node.Empty();
+		}
+	}
+
 	#endregion Advanced Methods
 
 	public int CompareTo(BasicBlock other)

Source/Mosa.Compiler.Framework/BitValue.cs

@@ -94,6 +94,8 @@ public sealed class BitValue
 
 	public ulong MinValue { get; private set; }
 
+	public bool Is32Bit { get; private set; }
+
 	#region Future
 
 	//public ulong A { get; private set; }
@@ -114,8 +116,6 @@ public sealed class BitValue
 
 	#endregion Future
 
-	public bool Is32Bit { get; private set; }
-
 	public bool Is64Bit => !Is32Bit;
 
 	public bool AreAll64BitsKnown => (BitsKnown & ulong.MaxValue) == ulong.MaxValue;

Source/Mosa.Compiler.Framework/Compiler.cs

@@ -202,9 +202,12 @@ public sealed class Compiler
 		mosaSettings.TwoPassOptimization && mosaSettings.BitTracker ? new BitTrackerStage() : null,
 		mosaSettings.TwoPassOptimization && mosaSettings.BasicOptimizations && mosaSettings.SSA ? new OptimizationStage(mosaSettings.LongExpansion) : null,
 
+		new NopRemovalStage(),
+		new FastBlockOrderingStage(),
+
 		mosaSettings.SSA ? new ExitSSAStage() : null,
 
-		new IRCleanupStage(),
+		new DeadBlockStage(),
 
 		mosaSettings.InlineMethods || mosaSettings.InlineExplicit ? new InlineEvaluationStage() : null,
 		new NewObjectStage(),
@@ -217,7 +220,7 @@ public sealed class Compiler
 		new GreedyRegisterAllocatorStage(),
 		new StackLayoutStage(),
 		new DeadBlockStage(),
-		new BlockOrderingStage(),
+		new AdvancedBlockOrderingStage(),
 
 		//new PreciseGCStage(),
 

Source/Mosa.Compiler.Framework/CompilerHooks.cs

@@ -1,6 +1,5 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
-using System.Collections.Generic;
 using Mosa.Compiler.Framework.Trace;
 using Mosa.Compiler.MosaTypeSystem;
 
@@ -20,8 +19,6 @@ public class CompilerHooks
 
 	public delegate void NotifyMethodCompiledHandler(MosaMethod method);
 
-	public delegate IList<CustomELFSection> CustomElfSectionsHandler();
-
 	public delegate NotifyTraceLogHandler NotifyMethodInstructionTraceHandler(MosaMethod method);
 
 	public delegate NotifyTraceLogHandler NotifyMethodTranformTraceHandler(MosaMethod method);

Source/Mosa.Compiler.Framework/IRInstruction.cs

@@ -2,7 +2,6 @@
 
 // This code was generated by an automated template.
 
-using Mosa.Compiler.Framework;
 using Mosa.Compiler.Framework.IR;
 
 namespace Mosa.Compiler.Framework;