Add an instruction tester to the test ROM.

diff --git a/FPGABoy.ise b/FPGABoy.ise
index 06b8ca4b0d1efd142d6cffefedce33343bab4605..7374a59cd31cd716c2382202c3d8e45f6af8f992 100644 (file)
Binary files a/FPGABoy.ise and b/FPGABoy.ise differ

diff --git a/GBZ80Core.v b/GBZ80Core.v
index 0f0496eed4200d7e2f98b8ac9a8ffd3e3952608a..e125225ede2924e2c3ce07eb4c2296d4bc0eb454 100644 (file)
--- a/GBZ80Core.v
+++ b/GBZ80Core.v
@@ -289,7 +289,7 @@ module GBZ80Core(
                                                `INSN_stack_HL: wdata <= registers[`REG_L];
                                                endcase
                                        end
                                                `INSN_stack_HL: wdata <= registers[`REG_L];
                                                endcase
                                        end

-                               2:      begin /* TWIDDLE OUR FUCKING THUMBS! */ end
+                               2:      begin /* Twiddle thumbs. */ end

                                3:      begin
                                                `EXEC_NEWCYCLE;
                                                `EXEC_INC_PC;
                                3:      begin
                                                `EXEC_NEWCYCLE;
                                                `EXEC_INC_PC;

diff --git a/rom.asm b/rom.asm
index 640c2b075bbef77b911785ad8a678c6385c255f8..02f095b50e00470b469615b586435f55b34de341 100644 (file)
--- a/rom.asm
+++ b/rom.asm
@@ -1,25 +1,32 @@
        SECTION "a",HOME
        SECTION "a",HOME

+

 main:
 main:

-       ld c, $51
+       ld c, $51       ; Note that we are alive.

        ld a, $FF
        ld [c],a
        ld a, $FF
        ld [c],a

-       ld sp,$DFFF

 
 

-       ld hl,text
+       ld sp, $DFFF
+
+       ld hl, signon

        call puts
        
        call memtest
        call puts
        
        call memtest

+
+       call insntest
+

        call waitsw
        call waitsw

+

        jp main
 
        jp main
 

-text:
+signon:

        db $0D,$0A,$1B,"[1mFPGABoy Diagnostic ROM",$1B,"[0m",$0D,$0A,0
 
        db $0D,$0A,$1B,"[1mFPGABoy Diagnostic ROM",$1B,"[0m",$0D,$0A,0
 

+; Memory tester: writes h ^ l to all addresses from C000 to DF80.

 memtest:
        ld hl,memteststr
        call puts
        
 memtest:
        ld hl,memteststr
        call puts
        

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

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


@@ -31,7 +38,7 @@ memtest:
        cp l
        jp nz, .wr
 
        cp l
        jp nz, .wr
 

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

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


@@ -47,11 +54,11 @@ memtest:
        cp l
        jp nz, .rd
        
        cp l
        jp nz, .rd
        

-       ld hl, testokstr
+       ld hl, testokstr        ; Say we're OK

        call puts
        ret
        call puts
        ret

-.memfail:
-       @ decrement hl the easy way
+.memfail:                      ; Say we failed (sadface)
+       ; decrement hl the easy way

        ld a,[hld]
        push hl
        ld hl, failatstr
        ld a,[hld]
        push hl
        ld hl, failatstr


@@ -66,14 +73,14 @@ memtest:
        ld a, $0D
        call putc
        ret
        ld a, $0D
        call putc
        ret

-

 memteststr:
        db "Testing memory from $C000 to $DF80...",0
 testokstr:
        db " OK!",$0D,$0A,0
 failatstr:
        db " Test failed at $",0
 memteststr:
        db "Testing memory from $C000 to $DF80...",0
 testokstr:
        db " OK!",$0D,$0A,0
 failatstr:
        db " Test failed at $",0

-puthex:
+
+puthex:                                ; Put two hex nibbles to the serial console.

        push af
        rra
        rra
        push af
        rra
        rra


@@ -92,6 +99,7 @@ puthex:
        call putc
        ret
 
        call putc
        ret
 

+; Wait for switches to be flipped on and off again.

 waitsw:
        ld hl,waitswstr
        call puts
 waitsw:
        ld hl,waitswstr
        call puts


@@ -115,6 +123,74 @@ waitsw:
 waitswstr:
        db "Diagnostic ROM complete; flip switches to nonzero and then to zero to reset.",$0D,$0A,0
 
 waitswstr:
        db "Diagnostic ROM complete; flip switches to nonzero and then to zero to reset.",$0D,$0A,0
 

+; Core instruction basic acceptance tests.
+insntest:
+       ld hl, .insnteststr
+       call puts
+       
+       ; Test PUSH and POP.
+       ld b, $12
+       ld c, $34
+       ld d, $56
+       ld e, $78
+       push bc
+       pop de
+       ld hl, .pushpopfail
+       ld a, d
+       cp b
+       jp nz,.fail
+       ld a, e
+       cp c
+       jp nz,.fail
+       
+       ; Test ALU (HL).
+       ld hl, .ff
+       ld a, $FF
+       xor [hl]
+       ld hl, .xorhlfail
+       jp nz, .fail
+       
+       ; Test CP.
+       ld hl, .cpfail
+       ld a, $10
+       ld b, $20
+       cp b
+       jp nc,.fail
+       ld a, $20
+       ld b, $10
+       cp b
+       jp c,.fail
+       
+       ; Test CPL
+       ld hl, .cplfail
+       ld a, $55
+       ld b, $AA
+       cpl
+       cp b
+       jp nz,.fail
+       
+       ld hl, .ok
+       call puts
+       ret
+.fail:
+       call puts
+       ret
+.insnteststr:
+       db "Testing instructions... ",$0
+.pushpopfail:
+       db "PUSH/POP test failed.",$0D,$0A,0
+.ff:
+       db $FF
+.xorhlfail:
+       db "XOR [HL] test failed.",$0D,$0A,0
+.cpfail:
+       db "CP test failed.",$0D,$0A,0
+.cplfail:
+       db "CPL test failed.",$0D,$0A,0
+.ok:
+       db "OK!",$0D,$0A,0
+
+; Serial port manipulation functions.

 putc:
        push af
        ld b, 0
 putc:
        push af
        ld b, 0