Index: kernel/arch/ia32/src/boot/vesa_prot.inc =================================================================== --- kernel/arch/ia32/src/boot/vesa_prot.inc (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) +++ kernel/arch/ia32/src/boot/vesa_prot.inc (revision 95aed62f997beed657c99c003a81e20a7a71d608) @@ -5,87 +5,87 @@ /* Copy real mode VESA initialization code */ - + pm_status $status_vesa_copy - + mov $vesa_init, %esi mov $VESA_INIT_SEGMENT << 4, %edi mov $e_vesa_init - vesa_init, %ecx rep movsb - + /* Check for multiboot command line */ - + pm_status $status_multiboot_cmdline - + mov multiboot_eax, %eax cmp $MULTIBOOT_LOADER_MAGIC, %eax jne no_cmdline - + mov multiboot_ebx, %ebx mov (%ebx), %eax bt $MBINFO_BIT_CMDLINE, %eax jnc no_cmdline - + /* Skip the kernel path in command line */ - + mov MBINFO_OFFSET_CMDLINE(%ebx), %esi - + skip_loop: lodsb - + cmp $0, %al je no_cmdline - + cmp $' ', %al je skip_loop_done - + jmp skip_loop skip_loop_done: - + space_loop: mov (%esi), %al - + cmp $0, %al je no_cmdline - + cmp $' ', %al jne space_loop_done - + inc %esi jmp space_loop space_loop_done: - + /* Copy at most 23 characters from command line */ - + mov $VESA_INIT_SEGMENT << 4, %edi add $default_mode - vesa_init, %edi mov $23, %ecx - + cmd_loop: lodsb stosb - + cmp $0, %al je cmd_loop_done - + loop cmd_loop cmd_loop_done: - + /* Zero termination */ - + xor %eax, %eax stosb - + no_cmdline: - + /* Jump to the real mode */ - + pm_status $status_vesa_real - + mov $VESA_INIT_SEGMENT << 4, %edi jmpl *%edi - + vesa_meeting_point: /* Returned back to protected mode */ - + /* * Initialize Global Descriptor Table and @@ -94,34 +94,34 @@ lgdtl bootstrap_gdtr lidtl bootstrap_idtr - + movzx %ax, %ecx mov %ecx, KA2PA(bfb_scanline) - + shr $16, %eax mov %ax, KA2PA(bfb_bpp) - + movzx %bx, %ecx mov %ecx, KA2PA(bfb_height) - + shr $16, %ebx mov %ebx, KA2PA(bfb_width) - + mov %dl, KA2PA(bfb_green_pos) - + shr $8, %edx mov %dl, KA2PA(bfb_green_size) - + shr $8, %edx mov %dl, KA2PA(bfb_red_pos) - + shr $8, %edx mov %dl, KA2PA(bfb_red_size) - + mov %esi, %edx mov %dl, KA2PA(bfb_blue_pos) - + shr $8, %edx mov %dl, KA2PA(bfb_blue_size) - + mov %edi, KA2PA(bfb_addr) #endif Index: kernel/arch/ia32/src/boot/vesa_real.inc =================================================================== --- kernel/arch/ia32/src/boot/vesa_real.inc (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) +++ kernel/arch/ia32/src/boot/vesa_real.inc (revision 95aed62f997beed657c99c003a81e20a7a71d608) @@ -31,7 +31,7 @@ vesa_init: lidtl vesa_idtr - + mov $GDT_SELECTOR(VESA_INIT_DATA_DES), %bx - + mov %bx, %es mov %bx, %fs @@ -39,5 +39,5 @@ mov %bx, %ds mov %bx, %ss - + jmp $GDT_SELECTOR(VESA_INIT_CODE_DES), $vesa_init_real - vesa_init @@ -51,10 +51,10 @@ and $~CR0_PE, %eax mov %eax, %cr0 - + jmp $VESA_INIT_SEGMENT, $vesa_init_real2 - vesa_init vesa_init_real2: mov $VESA_INIT_SEGMENT, %bx - + mov %bx, %es mov %bx, %fs @@ -62,32 +62,32 @@ mov %bx, %ds mov %bx, %ss - + movl %esp, %eax movl $0x0000fffc, %esp movl $0x0000fffc, %ebp pushl %eax - + /* Parse default mode string */ - + mov $default_mode - vesa_init, %di xor %eax, %eax xor %ebx, %ebx - + mov $8, %ecx parse_width: mov (%di), %al - + /* Check for digit */ - + cmp $'0', %al jb parse_width_done - + cmp $'9', %al ja parse_width_done - + sub $'0', %al - + /* Multiply default_width by 10 and add digit */ - + mov default_width - vesa_init, %bx lea (%ebx, %ebx, 4), %ebx @@ -95,30 +95,30 @@ add %ax, %bx mov %bx, default_width - vesa_init - + inc %di loop parse_width parse_width_done: - + mov (%di), %al cmp $0, %al jz parse_done inc %di - + mov $8, %ecx parse_height: mov (%di), %al - + /* Check for digit */ - + cmp $'0', %al jb parse_height_done - + cmp $'9', %al ja parse_height_done - + sub $'0', %al - + /* Multiply default_height by 10 and add digit */ - + mov default_height - vesa_init, %bx lea (%ebx, %ebx, 4), %ebx @@ -126,30 +126,30 @@ add %ax, %bx mov %bx, default_height - vesa_init - + inc %di loop parse_height parse_height_done: - + mov (%di), %al cmp $0, %al jz parse_done inc %di - + mov $4, %ecx parse_bpp: mov (%di), %al - + /* Check for digit */ - + cmp $'0', %al jb parse_bpp_done - + cmp $'9', %al ja parse_bpp_done - + sub $'0', %al - + /* Multiply default_bpp by 10 and add digit */ - + mov default_bpp - vesa_init, %bx lea (%ebx, %ebx, 4), %ebx @@ -157,11 +157,11 @@ add %ax, %bx mov %bx, default_bpp - vesa_init - + inc %di loop parse_bpp parse_bpp_done: - + parse_done: - + mov $VESA_GET_INFO, %ax mov $e_vesa_init - vesa_init, %di @@ -178,22 +178,22 @@ movl $0x32454256, (%di) int $0x10 - + pop %di cmp $VESA_OK, %al jnz no_mode - + mov 2 + VESA_MODE_LIST_PTR_OFFSET(%di), %si mov %si, %gs mov VESA_MODE_LIST_PTR_OFFSET(%di), %si - + add $VESA_INFO_SIZE, %di - + next_mode: /* Try next mode */ - + mov %gs:(%si), %cx cmp $VESA_END_OF_MODES, %cx je no_mode - + inc %si inc %si @@ -203,5 +203,5 @@ mov $VESA_GET_MODE_INFO, %ax int $0x10 - + pop %si pop %di @@ -209,41 +209,41 @@ cmp $VESA_OK, %al jne no_mode - + /* * Check for proper attributes (supported, * color, graphics, linear framebuffer). */ - + mov VESA_MODE_ATTRIBUTES_OFFSET(%di), %ax and $0x99, %ax cmp $0x99, %ax jne next_mode - + /* Check for proper resolution */ - + mov default_width - vesa_init, %ax cmp VESA_MODE_WIDTH_OFFSET(%di), %ax jne next_mode - + mov default_height - vesa_init, %ax cmp VESA_MODE_HEIGHT_OFFSET(%di), %ax jne next_mode - + /* Check for proper bpp */ - + mov default_bpp - vesa_init, %al cmp VESA_MODE_BPP_OFFSET(%di), %al je set_mode - + mov $24, %al cmp default_bpp - vesa_init, %al jne next_mode - + /* For 24 bpp modes accept also 32 bit bpp */ - + mov $32, %al cmp VESA_MODE_BPP_OFFSET(%di), %al jne next_mode - + set_mode: mov %cx, %bx @@ -252,67 +252,67 @@ mov $VESA_SET_MODE, %ax int $0x10 - + pop %di cmp $VESA_OK, %al jnz no_mode - + /* Set 3:2:3 VGA palette */ - + mov VESA_MODE_BPP_OFFSET(%di), %al cmp $8, %al jnz vga_not_set - + mov VESA_MODE_ATTRIBUTES_OFFSET(%di), %ax push %di mov $vga323 - vesa_init, %di mov $0x100, %ecx - + /* Test if VGA compatible registers are present */ bt $5, %ax jnc vga_compat - + /* Use VESA routine to set the palette */ - + mov $VESA_SET_PALETTE, %ax xor %bl, %bl xor %dx, %dx int $0x10 - + cmp $0x00, %ah je vga_not_compat - + vga_compat: - + /* 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 */ xor %al, %al outb %al, %dx - + movw $0x3c9, %dx /* data port */ - + vga_loop: movb %es:2(%di), %al outb %al, %dx - + movb %es:1(%di), %al outb %al, %dx - + movb %es:(%di), %al outb %al, %dx - + addw $4, %di loop vga_loop - + vga_not_compat: - + pop %di - + vga_not_set: - + /* * Store mode parameters: @@ -323,46 +323,46 @@ * edi = linear frame buffer */ - + mov VESA_MODE_BPP_OFFSET(%di), %al xor %ah, %ah shl $16, %eax mov VESA_MODE_SCANLINE_OFFSET(%di), %ax - + mov VESA_MODE_WIDTH_OFFSET(%di), %bx shl $16, %ebx mov VESA_MODE_HEIGHT_OFFSET(%di), %bx - + mov VESA_MODE_BLUE_MASK_OFFSET(%di), %dl shl $8, %edx mov VESA_MODE_BLUE_POS_OFFSET(%di), %dl mov %edx, %esi - + mov VESA_MODE_RED_MASK_OFFSET(%di), %dl shl $8, %edx mov VESA_MODE_RED_POS_OFFSET(%di), %dl - + shl $8, %edx mov VESA_MODE_GREEN_MASK_OFFSET(%di), %dl shl $8, %edx mov VESA_MODE_GREEN_POS_OFFSET(%di), %dl - + mov VESA_MODE_PHADDR_OFFSET(%di), %edi - + vesa_leave_real: - + mov %cr0, %ecx or $CR0_PE, %ecx mov %ecx, %cr0 - + jmp vesa_leave_real2 - + vesa_leave_real2: - + ljmpl $GDT_SELECTOR(KTEXT32_DES), $(vesa_init_protected - vesa_init + VESA_INIT_SEGMENT << 4) - + no_mode: - + /* No prefered mode found */ - + mov $0x111, %cx push %di @@ -370,5 +370,5 @@ mov $VESA_GET_MODE_INFO, %ax int $0x10 - + pop %cx pop %di @@ -376,17 +376,17 @@ jnz text_mode jz set_mode /* force relative jump */ - + text_mode: - + /* Reset to EGA text mode (because of problems with VESA) */ - + mov $0x0003, %ax int $0x10 - + xor %eax, %eax xor %ebx, %ebx xor %edx, %edx xor %edi, %edi - + jz vesa_leave_real /* force relative jump */ Index: kernel/arch/ia32/src/boot/vesa_ret.inc =================================================================== --- kernel/arch/ia32/src/boot/vesa_ret.inc (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) +++ kernel/arch/ia32/src/boot/vesa_ret.inc (revision 95aed62f997beed657c99c003a81e20a7a71d608) @@ -3,8 +3,8 @@ cli cld - + /* Initialize stack pointer */ movl $START_STACK, %esp - + /* Kernel data + stack */ movw $GDT_SELECTOR(KDATA_DES), %cx @@ -14,4 +14,4 @@ movw %cx, %ds movw %cx, %ss - + jmpl $GDT_SELECTOR(KTEXT_DES), $vesa_meeting_point