Improvement to mosa#85 Fix

Code improvement
Dynatrace-Rick-Boyd · Mar 29, 2015 · 10d6039 · 10d6039
1 parent 638a75b
commit 10d6039
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/Source/Mosa.Compiler.Framework/BaseMethodCompilerStage.cs b/Source/Mosa.Compiler.Framework/BaseMethodCompilerStage.cs
@@ -67,9 +67,9 @@ public abstract class BaseMethodCompilerStage : IMethodCompilerStage, ITraceFact
 		protected int NativePointerSize { get; private set; }
 
 		/// <summary>
-		/// Holds the native pointer alignment
+		/// Holds the native alignment
 		/// </summary>
-		protected int NativePointerAlignment { get; private set; }
+		protected int NativeAlignment { get; private set; }
 
 		/// <summary>
 		/// Gets the type of the platform internal runtime.
@@ -115,7 +115,7 @@ void IMethodCompilerStage.Initialize(BaseMethodCompiler compiler)
 			CallingConvention = Architecture.CallingConvention;
 
 			NativePointerSize = Architecture.NativePointerSize;
-			NativePointerAlignment = Architecture.NativeAlignment;
+			NativeAlignment = Architecture.NativeAlignment;
 			NativeInstructionSize = Architecture.NativeInstructionSize;
 
 			traceLogs = new List<TraceLog>();

diff --git a/Source/Mosa.Compiler.Framework/Stages/CILTransformationStage.cs b/Source/Mosa.Compiler.Framework/Stages/CILTransformationStage.cs
@@ -958,7 +958,7 @@ void CIL.ICILVisitor.Ldstr(Context context)
 
 			context.SetInstruction(IRInstruction.Move, context.Result, context.Operand1);
 
-			var symbol = linker.CreateSymbol(symbolName, SectionKind.ROData, NativePointerAlignment, NativePointerSize * 3 + stringdata.Length * 2);
+			var symbol = linker.CreateSymbol(symbolName, SectionKind.ROData, NativeAlignment, NativePointerSize * 3 + stringdata.Length * 2);
 			var stream = symbol.Stream;
 
 			// Type Definition and sync block

