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

added some debugging printfs()

Browse source
This commit is contained in:
Steffen Vogel 2014-02-07 11:04:12 +01:00
parent aa74d98737
commit 94b8897d58
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/syscall.c
View file

@ -416,7 +416,7 @@ static int sys_sbrk(int incr)
// allocation and mapping of new pages for the heap
// is catched by the pagefault handler
kprintf("sys_sbrk: task = %d, heap->start = %#lx, heap->end = %#lx, incr = %#4x\n", task->id, heap->start, heap->end, incr); // TOD0: remove
kprintf("sys_sbrk: task = %d, heap->start = %#lx, heap->end = %#lx, incr = %i\n", task->id, heap->start, heap->end, incr); // TOD0: remove
spinlock_unlock(&task->vma_lock);

10
mm/malloc.c
View file

@ -1,5 +1,5 @@
/*
* Copyright 2010 Steffen Vogel, Chair for Operating Systems,
* Copyright 2014 Steffen Vogel, Chair for Operating Systems,
* RWTH Aachen University
*
* Licensed under the Apache License, Version 2.0 (the "License");
@ -156,7 +156,7 @@ void pfree(void* addr, size_t sz)
size_t viraddr = (size_t) addr & PAGE_MASK;
uint32_t npages = PAGE_FLOOR(sz) >> PAGE_BITS;
// memory is propably not continously mapped!
// memory is propably not continously mapped! (userspace heap)
for (i=0; i<npages; i++) {
phyaddr = virt_to_phys(viraddr+i*PAGE_SIZE);
put_page(phyaddr);
@ -174,8 +174,6 @@ void* kmalloc(size_t sz)
// add space for the prefix
sz += sizeof(buddy_t);
kprintf("kmalloc(%lu)\n", sz); // TODO: remove
int exp = buddy_exp(sz);
if (BUILTIN_EXPECT(!exp, 0))
return NULL;
@ -188,6 +186,8 @@ void* kmalloc(size_t sz)
buddy->prefix.magic = BUDDY_MAGIC;
buddy->prefix.exponent = exp;
kprintf("kmalloc(%lu) = %p\n", sz, buddy+1); // TODO: remove
// pointer arithmetic: we hide the prefix
return buddy+1;
}
@ -197,6 +197,8 @@ void kfree(void *addr)
if (BUILTIN_EXPECT(!addr, 0))
return;
kprintf("kfree(%lu)\n", addr); // TODO: remove
buddy_t* buddy = (buddy_t*) addr - 1; // get prefix
// check magic

8
mm/memory.c
View file

@ -148,6 +148,8 @@ int put_pages(size_t phyaddr, size_t npages)
size_t i, ret = 0;
size_t base = phyaddr >> PAGE_BITS;
kprintf("put_pages: phyaddr=%#lx, npages = %d", phyaddr, npages); // TODO: remove
spinlock_lock(&bitmap_lock);
for (i=0; i<npages; i++) {
@ -162,7 +164,7 @@ int put_pages(size_t phyaddr, size_t npages)
atomic_int32_sub(&total_allocated_pages, ret);
atomic_int32_add(&total_available_pages, ret);
kprintf("put_pages: phyaddr=%#lx, npages = %d, ret = %d\n", phyaddr, npages, ret); // TODO: remove
kprintf(", ret = %d\n", ret); // TODO: remove
return ret;
}
@ -304,8 +306,8 @@ int mmu_init(void)
PAGE_FLOOR((size_t) &kernel_end),
VMA_READ|VMA_WRITE|VMA_EXECUTE|VMA_CACHEABLE);
// add LAPIC tp VMA list
vma_add((size_t) &kernel_start - PAGE_SIZE,
// add IOAPIC and LAPIC to VMA list
vma_add((size_t) &kernel_start - 2*PAGE_SIZE,
(size_t) &kernel_start,
VMA_READ|VMA_WRITE);