WIP - x86 Platform (#1106)

mosa · Aug 7, 2023 · 490b42d · 490b42d
1 parent 39b1200
commit 490b42d
Show file tree

Hide file tree

Showing 102 changed files with 1,318 additions and 257 deletions.
diff --git a/Source/Data/IR-Optimizations-LowerTo32.json b/Source/Data/IR-Optimizations-LowerTo32.json
@@ -0,0 +1,38 @@
+{
+	"Family": "IR",
+	"Section": "Optimizations.Auto",
+	"Commutative": [
+		"IR.Add32",
+		"IR.Add64",
+		"IR.AddR4",
+		"IR.AddR8",
+		"IR.And32",
+		"IR.And64",
+		"IR.Or32",
+		"IR.Or64",
+		"IR.Xor32",
+		"IR.Xor64",
+		"IR.MulR4",
+		"IR.MulR8",
+		"IR.MulUnsigned32",
+		"IR.MulUnsigned64",
+		"IR.MulSigned32",
+		"IR.MulSigned64",
+		"IR.AddCarryOut64",
+		"IR.AddCarryOut32",
+		"IR.AddCarryIn32",
+		"IR.AddCarryIn64"
+	],
+	"Optimizations": [
+		{
+			"Type": "LowerTo32",
+			"Name": "Or32Truncate64x32Truncate64x32",
+			"SubName": "",
+			"Expression": "IR.Or32 (IR.Truncate64x32 x) (IR.Truncate64x32 y)",
+			"Filter": "",
+			"Prefilter": "Is32BitPlatform(@) && IsLowerTo32(@)",
+			"Result": "(IR.GetLow32 (IR.Or64 x y))",
+			"Variations": "No"
+		}
+	]
+}
diff --git a/Source/Data/IR-Optimizations-Simplification.json b/Source/Data/IR-Optimizations-Simplification.json
@@ -443,15 +443,6 @@
 			"Result": "(IR.SignExtend16x## (IR.Or## x y))",
 			"Variations": "Yes"
 		},
-		{
-			"Type": "Simplification",
-			"Name": "Or32Truncate64x32Truncate64x32",
-			"SubName": "",
-			"Expression": "IR.Or32 (IR.Truncate64x32 x) (IR.Truncate64x32 y)",
-			"Filter": "",
-			"Result": "(IR.GetLow32 (IR.Or64 x y))",
-			"Variations": "No"
-		},
 		{
 			"Type": "Simplification",
 			"Name": "SignExtend32x64Truncate64x32",

diff --git a/Source/Data/X64-Instructions.json b/Source/Data/X64-Instructions.json
@@ -735,7 +735,7 @@
 			"OpcodeEncoding": [
 				{
 					"Condition": "",
-					"Encoding": "[x64-rex32],opcode=0xF2,opcode2=0x0F,opcode3=0x5A,mod=11,reg=reg3:o1,rm=reg3:o2,rex.r=reg4x:o1,rex.x=0,rex.b=reg4x:o1"
+					"Encoding": "[x64-rex32],opcode=0xF2,opcode2=0x0F,opcode3=0x5A,mod=11,reg=reg3:r,rm=reg3:o1,rex.r=reg4x:r,rex.x=0,rex.b=reg4x:o1"
 				}
 			]
 		},

diff --git a/Source/Mosa.BareMetal.HelloWorld.x86/Boot.cs b/Source/Mosa.BareMetal.HelloWorld.x86/Boot.cs
@@ -133,7 +133,7 @@ public static void Main()
 
 		//			var fatFileStream = new FatFileStream(fat, location);
 
-		//			uint len = (uint)fatFileStream.Length;
+		//			var len = (uint)fatFileStream.Length;
 
 		//			Console.WriteLine(" - Length: " + len + " bytes");
 

