WebSVN – HelenOS – Diff – //branches/tracing/kernel/arch/ia32/src/boot/boot.S

 #include <arch/boot/boot.h>
 #include <arch/boot/memmap.h>
 #include <arch/mm/page.h>
 #include <arch/pm.h>
+#include <arch/cpuid.h>
 #define START_STACK (BOOT_OFFSET - BOOT_STACK_SIZE)
 .section K_TEXT_START, "ax"
 .align 4
 .global multiboot_image_start
 multiboot_header:
 	.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
 	.long 0
 	.long 0
 	.long multiboot_image_start
 multiboot_image_start:
 	cld
-	movl $START_STACK, %esp			# initialize stack pointer
+	movl $START_STACK, %esp     # initialize stack pointer
-	lgdt KA2PA(bootstrap_gdtr)		# initialize Global Descriptor Table register
+	lgdt KA2PA(bootstrap_gdtr)  # initialize Global Descriptor Table register
-	movw $selector(KDATA_DES), %cx
+	movw $gdtselector(KDATA_DES), %cx
 	movw %cx, %es
 	movw %cx, %fs
 	movw %cx, %gs
-	movw %cx, %ds					# kernel data + stack
+	movw %cx, %ds               # kernel data + stack
 	movw %cx, %ss
-	jmpl $selector(KTEXT_DES), $multiboot_meeting_point
+	jmpl $gdtselector(KTEXT_DES), $multiboot_meeting_point
 	multiboot_meeting_point:
-	movl %eax, grub_eax					# save parameters from GRUB
+	movl %eax, grub_eax         # save parameters from GRUB
 	movl %ebx, grub_ebx
-	xorl %eax, %eax
+	movl $(INTEL_CPUID_LEVEL), %eax
- 	cpuid
+	cpuid
- 	cmp $0x0, %eax						# any function > 0?
+	cmp $0x0, %eax              # any function > 0?
 	jbe pse_unsupported
-	movl $0x1, %eax						# Basic function code 1
+	movl $(INTEL_CPUID_STANDARD), %eax
 	cpuid
-	bt $3, %edx							# Test if PSE is supported
+	bt $(INTEL_PSE), %edx
 	jc pse_supported
 	pse_unsupported:
 		movl $pse_msg, %esi
 		jmp error_halt
 	pse_supported:
