Heap

datascientist1976 · Jun 15, 2016 · 95c0021 · 95c0021
1 parent a4b05c8
commit 95c0021
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/Docs/Kernel/Memory.md b/Docs/Kernel/Memory.md
@@ -110,15 +110,15 @@ Is portable and simple. Can even be used without VirtMem, but increases time dur
 
 ```
 MM API
--Allocate new item
++Allocate new item
 -Add/remove ref
 -Lock/unlock an item
 -Force a compact
 -Resize a heap item - now way to integrate .NET as it doesnt resize ever (copies instead), but may be useful internally.
 Could also plug stringbuilder resize, etc. Possibly even special strings when used internally?
 
 Implicit
--Get pointer
++Get pointer
 
 Internal
 -Compact

diff --git a/source/Cosmos.Core.Memory.Test/RAT.cs b/source/Cosmos.Core.Memory.Test/RAT.cs
@@ -56,7 +56,7 @@ static public void Init(byte* aStartPtr, Native aSize) {
       // We need one status byte for each block.
       // Intel blocks are 4k (10 bits). So for 4GB, this means
       // 32 - 12 = 20 bits, 1 MB for a RAT for 4GB. 0.025%
-      Native xRatPageCount = mPageCount / (PageSize - 1) + 1;
+      Native xRatPageCount = (mPageCount - 1) / PageSize + 1;
       Native xRatPageBytes = xRatPageCount * PageSize;
       mRAT = mRamStart + mRamSize - xRatPageBytes;
       for (Native i = 0; i < xRatPageBytes - xRatPageCount; i++) {
@@ -66,8 +66,6 @@ static public void Init(byte* aStartPtr, Native aSize) {
         mRAT[i] = PageType.RAT;
       }
 
-      mRAT = Alloc(PageType.RAT, xRatPageCount);
-
       Heap.Init();
     }
 

diff --git a/source/Cosmos.Core.Memory.Test/UnitTest1.cs b/source/Cosmos.Core.Memory.Test/UnitTest1.cs
@@ -16,12 +16,12 @@ unsafe public void TestMethod1() {
         Native xRatPages = RAT.GetPageCount(RAT.PageType.RAT);
         Assert.IsTrue(xRatPages > 0);
 
-        Native xFreePages = RAT.GetPageCount(RAT.PageType.Empty);
+        var xFreePages = RAT.GetPageCount(RAT.PageType.Empty);
         Assert.IsTrue(xFreePages > 0);
 
         var x1 = (Int32*)Heap.Alloc(sizeof(Int32));
-        xFreePages = RAT.GetPageCount(RAT.PageType.Empty);
-        Assert.IsTrue(xFreePages > 0);
+        var xFreePages2 = RAT.GetPageCount(RAT.PageType.Empty);
+        Assert.IsTrue(xFreePages - xFreePages2 == 1);
       }
     }
   }