diff --git a/Source/Mosa.Compiler.Framework/MethodCompiler.cs b/Source/Mosa.Compiler.Framework/MethodCompiler.cs
@@ -335,6 +335,7 @@ public void Compile()
 	private void LogException(Exception exception, string title)
 	{
 		Compiler.PostEvent(CompilerEvent.Exception, title);
+		Compiler.PostEvent(CompilerEvent.Exception, exception.ToString());
 
 		var exceptionLog = new TraceLog(TraceType.MethodDebug, Method, "Exception", MethodData.Version);
 

diff --git a/Source/Mosa.Compiler.Framework/Stages/CILDecoderStage.cs b/Source/Mosa.Compiler.Framework/Stages/CILDecoderStage.cs
@@ -1849,6 +1849,13 @@ private bool Compare(Context context, Stack<StackEntry> stack, ConditionCode con
 				context.AppendInstruction(IRInstruction.Compare64x32, conditionCode, result, entry1.Operand, entry2.Operand);
 				return true;
 
+			case PrimitiveType.Int64 when entry2.PrimitiveType == PrimitiveType.Int32:
+				var v1 = MethodCompiler.VirtualRegisters.Allocate64();
+
+				context.AppendInstruction(IRInstruction.ZeroExtend32x64, v1, entry2.Operand);
+				context.AppendInstruction(IRInstruction.Compare64x32, conditionCode, result, entry1.Operand, v1);
+				return true;
+
 			default:
 
 				// TODO: Managed Pointers

diff --git a/Source/Mosa.Compiler.Framework/TransformContext.cs b/Source/Mosa.Compiler.Framework/TransformContext.cs
@@ -32,7 +32,7 @@ public sealed class TransformContext
 
 	public BasicBlocks BasicBlocks { get; set; }
 
-	public bool LowerTo32 { get; private set; }
+	public bool IsLowerTo32 { get; private set; }
 
 	public bool IsInSSAForm { get; private set; }
 
@@ -125,12 +125,10 @@ public void SetCompiler(Compiler compiler)
 		Is32BitPlatform = Compiler.Architecture.Is32BitPlatform;
 		TypeSystem = Compiler.TypeSystem;
 
-		LowerTo32 = Compiler.MosaSettings.LongExpansion;
+		IsLowerTo32 = Compiler.MosaSettings.LongExpansion;
 		Devirtualization = Compiler.MosaSettings.Devirtualization;
 		Window = Math.Max(Compiler.MosaSettings.OptimizationBasicWindow, 1);
 
-		LowerTo32 = Compiler.MosaSettings.LongExpansion;
-
 		LoadInstruction = Is32BitPlatform ? IRInstruction.Load32 : IRInstruction.Load64;
 		StoreInstruction = Is32BitPlatform ? IRInstruction.Store32 : IRInstruction.Store64;
 		MoveInstruction = Is32BitPlatform ? IRInstruction.Move32 : IRInstruction.Move64;
@@ -153,7 +151,7 @@ public void SetMethodCompiler(MethodCompiler methodCompiler)
 		AreCPURegistersAllocated = methodCompiler.AreCPURegistersAllocated;
 		IsInSSAForm = methodCompiler.IsInSSAForm;
 
-		LowerTo32 = false;
+		IsLowerTo32 = false;
 		TraceLog = null;
 		Managers.Clear();
 
@@ -162,7 +160,7 @@ public void SetMethodCompiler(MethodCompiler methodCompiler)
 
 	public void SetStageOptions(bool lowerTo32)
 	{
-		LowerTo32 = Compiler.MosaSettings.LongExpansion && lowerTo32 && Is32BitPlatform;
+		IsLowerTo32 = Compiler.MosaSettings.LongExpansion && lowerTo32 && Is32BitPlatform;
 	}
 
 	#region Manager

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/ArithShiftRight64By32.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/ArithShiftRight64By32.cs
@@ -10,7 +10,7 @@ public ArithShiftRight64By32() : base(IRInstruction.ArithShiftRight64, Transform
 
 	public override bool Match(Context context, TransformContext transform)
 	{
-		return transform.LowerTo32 && context.Operand2.IsResolvedConstant && context.Operand2.ConstantUnsigned32 == 32;
+		return transform.IsLowerTo32 && context.Operand2.IsResolvedConstant && context.Operand2.ConstantUnsigned32 == 32;
 	}
 
 	public override void Transform(Context context, TransformContext transform)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/BaseLower32Transform.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/BaseLower32Transform.cs
@@ -12,7 +12,7 @@ public BaseLower32Transform(BaseInstruction instruction, TransformType type, boo
 
 		public override bool Match(Context context, TransformContext transform)
 		{
-			return transform.LowerTo32;
+			return transform.IsLowerTo32;
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Branch64.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Branch64.cs
@@ -18,7 +18,7 @@ public override bool Match(Context context, TransformContext transform)
 		if (branch64Extends.Match(context, transform))
 			return false;
 
-		return transform.LowerTo32;
+		return transform.IsLowerTo32;
 	}
 
 	public override void Transform(Context context, TransformContext transform)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Branch64Extends.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Branch64Extends.cs
@@ -10,7 +10,7 @@ public Branch64Extends() : base(IRInstruction.Branch64, TransformType.Manual | T
 
 	public override bool Match(Context context, TransformContext transform)
 	{
-		if (!transform.LowerTo32)
+		if (!transform.IsLowerTo32)
 			return false;
 
 		if (!context.Operand1.IsVirtualRegister)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Compare64x32EqualOrNotEqual.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Compare64x32EqualOrNotEqual.cs
@@ -13,7 +13,7 @@ public override bool Match(Context context, TransformContext transform)
 		if (context.ConditionCode != ConditionCode.Equal && context.ConditionCode != ConditionCode.NotEqual)
 			return false;
 
-		return transform.LowerTo32;
+		return transform.IsLowerTo32;
 	}
 
 	public override void Transform(Context context, TransformContext transform)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Compare64x32Rest.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Compare64x32Rest.cs
@@ -18,7 +18,7 @@ public override bool Match(Context context, TransformContext transform)
 		if (transform.IsInSSAForm)
 			return false;
 
-		return transform.LowerTo32;
+		return transform.IsLowerTo32;
 	}
 
 	public override void Transform(Context context, TransformContext transform)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Compare64x32RestInSSA.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Compare64x32RestInSSA.cs
@@ -18,7 +18,7 @@ public override bool Match(Context context, TransformContext transform)
 		if (!transform.IsInSSAForm)
 			return false;
 
-		return transform.LowerTo32;
+		return transform.IsLowerTo32;
 	}
 
 	public override void Transform(Context context, TransformContext transform)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Compare64x32UnsignedGreater.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Compare64x32UnsignedGreater.cs
@@ -14,7 +14,7 @@ public override bool Match(Context context, TransformContext transform)
 		if (context.ConditionCode != ConditionCode.UnsignedGreater)
 			return false;
 
-		return transform.LowerTo32;
+		return transform.IsLowerTo32;
 	}
 
 	public override void Transform(Context context, TransformContext transform)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Compare64x64EqualOrNotEqual.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Compare64x64EqualOrNotEqual.cs
@@ -13,7 +13,7 @@ public override bool Match(Context context, TransformContext transform)
 		if (context.ConditionCode != ConditionCode.Equal && context.ConditionCode != ConditionCode.NotEqual)
 			return false;
 
-		return transform.LowerTo32;
+		return transform.IsLowerTo32;
 	}
 
 	public override void Transform(Context context, TransformContext transform)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Compare64x64Rest.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Compare64x64Rest.cs
@@ -18,7 +18,7 @@ public override bool Match(Context context, TransformContext transform)
 		if (transform.IsInSSAForm)
 			return false;
 
-		return transform.LowerTo32;
+		return transform.IsLowerTo32;
 	}
 
 	public override void Transform(Context context, TransformContext transform)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Compare64x64RestInSSA.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/Compare64x64RestInSSA.cs
