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

diff --git a/src/startup.s b/src/startup.s
index bff3991..82f548e 100644
--- a/src/startup.s
+++ b/src/startup.s
@@ -19,17 +19,25 @@
 
 	.extern _bss_start
 	.extern _bss_end
+	.extern pcboot_main
 
 	# 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
 
+	.global logohack
 logohack:
 	# copy palette
 	mov $logo_pal, %esi