X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=bootcensus;a=blobdiff_plain;f=src%2Fboot%2Fboot2.s;h=ab5c6ad339d431a685490b8bd74a44a920d21626;hp=86ee611d309a754d3b773eb05e1f68e0d79b68c4;hb=06e632cd7cf56db0d187bf1c8ee80172bc56e685;hpb=e552b31989dbb36f780428332be1b4958d26a37b

diff --git a/src/boot/boot2.s b/src/boot/boot2.s
index 86ee611..ab5c6ad 100644
--- a/src/boot/boot2.s
+++ b/src/boot/boot2.s
@@ -2,12 +2,14 @@
 	.code16
 	.section .boot2,"a"
 
-	.extern print_num
 	.extern ser_putchar
 
 	mov $0x13, %ax
 	int $0x10
 
+	movb $10, %al
+	call ser_putchar
+
 	# copy palette
 	mov $logo_pal, %si
 	xor %cl, %cl
@@ -16,8 +18,8 @@
 	mov $0x3c8, %dx
 	movb %cl, %al
 	outb %al, %dx
-	#DBG
-	call print_num
+	#### DBG
+	call ser_print_num
 	mov $58, %al
 	call ser_putchar
 	mov $32, %al
@@ -30,8 +32,8 @@
 	inc %si
 	shr $2, %al
 	outb %al, %dx
-	#DBG
-	call print_num
+	#### DBG
+	call ser_print_num
 	mov $32, %al
 	call ser_putchar
 	xor %eax, %eax
@@ -41,8 +43,8 @@
 	inc %si
 	shr $2, %al
 	outb %al, %dx
-	#DBG
-	call print_num
+	#### DBG
+	call ser_print_num
 	mov $32, %al
 	call ser_putchar
 	xor %eax, %eax
@@ -52,12 +54,10 @@
 	inc %si
 	shr $2, %al
 	outb %al, %dx
-	#DBG
-	call print_num
+	#### DBG
+	call ser_print_num
 	mov $32, %al
 	call ser_putchar
-	mov $13, %al
-	call ser_putchar
 	mov $10, %al
 	call ser_putchar
 	xor %eax, %eax
@@ -79,6 +79,46 @@
 	cli
 	hlt
 
+	# expects string pointer in ds:si
+ser_print_str:
+	pusha
+
+0:	mov (%si), %al
+	cmp $0, %al
+	jz .Lend
+	call ser_putchar
+	inc %si
+	jmp 0b
+
+.Lend:	popa
+	ret
+
+
+	# expects number in eax
+ser_print_num:
+	# save registers
+	pusha
+
+	movw $numbuf + 16, %si
+	movb $0, (%si)
+	mov $10, %ebx
+.Lconvloop:
+	xor %edx, %edx
+	div %ebx
+	add $48, %dl
+	dec %si
+	mov %dl, (%si)
+	cmp $0, %eax
+	jnz .Lconvloop
+
+	call ser_print_str
+
+	# restore regs
+	popa
+	ret
+
+numbuf: .space 16
+
 logo_pal:
 	.incbin "logo.pal"