-Merge (#1048)

Source/Data/IR-Instructions.json

@@ -34,6 +34,13 @@
 			"OperandCount": 2,
 			"Commutative": "true"
 		},
+		{
+			"Name": "AddManagedPointer",
+			"FamilyName": "IR",
+			"ResultCount": 1,
+			"OperandCount": 2,
+			"Commutative": "true"
+		},
 		{
 			"Name": "AddCarryOut32",
 			"FamilyName": "IR",
@@ -172,6 +179,13 @@
 			"OperandCount": 2,
 			"ResultType": "Boolean"
 		},
+		{
+			"Name": "CompareManagedPointer",
+			"FamilyName": "IR",
+			"ResultCount": 1,
+			"OperandCount": 2,
+			"ResultType": "Boolean"
+		},
 		{
 			"Name": "Compare32x32",
 			"FamilyName": "IR",
@@ -221,6 +235,13 @@
 			"OperandCount": 0,
 			"FlowControl": "ConditionalBranch"
 		},
+		{
+			"Name": "BranchManagedPointer",
+			"FamilyName": "IR",
+			"ResultCount": 2,
+			"OperandCount": 0,
+			"FlowControl": "ConditionalBranch"
+		},
 		{
 			"Name": "ConvertR4ToR8",
 			"FamilyName": "IR",
@@ -522,6 +543,13 @@
 			"OperandCount": 2,
 			"MemoryRead": "true"
 		},
+		{
+			"Name": "LoadManagedPointer",
+			"FamilyName": "IR",
+			"ResultCount": 1,
+			"OperandCount": 2,
+			"MemoryRead": "true"
+		},
 		{
 			"Name": "LoadSignExtend8x32",
 			"FamilyName": "IR",
@@ -608,6 +636,14 @@
 			"MemoryRead": "true",
 			"ParameterLoad": "true"
 		},
+		{
+			"Name": "LoadParamManagedPointer",
+			"FamilyName": "IR",
+			"ResultCount": 1,
+			"OperandCount": 1,
+			"MemoryRead": "true",
+			"ParameterLoad": "true"
+		},
 		{
 			"Name": "LoadParamR4",
 			"FamilyName": "IR",
@@ -876,6 +912,12 @@
 			"ResultCount": 1,
 			"OperandCount": 1
 		},
+		{
+			"Name": "MoveManagedPointer",
+			"FamilyName": "IR",
+			"ResultCount": 1,
+			"OperandCount": 1
+		},
 		{
 			"Name": "MulCarryOut32",
 			"FamilyName": "IR",
@@ -980,6 +1022,13 @@
 			"OperandCount": 0,
 			"VariableOperands": "true"
 		},
+		{
+			"Name": "PhiManagedPointer",
+			"FamilyName": "IR",
+			"ResultCount": 0,
+			"OperandCount": 0,
+			"VariableOperands": "true"
+		},
 		{
 			"Name": "Phi32",
 			"FamilyName": "IR",
@@ -1085,6 +1134,13 @@
 			"OperandCount": 1,
 			"FlowControl": "Return"
 		},
+		{
+			"Name": "SetReturnManagedPointer",
+			"FamilyName": "IR",
+			"ResultCount": 0,
+			"OperandCount": 1,
+			"FlowControl": "Return"
+		},
 		{
 			"Name": "SetReturnCompound",
 			"FamilyName": "IR",
@@ -1180,6 +1236,13 @@
 			"OperandCount": 3,
 			"MemoryWrite": "true"
 		},
+		{
+			"Name": "StoreManagedPointer",
+			"FamilyName": "IR",
+			"ResultCount": 0,
+			"OperandCount": 3,
+			"MemoryWrite": "true"
+		},
 		{
 			"Name": "StoreParamCompound",
 			"FamilyName": "IR",
@@ -1212,6 +1275,14 @@
 			"MemoryWrite": "true",
 			"ParameterStore": "true"
 		},
+		{
+			"Name": "StoreParamManagedPointer",
+			"FamilyName": "IR",
+			"ResultCount": 0,
+			"OperandCount": 2,
+			"MemoryWrite": "true",
+			"ParameterStore": "true"
+		},
 		{
 			"Name": "StoreParam8",
 			"FamilyName": "IR",
@@ -1268,6 +1339,12 @@
 			"ResultCount": 1,
 			"OperandCount": 2
 		},
