kern

diff src/main.c @ 30:a2c6110bd24b

find changesets by author, revision, files, or words in the commit message
refactored the code a bit, and merged with the malloc implementation branch
author John Tsiombikas <nuclear@siggraph.org>
date Fri, 27 May 2011 22:09:10 +0300
parents 387078ef5c0d
children 3ed041d07ae1
line diff
     1.1 --- a/src/main.c	Sat Apr 23 00:51:18 2011 +0300
     1.2 +++ b/src/main.c	Fri May 27 22:09:10 2011 +0300
     1.3 @@ -5,6 +5,7 @@
     1.4  #include "asmops.h"
     1.5  #include "segm.h"
     1.6  #include "intr.h"
     1.7 +#include "mem.h"
     1.8  #include "vm.h"
     1.9  
    1.10  static void do_nothing();
    1.11 @@ -57,7 +58,13 @@
    1.12  	/* silence the blasted timer interrupt */
    1.13  	interrupt(32, do_nothing);
    1.14  
    1.15 -	init_vm(mbinf);
    1.16 +	/* initialize the physical memory manager */
    1.17 +	init_mem(mbinf);
    1.18 +	/* initialize paging and the virtual memory manager */
    1.19 +	init_vm();
    1.20 +
    1.21 +	/* initialization complete, enable interrupts */
    1.22 +	enable_intr();
    1.23  
    1.24  	dbg_print_vm(MEM_USER);
    1.25  	dbg_print_vm(MEM_KERNEL);