diff --git a/Source/Mosa.Compiler.Framework/Stages/ProtectedRegionLayoutStage.cs b/Source/Mosa.Compiler.Framework/Stages/ProtectedRegionLayoutStage.cs
@@ -45,7 +45,7 @@ private void EmitProtectedRegionTable()
 		{
 			var trace = CreateTraceLog("Regions");
 
-			var protectedRegionTableSymbol = MethodCompiler.Linker.CreateSymbol(MethodCompiler.Method.FullName + Metadata.ProtectedRegionTable, SectionKind.ROData, NativePointerAlignment, 0);
+			var protectedRegionTableSymbol = MethodCompiler.Linker.CreateSymbol(MethodCompiler.Method.FullName + Metadata.ProtectedRegionTable, SectionKind.ROData, NativeAlignment, 0);
 			var writer = new EndianAwareBinaryWriter(protectedRegionTableSymbol.Stream, Architecture.Endianness);
 
 			int sectioncount = 0;

diff --git a/Source/Mosa.Platform.x86/Architecture.cs b/Source/Mosa.Platform.x86/Architecture.cs
@@ -295,7 +295,7 @@ public override void InsertMoveInstruction(Context context, Operand destination,
 		/// <param name="size">The size.</param>
 		public override void InsertCompoundMoveInstruction(BaseMethodCompiler compiler, Context context, Operand destination, Operand source, int size)
 		{
-			int alignedSize = size - (size % 4);
+			int alignedSize = size - (size % NativeAlignment);
 			Debug.Assert(size > 0);
 
 			var src = source;
@@ -308,7 +308,7 @@ public override void InsertCompoundMoveInstruction(BaseMethodCompiler compiler,
 
 			context.AppendInstruction(X86.Lea, srcReg, src);
 			context.AppendInstruction(X86.Lea, dstReg, dest);
-			for (int i = 0; i < alignedSize; i += 4)
+			for (int i = 0; i < alignedSize; i += NativeAlignment)
 			{
 				context.AppendInstruction(X86.Mov, InstructionSize.Size32, tmp, Operand.CreateMemoryAddress(src.Type.TypeSystem.BuiltIn.I4, srcReg, i));
 				context.AppendInstruction(X86.Mov, InstructionSize.Size32, Operand.CreateMemoryAddress(dest.Type.TypeSystem.BuiltIn.I4, dstReg, i), tmp);

diff --git a/Source/Mosa.Platform.x86/Stages/IRTransformationStage.cs b/Source/Mosa.Platform.x86/Stages/IRTransformationStage.cs
@@ -346,7 +346,7 @@ void IIRVisitor.CompoundLoad(Context context)
 		{
 			var type = context.Result.Type;
 			int typeSize = TypeLayout.GetTypeSize(type);
-			int alignedTypeSize = typeSize - (typeSize % 4);
+			int alignedTypeSize = typeSize - (typeSize % NativeAlignment);
 			Debug.Assert(typeSize > 0, context.Operand2.Name);
 
 			int offset = 0;
@@ -373,7 +373,7 @@ void IIRVisitor.CompoundLoad(Context context)
 				context.AppendInstruction(X86.Add, srcReg, srcReg, offsetop);
 			}
 
-			for (int i = 0; i < alignedTypeSize; i += 4)
+			for (int i = 0; i < alignedTypeSize; i += NativeAlignment)
 			{
 				context.AppendInstruction(X86.Mov, InstructionSize.Size32, tmp, Operand.CreateMemoryAddress(TypeSystem.BuiltIn.I4, srcReg, i + offset));
 				context.AppendInstruction(X86.Mov, InstructionSize.Size32, Operand.CreateMemoryAddress(TypeSystem.BuiltIn.I4, dstReg, i), tmp);
@@ -529,7 +529,7 @@ void IIRVisitor.CompoundMove(Context context)
 		{
 			var type = context.Result.Type;
 			int typeSize = TypeLayout.GetTypeSize(type);
-			int alignedTypeSize = typeSize - (typeSize % 4);
+			int alignedTypeSize = typeSize - (typeSize % NativeAlignment);
 			Debug.Assert(typeSize > 0, MethodCompiler.Method.FullName);
 
 			var src = context.Operand1;
@@ -551,7 +551,7 @@ void IIRVisitor.CompoundMove(Context context)
 			}
 			context.AppendInstruction(X86.Lea, dstReg, dest);
 
-			for (int i = 0; i < alignedTypeSize; i += 4)
+			for (int i = 0; i < alignedTypeSize; i += NativeAlignment)
 			{
 				context.AppendInstruction(X86.Mov, InstructionSize.Size32, tmp, Operand.CreateMemoryAddress(TypeSystem.BuiltIn.I4, srcReg, i));
 				context.AppendInstruction(X86.Mov, InstructionSize.Size32, Operand.CreateMemoryAddress(TypeSystem.BuiltIn.I4, dstReg, i), tmp);
@@ -697,7 +697,7 @@ void IIRVisitor.CompoundStore(Context context)
 		{
 			var type = context.Operand3.Type;
 			int typeSize = TypeLayout.GetTypeSize(type);
-			int alignedTypeSize = typeSize - (typeSize % 4);
+			int alignedTypeSize = typeSize - (typeSize % NativeAlignment);
 			Debug.Assert(typeSize > 0, MethodCompiler.Method.FullName);
 
 			int offset = 0;
@@ -724,7 +724,7 @@ void IIRVisitor.CompoundStore(Context context)
 				context.AppendInstruction(X86.Add, dstReg, dstReg, offsetop);
 			}
 
-			for (int i = 0; i < alignedTypeSize; i += 4)
+			for (int i = 0; i < alignedTypeSize; i += NativeAlignment)
 			{
 				context.AppendInstruction(X86.Mov, InstructionSize.Size32, tmp, Operand.CreateMemoryAddress(TypeSystem.BuiltIn.I4, srcReg, i));
 				context.AppendInstruction(X86.Mov, InstructionSize.Size32, Operand.CreateMemoryAddress(TypeSystem.BuiltIn.I4, dstReg, i + offset), tmp);