@@ -18,7 +18,7 @@ public override bool Match(Context context, TransformContext transform)
 		if (!transform.IsInSSAForm)
 			return false;
 
-		return transform.LowerTo32;
+		return transform.IsLowerTo32;
 	}
 
 	public override void Transform(Context context, TransformContext transform)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/ShiftLeft64ByConstant32.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/ShiftLeft64ByConstant32.cs
@@ -10,7 +10,7 @@ public ShiftLeft64ByConstant32() : base(IRInstruction.ShiftLeft64, TransformType
 
 	public override bool Match(Context context, TransformContext transform)
 	{
-		return transform.LowerTo32 && context.Operand2.IsResolvedConstant && context.Operand2.ConstantUnsigned32 <= 32;
+		return transform.IsLowerTo32 && context.Operand2.IsResolvedConstant && context.Operand2.ConstantUnsigned32 <= 32;
 	}
 
 	public override void Transform(Context context, TransformContext transform)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/ShiftLeft64ByConstant32Plus.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/ShiftLeft64ByConstant32Plus.cs
@@ -10,7 +10,7 @@ public ShiftLeft64ByConstant32Plus() : base(IRInstruction.ShiftLeft64, Transform
 
 	public override bool Match(Context context, TransformContext transform)
 	{
-		return transform.LowerTo32 && context.Operand2.IsResolvedConstant && context.Operand2.ConstantUnsigned32 > 32;
+		return transform.IsLowerTo32 && context.Operand2.IsResolvedConstant && context.Operand2.ConstantUnsigned32 > 32;
 	}
 
 	public override void Transform(Context context, TransformContext transform)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/ShiftRight64ByConstant32.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/ShiftRight64ByConstant32.cs
@@ -10,7 +10,7 @@ public ShiftRight64ByConstant32() : base(IRInstruction.ShiftRight64, TransformTy
 
 	public override bool Match(Context context, TransformContext transform)
 	{
-		return transform.LowerTo32 && context.Operand2.IsResolvedConstant && context.Operand2.ConstantUnsigned32 <= 32;
+		return transform.IsLowerTo32 && context.Operand2.IsResolvedConstant && context.Operand2.ConstantUnsigned32 <= 32;
 	}
 
 	public override void Transform(Context context, TransformContext transform)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/ShiftRight64ByConstant32Plus.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/ShiftRight64ByConstant32Plus.cs
@@ -10,7 +10,7 @@ public ShiftRight64ByConstant32Plus() : base(IRInstruction.ShiftRight64, Transfo
 
 	public override bool Match(Context context, TransformContext transform)
 	{
-		return transform.LowerTo32 && context.Operand2.IsResolvedConstant && context.Operand2.ConstantUnsigned32 > 32;
+		return transform.IsLowerTo32 && context.Operand2.IsResolvedConstant && context.Operand2.ConstantUnsigned32 > 32;
 	}
 
 	public override void Transform(Context context, TransformContext transform)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/SignExtend16x64.cs b/Source/Mosa.Compiler.Framework/Transforms/LowerTo32/SignExtend16x64.cs
@@ -10,7 +10,7 @@ public SignExtend16x64() : base(IRInstruction.SignExtend16x64, TransformType.Man
 
 	public override bool Match(Context context, TransformContext transform)
 	{
-		return transform.LowerTo32;
+		return transform.IsLowerTo32;
 	}
 
 	public override void Transform(Context context, TransformContext transform)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/Optimizations/Auto/AutoTransforms.cs b/Source/Mosa.Compiler.Framework/Transforms/Optimizations/Auto/AutoTransforms.cs
@@ -286,7 +286,6 @@ public static class AutoTransforms
 		new Simplification.Or32SignExtend16x32SignExtend16x32_v1(),
 		new Simplification.Or64SignExtend16x64SignExtend16x64(),
 		new Simplification.Or64SignExtend16x64SignExtend16x64_v1(),
-		new Simplification.Or32Truncate64x32Truncate64x32(),
 		new Simplification.SignExtend32x64Truncate64x32(),
 		new StrengthReduction.Add32Zero(),
 		new StrengthReduction.Add32Zero_v1(),
@@ -771,6 +770,7 @@ public static class AutoTransforms
 		new Simplification.Xor32Max_v1(),
 		new Simplification.Xor64Max(),
 		new Simplification.Xor64Max_v1(),
+		new LowerTo32.Or32Truncate64x32Truncate64x32(),
 		new Algebraic.Signed32AAPlusBBPlus2AB(),
 		new Algebraic.Signed32AAPlusBBPlus2AB_v1(),
 		new Algebraic.Signed32AAPlusBBPlus2AB_v2(),

diff --git a/...ication/Or32Truncate64x32Truncate64x32.cs → ...werTo32/Or32Truncate64x32Truncate64x32.cs b/...ication/Or32Truncate64x32Truncate64x32.cs → ...werTo32/Or32Truncate64x32Truncate64x32.cs
@@ -4,12 +4,12 @@
 
 using Mosa.Compiler.Framework;
 
-namespace Mosa.Compiler.Framework.Transforms.Optimizations.Auto.Simplification;
+namespace Mosa.Compiler.Framework.Transforms.Optimizations.Auto.LowerTo32;
 
 /// <summary>
 /// Or32Truncate64x32Truncate64x32
 /// </summary>
-[Transform("IR.Optimizations.Auto.Simplification")]
+[Transform("IR.Optimizations.Auto.LowerTo32")]
 public sealed class Or32Truncate64x32Truncate64x32 : BaseTransform
 {
 	public Or32Truncate64x32Truncate64x32() : base(IRInstruction.Or32, TransformType.Auto | TransformType.Optimization)
@@ -18,6 +18,12 @@ public Or32Truncate64x32Truncate64x32() : base(IRInstruction.Or32, TransformType
 
 	public override bool Match(Context context, TransformContext transform)
 	{
+		if (!transform.Is32BitPlatform)
+			return false;
+
+		if (!transform.IsLowerTo32)
+			return false;
+
 		if (!context.Operand1.IsVirtualRegister)
 			return false;
 

diff --git a/...ce/Mosa.Compiler.Framework/Transforms/Optimizations/Manual/Special/GetLow32CPURegister.cs b/...ce/Mosa.Compiler.Framework/Transforms/Optimizations/Manual/Special/GetLow32CPURegister.cs
@@ -16,7 +16,7 @@ public override bool Match(Context context, TransformContext transform)
 		if (!transform.Is32BitPlatform)
 			return false;
 
-		if (!transform.LowerTo32)
+		if (!transform.IsLowerTo32)
 			return false;
 
 		if (!context.Operand1.IsCPURegister)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/Optimizations/Manual/Special/GetLow32From64.cs b/Source/Mosa.Compiler.Framework/Transforms/Optimizations/Manual/Special/GetLow32From64.cs
@@ -16,7 +16,7 @@ public override bool Match(Context context, TransformContext transform)
 		if (!transform.Is32BitPlatform)
 			return false;
 
-		if (!transform.LowerTo32)
+		if (!transform.IsLowerTo32)
 			return false;
 
 		if (!context.Operand1.IsVirtualRegister)

diff --git a/Source/Mosa.Compiler.Framework/Transforms/Optimizations/Manual/Special/StoreLoad32.cs b/Source/Mosa.Compiler.Framework/Transforms/Optimizations/Manual/Special/StoreLoad32.cs
@@ -19,7 +19,7 @@ public override bool Match(Context context, TransformContext transform)
 		if (context.Operand1 != transform.StackFrame)
 			return false;
 
-		if (context.Operand2.Uses.Count != 2)
+		if (context.Operand2.Uses.Count != 2)   // FUTURE: traverse all uses
 			return false;
 
 		if (!(context.Operand3.IsConstant || context.Operand3.IsDefinedOnce))

diff --git a/Source/Mosa.Compiler.Framework/Transforms/Optimizations/Manual/Special/StoreLoad64.cs b/Source/Mosa.Compiler.Framework/Transforms/Optimizations/Manual/Special/StoreLoad64.cs
@@ -19,6 +19,9 @@ public override bool Match(Context context, TransformContext transform)
 		if (context.Operand1 != transform.StackFrame)
 			return false;
 
+		if (context.Operand2.Uses.Count != 2)   // FUTURE: traverse all uses
+			return false;
+
 		if (!(context.Operand3.IsConstant || context.Operand3.IsDefinedOnce))
 			return false;
 

diff --git a/...osa.Compiler.Framework/Transforms/Optimizations/Manual/Special/StoreLoadManagedPointer.cs b/...osa.Compiler.Framework/Transforms/Optimizations/Manual/Special/StoreLoadManagedPointer.cs
@@ -19,7 +19,7 @@ public override bool Match(Context context, TransformContext transform)
 		if (context.Operand1 != transform.StackFrame)
 			return false;
 
-		if (context.Operand2.Uses.Count != 2)
+		if (context.Operand2.Uses.Count != 2)   // FUTURE: traverse all uses
 			return false;
 
 		if (!context.Operand3.IsDefinedOnce)

diff --git a/Source/Mosa.Korlib/System.Threading/Interlocked.cs b/Source/Mosa.Korlib/System.Threading/Interlocked.cs
@@ -47,12 +47,8 @@ public static long Decrement(ref long location)
 	[MethodImplAttribute(MethodImplOptions.InternalCall)]
 	public static extern int CompareExchange(ref int location1, int value, int comparand);
 
-	//[MethodImplAttribute(MethodImplOptions.InternalCall)]
-	//public static extern long CompareExchange(ref long location1, long value, long comparand);
-	public static long CompareExchange(ref long location1, long value, long comparand)
-	{
-		return 0; //temp
-	}
+	[MethodImplAttribute(MethodImplOptions.InternalCall)]
+	public static extern long CompareExchange(ref long location1, long value, long comparand);
 
 	[MethodImplAttribute(MethodImplOptions.InternalCall)]
 	public static extern float CompareExchange(ref float location1, float value, float comparand);