- X86 Lea Expansion (WIP)

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

@@ -9,33 +9,28 @@ namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual;
 /// </summary>
 public static class ManualTransforms
 {
-	public static readonly List<BaseTransform> List = new List<BaseTransform>
+	public static readonly List<BaseTransform> List = new()
 	{
 		new Special.Deadcode(),
 
-		//new Standard.Mov32ToXor32(),
-		new Standard.Mov64ToXor64(),
-		new Standard.Add32ToInc32(),
-		new Standard.Sub32ToDec32(),
-		new Standard.Lea32ToInc32(),
-		new Standard.Lea32ToDec32(),
-		new Standard.Cmp32ToZero(),
-		new Standard.Test32ToZero(),
-		new Standard.Cmp32ToTest32(),
+		new Rewrite.Add32ToInc32(),
+		new Rewrite.Add32ToLea32(),
+		new Rewrite.Add64ToLea64(),
+		new Rewrite.Mov32ToXor32(),
+		new Rewrite.Mov64ToXor64(),
+		new Rewrite.Sub32ToDec32(),
+		new Rewrite.Sub64ToLea64(),
+		new Rewrite.Sub64ToLea64(),
+		new Rewrite.Lea32ToInc32(),
+		new Rewrite.Lea32ToDec32(),
+		new Rewrite.Lea32ToMov32(),
+		new Rewrite.Lea64ToMov64(),
+		new Rewrite.Cmp32ToZero(),
+		new Rewrite.Cmp32ToTest32(),
+		new Rewrite.Test32ToZero(),
 
-		//Add64ToLea64
-		//Add32ToLea32
-		//Sub64ToLea64
-		//Sub64ToLea64
-	};
-
-	public static readonly List<BaseTransform> PostList = new List<BaseTransform>
-	{
 		new Special.Mov32ConstantReuse(),
-	};
 
-	public static readonly List<BaseTransform> EarlyList = new List<BaseTransform>
-	{
 		new Stack.Add32(),
 		new Stack.Add64(),
 

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Add32ToInc32.cs

@@ -1,12 +1,10 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
-// This code was generated by an automated template.
-
 using Mosa.Compiler.Framework;
 
-namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Standard;
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
 
-[Transform("x64.Optimizations.Manual.Standard")]
+[Transform("x64.Optimizations.Manual.Rewrite")]
 public sealed class Add32ToInc32 : BaseTransform
 {
 	public Add32ToInc32() : base(X64.Add32, TransformType.Manual | TransformType.Optimization)

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Add32ToLea32.cs

@@ -2,14 +2,14 @@
 
 using Mosa.Compiler.Framework;
 
-namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Standard;
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
 // This transformation can reduce restrictions placed on the register allocator.
 // The LEA does not change any of the status flags, however, the add instruction does modify some flags (carry, zero, etc.)
 // Therefore, this transformation can only occur if the status flags are unused later.
 // A search is required to determine if a status flag is used.
 // However, if the search is not conclusive, the transformation is not made.
 
-[Transform("x64.Optimizations.Manual.Standard")]
+[Transform("x64.Optimizations.Manual.Rewrite")]
 public sealed class Add32ToLea32 : BaseTransform
 {
 	public Add32ToLea32() : base(X64.Add32, TransformType.Manual | TransformType.Optimization)

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Add64ToLea64.cs

@@ -2,14 +2,14 @@
 
 using Mosa.Compiler.Framework;
 
-namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Standard;
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
 // This transformation can reduce restrictions placed on the register allocator.
 // The LEA does not change any of the status flags, however, the add instruction does modify some flags (carry, zero, etc.)
 // Therefore, this transformation can only occur if the status flags are unused later.
 // A search is required to determine if a status flag is used.
 // However, if the search is not conclusive, the transformation is not made.
 
-[Transform("x64.Optimizations.Manual.Standard")]
+[Transform("x64.Optimizations.Manual.Rewrite")]
 public sealed class Add64ToLea64 : BaseTransform
 {
 	public Add64ToLea64() : base(X64.Add64, TransformType.Manual | TransformType.Optimization)

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Cmp32ToTest32.cs

@@ -2,9 +2,9 @@
 
 using Mosa.Compiler.Framework;
 
-namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Standard;
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
 
-[Transform("x64.Optimizations.Manual.Standard")]
+[Transform("x64.Optimizations.Manual.Rewrite")]
 public sealed class Cmp32ToTest32 : BaseTransform
 {
 	public Cmp32ToTest32() : base(X64.Cmp32, TransformType.Manual | TransformType.Optimization)

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Cmp32ToZero.cs

@@ -2,9 +2,9 @@
 
 using Mosa.Compiler.Framework;
 
-namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Standard;
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
 
-[Transform("x64.Optimizations.Manual.Standard")]
+[Transform("x64.Optimizations.Manual.Rewrite")]
 public sealed class Cmp32ToZero : BaseTransform
 {
 	public Cmp32ToZero() : base(X64.Cmp32, TransformType.Manual | TransformType.Optimization)

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Lea32ToDec32.cs

@@ -1,12 +1,10 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
-// This code was generated by an automated template.
-
 using Mosa.Compiler.Framework;
 
-namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Standard;
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
 
-[Transform("x64.Optimizations.Manual.Standard")]
+[Transform("x64.Optimizations.Manual.Rewrite")]
 public sealed class Lea32ToDec32 : BaseTransform
 {
 	public Lea32ToDec32() : base(X64.Lea32, TransformType.Manual | TransformType.Optimization)

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Lea32ToInc32.cs

@@ -1,12 +1,10 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
-// This code was generated by an automated template.
-
 using Mosa.Compiler.Framework;
 
-namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Standard;
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
 
-[Transform("x64.Optimizations.Manual.Standard")]
+[Transform("x64.Optimizations.Manual.Rewrite")]
 public sealed class Lea32ToInc32 : BaseTransform
 {
 	public Lea32ToInc32() : base(X64.Lea32, TransformType.Manual | TransformType.Optimization)

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Lea32ToMov32.cs

@@ -0,0 +1,32 @@
+// Copyright (c) MOSA Project. Licensed under the New BSD License.
+
+using Mosa.Compiler.Framework;
+
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
+
+[Transform("x64.Optimizations.Manual.Rewrite")]
+public sealed class Lea32ToMov32 : BaseTransform
+{
+	public Lea32ToMov32() : base(X64.Lea32, TransformType.Manual | TransformType.Optimization)
+	{
+	}
+
+	public override bool Match(Context context, Transform transform)
+	{
+		if (!context.Operand2.IsResolvedConstant)
+			return false;
+
+		if (!context.Operand2.IsConstantZero)
+			return false;
+
+		return true;
+	}
+
+	public override void Transform(Context context, Transform transform)
+	{
+		var result = context.Result;
+		var operand1 = context.Operand1;
+
+		context.SetInstruction(X64.Mov32, result, operand1);
+	}
+}

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Lea64ToMov64.cs

@@ -0,0 +1,32 @@
+// Copyright (c) MOSA Project. Licensed under the New BSD License.
+
+using Mosa.Compiler.Framework;
+
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
+
+[Transform("x64.Optimizations.Manual.Rewrite")]
+public sealed class Lea64ToMov64 : BaseTransform
+{
+	public Lea64ToMov64() : base(X64.Lea64, TransformType.Manual | TransformType.Optimization)
+	{
+	}
+
+	public override bool Match(Context context, Transform transform)
+	{
+		if (!context.Operand2.IsResolvedConstant)
+			return false;
+
+		if (!context.Operand2.IsConstantZero)
+			return false;
+
+		return true;
+	}
+
+	public override void Transform(Context context, Transform transform)
+	{
+		var result = context.Result;
+		var operand1 = context.Operand1;
+
+		context.SetInstruction(X64.Mov64, result, operand1);
+	}
+}

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Mov32ToXor32.cs

@@ -2,9 +2,9 @@
 
 using Mosa.Compiler.Framework;
 
-namespace Mosa.Compiler.x64.Transforms.Manual.Standard;
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
 
-[Transform("x64.Optimizations.Manual.Standard")]
+[Transform("x64.Optimizations.Manual.Rewrite")]
 public sealed class Mov32ToXor32 : BaseTransform
 {
 	public Mov32ToXor32() : base(X64.Mov32, TransformType.Manual | TransformType.Optimization)

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Mov64ToXor64.cs

@@ -2,9 +2,9 @@
 
 using Mosa.Compiler.Framework;
 
-namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Standard;
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
 
-[Transform("x64.Optimizations.Manual.Standard")]
+[Transform("x64.Optimizations.Manual.Rewrite")]
 public sealed class Mov64ToXor64 : BaseTransform
 {
 	public Mov64ToXor64() : base(X64.Mov64, TransformType.Manual | TransformType.Optimization)

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Sub32ToDec32.cs

@@ -1,12 +1,10 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
-// This code was generated by an automated template.
-
 using Mosa.Compiler.Framework;
 
-namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Standard;
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
 
-[Transform("x64.Optimizations.Manual.Standard")]
+[Transform("x64.Optimizations.Manual.Rewrite")]
 public sealed class Sub32ToDec32 : BaseTransform
 {
 	public Sub32ToDec32() : base(X64.Sub32, TransformType.Manual | TransformType.Optimization)

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Sub32ToLea32.cs

@@ -2,14 +2,14 @@
 
 using Mosa.Compiler.Framework;
 
-namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Standard;
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
 // This transformation can reduce restrictions placed on the register allocator.
 // The LEA does not change any of the status flags, however, the sub instruction does modify some flags (carry, zero, etc.)
 // Therefore, this transformation can only occur if the status flags are unused later.
 // A search is required to determine if a status flag is used.
 // However, if the search is not conclusive, the transformation is not made.
 
-[Transform("x64.Optimizations.Manual.Standard")]
+[Transform("x64.Optimizations.Manual.Rewrite")]
 public sealed class Sub32ToLea32 : BaseTransform
 {
 	public Sub32ToLea32() : base(X64.Sub32, TransformType.Manual | TransformType.Optimization)

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Sub64ToLea64.cs

@@ -2,14 +2,14 @@
 
 using Mosa.Compiler.Framework;
 
-namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Standard;
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
 // This transformation can reduce restrictions placed on the register allocator.
 // The LEA does not change any of the status flags, however, the sub instruction does modify some flags (carry, zero, etc.)
 // Therefore, this transformation can only occur if the status flags are unused later.
 // A search is required to determine if a status flag is used.
 // However, if the search is not conclusive, the transformation is not made.
 
-[Transform("x64.Optimizations.Manual.Standard")]
+[Transform("x64.Optimizations.Manual.Rewrite")]
 public sealed class Sub64ToLea64 : BaseTransform
 {
 	public Sub64ToLea64() : base(X64.Sub64, TransformType.Manual | TransformType.Optimization)

Source/Mosa.Compiler.x64/Transforms/Optimizations/Manual/Rewrite/Test32ToZero.cs

@@ -2,9 +2,9 @@
 
 using Mosa.Compiler.Framework;
 
-namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Standard;
+namespace Mosa.Compiler.x64.Transforms.Optimizations.Manual.Rewrite;
 
-[Transform("x64.Optimizations.Manual.Standard")]
+[Transform("x64.Optimizations.Manual.Rewrite")]
 public sealed class Test32ToZero : BaseTransform
 {
 	public Test32ToZero() : base(X64.Test32, TransformType.Manual | TransformType.Optimization)

Source/Mosa.Compiler.x86/Instructions/Lea32.cs

@@ -108,16 +108,6 @@ public override void Emit(Node node, OpcodeEncoder opcodeEncoder)
 			return;
 		}
 
-		if (node.Operand1.IsConstant && node.Operand2.IsConstantZero)
-		{
-			opcodeEncoder.Append8Bits(0x8D);
-			opcodeEncoder.Append2Bits(0b00);
-			opcodeEncoder.Append3Bits(node.Result.Register.RegisterCode);
-			opcodeEncoder.Append3Bits(0b101);
-			opcodeEncoder.Append32BitImmediate(node.Operand1);
-			return;
-		}
-
 		throw new Compiler.Common.Exceptions.CompilerException("Invalid Opcode");
 	}
 }