Index: kernel/arch/ia32/src/boot/boot.S =================================================================== --- kernel/arch/ia32/src/boot/boot.S (revision bac86377e1dbd799c062af0852acec649a1d3339) +++ kernel/arch/ia32/src/boot/boot.S (revision c685fc8841d46e4d5001a1ed3d6df9ad5b9e5bb4) @@ -1,30 +1,30 @@ -# -# Copyright (c) 2001-2004 Jakub Jermar -# Copyright (c) 2005-2006 Martin Decky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# +/* + * Copyright (c) 2001 Jakub Jermar + * Copyright (c) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #include @@ -34,9 +34,29 @@ #include -#define START_STACK (BOOT_OFFSET - BOOT_STACK_SIZE) +#define START_STACK (BOOT_OFFSET - BOOT_STACK_SIZE) .section K_TEXT_START, "ax" .code32 + +.macro pm_error msg + movl \msg, %esi + jmp pm_error_halt +.endm + +.macro pm_status msg +#ifdef CONFIG_EGA + pushl %esi + movl \msg, %esi + call pm_early_puts + popl %esi +#endif +.endm + +.macro pm2_status msg + pushl \msg + call early_puts +.endm + .align 4 .global multiboot_image_start @@ -44,5 +64,5 @@ .long MULTIBOOT_HEADER_MAGIC .long MULTIBOOT_HEADER_FLAGS - .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) # checksum + .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) /* checksum */ .long multiboot_header .long unmapped_ktext_start @@ -53,12 +73,17 @@ multiboot_image_start: cld - movl $START_STACK, %esp # initialize stack pointer - lgdt KA2PA(bootstrap_gdtr) # initialize Global Descriptor Table register - + + /* Initialize stack pointer */ + movl $START_STACK, %esp + + /* Initialize Global Descriptor Table register */ + lgdtl KA2PA(bootstrap_gdtr) + + /* Kernel data + stack */ movw $gdtselector(KDATA_DES), %cx movw %cx, %es movw %cx, %fs movw %cx, %gs - movw %cx, %ds # kernel data + stack + movw %cx, %ds movw %cx, %ss @@ -66,10 +91,13 @@ multiboot_meeting_point: - movl %eax, grub_eax # save parameters from GRUB + /* Save GRUB arguments */ + movl %eax, grub_eax movl %ebx, grub_ebx + + pm_status $status_prot movl $(INTEL_CPUID_LEVEL), %eax cpuid - cmp $0x0, %eax # any function > 0? + cmp $0x0, %eax /* any function > 0? */ jbe pse_unsupported @@ -80,26 +108,31 @@ pse_unsupported: - movl $pse_msg, %esi - jmp error_halt + + pm_error $err_pse pse_supported: #include "vesa_prot.inc" - - # map kernel and turn paging on + + /* Map kernel and turn paging on */ call map_kernel - # call arch_pre_main(grub_eax, grub_ebx) + /* Create the first stack frame */ + pushl $0 + movl %esp, %ebp + + pm2_status $status_prot2 + + /* Call arch_pre_main(grub_eax, grub_ebx) */ pushl grub_ebx pushl grub_eax call arch_pre_main - - # Create the first stack frame - pushl $0 - movl %esp, %ebp - + + pm2_status $status_main + + /* Call main_bsp() */ call main_bsp - # not reached + /* Not reached */ cli hlt0: @@ -107,13 +140,15 @@ jmp hlt0 +/** Setup mapping for the kernel. + * + * Setup mapping for both the unmapped and mapped sections + * of the kernel. For simplicity, we map the entire 4G space. + * + */ .global map_kernel map_kernel: - # - # Here we setup mapping for both the unmapped and mapped sections of the kernel. - # For simplicity, we map the entire 4G space. - # movl %cr4, %ecx - orl $(1 << 4), %ecx # turn PSE on - andl $(~(1 << 5)), %ecx # turn PAE off + orl $(1 << 4), %ecx /* PSE on */ + andl $(~(1 << 5)), %ecx /* PAE off */ movl %ecx, %cr4 @@ -126,6 +161,8 @@ movl $((1 << 7) | (1 << 1) | (1 << 0)), %eax orl %ebx, %eax - movl %eax, (%esi, %ecx, 4) # mapping 0x00000000 + %ecx * 4M => 0x00000000 + %ecx * 4M - movl %eax, (%edi, %ecx, 4) # mapping 0x80000000 + %ecx * 4M => 0x00000000 + %ecx * 4M + /* Mapping 0x00000000 + %ecx * 4M => 0x00000000 + %ecx * 4M */ + movl %eax, (%esi, %ecx, 4) + /* Mapping 0x80000000 + %ecx * 4M => 0x00000000 + %ecx * 4M */ + movl %eax, (%edi, %ecx, 4) addl $(4 * 1024 * 1024), %ebx @@ -137,14 +174,25 @@ movl %cr0, %ebx - orl $(1 << 31), %ebx # turn paging on + orl $(1 << 31), %ebx /* paging on */ movl %ebx, %cr0 ret -# Print string from %esi to EGA display (in red) and halt -error_halt: - movl $0xb8000, %edi # base of EGA text mode memory +/** Print string to EGA display (in light red) and halt. + * + * Should be executed from 32 bit protected mode with paging + * turned off. Stack is not required. This routine is used even + * if CONFIG_EGA is not enabled. Since we are going to halt the + * CPU anyway, it is always better to at least try to print + * some hints. + * + * @param %esi NULL-terminated string to print. + * + */ +pm_error_halt: + movl $0xb8000, %edi /* base of EGA text mode memory */ xorl %eax, %eax - movw $0x3d4, %dx # read bits 8 - 15 of the cursor address + /* Read bits 8 - 15 of the cursor address */ + movw $0x3d4, %dx movb $0xe, %al outb %al, %dx @@ -154,5 +202,6 @@ shl $8, %ax - movw $0x3d4, %dx # read bits 0 - 7 of the cursor address + /* Read bits 0 - 7 of the cursor address */ + movw $0x3d4, %dx movb $0xf, %al outb %al, %dx @@ -161,10 +210,11 @@ inb %dx, %al - cmp $1920, %ax - jbe cursor_ok - - movw $1920, %ax # sanity check for the cursor on the last line - - cursor_ok: + /* Sanity check for the cursor on screen */ + cmp $2000, %ax + jb err_cursor_ok + + movw $1998, %ax + + err_cursor_ok: movw %ax, %bx @@ -172,16 +222,40 @@ addl %eax, %edi - movw $0x0c00, %ax # black background, light red foreground - - ploop: + err_ploop: lodsb + cmp $0, %al - je ploop_end + je err_ploop_end + + movb $0x0c, %ah /* black background, light red foreground */ stosw + + /* Sanity check for the cursor on the last line */ inc %bx - jmp ploop - ploop_end: - - movw $0x3d4, %dx # write bits 8 - 15 of the cursor address + cmp $2000, %bx + jb err_ploop + + /* Scroll the screen (24 rows) */ + movl %esi, %edx + movl $0xb80a0, %esi + movl $0xb8000, %edi + movl $1920, %ecx + rep movsw + + /* Clear the 24th row */ + xorl %eax, %eax + movl $80, %ecx + rep stosw + + /* Go to row 24 */ + movl %edx, %esi + movl $0xb8f00, %edi + movw $1920, %bx + + jmp err_ploop + err_ploop_end: + + /* Write bits 8 - 15 of the cursor address */ + movw $0x3d4, %dx movb $0xe, %al outb %al, %dx @@ -191,5 +265,6 @@ outb %al, %dx - movw $0x3d4, %dx # write bits 0 - 7 of the cursor address + /* Write bits 0 - 7 of the cursor address */ + movw $0x3d4, %dx movb $0xf, %al outb %al, %dx @@ -204,4 +279,232 @@ jmp hlt1 +/** Print string to EGA display (in light green). + * + * Should be called from 32 bit protected mode with paging + * turned off. A stack space of at least 24 bytes is required, + * but the function does not establish a stack frame. + * + * Macros such as pm_status take care that this function + * is used only when CONFIG_EGA is enabled. + * + * @param %esi NULL-terminated string to print. + * + */ +pm_early_puts: + pushl %eax + pushl %ebx + pushl %ecx + pushl %edx + pushl %edi + + movl $0xb8000, %edi /* base of EGA text mode memory */ + xorl %eax, %eax + + /* Read bits 8 - 15 of the cursor address */ + movw $0x3d4, %dx + movb $0xe, %al + outb %al, %dx + + movw $0x3d5, %dx + inb %dx, %al + shl $8, %ax + + /* Read bits 0 - 7 of the cursor address */ + movw $0x3d4, %dx + movb $0xf, %al + outb %al, %dx + + movw $0x3d5, %dx + inb %dx, %al + + /* Sanity check for the cursor on screen */ + cmp $2000, %ax + jb pm_puts_cursor_ok + + movw $1998, %ax + + pm_puts_cursor_ok: + + movw %ax, %bx + shl $1, %eax + addl %eax, %edi + + pm_puts_ploop: + lodsb + + cmp $0, %al + je pm_puts_ploop_end + + movb $0x0a, %ah /* black background, light green foreground */ + stosw + + /* Sanity check for the cursor on the last line */ + inc %bx + cmp $2000, %bx + jb pm_puts_ploop + + /* Scroll the screen (24 rows) */ + movl %esi, %edx + movl $0xb80a0, %esi + movl $0xb8000, %edi + movl $1920, %ecx + rep movsw + + /* Clear the 24th row */ + xorl %eax, %eax + movl $80, %ecx + rep stosw + + /* Go to row 24 */ + movl %edx, %esi + movl $0xb8f00, %edi + movw $1920, %bx + + jmp pm_puts_ploop + pm_puts_ploop_end: + + /* Write bits 8 - 15 of the cursor address */ + movw $0x3d4, %dx + movb $0xe, %al + outb %al, %dx + + movw $0x3d5, %dx + movb %bh, %al + outb %al, %dx + + /* Write bits 0 - 7 of the cursor address */ + movw $0x3d4, %dx + movb $0xf, %al + outb %al, %dx + + movw $0x3d5, %dx + movb %bl, %al + outb %al, %dx + + popl %edi + popl %edx + popl %ecx + popl %ebx + popl %eax + + ret + +/** Print string to EGA display. + * + * Should be called from 32 bit protected mode (with paging + * enabled and stack established). This function is ABI compliant. + * + * If CONFIG_EGA is undefined or CONFIG_FB is defined + * then this function does nothing. + * + * @param %ebp+0x08 NULL-terminated string to print. + * + */ +early_puts: + +#if ((defined(CONFIG_EGA)) && (!defined(CONFIG_FB))) + + /* Prologue, save preserved registers */ + pushl %ebp + movl %esp, %ebp + pushl %ebx + pushl %esi + pushl %edi + + movl 0x08(%ebp), %esi + movl $(PA2KA(0xb8000)), %edi /* base of EGA text mode memory */ + xorl %eax, %eax + + /* Read bits 8 - 15 of the cursor address */ + movw $0x3d4, %dx + movb $0xe, %al + outb %al, %dx + + movw $0x3d5, %dx + inb %dx, %al + shl $8, %ax + + /* Read bits 0 - 7 of the cursor address */ + movw $0x3d4, %dx + movb $0xf, %al + outb %al, %dx + + movw $0x3d5, %dx + inb %dx, %al + + /* Sanity check for the cursor on screen */ + cmp $2000, %ax + jb early_puts_cursor_ok + + movw $1998, %ax + + early_puts_cursor_ok: + + movw %ax, %bx + shl $1, %eax + addl %eax, %edi + + early_puts_ploop: + lodsb + + cmp $0, %al + je early_puts_ploop_end + + movb $0x0e, %ah /* black background, yellow foreground */ + stosw + + /* Sanity check for the cursor on the last line */ + inc %bx + cmp $2000, %bx + jb early_puts_ploop + + /* Scroll the screen (24 rows) */ + movl %esi, %edx + movl $(PA2KA(0xb80a0)), %esi + movl $(PA2KA(0xb8000)), %edi + movl $1920, %ecx + rep movsw + + /* Clear the 24th row */ + xorl %eax, %eax + movl $80, %ecx + rep stosw + + /* Go to row 24 */ + movl %edx, %esi + movl $(PA2KA(0xb8f00)), %edi + movw $1920, %bx + + jmp early_puts_ploop + early_puts_ploop_end: + + /* Write bits 8 - 15 of the cursor address */ + movw $0x3d4, %dx + movb $0xe, %al + outb %al, %dx + + movw $0x3d5, %dx + movb %bh, %al + outb %al, %dx + + /* Write bits 0 - 7 of the cursor address */ + movw $0x3d4, %dx + movb $0xf, %al + outb %al, %dx + + movw $0x3d5, %dx + movb %bl, %al + outb %al, %dx + + /* Epilogue, restore preserved registers */ + popl %edi + popl %esi + popl %ebx + leave + +#endif + + ret + #include "vesa_real.inc" @@ -218,5 +521,17 @@ .long 0 -pse_msg: +err_pse: .asciz "Page Size Extension not supported. System halted." +status_prot: + .asciz "[prot] " +status_vesa_copy: + .asciz "[vesa_copy] " +status_grub_cmdline: + .asciz "[grub_cmdline] " +status_vesa_real: + .asciz "[vesa_real] " +status_prot2: + .asciz "[prot2] " +status_main: + .asciz "[main] " Index: kernel/arch/ia32/src/boot/vesa_prot.inc =================================================================== --- kernel/arch/ia32/src/boot/vesa_prot.inc (revision bac86377e1dbd799c062af0852acec649a1d3339) +++ kernel/arch/ia32/src/boot/vesa_prot.inc (revision c685fc8841d46e4d5001a1ed3d6df9ad5b9e5bb4) @@ -5,5 +5,7 @@ #define MBINFO_OFFSET_CMDLINE 16 - # copy real mode VESA initialization code + /* Copy real mode VESA initialization code */ + + pm_status $status_vesa_copy mov $vesa_init, %esi @@ -12,5 +14,7 @@ rep movsb - # check for GRUB command line + /* Check for GRUB command line */ + + pm_status $status_grub_cmdline mov grub_eax, %eax @@ -23,5 +27,5 @@ jnc no_cmdline - # skip the kernel path in command line + /* Skip the kernel path in command line */ mov MBINFO_OFFSET_CMDLINE(%ebx), %esi @@ -52,5 +56,5 @@ space_loop_done: - # copy at most 23 characters from command line + /* Copy at most 23 characters from command line */ mov $VESA_INIT_SEGMENT << 4, %edi @@ -68,5 +72,5 @@ cmd_loop_done: - # zero termination + /* Zero termination */ xor %eax, %eax @@ -75,5 +79,7 @@ no_cmdline: - # jump to the real mode + /* Jump to the real mode */ + + pm_status $status_vesa_real mov $VESA_INIT_SEGMENT << 4, %edi @@ -81,5 +87,5 @@ vesa_meeting_point: - # returned back to protected mode + /* Returned back to protected mode */ mov %ax, KA2PA(vesa_scanline) Index: kernel/arch/ia32/src/boot/vesa_real.inc =================================================================== --- kernel/arch/ia32/src/boot/vesa_real.inc (revision bac86377e1dbd799c062af0852acec649a1d3339) +++ kernel/arch/ia32/src/boot/vesa_real.inc (revision c685fc8841d46e4d5001a1ed3d6df9ad5b9e5bb4) @@ -31,5 +31,5 @@ vesa_init: jmp $gdtselector(VESA_INIT_DES), $vesa_init_real - vesa_init - + .code16 vesa_init_real: @@ -55,5 +55,5 @@ pushl %eax - # parse default mode string + /* Parse default mode string */ mov $default_mode - vesa_init, %di @@ -65,5 +65,5 @@ mov (%di), %al - # check for digit + /* Check for digit */ cmp $'0', %al @@ -75,5 +75,5 @@ sub $'0', %al - # multiply default_width by 10 and add digit + /* Multiply default_width by 10 and add digit */ mov default_width - vesa_init, %bx @@ -96,5 +96,5 @@ mov (%di), %al - # check for digit + /* Check for digit */ cmp $'0', %al @@ -106,5 +106,5 @@ sub $'0', %al - # multiply default_height by 10 and add digit + /* Multiply default_height by 10 and add digit */ mov default_height - vesa_init, %bx @@ -127,5 +127,5 @@ mov (%di), %al - # check for digit + /* Check for digit */ cmp $'0', %al @@ -137,5 +137,5 @@ sub $'0', %al - # multiply default_bpp by 10 and add digit + /* Multiply default_bpp by 10 and add digit */ mov default_bpp - vesa_init, %bx @@ -167,5 +167,6 @@ next_mode: - # try next mode + /* Try next mode */ + mov %gs:(%si), %cx cmp $VESA_END_OF_MODES, %cx @@ -186,5 +187,8 @@ jne no_mode - # check for proper attributes (supported, color, graphics, linear framebuffer) + /* + * Check for proper attributes (supported, + * color, graphics, linear framebuffer). + */ mov VESA_MODE_ATTRIBUTES_OFFSET(%di), %ax @@ -193,5 +197,5 @@ jne next_mode - # check for proper resolution + /* Check for proper resolution */ mov default_width - vesa_init, %ax @@ -203,5 +207,5 @@ jne next_mode - # check for proper bpp + /* Check for proper bpp */ mov default_bpp - vesa_init, %al @@ -213,5 +217,5 @@ jne next_mode - # for 24 bpp modes accept also 32 bit bpp + /* For 24 bpp modes accept also 32 bit bpp */ mov $32, %al @@ -230,5 +234,5 @@ jnz no_mode - # set 3:2:3 VGA palette + /* Set 3:2:3 VGA palette */ mov VESA_MODE_BPP_OFFSET(%di), %al @@ -241,8 +245,10 @@ mov $0x100, %ecx - bt $5, %ax # test if VGA compatible registers are present + /* Test if VGA compatible registers are present */ + bt $5, %ax jnc vga_compat - # try VESA routine to set palette + /* Use VESA routine to set the palette */ + mov $VESA_SET_PALETTE, %ax xor %bl, %bl @@ -254,14 +260,16 @@ vga_compat: - # try VGA registers to set palette - movw $0x3c6, %dx # set palette mask + + /* Use VGA registers to set the palette */ + + movw $0x3c6, %dx /* set palette mask */ movb $0xff, %al outb %al, %dx - movw $0x3c8, %dx # first index to set + movw $0x3c8, %dx /* first index to set */ xor %al, %al outb %al, %dx - movw $0x3c9, %dx # data port + movw $0x3c9, %dx /* data port */ vga_loop: @@ -284,10 +292,12 @@ vga_not_set: - # store mode parameters - # eax = bpp[8] scanline[16] - # ebx = width[16] height[16] - # edx = red_mask[8] red_pos[8] green_mask[8] green_pos[8] - # esi = blue_mask[8] blue_pos[8] - # edi = linear frame buffer + /* + * Store mode parameters: + * eax = bpp[8] scanline[16] + * ebx = width[16] height[16] + * edx = red_mask[8] red_pos[8] green_mask[8] green_pos[8] + * esi = blue_mask[8] blue_pos[8] + * edi = linear frame buffer + */ mov VESA_MODE_BPP_OFFSET(%di), %al @@ -328,5 +338,7 @@ no_mode: - # no prefered mode found + + /* No prefered mode found */ + mov $0x111, %cx push %di @@ -339,13 +351,15 @@ cmp $VESA_OK, %al jnz text_mode - jz set_mode # force relative jump + jz set_mode /* force relative jump */ text_mode: - # reset to EGA text mode (because of problems with VESA) + + /* Reset to EGA text mode (because of problems with VESA) */ + mov $0x0003, %ax int $0x10 mov $0xffffffff, %edi xor %ax, %ax - jz vesa_leave_real # force relative jump + jz vesa_leave_real /* force relative jump */ vga323: Index: kernel/arch/ia32/src/boot/vesa_ret.inc =================================================================== --- kernel/arch/ia32/src/boot/vesa_ret.inc (revision bac86377e1dbd799c062af0852acec649a1d3339) +++ kernel/arch/ia32/src/boot/vesa_ret.inc (revision c685fc8841d46e4d5001a1ed3d6df9ad5b9e5bb4) @@ -1,12 +1,16 @@ .code32 vesa_init_protected: + cld + + /* Initialize stack pointer */ + movl $START_STACK, %esp + + /* Kernel data + stack */ movw $gdtselector(KDATA_DES), %cx movw %cx, %es movw %cx, %fs movw %cx, %gs - movw %cx, %ds # kernel data + stack + movw %cx, %ds movw %cx, %ss - movl $START_STACK, %esp # initialize stack pointer - jmpl $gdtselector(KTEXT_DES), $vesa_meeting_point