+		{
+			"Name": "SubManagedPointer",
+			"FamilyName": "IR",
+			"ResultCount": 1,
+			"OperandCount": 2
+		},
 		{
 			"Name": "SubCarryOut32",
 			"FamilyName": "IR",
@@ -1469,6 +1546,12 @@
 			"ResultCount": 1,
 			"OperandCount": 3
 		},
+		{
+			"Name": "IfThenElseManagedPointer",
+			"FamilyName": "IR",
+			"ResultCount": 1,
+			"OperandCount": 3
+		},
 		{
 			"Name": "BitCopyR4To32",
 			"FamilyName": "IR",

Source/Data/IR-Optimizations-ConstantMove.json

@@ -18,6 +18,14 @@
 			"Filter": "IsResolvedConstant(a) & !IsResolvedConstant(b)",
 			"Result": "(IR.AddR# b a)"
 		},
+		{
+			"Type": "ConstantMove",
+			"Name": "AddManagedPointer",
+			"SubName": "",
+			"Expression": "IR.AddManagedPointer a b",
+			"Filter": "IsResolvedConstant(a) & !IsResolvedConstant(b)",
+			"Result": "(IR.AddManagedPointer b a)"
+		},
 		{
 			"Type": "ConstantMove",
 			"Name": "MulSigned##",

Source/Data/IR-Optimizations-Rewrite.json

@@ -26,7 +26,8 @@
 		"IR.Compare32x64",
 		"IR.Compare64x32",
 		"IR.Compare64x64",
-		"IR.CompareObject"
+		"IR.CompareObject",
+		"IR.CompareManagedPointer"
 	],
 	"Optimizations": [
 		{
@@ -38,6 +39,15 @@
 			"Result": "(IR.CompareObject {!= u} a b)",
 			"Variations": "Yes"
 		},
+		{
+			"Type": "Rewrite",
+			"Name": "CompareManagedPointer",
+			"SubName": "GreaterThanZero",
+			"Expression": "IR.CompareManagedPointer {> u} a b",
+			"Filter": "IsZero(b)",
+			"Result": "(IR.CompareManagedPointer {!= u} a b)",
+			"Variations": "Yes"
+		},
 		{
 			"Type": "Rewrite",
 			"Name": "Compare32x##",

Source/Data/IR-Optimizations-Simplification.json

@@ -40,6 +40,14 @@
 			"Filter": "",
 			"Result": "(IR.MoveObject a)"
 		},
+		{
+			"Type": "Simplification",
+			"Name": "MoveManagedPointer",
+			"SubName": "Coalescing",
+			"Expression": "IR.MoveManagedPointer (IR.MoveManagedPointer a)",
+			"Filter": "",
+			"Result": "(IR.MoveManagedPointer a)"
+		},
 		{
 			"Type": "Simplification",
 			"Name": "Not##",
@@ -264,6 +272,15 @@
 			"Result": "(IR.Move32 [To32(1)])",
 			"Variations": "Yes"
 		},
+		{
+			"Type": "Simplification",
+			"Name": "CompareManagedPointer",
+			"SubName": "SameAndEqual",
+			"Expression": "IR.CompareManagedPointer {==, >=, <=, >= u, <= u} a a",
+			"Filter": "",
+			"Result": "(IR.Move32 [To32(1)])",
+			"Variations": "Yes"
+		},
 		{
 			"Type": "Simplification",
 			"Name": "CompareObject",
@@ -273,6 +290,15 @@
 			"Result": "(IR.Move32 [To32(0)])",
 			"Variations": "Yes"
 		},
+		{
+			"Type": "Simplification",
+			"Name": "CompareManagedPointer",
+			"SubName": "SameAndNotEqual",
+			"Expression": "IR.CompareManagedPointer {!=, >, <, > u, < u} a a",
+			"Filter": "",
+			"Result": "(IR.Move32 [To32(0)])",
+			"Variations": "Yes"
+		},
 		{
 			"Type": "Simplification",
 			"Name": "Compare32x##",

Source/Data/IR-Optimizations-StrengthReduction.json

@@ -6,6 +6,7 @@
 		"IR.Add64",
 		"IR.AddR4",
 		"IR.AddR8",
+		"IR.AddManagedPointer",
 		"IR.And32",
 		"IR.And64",
 		"IR.Or32",
@@ -48,6 +49,16 @@
 			"Priority": "80",
 			"Variations": "Yes"
 		},
+		{
+			"Type": "StrengthReduction",
+			"Name": "AddManagedPointer",
+			"SubName": "Zero",
+			"Expression": "IR.AddManagedPointer a 0",
+			"Filter": "",
+			"Result": "(IR.MoveManagedPointer [To32(0)])",
+			"Priority": "80",
+			"Variations": "Yes"
+		},
 		{
 			"Type": "StrengthReduction",
 			"Name": "And32",
@@ -173,6 +184,24 @@
 			"Result": "(IR.Move## [To##(0)])",
 			"Priority": "80"
 		},
+		{
+			"Type": "StrengthReduction",
+			"Name": "SubManagedPointer",
+			"SubName": "ByZero",
+			"Expression": "IR.SubManagedPointer a 0",
+			"Filter": "",
+			"Result": "(IR.MoveManagedPointer a)",
+			"Priority": "80"
+		},
+		{
+			"Type": "StrengthReduction",
+			"Name": "SubManagedPointer",
+			"SubName": "Same",
+			"Expression": "IR.SubManagedPointer a a",
+			"Filter": "",
+			"Result": "(IR.MoveManagedPointer [To32(0)])",
+			"Priority": "80"
+		},
 		{
 			"Type": "StrengthReduction",
 			"Name": "Xor##",

Source/Mosa.Compiler.Framework/BaseMethodCompilerStage.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using Mosa.Compiler.Common.Exceptions;
+using Mosa.Compiler.Framework.IR;
 using Mosa.Compiler.Framework.Linker;
 using Mosa.Compiler.Framework.Trace;
 using Mosa.Compiler.MosaTypeSystem;
@@ -720,6 +721,7 @@ public static bool IsMoveInstruction(BaseInstruction instruction)
 		return instruction == IRInstruction.Move32
 			|| instruction == IRInstruction.Move64
 			|| instruction == IRInstruction.MoveObject
+			|| instruction == IRInstruction.MoveManagedPointer
 			|| instruction == IRInstruction.MoveR8
 			|| instruction == IRInstruction.MoveR4;
 	}
@@ -731,6 +733,7 @@ public static bool IsCompareInstruction(BaseInstruction instruction)
 			|| instruction == IRInstruction.Compare64x32
 			|| instruction == IRInstruction.Compare64x64
 			|| instruction == IRInstruction.CompareObject
+			|| instruction == IRInstruction.CompareManagedPointer
 			|| instruction == IRInstruction.CompareR4
 			|| instruction == IRInstruction.CompareR8;
 	}
