summaryrefslogtreecommitdiff
path: root/Source/Kernel/MemoryManager/Mem.ns.cpp
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-12-22 16:48:52 +0100
committerAlexis211 <alexis211@gmail.com>2009-12-22 16:48:52 +0100
commitbfec696da052c8c9320773ca69927422efebe8c7 (patch)
tree325efd88744344cd732d6e3d09bfebf3cb5847a4 /Source/Kernel/MemoryManager/Mem.ns.cpp
parent2c23da1cf398aef420130dde1b86e4c474e3cacb (diff)
downloadMelon-bfec696da052c8c9320773ca69927422efebe8c7.tar.gz
Melon-bfec696da052c8c9320773ca69927422efebe8c7.zip
[noncompiling commit] Started working on a segmented memory model
Diffstat (limited to 'Source/Kernel/MemoryManager/Mem.ns.cpp')
-rw-r--r--Source/Kernel/MemoryManager/Mem.ns.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Kernel/MemoryManager/Mem.ns.cpp b/Source/Kernel/MemoryManager/Mem.ns.cpp
index a0809b0..712c0f3 100644
--- a/Source/Kernel/MemoryManager/Mem.ns.cpp
+++ b/Source/Kernel/MemoryManager/Mem.ns.cpp
@@ -20,7 +20,7 @@ void *kallocInternal(size_t sz, bool align) {
u32int temp = placementAddress;
placementAddress += sz;
for (u32int i = temp; i < placementAddress; i += 0x1000) {
- if (pagingEnabled) kernelPageDirectory->allocFrame(i, false, false);
+ if (pagingEnabled) PhysMem::keSeg.allocFrame(i);
}
return (void*)temp;
}
@@ -34,7 +34,7 @@ void createHeap() {
u32int heapSize = HEAP_MIN_SIZE + heapIndexSize; //Calculate heap size
for (u32int i = (placementAddress & 0xFFFFF000); i < heapStart; i += 0x1000) {
- kernelPageDirectory->allocFrame(i, false, false);
+ PhysMem::keSeg.allocFrame(i);
}
kheap.create(heapStart, heapSize, heapIndexSize, kernelPageDirectory, false, false);