X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=bootcensus;a=blobdiff_plain;f=src%2Fstartup.s;h=01090cd69c3fb15e81052074a423d24f5a4a092d;hp=bff3991ff9e631fab41b2b4b419a3a68eba1f006;hb=81c11bdd80190ec319a82b0402173cfb65fcbf72;hpb=559dd7c3c836a69eac46bd12c7ef61bb5de8882c

diff --git a/src/startup.s b/src/startup.s
index bff3991..01090cd 100644
--- a/src/startup.s
+++ b/src/startup.s
@@ -1,5 +1,5 @@
 # pcboot - bootable PC demo/game kernel
-# Copyright (C) 2018  John Tsiombikas <nuclear@member.fsf.org>
+# Copyright (C) 2018-2019  John Tsiombikas <nuclear@member.fsf.org>
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,18 +19,66 @@
 
 	.extern _bss_start
 	.extern _bss_end
+	.extern pcboot_main
+	.extern wait_vsync
+	.extern kb_getkey
+
+	.equ STACKTOP,0x80000
+
+	# move the stack to the top of the conventional memory
+	cli
+	movl $STACKTOP, %esp
+	# push a 0 ret-addr to terminate gdb backtraces
+	pushl $0
 
 	# zero the BSS section
 	xor %eax, %eax
-	mov _bss_start, %edi
-	mov _bss_size, %ecx
+	mov $_bss_start, %edi
+	mov $_bss_size, %ecx
+	cmp $0, %ecx
 	jz skip_bss_zero
 	shr $4, %ecx
 	rep stosl
 skip_bss_zero:
 
+	call pcboot_main
+	# pcboot_main never returns
+0:	cli
+	hlt
+	jmp 0b
+
+	# this is called once after memory init, to move the protected mode
+	# stack to the top of usable memory, to avoid interference from 16bit
+	# programs (as much as possible)
+	.global move_stack
+move_stack:
+	# calculate the currently used lowest address of the stack (rounded
+	# down to 4-byte alignment), to see where to start copying
+	mov %esp, %esi
+	and $0xfffffffc, %esi
+	# calculate the size we need to copy
+	mov $STACKTOP, %ecx
+	sub %esi, %ecx
+	# load the destination address to edi
+	mov 4(%esp), %edi
+	sub %ecx, %edi
+	# size in longwords
+	shr $2, %ecx
+
+	# change esp to the new stack
+	mov $STACKTOP, %ecx
+	sub %esp, %ecx
+	mov 4(%esp), %eax
+	mov %eax, %esp
+	sub %ecx, %esp
+
+	rep movsd
+	ret
 
+	.global logohack
 logohack:
+	pusha
+
 	# copy palette
 	mov $logo_pal, %esi
 	xor %cl, %cl
@@ -120,16 +168,18 @@ xloop:
 
 	incl frameno
 
-	# wait vsync
-	mov $0x3da, %dx
-0:	in %dx, %al
-	and $8, %al
-	jnz 0b
-0:	in %dx, %al
-	and $8, %al
-	jz 0b
+	call wait_vsync
+
+	# check for escape keypress
+	call kb_getkey
+	cmp $27, %eax
+	jz 0f
+
 	jmp frameloop
 
+0:	popa
+	ret
+
 xval: .long 0
 yval: .long 0
 frameno: .long 0