Add DI/EI delay test. Add LD M, A.

[fpgaboy.git] / diag.asm

diff --git a/diag.asm b/diag.asm
index 786052e76801b8ef901312ad0c2c474d660331e0..55127f82cff8704fd3c716ebdd22f43b2ff1e28e 100644 (file)
--- a/diag.asm
+++ b/diag.asm
@@ -52,11 +52,10 @@ irqhand:
        ld a, $41       ; print A
        call putc
 .noprint:
+       inc [hl]
        ld a, [hl]
-       add 1
        ld c, $51
        ld [c], a
-       ld [hl], a
 
        POP HL
        POP DE
@@ -235,11 +234,32 @@ insntest:
        cpl
        cp $AA
        jr nz,.fail
+
+       ; Test DI/EI delay
+       di
+       ld hl, .difail
+       ld c, $0F       ; First, wait until an interrupt happens...
+.wait: ld a, [c]
+       cp 0
+       jr z, .wait
+       ei              ; Now make sure that an IRQ didn't happen on EI/DI
+       di
+       ld a, [c]
+       cp 0
+       jr z, .fail
+       ei              ; Make sure that an IRQ does happen on EI/NOP/DI
+       nop
+       di
+       ld a, [c]
+       cp 0
+       jr nz, .fail
+       ei
        
        ld hl, .ok
        call puts
        ret
 .fail:
+       ei
        call puts
        ld hl, .testfailed
        call puts
@@ -262,6 +282,8 @@ insntest:
        db "CPL",0
 .inc16fail:
        db "INC16",0
+.difail:
+       db "DI/EI delay",0
 .testfailed:
        db " test failed.",$0D,$0A,0
 .ok: