Fix (#1050)

* -Merge * - Fix * - Fix * - Fix
mosa · May 14, 2023 · e338101 · e338101
1 parent 24d4740
commit e338101
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 7 deletions.
diff --git a/Source/Mosa.Platform.ARMv8A32/Transforms/IR/IRTransforms.cs b/Source/Mosa.Platform.ARMv8A32/Transforms/IR/IRTransforms.cs
@@ -15,6 +15,7 @@ public static class IRTransforms
 		new Add32(),
 		new AddCarryIn32(),
 		new AddCarryOut32(),
+		new AddManagedPointer(),
 		//new AddOverflowOut32(),
 		new AddR4(),
 		new AddR8(),
@@ -104,6 +105,7 @@ public static class IRTransforms
 		new Sub32(),
 		new SubCarryIn32(),
 		new SubCarryOut32(),
+		new SubManagedPointer(),
 		//new SubOverflowOut32(),
 		new SubR4(),
 		new SubR8(),

diff --git a/Source/Mosa.Platform.x64/Transforms/IR/IRTransforms.cs b/Source/Mosa.Platform.x64/Transforms/IR/IRTransforms.cs
@@ -15,6 +15,7 @@ public static class IRTransforms
 		new Add32(),
 		new AddCarryIn32(),
 		new AddCarryOut32(),
+		new AddManagedPointer(),
 		//new AddOverflowOut32(),
 		new AddR4(),
 		new AddR8(),
@@ -104,6 +105,7 @@ public static class IRTransforms
 		new Sub32(),
 		new SubCarryIn32(),
 		new SubCarryOut32(),
+		new SubManagedPointer(),
 		//new SubOverflowOut32(),
 		new SubR4(),
 		new SubR8(),

diff --git a/Source/Mosa.Platform.x86/Transforms/IR/IRTransforms.cs b/Source/Mosa.Platform.x86/Transforms/IR/IRTransforms.cs
@@ -15,6 +15,7 @@ public static class IRTransforms
 		new Add32(),
 		new AddCarryIn32(),
 		new AddCarryOut32(),
+		new AddManagedPointer(),
 		new AddOverflowOut32(),
 		new AddR4(),
 		new AddR8(),
@@ -102,6 +103,7 @@ public static class IRTransforms
 		new StoreParamObject(),
 		new StoreParamManagedPointer(),
 		new Sub32(),
+		new SubManagedPointer(),
 		new SubCarryIn32(),
 		new SubCarryOut32(),
 		new SubOverflowOut32(),

diff --git a/Source/Mosa.Runtime/Internal.cs b/Source/Mosa.Runtime/Internal.cs
@@ -188,19 +188,35 @@ public static Pointer UnboxAny(Pointer src, Pointer dest, uint size)
 
 	#region Memory Manipulation
 
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public static void MemoryCopy(Pointer dest, Pointer src, uint count)
 	{
-		// FUTURE: Improve
+		if (count % 4 == 0)
+			MemoryCopy4(dest, src, count);
+		else
+			MemoryCopy1(dest, src, count);
+	}
+
+	private static void MemoryCopy1(Pointer dest, Pointer src, uint count)
+	{
 		for (var i = 0; i < count; i++)
 		{
-			byte value = src.Load8(i);
+			var value = src.Load8(i);
 			dest.Store8(i, value);
 		}
 	}
 
+	private static void MemoryCopy4(Pointer dest, Pointer src, uint count)
+	{
+		for (var i = 0; i < count; i += 4)
+		{
+			var value = src.Load32(i);
+			dest.Store32(i, value);
+		}
+	}
+
 	public static void MemorySet(Pointer dest, byte value, uint count)
 	{
-		// FUTURE: Improve
 		for (var i = 0; i < count; i++)
 		{
 			dest.Store8(i, value);
@@ -209,7 +225,6 @@ public static void MemorySet(Pointer dest, byte value, uint count)
 
 	public static void MemorySet(Pointer dest, ushort value, uint count)
 	{
-		// FUTURE: Improve
 		for (var i = 0; i < count; i += 2)
 		{
 			dest.Store16(i, value);
@@ -218,7 +233,6 @@ public static void MemorySet(Pointer dest, ushort value, uint count)
 
 	public static void MemorySet(Pointer dest, uint value, uint count)
 	{
-		// FUTURE: Improve
 		for (var i = 0; i < count; i += 4)
 		{
 			dest.Store32(i, value);
@@ -227,13 +241,28 @@ public static void MemorySet(Pointer dest, uint value, uint count)
 
 	public static void MemoryClear(Pointer dest, uint count)
 	{
-		// FUTURE: Improve
-		for (int i = 0; i < count; i++)
+		if (count % 4 == 0)
+			MemoryClear4(dest, count);
+		else
+			MemoryClear1(dest, count);
+	}
+
+	private static void MemoryClear1(Pointer dest, uint count)
+	{
+		for (var i = 0; i < count; i++)
 		{
 			dest.Store8(i, 0);
 		}
 	}
 
+	private static void MemoryClear4(Pointer dest, uint count)
+	{
+		for (var i = 0; i < count; i += 4)
+		{
+			dest.Store32(i, 0);
+		}
+	}
+
 	#endregion Memory Manipulation
 
 	#region Virtual Machine