@@ -740,6 +743,7 @@ public static bool IsPhiInstruction(BaseInstruction instruction)
 		return instruction == IRInstruction.Phi32
 			|| instruction == IRInstruction.Phi64
 			|| instruction == IRInstruction.PhiObject
+			|| instruction == IRInstruction.PhiManagedPointer
 			|| instruction == IRInstruction.PhiR4
 			|| instruction == IRInstruction.PhiR8;
 	}
@@ -773,11 +777,6 @@ public List<BasicBlock> AddMissingBlocksIfRequired(List<BasicBlock> blocks)
 		return list;
 	}
 
-	protected BaseInstruction Select(BaseInstruction instruction32, BaseInstruction instruction64)
-	{
-		return Is32BitPlatform ? instruction32 : instruction64;
-	}
-
 	public static void ReplaceOperand(Operand target, Operand replacement)
 	{
 		foreach (var node in target.Uses.ToArray())

Source/Mosa.Compiler.Framework/IR/AddManagedPointer.cs

@@ -0,0 +1,19 @@
+// Copyright (c) MOSA Project. Licensed under the New BSD License.
+
+// This code was generated by an automated template.
+
+namespace Mosa.Compiler.Framework.IR;
+
+/// <summary>
+/// AddManagedPointer
+/// </summary>
+/// <seealso cref="Mosa.Compiler.Framework.IR.BaseIRInstruction" />
+public sealed class AddManagedPointer : BaseIRInstruction
+{
+	public AddManagedPointer()
+		: base(2, 1)
+	{
+	}
+
+	public override bool IsCommutative => true;
+}

Source/Mosa.Compiler.Framework/IR/BranchManagedPointer.cs

@@ -0,0 +1,19 @@
+// Copyright (c) MOSA Project. Licensed under the New BSD License.
+
+// This code was generated by an automated template.
+
+namespace Mosa.Compiler.Framework.IR;
+
+/// <summary>
+/// BranchManagedPointer
+/// </summary>
+/// <seealso cref="Mosa.Compiler.Framework.IR.BaseIRInstruction" />
+public sealed class BranchManagedPointer : BaseIRInstruction
+{
+	public BranchManagedPointer()
+		: base(0, 2)
+	{
+	}
+
+	public override FlowControl FlowControl => FlowControl.ConditionalBranch;
+}