fixed partial loading bug

[bootcensus] / src / boot / boot.s

diff --git a/src/boot/boot.s b/src/boot/boot.s
index ac4a424..b9e1a76 100644 (file)
--- a/src/boot/boot.s
+++ b/src/boot/boot.s
@@ -1,12 +1,15 @@
        .code16
        .section .boot,"a"
 
+       .set scratchbuf, 0x7b00
+
+boot:
        cli
        cld
        # move stack to just below the code
        xor %ax, %ax
        mov %ax, %ss
-       mov $0x7c00, %sp
+       mov $0x7b00, %sp
        # use the code segment for data access
        mov %cs, %ax
        mov %ax, %ds
@@ -14,10 +17,7 @@
 
        mov %dl, drive_number
 
-       call clearscr
-
-       mov $_boot2_size, %eax
-       call print_num
+       call setup_serial
 
        # load the second stage boot loader and jump to it
        mov $_boot2_size, %eax
@@ -37,9 +37,6 @@
        call read_sectors
        jmp boot2_addr
 
-       cli
-       hlt
-
        .set SECT_PER_TRACK, 18
 
        .set ARG_NSECT, 6
@@ -66,6 +63,7 @@ read_sectors:
        ret
 
        .set VAR_ATTEMPTS, -2
+#str_rdsec_msg: .asciz "rdsec: "
 
 # read_sector(sidx)
 read_sector:
@@ -80,6 +78,9 @@ read_sector:
 .Lread_try:
        # calculate the track (sidx / sectors_per_track)
        mov 4(%bp), %ax
+#      mov $str_rdsec_msg, %si
+#      call print_str_num16
+
        xor %dx, %dx
        mov $SECT_PER_TRACK, %cx
        div %cx
@@ -95,7 +96,8 @@ read_sector:
        and $0xc0, %cl
        # sector num cl[0-5] is sidx % sectors_per_track (saved in ax)
        inc %al
-       or %al, %cl 
+       or %al, %cl
+
        # ah = 2 (read), al = 1 sectors
        mov $0x0201, %ax
        movb drive_number, %dl
@@ -116,9 +118,14 @@ read_sector:
        jmp abort_read
 
 .Lread_ok:
+       # DBG print first dword
+#      mov $str_read_error + 4, %si
+#      mov %es:(%bx), %eax
+#      call print_str_num
+
        # increment es:bx accordingly (advance es if bx overflows)
        add $512, %bx
-       jno 0f
+       jnc 0f
        mov %es, %ax
        add $4096, %ax
        mov %ax, %es
@@ -129,41 +136,46 @@ read_sector:
        pop %bp
        ret
 
-str_read_error: .asciz "Failed to read sector: "
+str_read_error: .asciz "err read sect: "
 
 abort_read:
-       push %ax
        mov $str_read_error, %si
-       call print_str
-
-       xor %eax, %eax
-       pop %ax
-       call print_num
-
-       cli
+       call print_str_num16
        hlt
 
-clearscr:
-       push %es
-       pushw $0xb800
-       pop %es
-       xor %eax, %eax
-       xor %di, %di
-       movl $500, %ecx
-       rep stosl
-       pop %es
+cursor_x: .byte 0
+
+       # prints a string (ds:si) followed by a number (eax)
+print_str_num:
+       push %eax
+       call print_str
+       pop %eax
+       call print_num
+       mov $13, %al
+       call ser_putchar
+       mov $10, %al
+       call ser_putchar
        ret
 
-cursor_x: .byte 0
+print_str_num16:
+       push %eax
+       and $0xffff, %eax
+       call print_str_num
+       pop %eax
+       ret
 
-# expects string pointer in ds:si
+       # expects string pointer in ds:si
 print_str:
        push %es
+       pusha
+
        pushw $0xb800
        pop %es
        xor %di, %di
        movb $0, cursor_x
 
+       push %si
+
 0:     mov (%si), %al
        mov %al, %es:(%di)
        movb $7, %es:1(%di)
@@ -173,16 +185,22 @@ print_str:
        cmp $0, %al
        jnz 0b
 
+       pop %si
+       call ser_putstr
+
+       popa
        pop %es
        ret
 
-# expects number in eax
+       # expects number in eax
+       .global print_num
 print_num:
-       # save es
+       # save registers
        push %es
+       pusha
 
        xor %cx, %cx
-       movw $numbuf, %si
+       movw $scratchbuf, %si
        mov $10, %ebx
 
 0:     xor %edx, %edx
@@ -205,6 +223,7 @@ print_num:
 0:     dec %si
        mov (%si), %al
        movb %al, %es:(%di)
+       call ser_putchar
        inc %di
        mov $7, %al
        movb %al, %es:(%di)
@@ -212,12 +231,88 @@ print_num:
        dec %cx
        jnz 0b
 
-       # restore es
+       # restore regs
+       popa
        pop %es
        ret
 
+       .set UART_DATA, 0x3f8
+       .set UART_DIVLO, 0x3f8
+       .set UART_DIVHI, 0x3f9
+       .set UART_FIFO, 0x3fa
+       .set UART_LCTL, 0x3fb
+       .set UART_MCTL, 0x3fc
+       .set UART_LSTAT, 0x3fd
+       .set DIV_9600, 115200 / 9600
+       .set LCTL_8N1, 0x03
+       .set LCTL_DLAB, 0x80
+       .set FIFO_ENABLE, 0x01
+       .set FIFO_SEND_CLEAR, 0x04
+       .set FIFO_RECV_CLEAR, 0x02
+       .set MCTL_DTR, 0x01
+       .set MCTL_RTS, 0x02
+       .set MCTL_OUT2, 0x08
+       .set LST_TREG_EMPTY, 0x20
+
+setup_serial:
+       # set clock divisor
+       mov $LCTL_DLAB, %al
+       mov $UART_LCTL, %dx
+       out %al, %dx
+       mov $DIV_9600, %ax
+       mov $UART_DIVLO, %dx
+       out %al, %dx
+       shr $8, %ax
+       mov $UART_DIVHI, %dx
+       out %al, %dx
+       # set format 8n1
+       mov $LCTL_8N1, %al
+       mov $UART_LCTL, %dx
+       out %al, %dx
+       # clear and enable fifo
+       mov $FIFO_ENABLE, %al
+       or $FIFO_SEND_CLEAR, %al
+       or $FIFO_RECV_CLEAR, %al
+       mov $UART_FIFO, %dx
+       out %al, %dx
+       # assert RTS and DTR
+       mov $MCTL_DTR, %al
+       or $MCTL_RTS, %al
+       or $MCTL_OUT2, %al
+       mov $UART_MCTL, %dx
+       out %al, %dx
+       ret
+
+       # expects a character in al
+       .global ser_putchar
+ser_putchar:
+       push %dx
+
+       mov %al, %ah
+       # wait until the transmit register is empty
+       mov $UART_LSTAT, %dx
+0:     in %dx, %al
+       and $LST_TREG_EMPTY, %al
+       jz 0b
+       mov $UART_DATA, %dx
+       mov %ah, %al
+       out %al, %dx
+
+       pop %dx
+       ret
+
+       # expects a string in ds:si
+ser_putstr:
+       mov (%si), %al
+       cmp $0, %al
+       jz 0f
+       call ser_putchar
+       inc %si
+       jmp ser_putstr
+0:     ret
+       
+
 drive_number: .byte 0
-numbuf: .space 10
        .org 510
        .byte 0x55
        .byte 0xaa