- Fixes (#1027)

Source/Mosa.Compiler.Framework/Compiler.cs

@@ -185,6 +185,7 @@ private static List<BaseMethodCompilerStage> GetDefaultMethodPipeline(CompilerSe
 			new PlugStage(),
 			new RuntimeStage(),
 			new IRTransformsStage(),
+
 			(compilerSettings.InlineMethods || compilerSettings.InlineExplicit) ? new InlineStage() : null,
 			new PromoteTemporaryVariables(),
 			new StaticLoadOptimizationStage(),

Source/Mosa.Compiler.Framework/Transforms/Optimizations/Manual/CodeMotion/BaseCodeMotionTransform.cs

@@ -1,6 +1,5 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
-using System.Diagnostics;
 using Mosa.Compiler.Framework.Managers;
 
 namespace Mosa.Compiler.Framework.Transforms.Optimizations.Manual.CodeMotion

Source/Mosa.Compiler.Framework/Transforms/Optimizations/Manual/CodeMotion/LoadZeroExtend8x32.cs

@@ -7,7 +7,7 @@ namespace Mosa.Compiler.Framework.Transforms.Optimizations.Manual.CodeMotion;
 /// </summary>
 public sealed class LoadZeroExtend8x32 : BaseCodeMotionTransform
 {
-	public LoadZeroExtend8x32() : base(IRInstruction.LoadZeroExtend8x32, TransformType.Manual | TransformType.Optimization, true)
+	public LoadZeroExtend8x32() : base(IRInstruction.LoadZeroExtend8x32, TransformType.Manual | TransformType.Optimization)
 	{
 	}
 }

Source/Mosa.Demo.TestWorld.x86/Boot.cs

@@ -87,9 +87,9 @@ public static void Main()
 
 		TestHash();
 
-		Screen.Write("CheckedTests.MulI8I8: ");
+		Screen.Write("StringTest.SubStringTest4: ");
 
-		var value1 = Test2();
+		var value1 = Test5();
 
 		if (value1)
 			Screen.WriteLine("Ok");
@@ -310,4 +310,10 @@ public static long Test4()
 	{
 		return SpecificTests.SwitchI8_v2(9223372036854775807);
 	}
+
+	[MethodImpl(MethodImplOptions.NoInlining)]
+	public static bool Test5()
+	{
+		return StringTest.SubStringTest4();
+	}
 }

Source/Mosa.Platform.x64/Transforms/Optimizations/Manual/ManualTransforms.cs

@@ -1,20 +1,19 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
-// This code was generated by an automated template.
-
 using System.Collections.Generic;
 using Mosa.Compiler.Framework;
 
 namespace Mosa.Platform.x64.Transforms.Optimizations.Manual;
 
 /// <summary>
-/// Transformations
+/// Manual Optimizations Transformations
 /// </summary>
 public static class ManualTransforms
 {
 	public static readonly List<BaseTransform> List = new List<BaseTransform>
 	{
 		new Special.Deadcode(),
+
 		new Standard.Mov32ToXor32(),
 		new Standard.Mov64ToXor64(),
 		new Standard.Add32ToInc32(),

Source/Mosa.Platform.x64/Transforms/Optimizations/Manual/Special/Mov32Coalescing.cs

@@ -1,7 +1,6 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
 using Mosa.Compiler.Framework;
-using Mosa.Compiler.Framework.Transforms;
 
 namespace Mosa.Platform.x64.Transforms.Optimizations.Manual.Special;
 

Source/Mosa.Platform.x64/Transforms/Optimizations/Manual/Special/Mov32ConstantReuse.cs

@@ -1,7 +1,6 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
 using Mosa.Compiler.Framework;
-using Mosa.Compiler.Framework.Transforms;
 
 namespace Mosa.Platform.x64.Transforms.Optimizations.Manual.Special;
 
@@ -13,6 +12,9 @@ public Mov32ConstantReuse() : base(X64.Mov32, TransformType.Manual | TransformTy
 
 	public override bool Match(Context context, TransformContext transform)
 	{
+		if (!transform.AreCPURegistersAllocated)
+			return false;
+
 		if (!context.Operand1.IsResolvedConstant)
 			return false;
 

Source/Mosa.Platform.x64/Transforms/Optimizations/Manual/Special/Mov64ConstantReuse.cs

@@ -13,6 +13,9 @@ public Mov64ConstantReuse() : base(X64.Mov64, TransformType.Manual | TransformTy
 
 	public override bool Match(Context context, TransformContext transform)
 	{
+		if (!transform.AreCPURegistersAllocated)
+			return false;
+
 		if (!context.Operand1.IsResolvedConstant)
 			return false;
 
@@ -27,7 +30,7 @@ public override bool Match(Context context, TransformContext transform)
 
 		var previous = context.Node.PreviousNonEmpty;
 
-		if (previous == null || previous.Instruction != X64.Mov64)
+		if (previous == null || previous.Instruction != X64.Mov32)
 			return false;
 
 		if (previous.Result.Register != CPURegister.RSP)

Source/Mosa.Platform.x86/Stages/PlatformTransformationStage.cs

@@ -25,8 +25,7 @@ public PlatformTransformationStage()
 		AddTranforms(AddressModeTransforms.List);
 
 		AddTranform(new Mov32Unless());
-		AddTranform(new Mov32Propagation());
-		AddTranform(new Mov32Consolidate());
+		AddTranform(new Mov32Coalescing());
 		AddTranform(new Deadcode());
 	}
 }

Source/Mosa.Platform.x86/Transforms/Optimizations/Manual/ManualTransforms.cs

@@ -23,7 +23,6 @@ public static class ManualTransforms
 		new Standard.Cmp32ToTest32(),
 
 		new Special.Mov32ConstantReuse(),
-		new Special.Mov32Consolidate(),
 		new Special.Bt32Movzx8To32Setcc(),
 
 		new Stack.Add32(),

Source/Mosa.Platform.x86/Transforms/Optimizations/Manual/Special/Mov32Propagation.cs → Source/Mosa.Platform.x86/Transforms/Optimizations/Manual/Special/Mov32Coalescing.cs

@@ -1,13 +1,12 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
 using Mosa.Compiler.Framework;
-using Mosa.Compiler.Framework.Transforms;
 
 namespace Mosa.Platform.x86.Transforms.Optimizations.Manual.Special;
 
-public sealed class Mov32Propagation : BaseTransform
+public sealed class Mov32Coalescing : BaseTransform
 {
-	public Mov32Propagation() : base(X86.Mov32, TransformType.Manual | TransformType.Optimization)
+	public Mov32Coalescing() : base(X86.Mov32, TransformType.Manual | TransformType.Optimization)
 	{
 	}
 

Source/Mosa.Platform.x86/Transforms/Optimizations/Manual/Special/Mov32ConstantReuse.cs

@@ -1,7 +1,6 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
 using Mosa.Compiler.Framework;
-using Mosa.Compiler.Framework.Transforms;
 
 namespace Mosa.Platform.x86.Transforms.Optimizations.Manual.Special;
 

Source/Mosa.Platform.x86/Transforms/Optimizations/Manual/Special/Mov32Unless.cs

@@ -1,7 +1,6 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
 using Mosa.Compiler.Framework;
-using Mosa.Compiler.Framework.Transforms;
 
 namespace Mosa.Platform.x86.Transforms.Optimizations.Manual.Special;