Add bit instruction

[fpgaboy.git] / diag.asm

diff --git a/diag.asm b/diag.asm
index ff70e0755b1f7ef374cc5717c225e3a78bd2f2cf..e9a9f19a602d70f15445230fd9a960567194078f 100644 (file)
--- a/diag.asm
+++ b/diag.asm
@@ -1,14 +1,30 @@
-       SECTION "a",HOME
+       section "end",HOME[1024]
+       nop
+
+       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
 
 main:
        ld a, $FF

-       ld [$FF51],a
-       
+       ld c, $51
+       ld [c], a
+

        ld sp, $DFF0
        
        ld a, $04       ;start timer, 4.096KHz
        ld sp, $DFF0
        
        ld a, $04       ;start timer, 4.096KHz

-       ld [$FF07], a
-
+       ld c, $07
+       ld [c], a
+       

        ld hl, $DF81
        xor a
        ld [hli], a
        ld hl, $DF81
        xor a
        ld [hli], a


@@ -16,6 +32,8 @@ main:
        
        ld hl, signon
        call puts
        
        ld hl, signon
        call puts

+
+       call putscreen

        
        ei
 
        
        ei
 


@@ -32,8 +50,161 @@ main:
 signon:
        db $0D,$0A,$1B,"[1mFPGABoy Diagnostic ROM",$1B,"[0m",$0D,$0A,0
 
 signon:
        db $0D,$0A,$1B,"[1mFPGABoy Diagnostic ROM",$1B,"[0m",$0D,$0A,0
 

-       section "fuq",HOME[$100]
-irqhand:
+tiles:
+       db %01111100
+       db %11000110
+       db %11000110
+       db %11111110
+       db %11000110
+       db %11000110
+       db %11000110
+       db %00000000
+       
+       db %11111100
+       db %11000110
+       db %11000110
+       db %11111100
+       db %11000110
+       db %11000110
+       db %11111100
+       db %00000000
+
+       db %01111100
+       db %11000110
+       db %11000010
+       db %11000000
+       db %11000010
+       db %11000110
+       db %01111100
+       db %00000000
+
+       db %11111100
+       db %11000110
+       db %11000110
+       db %11000110
+       db %11000110
+       db %11000110
+       db %11111100
+       db %00000000
+
+putscreen:
+       ; Wait for vblank
+       call .vblwait
+
+       ld hl, $8000    ; Copy two tiles.
+       ld de, tiles
+       ld c, $20
+.cloop:        ld a, [de]
+       inc de
+       ld [hli], a
+       ld [hli], a
+       dec c
+       xor a
+       cp c
+       jr nz, .cloop
+       
+       ld hl, $9800
+.vloop:        call .vblwait
+       ld c, $40
+       ld b, 0
+.loop: ld a, b
+       inc b
+       and $03
+       ld [hli], a
+       ld a, h
+       cp $9C
+       ret z
+       dec c
+       xor a
+       cp c
+       jr nz,.loop
+       jr .vloop
+
+.vblwait:
+.stat1:        ld a, [$FF41]   ; STAT
+       and $03
+       cp $00
+       jp nz, .stat1
+.stat2:        ld a, [$FF41]
+       and $03
+       cp $01
+       jr nz, .stat2
+       ret
+
+vbl:
+       PUSH AF
+       PUSH BC
+       PUSH DE
+       PUSH HL
+       
+       xor a
+       ld [$FF0F], a
+
+       ld a, [$FF51]
+       ld b, a
+       and $80
+       cp $80
+       jr nz, .nothing
+       ld c, $0
+
+       ld a, b
+       and $1
+       cp c
+       call nz, .scyup
+       
+       ld a, b
+       and $2
+       cp c
+       call nz, .scydown
+       
+       ld a, b
+       and $4
+       cp c
+       call nz, .scxup
+       
+       ld a, b
+       and $8
+       cp c
+       call nz, .scxdown
+
+.nothing:
+       POP HL
+       POP DE
+       POP BC
+       POP AF
+
+       RETI
+
+.scyup:        ld hl, $FF42
+       inc [hl]
+       ret
+
+.scydown:      ld hl, $FF42
+       dec [hl]
+       ret
+
+.scxup:        ld hl, $FF43
+       inc [hl]
+       ret
+
+.scxdown:      ld hl, $FF43
+       dec [hl]
+       ret     
+       
+
+lcdc:
+       PUSH AF
+       PUSH BC
+       
+       xor a
+       ld [$FF0F], a
+       
+       POP BC
+       POP AF
+       
+       reti
+       
+tmro:

        PUSH AF
        PUSH BC
        PUSH DE
        PUSH AF
        PUSH BC
        PUSH DE


@@ -42,15 +213,20 @@ irqhand:
        xor a
        ld [$FF0F], a
        
        xor a
        ld [$FF0F], a
        

-       ld hl, $DF82
-       ld a, [hld]
+       ld c, $45       ; LYC
+       ld a, [c]
+       inc a
+       ld [c], a
+       
+       ld a, [$DF82]

        cp 0
        jr z, .noprint
        ld a, $41       ; print A
        call putc
 .noprint:
        cp 0
        jr z, .noprint
        ld a, $41       ; print A
        call putc
 .noprint:

-       inc [hl]
-       ld a, [hl]
+       ld a, [$DF81]
+       inc a
+       ld [$DF81], a

        ld [$FF51], a
 
        POP HL
        ld [$FF51], a
 
        POP HL


@@ -64,7 +240,7 @@ memtest:
        ld hl,memteststr
        call puts
        
        ld hl,memteststr
        call puts
        

-       ld hl, $C001            ; Write loop
+       ld hl, $C000            ; Write loop

 .wr:
        ld a,h
        xor l
 .wr:
        ld a,h
        xor l


@@ -76,7 +252,7 @@ memtest:
        cp $80
        jr nz, .wr
 
        cp $80
        jr nz, .wr
 

-       ld hl, $C001            ; Read loop
+       ld hl, $C000            ; Read loop

 .rd:
        ld a,h
        xor l
 .rd:
        ld a,h
        xor l


@@ -97,7 +273,7 @@ memtest:
        ret
 .memfail:                      ; Say we failed (sadface)
        ; decrement hl the easy way
        ret
 .memfail:                      ; Say we failed (sadface)
        ; decrement hl the easy way

-       ld a,[hld]
+       dec [hl]

        push hl
        ld hl, failatstr
        call puts
        push hl
        ld hl, failatstr
        call puts


@@ -233,20 +409,25 @@ insntest:
 
        ; Test DI/EI delay
        di
 
        ; Test DI/EI delay
        di

-       ld hl, .difail
+       ld hl, .dinocausefail

        ld c, $0F       ; First, wait until an interrupt happens...
 .wait: ld a, [c]
        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]
        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
        cp 0
        jr z, .fail

+       ld hl, .dicausefail

        ei              ; Make sure that an IRQ does happen on EI/NOP/DI
        nop
        ei              ; Make sure that an IRQ does happen on EI/NOP/DI
        nop

+       nop

        di
        ld a, [c]
        di
        ld a, [c]

+       and $04

        cp 0
        jr nz, .fail
        ei
        cp 0
        jr nz, .fail
        ei


@@ -278,8 +459,10 @@ insntest:
        db "CPL",0
 .inc16fail:
        db "INC16",0
        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:
 .testfailed:
        db " test failed.",$0D,$0A,0
 .ok:


@@ -303,3 +486,4 @@ puts:
        ret z
        call putc
        jr puts
        ret z
        call putc
        jr puts

+