kern

diff src/boot/mboot.S @ 16:2cbc2b922e49

adding paging
author John Tsiombikas <nuclear@member.fsf.org>
date Sat, 26 Mar 2011 12:27:57 +0200
parents 7f9af8cddc96
children
line diff
     1.1 --- a/src/boot/mboot.S	Sat Mar 05 16:59:49 2011 +0200
     1.2 +++ b/src/boot/mboot.S	Sat Mar 26 12:27:57 2011 +0200
     1.3 @@ -1,5 +1,6 @@
     1.4  #define MAGIC		0x1badb002
     1.5 -#define FLAGS		0
     1.6 +/* flags with bit 1 set means we need memory info */
     1.7 +#define FLAGS		2
     1.8  #define STACK_SIZE	0x4000
     1.9  
    1.10  	.text
    1.11 @@ -17,7 +18,9 @@
    1.12  	/* reset eflags register */
    1.13  	pushl $0
    1.14  	popf
    1.15 -	/* call the kernel main function */
    1.16 +	/* call the kernel main function. ebx points to the
    1.17 +     * multiboot information structure */
    1.18 +	push %ebx
    1.19  	call kmain
    1.20  	/* we dropped out of main, halt the CPU */
    1.21  	cli