# HG changeset patch # User John Tsiombikas # Date 1306490903 -10800 # Node ID 3ed041d07ae13f95883e5ba43ee18bb58ff27b50 # Parent bdd9bf70269d32f4063e90b5007e69f758bd6c76 ops ... range->size = pgcount * PGSIZE not pg * PGSIZE diff -r bdd9bf70269d -r 3ed041d07ae1 src/klibc/malloc.c --- a/src/klibc/malloc.c Fri May 27 12:05:38 2011 +0300 +++ b/src/klibc/malloc.c Fri May 27 13:08:23 2011 +0300 @@ -90,7 +90,7 @@ range = alloc_node(); range->start = PAGE_TO_ADDR(pg); - range->size = pg * PGSIZE; + range->size = pgcount * PGSIZE; add_range(range); goto find_range; } diff -r bdd9bf70269d -r 3ed041d07ae1 src/main.c --- a/src/main.c Fri May 27 12:05:38 2011 +0300 +++ b/src/main.c Fri May 27 13:08:23 2011 +0300 @@ -69,6 +69,24 @@ dbg_print_vm(MEM_USER); dbg_print_vm(MEM_KERNEL); + { + void *foo, *bar, *xyzzy, *koko, *lala; + + foo = malloc(128); + bar = malloc(32 * 1024); + xyzzy = malloc(8000); + + free(bar); + + koko = malloc(700); + lala = malloc(6 * 1024 * 1024); + + free(xyzzy); + free(foo); + free(koko); + free(lala); + } + for(;;) { char c, keypress; do {