Some LCDC IRQ stuffs. Working on fixing ldm_a

[fpgaboy.git] / diag.asm

diff --git a/diag.asm b/diag.asm
index ff70e0755b1f7ef374cc5717c225e3a78bd2f2cf..8d6aec83a8e18ffc8f5465bf746d278ff4feac09 100644 (file)
--- a/diag.asm
+++ b/diag.asm
@@ -1,13 +1,28 @@
-       SECTION "a",HOME
+       SECTION "a",HOME[$00]
+
+start: jp main
+       
+       section "vbl",HOME[$40]
+       jp vbl
+       
+       section "lcdc",HOME[$48]
+       jp lcdc
+       
+       section "tmro",HOME[$50]
+       jp tmro
 
 main:
        ld a, $FF
        ld [$FF51],a
+
+;      ld a, $04
+;      ld [$FFFF], a
        
        ld sp, $DFF0
        
        ld a, $04       ;start timer, 4.096KHz
-       ld [$FF07], a
+       ld c, $07
+       ld [c], a
 
        ld hl, $DF81
        xor a
@@ -32,15 +47,27 @@ main:
 signon:
        db $0D,$0A,$1B,"[1mFPGABoy Diagnostic ROM",$1B,"[0m",$0D,$0A,0
 
-       section "fuq",HOME[$100]
-irqhand:
+vbl:
+lcdc:
+       PUSH AF
+       
+       xor a
+       ld c, $0F
+       ld [c], a
+       
+       POP AF
+       
+       reti
+       
+tmro:
        PUSH AF
        PUSH BC
        PUSH DE
        PUSH HL
        
        xor a
-       ld [$FF0F], a
+       ld c, $0F
+       ld [c], a
        
        ld hl, $DF82
        ld a, [hld]
@@ -49,9 +76,12 @@ irqhand:
        ld a, $41       ; print A
        call putc
 .noprint:
-       inc [hl]
+       ld hl, $DF81
        ld a, [hl]
-       ld [$FF51], a
+       add 1
+       ld [hl], a
+       ld c, $51
+       ld [c], a
 
        POP HL
        POP DE
@@ -233,20 +263,25 @@ insntest:
 
        ; Test DI/EI delay
        di
-       ld hl, .difail
+       ld hl, .dinocausefail
        ld c, $0F       ; First, wait until an interrupt happens...
 .wait: ld a, [c]
+       and $04
        cp 0
        jr z, .wait
        ei              ; Now make sure that an IRQ didn't happen on EI/DI
        di
        ld a, [c]
+       and $04
        cp 0
        jr z, .fail
+       ld hl, .dicausefail
        ei              ; Make sure that an IRQ does happen on EI/NOP/DI
        nop
+       nop
        di
        ld a, [c]
+       and $04
        cp 0
        jr nz, .fail
        ei
@@ -278,8 +313,10 @@ insntest:
        db "CPL",0
 .inc16fail:
        db "INC16",0
-.difail:
-       db "DI/EI delay",0
+.dinocausefail:
+       db "DI/EI does not cause interrupt",0
+.dicausefail:
+       db "DI/NOP/EI cause interrupt",0
 .testfailed:
        db " test failed.",$0D,$0A,0
 .ok: