Rework it all to use the new macros.

[fpgaboy.git] / rom.asm

diff --git a/rom.asm b/rom.asm
index 7994d3ea2f7103a0a4e4cde108642f7537ad52b0..512cfcedf6c6bb4f7ebb6dbea41ae8b88cd7aa54 100644 (file)
--- a/rom.asm
+++ b/rom.asm
@@ -5,19 +5,70 @@ main:
        ld a, $FF
        ld [c],a
        
-       ld sp, $DFFF
+       ld sp, $DFF0
+       
+       ld hl, $DF81
+       ld a, $80
+       ld [hl], a
+
+;      ld c, $07
+;      ld a, $04       ;start timer, 4.096KHz
+;      ld [c], a
+diqs:; ei
+       jr diqs
 
        ld hl, signon
        call puts
+
+       
+       ei
        
        call memtest
 
        call insntest
 
        call waitsw
+       di
 
        jr main
 
+       section "fuq",HOME[$50]
+irqhand:
+       PUSH AF
+       PUSH BC
+       PUSH DE
+       PUSH HL
+       
+;      ld c, $51
+;      ld a, $F0
+;      ld [c], a
+       
+       xor a
+       ld c, $0F       ; ack the irq
+       ld [c], a
+       
+       ;ld a, $41      ; print A
+       ;call putc
+       
+       ld hl, $DF81
+       ld a, [hl]
+;      ld b, 1
+;      add b
+       ld c, $51
+;      ld [c], a
+;      ld [hl], a
+
+
+;      ld c, $51
+;      ld a, $0F
+;      ld [c], a
+       
+       POP HL
+       POP DE
+       POP BC
+       POP AF
+       RETI
+
 signon:
        db $0D,$0A,$1B,"[1mFPGABoy Diagnostic ROM",$1B,"[0m",$0D,$0A,0
 
@@ -26,7 +77,7 @@ memtest:
        ld hl,memteststr
        call puts
        
-       ld hl, $C000            ; Write loop
+       ld hl, $C001            ; Write loop
 .wr:
        ld a,h
        xor l
@@ -38,7 +89,7 @@ memtest:
        cp l
        jr nz, .wr
 
-       ld hl, $C000            ; Read loop
+       ld hl, $C001            ; Read loop
 .rd:
        ld a,h
        xor l
@@ -103,25 +154,16 @@ puthex:                           ; Put two hex nibbles to the serial console.
 waitsw:
        ld hl,waitswstr
        call puts
-       
-       ld c, $07
-       ld a, $04       ;start timer, 4.096KHz
-       ld [c], a
-       
+
        ld c, $51
-       ld a, $00
+       xor a
        ld [c],a
        
-       ld e, a
-       
-.loop1:
-       push bc
-       call testa
-       pop bc
-       ld c, $51
        ld b, $0
+.loop1:
        ld a,[c]
        cp b
+       ei
        jr z,.loop1
 .loop2:
        ld a,[c]
@@ -132,23 +174,6 @@ waitsw:
 waitswstr:
        db "Diagnostic ROM complete; flip switches to nonzero and then to zero to reset. Expect A.",$0D,$0A,0
 
-testa:
-       ld c, $0F
-       ld a, [c]
-       ld b, $00
-       cp b
-       ret z
-       xor a
-       ld [c], a
-       ld a, $41
-       call putc
-       ld a, 1
-       add e
-       ld c, $51
-       ld [c], a
-       ld e, a
-       ret
-
 ; Core instruction basic acceptance tests.
 insntest:
        ld hl, .insnteststr
@@ -273,8 +298,6 @@ puts:
        ld a, [hli]
        ld b, $00
        cp b
-       jr z, .done
+       ret z
        call putc
        jr puts
-.done:
-       ret