X-Git-Url: http://git.joshuawise.com/fpgaboy.git/blobdiff_plain/30ef1ae0e1d60f55aee401ad9741cb8d5a0feef0..7d59dad969a6cd1e42958f4c805d1d373ee04713:/diag.asm

diff --git a/diag.asm b/diag.asm
index 004935a..2c843eb 100644
--- a/diag.asm
+++ b/diag.asm
@@ -1,22 +1,39 @@
-	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 c, $51	; Note that we are alive.
 	ld a, $FF
-	ld [c],a
-	
+	ld c, $51
+	ld [c], a
+
 	ld sp, $DFF0
 	
-	ld c, $07
 	ld a, $04	;start timer, 4.096KHz
+	ld c, $07
 	ld [c], a
-
+	
 	ld hl, $DF81
 	xor a
-	ld [hl], a
+	ld [hli], a
+	ld [hli], a
 	
 	ld hl, signon
 	call puts
+
+	call putscreen
 	
 	ei
 
@@ -33,56 +50,154 @@ main:
 signon:
 	db $0D,$0A,$1B,"[1mFPGABoy Diagnostic ROM",$1B,"[0m",$0D,$0A,0
 
-	section "fuq",HOME[$100]
-irqhand:
+putscreen:
+	; Wait for vblank
+.stat:	ld a, [$FF41]
+	ld [$FF51], a
+	and $03		; mode
+	cp $01		; VBLANK
+	jr nz, .stat
+
+	ld hl, $8000	; Copy two tiles.
+	ld a, $AA
+	ld [hli], a
+	ld [hli], a
+	ld a, $55
+	ld [hli], a
+	ld [hli], a
+	ld a, $AA
+	ld [hli], a
+	ld [hli], a
+	ld a, $55
+	ld [hli], a
+	ld [hli], a
+	ld a, $AA
+	ld [hli], a
+	ld [hli], a
+	ld a, $55
+	ld [hli], a
+	ld [hli], a
+	ld a, $AA
+	ld [hli], a
+	ld [hli], a
+	ld a, $55
+	ld [hli], a
+	ld [hli], a
+	xor a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	
+	ld hl, $9800
+.loop:	ld a, $01
+	ld [hli], a
+	xor a
+	ld [hli], a
+	ld a, h
+	cp $9C
+	jp nz,.loop
+	ret
+
+vbl:
 	PUSH AF
 	PUSH BC
 	PUSH DE
 	PUSH HL
 	
 	xor a
-	ld c, $0F	; ack the irq
+	ld [$FF0F], a
+
+	ld c, $42	; SCY
+	ld a, [c]
+	inc a
 	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, $43	; SCX
+	ld a, [c]
+	inc a
 	ld [c], a
-	ld [hl], a
 
+	POP HL
+	POP DE
+	POP BC
+	POP AF
+
+	RETI
+
+lcdc:
+	PUSH AF
+	PUSH BC
+	
+	xor a
+	ld [$FF0F], a
+	
+	POP BC
+	POP AF
+	
+	reti
+	
+tmro:
+	PUSH AF
+	PUSH BC
+	PUSH DE
+	PUSH HL
+	
+	xor a
+	ld [$FF0F], a
+	
+	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:
+	ld a, [$DF81]
+	inc a
+	ld [$DF81], a
+	ld [$FF51], a
 
 	POP HL
 	POP DE
 	POP BC
 	POP AF
 	RETI
-	db $18,$FE,$18,$FE,$18,$FE,$18,$FE,$18,$FE,$18,$FE,$18,$FE,$18,$FE
-	db $18,$FE,$18,$FE,$18,$FE,$18,$FE,$18,$FE,$18,$FE,$18,$FE,$18,$FE
-	db $18,$FE,$18,$FE,$18,$FE,$18,$FE,$18,$FE,$18,$FE,$18,$FE,$18,$FE
 
 ; Memory tester: writes h ^ l to all addresses from C000 to DF80.
 memtest:
 	ld hl,memteststr
 	call puts
 	
-	ld hl, $C001		; Write loop
+	ld hl, $C000		; Write loop
 .wr:
 	ld a,h
 	xor l
 	ld [hli],a
-	ld a, $DF
-	cp h
+	ld a, h
+	cp $DF
 	jr nz, .wr
-	ld a, $80
-	cp l
+	ld a, l
+	cp $80
 	jr nz, .wr
 
-	ld hl, $C001		; Read loop
+	ld hl, $C000		; Read loop
 .rd:
 	ld a,h
 	xor l
@@ -91,11 +206,11 @@ memtest:
 	cp b
 	jr nz, .memfail
 	
-	ld a, $DF
-	cp h
+	ld a, h
+	cp $DF
 	jr nz, .rd
-	ld a, $80
-	cp l
+	ld a, l
+	cp $80
 	jr nz, .rd
 	
 	ld hl, testokstr	; Say we're OK
@@ -103,7 +218,7 @@ memtest:
 	ret
 .memfail:			; Say we failed (sadface)
 	; decrement hl the easy way
-	ld a,[hld]
+	dec [hl]
 	push hl
 	ld hl, failatstr
 	call puts
@@ -130,16 +245,12 @@ puthex:				; Put two hex nibbles to the serial console.
 	rra
 	rra
 	rra
-	ld b,$0F
-	and b
-	ld b,$30
-	add b
+	and $0F
+	add $30
 	call putc
 	pop af
-	ld b,$0F
-	and b
-	ld b,$30
-	add b
+	and $0F
+	add $30
 	call putc
 	ret
 
@@ -147,19 +258,22 @@ puthex:				; Put two hex nibbles to the serial console.
 waitsw:
 	ld hl,waitswstr
 	call puts
+	
+	ld hl,$DF82
+	ld a, 1
+	ld [hl], a
 
 	ld c, $51
 	xor a
 	ld [c],a
 	
-	ld b, $0
 .loop1:
 	ld a,[c]
-	cp b
+	cp $0
 	jr z,.loop1
 .loop2:
 	ld a,[c]
-	cp b
+	cp $0
 	jr nz,.loop2
 	ret
 
@@ -203,8 +317,7 @@ insntest:
 
 	; Test JR
 	ld a, $FF
-	ld b, $00
-	cp b
+	cp $0
 	jr nz,.jr
 	ld hl, .jrfail
 	jr .fail
@@ -226,26 +339,49 @@ insntest:
 	; Test CP.
 	ld hl, .cpfail
 	ld a, $10
-	ld b, $20
-	cp b
+	cp $20
 	jr nc,.fail
 	ld a, $20
-	ld b, $10
-	cp b
+	cp $10
 	jr c,.fail
 	
 	; Test CPL
 	ld hl, .cplfail
 	ld a, $55
-	ld b, $AA
 	cpl
-	cp b
+	cp $AA
 	jr nz,.fail
+
+	; Test DI/EI delay
+	di
+	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
 	
 	ld hl, .ok
 	call puts
 	ret
 .fail:
+	ei
 	call puts
 	ld hl, .testfailed
 	call puts
@@ -268,6 +404,10 @@ insntest:
 	db "CPL",0
 .inc16fail:
 	db "INC16",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:
@@ -275,12 +415,11 @@ insntest:
 
 ; Serial port manipulation functions.
 putc:
-	ld b, 0
 	ld c, $50
 	push af
 .waitport:
 	ld a,[c]
-	cp b
+	cp $00
 	jr nz,.waitport
 	pop af
 	ld [c],a
@@ -288,8 +427,8 @@ putc:
 
 puts:
 	ld a, [hli]
-	ld b, $00
-	cp b
+	cp $00
 	ret z
 	call putc
 	jr puts
+