-#ifdef CONFIG_FB
-	mov $vesa_init, %esi
-	mov $VESA_INIT_SEGMENT << 4, %edi
-	mov $e_vesa_init - vesa_init, %ecx
-	rep movsb
-	mov $VESA_INIT_SEGMENT << 4, %edi
-	jmpl *%edi
-	vesa_meeting_point:
-	mov %esi, KA2PA(vesa_ph_addr)
-	mov %di, KA2PA(vesa_height)
-	shr $16, %edi
-	mov %di, KA2PA(vesa_width)
-	mov %bx, KA2PA(vesa_scanline)
-	shr $16, %ebx
-	mov %bx, KA2PA(vesa_bpp)
-#endif
-	call map_kernel							# map kernel and turn paging on
-	movl grub_eax, %eax
-	movl grub_ebx, %ebx
-	cmpl $MULTIBOOT_LOADER_MAGIC, %eax				# compare GRUB signature
-	je valid_boot
-		xorl %ecx, %ecx							# no memory map available
-		movl %ecx, e820counter
-		jmp invalid_boot
-	valid_boot:
-		movl (%ebx), %eax						# ebx = physical address of struct multiboot_info
-		bt $3, %eax								# mbi->flags[3] (mods_count, mods_addr valid)
-		jc mods_valid
-			xorl %ecx, %ecx
-			movl %ecx, init
-			jmp mods_end
-		mods_valid:
-		movl 20(%ebx), %ecx						# mbi->mods_count
-		movl %ecx, init
-		cmpl $0, %ecx
-		je mods_end
-		movl 24(%ebx), %esi						# mbi->mods_addr
-		movl $init, %edi
-		mods_loop:
-			movl 0(%esi), %edx					# mods->mod_start
-			addl $0x80000000, %edx
-			movl %edx, 4(%edi)
-			movl 4(%esi), %edx
+	bt $(INTEL_SEP), %edx
-			subl 0(%esi), %edx					# mods->mod_end - mods->mod_start
-			movl %edx, 8(%edi)
-			addl $16, %esi
-			addl $8	, %edi
-			loop mods_loop
-		mods_end:
-		bt $6, %eax								# mbi->flags[6] (mmap_length, mmap_addr valid)
-		jc mmap_valid
+	jc sep_supported
-			xorl %edx, %edx
-			jmp mmap_invalid
-		mmap_valid:
-		movl 44(%ebx), %ecx						# mbi->mmap_length
-		movl 48(%ebx), %esi						# mbi->mmap_addr
-		movl $e820table, %edi
-		xorl %edx, %edx
-		mmap_loop:
-			cmpl $0, %ecx
-			jle mmap_end
-			movl 4(%esi), %eax					# mmap->base_addr_low
-			movl %eax, (%edi)
-			movl 8(%esi), %eax					# mmap->base_addr_high
-			movl %eax, 4(%edi)
-			movl 12(%esi), %eax					# mmap->length_low
-			movl %eax, 8(%edi)
-			movl 16(%esi), %eax					# mmap->length_high
-			movl %eax, 12(%edi)
-			movl 20(%esi), %eax					# mmap->type
-			movl %eax, 16(%edi)
-			movl (%esi), %eax					# mmap->size
-			addl $0x4, %eax
-			addl %eax, %esi
-			subl %eax, %ecx
-			addl $MEMMAP_E820_RECORD_SIZE, %edi
-			incl %edx
-			jmp mmap_loop
-		mmap_end:
-		mmap_invalid:
-		movl %edx, e820counter
-	invalid_boot:
-#ifdef CONFIG_SMP
-	# copy AP bootstrap routines below 1 MB
-	movl $BOOT_OFFSET, %esi
+		movl $sep_msg, %esi
-	movl $AP_BOOT_OFFSET, %edi
-	movl $_hardcoded_unmapped_size, %ecx
-	rep movsb
+		jmp error_halt
-#endif
+	sep_supported:
-	call main_bsp								# never returns
+#include "vesa_prot.inc"
+	# map kernel and turn paging on
+	call map_kernel
+	# call arch_pre_main(grub_eax, grub_ebx)
+	pushl grub_ebx
+	pushl grub_eax
+	call arch_pre_main
+	call main_bsp
+	# not reached
 	cli
+	hlt0:
-	hlt
+		hlt
+		jmp hlt0
 .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
+	orl $(1 << 4), %ecx                 # turn PSE on
-	andl $(~(1 << 5)), %ecx						# turn PAE off
+	andl $(~(1 << 5)), %ecx             # turn PAE off
 	movl %ecx, %cr4
 	movl $(page_directory + 0), %esi
 	movl $(page_directory + 2048), %edi
 	xorl %ecx, %ecx
 	xorl %ebx, %ebx
-:
+	floop:
-	movl $((1 << 7) | (1 << 1) | (1 << 0)), %eax
+		movl $((1 << 7) | (1 << 1) | (1 << 0)), %eax
-	orl %ebx, %eax
+		orl %ebx, %eax
-	movl %eax, (%esi, %ecx, 4)					# mapping 0x00000000 + %ecx * 4M => 0x00000000 + %ecx * 4M
+		movl %eax, (%esi, %ecx, 4)      # mapping 0x00000000 + %ecx * 4M => 0x00000000 + %ecx * 4M
-	movl %eax, (%edi, %ecx, 4)					# mapping 0x80000000 + %ecx * 4M => 0x00000000 + %ecx * 4M
+		movl %eax, (%edi, %ecx, 4)      # mapping 0x80000000 + %ecx * 4M => 0x00000000 + %ecx * 4M
-	addl $(4 * 1024 * 1024), %ebx
+		addl $(4 * 1024 * 1024), %ebx
-	incl %ecx
+		incl %ecx
-	cmpl $512, %ecx
+		cmpl $512, %ecx
-	jl 0b
+		jl floop
 	movl %esi, %cr3
 	movl %cr0, %ebx
