cleanup

[lifeboot.git] / lifeboot.asm

diff --git a/lifeboot.asm b/lifeboot.asm
index 658abe719824f5cc7a97dc2af2ec281ec469289c..8f11b8700d7a9e04ffcb69e53f40962a118375bb 100644 (file)
--- a/lifeboot.asm
+++ b/lifeboot.asm
@@ -1,25 +1,27 @@
 bits 16
 bits 16

-org 0x7c00
+org 7c00h

 
 ; =============================================================================
 
 ; settings --------------------------------------------------------------------
 
 %define DEAD ' '            ; char to represent a dead cell
 
 ; =============================================================================
 
 ; settings --------------------------------------------------------------------
 
 %define DEAD ' '            ; char to represent a dead cell

-%define ALIVE '#'           ; char to represent an alive cell
-%define PRINT_COLOR 0x07    ; grey on black
-%define WAIT_DELAY 0x02     ; 0.131072 seconds
+%define ALIVE '.'           ; char to represent an alive cell
+%define PRINT_COLOR 07h     ; grey on black
+
+%define WAIT_DELAY_CX 01h   ; cx:dx = delay in microseconds
+%define WAIT_DELAY_DX 00h

 
 ; constants -------------------------------------------------------------------
 
 %define COLS 80
 %define ROWS 25
 
 ; constants -------------------------------------------------------------------
 
 %define COLS 80
 %define ROWS 25

-%define VGAPGSZ (COLS * ROWS * 2)
+%define VGAPGSZ 1000h

 
 ; memory layout ---------------------------------------------------------------
 
 
 ; memory layout ---------------------------------------------------------------
 

-%define ORG 0x7c00
-%define VGA 0xb8000
+%define ORG 7c00h
+%define VGA 0b8000h

 %define DAT ORG + 512
 
 ; static variables ------------------------------------------------------------
 %define DAT ORG + 512
 
 ; static variables ------------------------------------------------------------


@@ -47,17 +49,24 @@ mov sp, bp
 cld
 
 ; disable cursor
 cld
 
 ; disable cursor

-mov ch, 0x3f                ; cursor start and options
-mov ah, 0x01                ; set text-mode cursor shape
-int 0x10                    ; video services
+mov ch, 3fh                 ; cursor start and options
+mov ah, 01h                 ; set text-mode cursor shape
+int 10h                     ; video services

 
 ; initialize xss
 
 ; initialize xss

-mov ah, 0x00                ; get
-int 0x1a                    ;  system time
+
+set_xss_seed:
+
+mov ah, 00h                 ; get
+int 1ah                     ;  system time
+
+cmp dx, 0
+je set_xss_seed             ; if seed is 0, xs wont work properly
+

 mov [xss], dx               ; cx:dx = number of clock ticks since midnight
 
 ; initialize currvgapg
 mov [xss], dx               ; cx:dx = number of clock ticks since midnight
 
 ; initialize currvgapg

-mov word [currvgapg], VGAPGSZ
+mov word [currvgapg], 0

 
 ; start simulation from random state ------------------------------------------
 
 
 ; start simulation from random state ------------------------------------------
 


@@ -69,10 +78,10 @@ call init_grid
 
 next_state:
 
 
 next_state:
 

-call flip_vga_page          ; display current state
-call delay                  ; sleep a little
-
-call write_next_vga_page    ; write the next state to the hidden page
+call vsync_wait
+call write_next_vga_page
+call delay
+call flip_vga_page

 
 jmp next_state
 
 
 jmp next_state
 


@@ -86,11 +95,11 @@ jmp next_state
 
 delay:
 
 
 delay:
 

-mov cx, WAIT_DELAY          ; cx:dx = interval in microseconds
-mov dx, 0
+mov cx, WAIT_DELAY_CX
+mov dx, WAIT_DELAY_DX

 
 

