X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fboot%2Fboot2.s;h=d44b634ea2f3dd4b41d927b66f1fd369ed7a192b;hb=b3d12cd7ebb86b8fafbb3ef9d2aaa9a4797b4f00;hp=37f102615d4c0ffe9a4c00b06c1b407427958366;hpb=4c7af0d72e32cc07c04345bc9fe57a4a32a29695;p=bootcensus

diff --git a/src/boot/boot2.s b/src/boot/boot2.s
index 37f1026..d44b634 100644
--- a/src/boot/boot2.s
+++ b/src/boot/boot2.s
@@ -554,10 +554,9 @@ kbc_wait_write:
 numbuf: .space 16
 
 
-# this is not boot loader code. It's called later on by the main
-# kernel code in 32bit protected mode. It's placed here because
-# it needs to be in base memory as it returns and runs in real mode.
-
+# this is not boot loader code. It's called later on by the main kernel
+# code in 32bit protected mode. It's placed here because it needs to be
+# located in base memory as it returns and runs in real mode.
 	.code32
 	.align 4
 	# place to save the protected mode IDTR pseudo-descriptor
@@ -571,15 +570,26 @@ idtaddr:.long 0
 rmidt:	.short 0x3ff
 	.long 0
 
-	# drop back to unreal mode to set video mode
-	.global set_mode13h
-set_mode13h:
+saved_esp: .long 0
+saved_ebp: .long 0
+
+	# drop back to unreal mode to call 16bit interrupt
+	.global int86
+int86:
+	push %ebp
+	mov %esp, %ebp
 	pushal
 	cli
 	# save protected mode IDTR and replace it with the real mode vectors
 	sidt (saved_idtr)
 	lidt (rmidt)
 
+	# modify the int instruction do this here before the
+	# cs-load jumps, to let them flush the instruction cache
+	mov $int_op, %ebx
+	movb 8(%ebp), %al
+	movb %al, 1(%ebx)
+
 	# long jump to load code selector for 16bit code (6)
 	ljmp $0x30,$0f
 0:
@@ -597,9 +607,22 @@ set_mode13h:
 	mov %ax, %ss
 	nop
 
-	# switch video mode by calling the video bios
-	mov $0x13, %ax
-	int $0x10
+	# load registers from the int86regs struct
+	mov %esp, saved_esp
+	mov %ebp, saved_ebp
+	mov 12(%ebp), %esp
+	popal
+	mov saved_esp, %esp
+
+	# call 16bit interrupt
+int_op:	int $0
+
+	mov saved_ebp, %ebp
+	mov 12(%ebp), %esp
+	add $34, %esp
+	pushfw
+	pushal
+	mov saved_esp, %esp
 
 	# re-enable protection
 	mov %cr0, %eax
@@ -620,6 +643,7 @@ set_mode13h:
 	lidt (saved_idtr)
 	sti
 	popal
+	pop %ebp
 	ret