-	orl $(1 << 31), %ebx						# turn paging on
+	orl $(1 << 31), %ebx                # turn 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
+	movl $0xb8000, %edi         # base of EGA text mode memory
 	xorl %eax, %eax
-	movw $0x3d4, %dx						# read bits 8 - 15 of the cursor address
+	movw $0x3d4, %dx            # read bits 8 - 15 of the cursor address
 	movb $0xe, %al
 	outb %al, %dx
 	movw $0x3d5, %dx
 	inb %dx, %al
 	shl $8, %ax
-	movw $0x3d4, %dx						# read bits 0 - 7 of the cursor address
+	movw $0x3d4, %dx            # read bits 0 - 7 of the cursor address
 	movb $0xf, %al
 	outb %al, %dx
 	movw $0x3d5, %dx
 	inb %dx, %al
 	cmp $1920, %ax
 	jbe cursor_ok
-		movw $1920, %ax						# sanity check for the cursor on the last line
+		movw $1920, %ax         # sanity check for the cursor on the last line
 	cursor_ok:
 	movw %ax, %bx
 	shl $1, %eax
 	addl %eax, %edi
-	movw $0x0c00, %ax						# black background, light red foreground
+	movw $0x0c00, %ax           # black background, light red foreground
 	ploop:
 		lodsb
 		cmp $0, %al
 		je ploop_end
 		stosw
 		inc %bx
 		jmp ploop
 	ploop_end:
-	movw $0x3d4, %dx						# write bits 8 - 15 of the cursor address
+	movw $0x3d4, %dx            # write bits 8 - 15 of the cursor address
 	movb $0xe, %al
 	outb %al, %dx
 	movw $0x3d5, %dx
 	movb %bh, %al
 	outb %al, %dx
-	movw $0x3d4, %dx						# write bits 0 - 7 of the cursor address
+	movw $0x3d4, %dx            # write bits 0 - 7 of the cursor address
 	movb $0xf, %al
 	outb %al, %dx
 	movw $0x3d5, %dx
 	movb %bl, %al
 	outb %al, %dx
