Revert "Minor refactoring & Implement swap for memoryblock"

This reverts commit f68ce81.

Author: terminal-cs

source/Cosmos.Core/MemoryBlock.cs

@@ -10,48 +10,41 @@ namespace Cosmos.Core
     /// </summary>
     public class MemoryBlock
     {
-        /// <summary>
-        /// Create new instance of the <see cref="MemoryBlock"/> class.
-        /// </summary>
-        /// <param name="aBase">A base.</param>
-        /// <param name="aByteSize">A size.</param>
-        public MemoryBlock(uint aBase, uint aByteSize)
-        {
-            Base = aBase;
-            Size = aByteSize;
-            Bytes = new MemoryBlock08(aBase, aByteSize);
-            Words = new MemoryBlock16(aBase, aByteSize);
-            DWords = new MemoryBlock32(aBase, aByteSize);
-        }
-
-        #region Properties
-
         /// <summary>
         /// Memory block base address.
         /// </summary>
-        public uint Base { get; internal set; }
-
+        public readonly uint Base;
         /// <summary>
         /// Memory block size.
         /// </summary>
-        public uint Size { get; internal set; }
+        public readonly uint Size;
 
         /// <summary>
         /// Bytes memory block.
         /// </summary>
         public readonly MemoryBlock08 Bytes;
-
         /// <summary>
         /// Words memory block.
         /// </summary>
         public readonly MemoryBlock16 Words;
-
         /// <summary>
         /// DWords memory block.
         /// </summary>
         public readonly MemoryBlock32 DWords;
 
-        #endregion
+        /// <summary>
+        /// Create new instance of the <see cref="MemoryBlock"/> class.
+        /// </summary>
+        /// <param name="aBase">A base.</param>
+        /// <param name="aByteSize">A size.</param>
+        public MemoryBlock(uint aBase, uint aByteSize)
+        {
+            Base = aBase;
+            Size = aByteSize;
+            Bytes = new MemoryBlock08(aBase, aByteSize);
+            Words = new MemoryBlock16(aBase, aByteSize);
+            DWords = new MemoryBlock32(aBase, aByteSize);
+        }
 
         //TODO: Fill all these methods with fast ASM
         //TODO: Make an attribute that can be applied to methods to tell the copmiler to inline them to save
@@ -83,8 +76,6 @@ public unsafe uint this[uint aByteOffset]
             }
         }
 
-        #region Methods
-
         /// <summary>
         /// Fill memory block.
         /// </summary>
@@ -192,8 +183,7 @@ unsafe public void Copy(uint aByteOffset, uint[] aData, int aIndex, int aCount)
             // TODO thow exception if aStart and aCount are not in bound. I've tried to do this but Bochs dies :-(
             uint* xDest = (uint*)(Base + aByteOffset);
 
-            fixed (uint* aDataPtr = aData)
-            {
+            fixed (uint* aDataPtr = aData) {
                 MemoryOperations.Copy(xDest, aDataPtr + aIndex, aCount);
             }
         }
@@ -244,7 +234,7 @@ public void Copy(int[] aData)
         /// <exception cref="OverflowException">Thrown if aData length in greater then Int32.MaxValue.</exception>
         public void Copy(int[] aData, int aIndex, int aCount)
         {
-            if (aData.Length < aCount)
+            if(aData.Length < aCount)
             {
                 throw new IndexOutOfRangeException();
             }
@@ -280,20 +270,6 @@ public unsafe void Copy(ManagedMemoryBlock block)
             MemoryOperations.Copy(xDest, aDataPtr, (int)block.Size);
         }
 
-        /// <summary>
-        /// Swaps the internal pointer for a replacement and the replacement becomes the current pointer.
-        /// </summary>
-        /// <param name="toSwap">The pointer value to swap with.</param>
-        /// <param name="newSize">The new size that the memory block should have.</param>
-        public unsafe void Swap(ref uint toSwap, uint newSize, out uint oldSize)
-        {
-            // Assign the old size to the output size and set the new block size.
-            (oldSize, Size) = (Size, newSize);
-
-            // Swap both pointer values.
-            (Base, toSwap) = (toSwap, Base);
-        }
-
         /// <summary>
         /// Move bytes array down the memory block.
         /// </summary>
@@ -330,7 +306,7 @@ public void MoveUp(uint aDest, uint aSrc, uint aCount)
         /// <exception cref="Exception">Thrown on memory access violation.</exception>
         public unsafe void Read8(byte[] aBuffer)
         {
-            if (aBuffer.Length >= Size)
+            if(aBuffer.Length >= Size)
             {
                 throw new Exception("Memory access violation");
             }
@@ -348,7 +324,7 @@ public unsafe void Read8(byte[] aBuffer)
         /// <exception cref="Exception">Thrown on memory access violation.</exception>
         public unsafe void Write8(byte[] aBuffer)
         {
-            if (aBuffer.Length >= Size)
+            if(aBuffer.Length >= Size)
             {
                 throw new Exception("Memory access violation");
             }
@@ -366,7 +342,7 @@ public unsafe void Write8(byte[] aBuffer)
         /// <exception cref="Exception">Thrown on memory access violation.</exception>
         public unsafe void Read16(ushort[] aBuffer)
         {
-            if (aBuffer.Length >= Size)
+            if(aBuffer.Length >= Size)
             {
                 throw new Exception("Memory access violation");
             }
@@ -384,7 +360,7 @@ public unsafe void Read16(ushort[] aBuffer)
         /// <exception cref="Exception">Thrown on memory access violation.</exception>
         public unsafe void Write16(ushort[] aBuffer)
         {
-            if (aBuffer.Length >= Size)
+            if(aBuffer.Length >= Size)
             {
                 throw new Exception("Memory access violation");
             }
@@ -402,7 +378,7 @@ public unsafe void Write16(ushort[] aBuffer)
         /// <exception cref="Exception">Thrown on memory access violation.</exception>
         public unsafe void Read32(uint[] aBuffer)
         {
-            if (aBuffer.Length >= Size)
+            if(aBuffer.Length >= Size)
             {
                 throw new Exception("Memory access violation");
             }
@@ -420,7 +396,7 @@ public unsafe void Read32(uint[] aBuffer)
         /// <exception cref="Exception">Thrown on memory access violation.</exception>
         public unsafe void Write32(uint[] aBuffer)
         {
-            if (aBuffer.Length >= Size)
+            if(aBuffer.Length >= Size)
             {
                 throw new Exception("Memory access violation");
             }
@@ -458,7 +434,6 @@ public uint[] ToArray()
             return ToArray(0, 0, (int)Size);
         }
 
-        #endregion
     }
 
     /// <summary>