stv0g/eduOS
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'stage5' into stage6

Browse source
This commit is contained in:
Stefan Lankes 2014-12-27 23:28:25 +01:00
commit f0c0a764ea
4 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/x86/kernel/entry.asm
View file

@ -83,9 +83,9 @@ cpu_init:
mov cr3, eax
; Set CR4
mov cr4, eax
and eax, ~(1 << 9) ; disable SSE
or eax, (1 << 4) ; enable PSE
mov eax, cr4
and eax, 0xfffbf9ff ; disable SSE
or eax, (1 << 4) ; enable PSE
mov cr4, eax
; Set CR0

2
arch/x86/mm/page.c
View file

@ -282,7 +282,7 @@ int page_init()
for(i=0; i<mb_info->mods_count; i++) {
addr = mmodule[i].mod_start;
npages = PAGE_FLOOR(mmodule[i].mod_end - mmodule[i].mod_start) >> PAGE_BITS;
page_map(addr, addr, npages, PG_USER | PG_GLOBAL);
page_map(addr, addr, npages, PG_GLOBAL);
}
}
}

3
kernel/main.c
View file

@ -143,7 +143,8 @@ int main(void)
kprintf("Kernel starts at %p and ends at %p\n", &kernel_start, &kernel_end);
kprintf("Processor frequency: %u MHz\n", get_cpu_frequency());
kprintf("Total memory: %lu KiB\n", atomic_int32_read(&total_pages) * PAGE_SIZE / 1024);
kprintf("Total memory available: %lu KiB\n", atomic_int32_read(&total_available_pages) * PAGE_SIZE / 1024);
kprintf("Current allocated memory: %lu KiB\n", atomic_int32_read(&total_allocated_pages) * PAGE_SIZE / 1024);
kprintf("Curren available memory: %lu KiB\n", atomic_int32_read(&total_available_pages) * PAGE_SIZE / 1024);
create_kernel_task(&id1, foo, "foo1", NORMAL_PRIO);

14
mm/memory.c
View file

@ -169,22 +169,27 @@ int memory_init(void)
// parse multiboot information for available memory
if (mb_info) {
if (mb_info->flags & MULTIBOOT_INFO_MEM_MAP) {
size_t end_addr;
multiboot_memory_map_t* mmap = (multiboot_memory_map_t*) ((size_t) mb_info->mmap_addr);
multiboot_memory_map_t* mmap_end = (void*) ((size_t) mb_info->mmap_addr + mb_info->mmap_length);
// mark available memory as free
while (mmap < mmap_end) {
if (mmap->type == MULTIBOOT_MEMORY_AVAILABLE) {
for (addr=mmap->addr; addr < mmap->addr + mmap->len; addr += PAGE_SIZE) {
/* set the available memory as "unused" */
addr = mmap->addr;
end_addr = addr + mmap->len;
while ((addr < end_addr) && (addr < (BITMAP_SIZE*8*PAGE_SIZE))) {
page_clear_mark(addr >> PAGE_BITS);
addr += PAGE_SIZE;
atomic_int32_inc(&total_pages);
atomic_int32_inc(&total_available_pages);
}
}
mmap++;
}
}
else if (mb_info->flags & MULTIBOOT_INFO_MEM) {
} else if (mb_info->flags & MULTIBOOT_INFO_MEM) {
size_t page;
size_t pages_lower = mb_info->mem_lower >> 2; /* KiB to page number */
size_t pages_upper = mb_info->mem_upper >> 2;
@ -192,6 +197,9 @@ int memory_init(void)
for (page=0; page<pages_lower; page++)
page_clear_mark(page);
if (pages_upper > BITMAP_SIZE*8-256)
pages_upper = BITMAP_SIZE*8-256;
for (page=0; page<pages_upper; page++)
page_clear_mark(page + 256); /* 1 MiB == 256 pages offset */