-	cli
-	hlt
-#ifdef CONFIG_FB
-vesa_init:
-	jmp $selector(VESA_INIT_DES), $vesa_init_real - vesa_init
-.code16
-vesa_init_real:
-	mov %cr0, %eax
-	and $~1, %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
-	mov %bx, %gs
-	mov %bx, %ds
-	mov %bx, %ss
-	movl %esp, %eax
-	movl $0x0000fffc, %esp
-	movl $0x0000fffc, %ebp
-	pushl %eax
-#define VESA_INFO_SIZE 1024
-#define VESA_MODE_ATTRIBUTES_OFFSET 0
-#define VESA_MODE_LIST_PTR_OFFSET 14
-#define VESA_MODE_SCANLINE_OFFSET 16
-#define VESA_MODE_WIDTH_OFFSET 18
-#define VESA_MODE_HEIGHT_OFFSET 20
-#define VESA_MODE_BPP_OFFSET 25
-#define VESA_MODE_PHADDR_OFFSET 40
-#define VESA_END_OF_MODES 0xffff
-#define VESA_OK 0x4f
-#define VESA_GET_INFO 0x4f00
-#define VESA_GET_MODE_INFO 0x4f01
-#define VESA_SET_MODE 0x4f02
-#define VESA_SET_PALETTE 0x4f09
-#if CONFIG_VESA_BPP == 24
-#define CONFIG_VESA_BPP_VARIANT 32
-#endif
-	mov $VESA_GET_INFO, %ax
-	mov $e_vesa_init - vesa_init, %di
-	push %di
-	int $0x10
-	pop %di
-	cmp $VESA_OK, %al
-	jnz 0f
-	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
-:# Try next mode
-	mov %gs:(%si), %cx
-	cmp $VESA_END_OF_MODES, %cx
-	jz 0f
-	inc %si
-	inc %si
+	cli
-	push %cx
-	push %di
-	push %si
-	mov $VESA_GET_MODE_INFO, %ax
-	int $0x10
-	pop %si
-	pop %di
-	pop %cx
-	cmp $VESA_OK, %al
-	jnz 0f
-	mov $CONFIG_VESA_WIDTH, %ax
-	cmp VESA_MODE_WIDTH_OFFSET(%di), %ax
-	jnz 1b
-	mov $CONFIG_VESA_HEIGHT, %ax
-	cmp VESA_MODE_HEIGHT_OFFSET(%di), %ax
-	jnz 1b
-	mov $CONFIG_VESA_BPP, %al
-	cmp VESA_MODE_BPP_OFFSET(%di), %al
-#ifdef CONFIG_VESA_BPP_VARIANT
-	jz 2f
-	mov $CONFIG_VESA_BPP_VARIANT, %al
-	cmp VESA_MODE_BPP_OFFSET(%di), %al
-#endif
-	jnz 1b
+	hlt1:
-:
-	mov %cx, %bx
-	or $0xc000, %bx
-	push %di
-	mov $VESA_SET_MODE, %ax
-	int $0x10
-	pop %di
-	cmp $VESA_OK, %al
-	jnz 0f
-#if CONFIG_VESA_BPP == 8
-	# Set 3:2:3 VGA palette
-	mov VESA_MODE_ATTRIBUTES_OFFSET(%di), %ax
-	push %di
-	mov $vga323 - vesa_init, %di
-	mov $0x100, %ecx
-	bt $5, %ax							# Test if VGA compatible registers are present
-	jnc vga_compat
-		# Try VESA routine to set palette
-		mov $VESA_SET_PALETTE, %ax
-		xor %bl, %bl
-		xor %dx, %dx
-		int $0x10
-		jmp vga_not_compat
-	vga_compat:
-		# Try VGA registers to set 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
+		hlt
-			movb %es:(%di), %al
-			outb %al, %dx
-			addw $4, %di
-			loop vga_loop
-	vga_not_compat:
-	pop %di
-#endif
-	mov VESA_MODE_PHADDR_OFFSET(%di), %esi
-	mov VESA_MODE_WIDTH_OFFSET(%di), %ax
-	shl $16, %eax
-	mov VESA_MODE_HEIGHT_OFFSET(%di), %ax
-	mov VESA_MODE_BPP_OFFSET(%di), %bl
-	xor %bh, %bh
-	shl $16, %ebx
-	mov VESA_MODE_SCANLINE_OFFSET(%di), %bx
-	mov %eax, %edi
-:
-	mov %cr0, %eax
-	or $1, %eax
-	mov %eax, %cr0
-	jmp 9f
+		jmp hlt1
-:
-	ljmpl $selector(KTEXT_DES), $(vesa_init_protect - vesa_init + VESA_INIT_SEGMENT << 4)
-:# No prefered mode found
-	mov $0x111, %cx
-	push %di
-	push %cx
-	mov $VESA_GET_MODE_INFO, %ax
-	int $0x10
-	pop %cx
-	pop %di
-	cmp $VESA_OK, %al
-	jnz 1f
-	jz 2b						# Force relative jump
-:
-	mov $0x0003, %ax
-	int $0x10
-	mov $0xffffffff, %edi		# EGA text mode used, because of problems with VESA
-	xor %ax, %ax
-	jz 8b						# Force relative jump
-vga323:
-#include "vga323.pal"
-.code32
-vesa_init_protect:
-	movw $selector(KDATA_DES), %cx
-	movw %cx, %es
-	movw %cx, %fs
-	movw %cx, %gs
-	movw %cx, %ds					# kernel data + stack
-	movw %cx, %ss
-	movl $START_STACK, %esp			# initialize stack pointer
-	jmpl $selector(KTEXT_DES), $vesa_meeting_point
-.align 4
-e_vesa_init:
+#include "vesa_real.inc"
-#endif
 .section K_DATA_START, "aw", @progbits
 .align 4096
 page_directory:
 grub_ebx:
 	.long 0
 pse_msg:
 	.asciz "Page Size Extension not supported. System halted."
+sep_msg:
+	.asciz "SYSENTER/SYSEXIT not supported. System halted."

Subversion Repositories HelenOS

(root)//branches/tracing/kernel/arch/ia32/src/boot/boot.S – Rev 2787 → 4377