Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00
Code Issues Releases Wiki Activity

use kernel_stack and kernel_end to determine the size of the kernel

Browse source
This commit is contained in:
Stefan Lankes 2015-08-28 07:59:02 +02:00
parent a48e28f88f
commit 2a55eb781b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hermit/mm/memory.c
View file

@ -36,7 +36,6 @@
extern uint64_t base;
extern uint64_t limit;
extern uint64_t image_size;
typedef struct free_list {
size_t start, end;
@ -192,7 +191,7 @@ int copy_page(size_t pdest, size_t psrc)
int memory_init(void)
{
size_t addr;
size_t addr, image_size = (size_t) &kernel_end - (size_t) &kernel_start;
int ret = 0;
// enable paging and map Multiboot modules etc.
@ -204,13 +203,13 @@ int memory_init(void)
kprintf("memory_init: base 0x%zx, image_size 0x%zx, limit 0x%zx\n", base, image_size, limit);
// mark available memory as free
// determine available memory
for(addr=base; addr<limit; addr+=PAGE_SIZE) {
atomic_int64_inc(&total_pages);
atomic_int64_inc(&total_available_pages);
}
// mark kernel as used, we use 2MB pages to map the kernel
// determine allocated memory, we use 2MB pages to map the kernel
for(addr=base; addr<((base + image_size + 0x200000) & 0xFFFFFFFFFFE00000ULL); addr+=PAGE_SIZE) {
atomic_int64_inc(&total_allocated_pages);
atomic_int64_dec(&total_available_pages);
@ -220,6 +219,7 @@ int memory_init(void)
init_list.start = (base + image_size + 0x200000) & 0xFFFFFFFFFFE00000ULL;
init_list.end = limit;
init_list.prev = init_list.next = NULL;
kprintf("free list starts at 0x%zx, limit 0x%zx\n", init_list.start, init_list.end);
ret = vma_init();
if (BUILTIN_EXPECT(ret, 0))