-mov ah, 0x86
-int 0x15                    ; wait
+mov ah, 86h
+int 15h                     ; wait

 
 ret
 
 
 ret
 


@@ -100,16 +109,16 @@ ret
 
 vsync_wait:
 
 
 vsync_wait:
 

-mov dx, 0x3da               ; input status #1 register
+mov dx, 3dah                ; input status #1 register

 
 .wait_on:
     in al, dx
 
 .wait_on:
     in al, dx

-    test al, 0x08           ; vertical retrace bit
+    test al, 08h            ; vertical retrace bit

     jnz .wait_on
 
 .wait_off:
     in al, dx
     jnz .wait_on
 
 .wait_off:
     in al, dx

-    test al, 0x08
+    test al, 08h

     jz .wait_off
 
 ret
     jz .wait_off
 
 ret


@@ -177,8 +186,8 @@ call vsync_wait
 xor word [currvgapg], VGAPGSZ   ; flip currvgapg
 setnz al                        ; al = !(currvgapg == 0)
 
 xor word [currvgapg], VGAPGSZ   ; flip currvgapg
 setnz al                        ; al = !(currvgapg == 0)
 

-mov ah, 0x05                ; select active display page
-int 0x10                    ; video services
+mov ah, 05h                 ; select active display page
+int 10h                     ; video services

 
 ret
 
 
 ret
 


@@ -248,7 +257,7 @@ mov byte [bp - 4], -1       ; i = -1
 
         mov dx, [es:si + bx]            ; dl = cell state
 
 
         mov dx, [es:si + bx]            ; dl = cell state
 

-        test dl, ALIVE                  ; if (!ALIVE) continue
+        cmp dl, ALIVE                   ; if (!ALIVE) continue

         jne .continue
 
         inc byte [bp - 3]               ; neighbours++
         jne .continue
 
         inc byte [bp - 3]               ; neighbours++


@@ -288,20 +297,20 @@ shl bx, 1
 
 mov dx, [es:si + bx]        ; dl = cell current state
 
 
 mov dx, [es:si + bx]        ; dl = cell current state
 

-test dl, ALIVE              ; if (ALIVE) {
+cmp dl, ALIVE               ; if (ALIVE) {

 jne .else
 
 jne .else
 

-test ax, 2                  ;     if (n < 2)
+cmp ax, 2                   ;     if (n < 2)

 jl .dead                    ;         return DEAD
 
 jl .dead                    ;         return DEAD
 

-test ax, 3                  ;     if (n > 3)
+cmp ax, 3                   ;     if (n > 3)

 jg .dead                    ;         return DEAD
 
 jmp .alive                  ;     return ALIVE
 
 .else:                      ; }
 
 jg .dead                    ;         return DEAD
 
 jmp .alive                  ;     return ALIVE
 
 .else:                      ; }
 

-test ax, 3                  ; if (n != 3)
+cmp ax, 3                   ; if (n != 3)

 jne .dead                   ;     return DEAD
 
 .alive:                     ; return ALIVE
 jne .dead                   ;     return DEAD
 
 .alive:                     ; return ALIVE


@@ -333,7 +342,7 @@ xor cx, cx                  ; i = 0
 call write_next_cell_state
 
 inc cx
 call write_next_cell_state
 
 inc cx

-test cx, COLS * ROWS
+cmp cx, COLS * ROWS

 jl .update_loop             ; for i in [0 .. COLS * ROWS - 1]
 
 ret
 jl .update_loop             ; for i in [0 .. COLS * ROWS - 1]
 
 ret


@@ -349,4 +358,4 @@ jmp halt
 ; =============================================================================
 
 times 510 - ($ - $$) db 0   ; fill remaining bytes with zeroes
 ; =============================================================================
 
 times 510 - ($ - $$) db 0   ; fill remaining bytes with zeroes

-dw 0xaa55                   ; mbr magic byte
+dw 0aa55h                   ; mbr magic byte