diff options
| author | Franklin Wei <frankhwei536@gmail.com> | 2015-02-06 22:14:32 -0500 |
|---|---|---|
| committer | Franklin Wei <frankhwei536@gmail.com> | 2015-02-06 22:14:32 -0500 |
| commit | 21731c82e1aa2f90a7db062218a6f8958cbcb041 (patch) | |
| tree | 83464294d66cf8f22f8438621d31242d08e837e0 | |
| parent | 4ed62ec3de6f166d20ed4bf628f953e842ae006a (diff) | |
| download | kappa-21731c82e1aa2f90a7db062218a6f8958cbcb041.zip kappa-21731c82e1aa2f90a7db062218a6f8958cbcb041.tar.gz kappa-21731c82e1aa2f90a7db062218a6f8958cbcb041.tar.bz2 kappa-21731c82e1aa2f90a7db062218a6f8958cbcb041.tar.xz | |
fix multiboot bug
| -rw-r--r-- | boot/head.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/boot/head.S b/boot/head.S index 62af7d1..4d17f73 100644 --- a/boot/head.S +++ b/boot/head.S @@ -1,7 +1,7 @@ .set ALIGN, 1<<0 .set MEMINFO, 1<<1 .set GFXMODE, 1<<2 # this flag enables the graphics fields - .set FLAGS, ALIGN | MEMINFO + .set FLAGS, ALIGN | MEMINFO | GFXMODE .set MAGIC, 0x1BADB002 # multiboot magic .set CHECKSUM, -(MAGIC + FLAGS) @@ -16,10 +16,10 @@ multiboot_header: .long 0 .long 0 .long 0 - .long 1 # text mode - .long 0 - .long 0 .long 0 + .long 320 + .long 200 + .long 32 .section .stack stack_bottom: # Stack grows up in addresses, so bottom is @@ -34,7 +34,7 @@ _start: cli movl $stack_top, %esp push %eax # multiboot magic - push %ebp # multiboot header + push %ebx # multiboot header call main cli hlt |