make instr operand size explicit

[lifeboot.git] / lifeboot.asm

diff --git a/lifeboot.asm b/lifeboot.asm
index 8b530f9f378b143a6be628fb119e7692505e95c3..f438c6069c9c25b110a8f2dc2f4b660c15dec224 100644 (file)
--- a/lifeboot.asm
+++ b/lifeboot.asm
@@ -30,50 +30,22 @@ mov bp, ORG
 ; clear direction flag
 cld
 
-; clear screen ----------------------------------------------------------------
-
 ; disable cursor
 mov ch, 0x3f
 mov ah, 0x01
 int 0x10
 
-; clear video memory
-mov cx, COLS * ROWS
-mov ax, VGA >> 4
-mov es, ax
-xor di, di
-mov ax, (PRINT_COLOR << 8) | DEAD
-
-rep stosw                   ; fill cx words at es:di with ax
-
-; setup -----------------------------------------------------------------------
-
-setup:
-
 ; initialize xss
 mov ah, 0x00                ; get
 int 0x1a                    ;  system time
 mov [XSS], dx               ; cx:dx = number of clock ticks since midnight
 
-; initialize grid
-mov cx, COLS * ROWS         ; for each cell
-xor ax, ax
-mov es, ax
-mov di, GRID                ; es:di -> GRID
-
-.initgrid:                  ; do {
-    call xs                 ;     [XSS] = rand
-    mov al, DEAD            ;     al = DEAD (likely)
-
-    test [XSS], 0b11
-
-    jnz  .initgrid_nz       ;     if ([XSS] % 4 == 0)
-    mov al, ALIVE           ;         al = ALIVE
+; setup -----------------------------------------------------------------------
 
-.initgrid_nz:
-    stosb                   ;     [es:(di++)] = al
+setup:
 
-    loop .initgrid          ; } while (--cx)
+call init_grid
+call print_grid
 
 jmp halt
 
@@ -105,39 +77,72 @@ mov [XSS], bx
 
 ret
 
-; errors ----------------------------------------------------------------------
+; init_grid() - initialize GRID cells with random values ----------------------
+
+; (*) expects es = 0.
+
+; clobbers ax, bx, cx, dx, di
+
+init_grid:
+
+mov di, GRID                ; es:di -> GRID
+mov cx, COLS * ROWS         ; for each cell
+
+.write_cell:                ; do {
+    call xs                 ;     [XSS] = rand
+    mov al, DEAD            ;     al = DEAD (likely)
+
+    test word [XSS], 0b11
+
+    jnz  .nz                ;     if ([XSS] % 4 == 0)
+    mov al, ALIVE           ;         al = ALIVE
+
+.nz:
+    stosb                   ;     [es:(di++)] = al
+
+    loop .write_cell        ; } while (--cx)
+
+ret
+
+; print_grid() - print GRID cells to screen -----------------------------------
 
-hello:
-mov si, str.hello
+; (*) this function expects ds = 0 when called and sets es = 0 before
+;     returning. this is simpler because in the rest of the program we want the
+;     segment registers to be zeroed anyway.
 
-; print the error message string in si and halt
-; note: we assume es = VGA_SEG and ds = 0
-printerr:
+; clobbers ax, cx, di, si
+
+print_grid:
+
+mov ax, VGA >> 4
 xor di, di
-mov ah, PRINT_COLOR
 
-; es:di = video memory
-; ds:si = error message
-; al = current char
-; ah = color attribute
+mov es, ax                  ; es:di -> VGA
+mov si, GRID                ; ds:si -> GRID
+
+mov ah, PRINT_COLOR         ; ah = color attribute
+
+mov cx, COLS * ROWS         ; for each cell
+
+.print_cell:                ; do {
 
-write_char:
-lodsb                   ; al = [ds:si], si += 1
-or  al, al              ; on null terminator,
-jz  halt                ;  halt
-stosw                   ; [es:di] = ax, di += 2
-jmp write_char
+    lodsb                   ;     al = [ds:(si++)]
+    stosw                   ;     [es:di] = ax ; di += 2
+
+    loop .print_cell        ; } while (--cx)
+
+mov es, cx                  ; es = 0
+ret
+
+; halt() - stop program execution ---------------------------------------------
 
 halt:
-cli                     ; disable interrupts
+
+cli                         ; disable interrupts
 hlt
 jmp halt
 
-; data ------------------------------------------------------------------------
-
-str:
-.hello:
-    db "lifeboot", 0
+; -----------------------------------------------------------------------------
 
 times 510 - ($ - $$) db 0   ; fill remaining bytes with zeroes
 dw 0xaa55                   ; mbr magic byte