WebSVN – HelenOS – Diff – /branches/rcu/kernel/arch/amd64/src/boot/boot.S

 	multiboot_meeting_point:
 	movl %eax, grub_eax							# save parameters from GRUB
 	movl %ebx, grub_ebx
+	# Protected 32-bit. We want to reuse the code-seg descriptor,
+	# the Default operand size must not be 1 when entering long mode
+	movl $0x80000000, %eax
+ 	cpuid
+ 	cmp $0x80000000, %eax						# any function > 80000000h?
+	jbe long_mode_unsupported
+	movl $(AMD_CPUID_EXTENDED), %eax			# Extended function code 80000001
+	cpuid
+	bt $29, %edx								# Test if long mode is supported.
+ 	jc long_mode_supported
+	long_mode_unsupported:
+		movl $long_mode_msg, %esi
+		jmp error_halt
+	long_mode_supported:
 #ifdef CONFIG_FB
-	mov $vesa_init, %esi;
+	mov $vesa_init, %esi
 	mov $VESA_INIT_SEGMENT << 4, %edi
 	mov $e_vesa_init - vesa_init, %ecx
 	cld
 	rep movsb
 	mov %di, KA2PA(vesa_width)
 	mov %bx, KA2PA(vesa_scanline)
 	shr $16, %ebx
 	mov %bx, KA2PA(vesa_bpp)
 #endif
-	# Protected 32-bit. We want to reuse the code-seg descriptor,
-	# the Default operand size must not be 1 when entering long mode
-	movl $0x80000000, %eax
- 	cpuid
- 	cmp $0x80000000, %eax						# any function > 80000000h?
-	jbe long_mode_unsupported
-	movl $(AMD_CPUID_EXTENDED), %eax			# Extended function code 80000001
-	cpuid
-	bt $29, %edx								# Test if long mode is supported.
- 	jc long_mode_supported
-	long_mode_unsupported:
-		cli
-		hlt
-	long_mode_supported:
 	# Enable 64-bit page transaltion entries - CR4.PAE = 1.
 	# Paging is not enabled until after long mode is enabled
 	movl %cr4, %eax
 	movl $0x0000fffc, %esp
     movl $0x0000fffc, %ebp
 #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_SCANLINE_OFFSET 16
 #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
 #define CONFIG_VESA_BPP_a 255
 #if CONFIG_VESA_BPP == 24
-#undef CONFIG_VESA_BPP_a
-#define CONFIG_VESA_BPP_a 32
+#define CONFIG_VESA_BPP_VARIANT 32
 #endif
 	mov $VESA_GET_INFO, %ax
 	mov $e_vesa_init - vesa_init, %di
 	push %di
 	int $0x10
 	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
 	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_a, %al
+	mov $CONFIG_VESA_BPP_VARIANT, %al
 	cmp VESA_MODE_BPP_OFFSET(%di), %al
+#endif
 	jnz 1b
 :
 	mov %cx, %bx
 	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
+			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 $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 $gdtselector(KDATA_DES), %cx
 	movw %cx, %es
 	#  when _visible_ part of GS does not point to user-mode segment
 	movw $gdtselector(UDATA_DES), %cx
 	movw %cx, %fs
 	movw %cx, %gs
+	movl $START_STACK, %esp			# initialize stack pointer
 	jmpl $gdtselector(KTEXT32_DES), $vesa_meeting_point
 .align 4
 e_vesa_init:
 #endif
+# Print string from %esi to EGA display (in red) and halt
+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
+	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
+	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
+	cursor_ok:
+	movw %ax, %bx
+	shl $1, %eax
+	addl %eax, %edi
+	movw $0x0c00, %ax						# black background, light red foreground
+	cld
+	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
+	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
+	movb $0xf, %al
+	outb %al, %dx
+	movw $0x3d5, %dx
+	movb %bl, %al
+	outb %al, %dx
+	cli
+	hlt
 .section K_DATA_START, "aw", @progbits
 .align 4096
 # Identical mapping of first 64MB and the same of -2GB -> 0
 grub_eax:
 	.long 0
 grub_ebx:
 	.long 0
+long_mode_msg:
+	.asciz "64 bit long mode not supported. System halted."

Subversion Repositories HelenOS

(root)/branches/rcu/kernel/arch/amd64/src/boot/boot.S – Rev 2131 → 2307