From 21731c82e1aa2f90a7db062218a6f8958cbcb041 Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Fri, 6 Feb 2015 22:14:32 -0500 Subject: fix multiboot bug --- boot/head.S | 10 +++++----- 1 file 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 -- cgit v1.1