From 3f45cceec8a4d1eed1fc30fc2eb112eebb3107dd Mon Sep 17 00:00:00 2001
From: Zellyn Hunter <zellyn@squareup.com>
Date: Thu, 26 Jan 2017 20:46:38 -0600
Subject: [PATCH] Added Cxxx ROM checks

---
 README.md            |   4 +-
 audit/audit.asm      |   2 +
 audit/audit.dsk      | Bin 143360 -> 143360 bytes
 audit/auxmem.asm     | 251 ++++++++++++++++++++++++++++++++++++++-----
 audit/langcard.asm   |   4 +-
 audit/notes.org      |   9 ++
 audit/resetall.asm   |   2 +
 audit/softswitch.asm |  26 ++++-
 v0/index.md          |   4 +
 9 files changed, 267 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 9063cb4..c4a4bda 100644
--- a/README.md
+++ b/README.md
@@ -24,11 +24,11 @@ Error messages can be viewed at
 - [x] language card tests
 - [x] main/auxiliary memory softswitch behavior tests
 - [x] softswitch reading tests
+- [x] Incorporate Cxxx testing into data-driven test
+- [x] Add testcases for Cxxx testing
 
 ### TODO
 
-- [ ] Incorporate Cxxx testing into data-driven test
-- [ ] Add testcases for Cxxx testing
 - [ ] weirder softswitch behavior corner cases
 - [ ] floating-bus tests
 
diff --git a/audit/audit.asm b/audit/audit.asm
index 4c53578..850aa84 100644
--- a/audit/audit.asm
+++ b/audit/audit.asm
@@ -8,6 +8,8 @@
 
 	;; Zero-page locations.
 	SCRATCH = $1
+	SCRATCH2 = $2
+	SCRATCH3 = $3
 	LCRESULT = $10
 	LCRESULT1 = $11
 	AUXRESULT = $12
diff --git a/audit/audit.dsk b/audit/audit.dsk
index 9c466c6a9a4055aa45b69577ab774e8b7a3cea76..04350c1df53e9b0c62bd7e224fb592f6960089a8 100644
GIT binary patch
delta 2995
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
CVmFEa

delta 2504
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
T=WC?z4bn$`M*66tmn6OgH$;>s

diff --git a/audit/auxmem.asm b/audit/auxmem.asm
index eaeaa67..6bee18b 100644
--- a/audit/auxmem.asm
+++ b/audit/auxmem.asm
@@ -9,11 +9,15 @@
 	.MEM_4 = %11
 	.MEM_2_1_1_1 = (.MEM_2 << 0) + (.MEM_1 << 2) + (.MEM_1 << 4) + (.MEM_1 << 6)
 	.MEM_3_2_2_2 = (.MEM_3 << 0) + (.MEM_2 << 2) + (.MEM_2 << 4) + (.MEM_2 << 6)
-	
-	.C_1 = %001
-	.C_3 = %010
-	.C_8 = %100
-	.C_138 = .C_1 | .C_3 | .C_8
+
+	.C_8f = %0001
+	.C_12 = %0010
+	.C_47 = %0100
+	.C_3  = %1000
+	.C_0  = %0000
+	.C_skip = $80
+	.C_1348 = .C_12 | .C_3 | .C_47 | .C_8f
+	.C_38 = .C_3 | .C_8f
 
 	.checkdata = tmp1
 	.ismain = tmp3
@@ -202,9 +206,10 @@ AUXMEMTESTS
 
 	;; First checkdata byte is for Cxxx tests.
 	jsr .nextcheck
+	bmi +
 	jsr .checkCxxx
 
-	ldx .checkdata
++	ldx .checkdata
 	ldy .checkdata+1
 	jsr RESETALL
 	stx .checkdata
@@ -331,8 +336,133 @@ AUXMEMTESTS
 	
 ;;; Check that the expected ROM areas are visible.
 .checkCxxx
+	.gotCxxx = tmp0
+	.wantCxxx = SCRATCH
+	pha
+	jsr .genCxxxFingerprint
+	pla
+	cmp .gotCxxx
+	beq .checkCxxxDone
+	lda .gotCxxx
+
+	;; Reset, but copy .checkdata over.
+	ldx .checkdata
+	ldy .checkdata+1
+	jsr RESETALL
+	stx .checkdata
+	sty .checkdata+1
+	sta .gotCxxx
+	ldy #0
+	lda (.checkdata),y
+	sta .wantCxxx
+
+	jsr .printtest
+	+print
+	!text "WANT:",$8D
+	+printed
+	lda .wantCxxx
+	jsr .printCxxxBits
+	+print
+	!text "GOT:",$8D
+	+printed
+	lda .gotCxxx
+	jsr .printCxxxBits
+	
+	+prerr $000B ;; E000B: This is a the Cxxx-ROM check part of the auxiliary memory data-driven test (see E000A for a description of the other part). After a full reset, we perform a testdata-driven sequence of instructions. Finally we check which parts of Cxxx ROM seem to be visible. We check C100-C2FF, C300-C3FF, C400-C7FF (which should be the same as C100-C2FF), and C800-CFFE. For more details, see Understanding the Apple IIe, by James Fielding Sather, Pg 5-28.
+	!text "CXXX ROM TEST FAILED"
+	+prerred
+
+	;; Don't continue with auxmem check: return from parent JSR.
+	pla
+	pla
+	sec
+	rts
+	
+.checkCxxxDone
 	rts
 
+.genCxxxFingerprint
+	.dataptr = SCRATCH2
+	.want = SCRATCH3
+	.loopctr = SCRATCH
+
+	lda #0
+	sta .gotCxxx
+	lda #0
+	sta .dataptr
+	lda #4
+	sta .loopctr
+
+--	clc
+	ror .gotCxxx
+	ldx #4			; four check bytes per region
+	lda #$8			; start out with positive match bit
+	ora .gotCxxx
+	sta .gotCxxx
+-	ldy .dataptr
+	lda .cxtestdata,y
+	iny
+	sta SRC
+	lda .cxtestdata,y
+	iny
+	sta SRC+1
+	lda .cxtestdata,y
+	iny
+	sta .want
+	sty .dataptr
+	ldy #0
+	lda (SRC),y
+	cmp .want
+	beq +
+	lda #($ff-$8)		; mismatch: clear current bit
+	and .gotCxxx
+	sta .gotCxxx
++	dex
+	bne -
+
+	dec .loopctr
+	bne --
+	rts
+
+.printCxxxBits
+	tax
+	+print
+	!text "- C100-C2FF: "
+	+printed
+	txa
+	and #.C_12
+	jsr .printCxxxBit
+	+print
+	!text "- C300-C3FF: "
+	+printed
+	txa
+	and #.C_3
+	jsr .printCxxxBit
+	+print
+	!text "- C400-C7FF: "
+	+printed
+	txa
+	and #.C_47
+	jsr .printCxxxBit
+	+print
+	!text "- C800-CFFE: "
+	+printed
+	txa
+	and #.C_8f
+	jsr .printCxxxBit
+	rts
+
+.printCxxxBit
+	bne +
+	+print
+	!text "?",$8D
+	+printed
+	rts
++	+print
+	!text "ROM",$8D
+	+printed
+	rts
+	
 ;;; Increment .checkdata pointer to the next memory location, and load
 ;;; it into the accumulator. X and Y are preserved.
 .nextcheck
@@ -403,26 +533,26 @@ zpfromaux
 	;; Test 1: everything reset.
 	lda #1
 	jsr .check
-	!byte .C_138, 2, 2, 2, 2, 3, 3, 3, 3
+	!byte .C_skip, 2, 2, 2, 2, 3, 3, 3, 3
 
 	;; Test 2: write to AUX but read from Main RAM, everything else normal.
 	lda #2
 	sta SET_RAMWRT
 	jsr .check
-	!byte .C_138, 2, 1, 1, 1, 3, 2, 2, 2
+	!byte .C_skip, 2, 1, 1, 1, 3, 2, 2, 2
 
 	;; Test 3: write to main but read AUX, everything else normal.
 	lda #3
 	sta SET_RAMRD
 	jsr .check
-	!byte .C_138, 2, 4, 4, 4, 3, 3, 3, 3
+	!byte .C_skip, 2, 4, 4, 4, 3, 3, 3, 3
 	
 	;; Test 4: write to AUX, read from AUX, everything else normal.
 	lda #4
 	sta SET_RAMRD
 	sta SET_RAMWRT
 	jsr .check
-	!byte .C_138, 2, 1, 1, 1, 3, 4, 4, 4
+	!byte .C_skip, 2, 1, 1, 1, 3, 4, 4, 4
 
 	;; Our four basic tests, but with 80STORE ON -----------------
 	;; (400-7ff is pointing at main mem)
@@ -431,21 +561,21 @@ zpfromaux
 	lda #5
 	sta SET_80STORE
 	jsr .check
-	!byte .C_138, 2, 2, 2, 2, 3, 3, 3, 3
+	!byte .C_skip, 2, 2, 2, 2, 3, 3, 3, 3
 
 	;; Test 6: write to aux
 	lda #6
 	sta SET_RAMWRT
 	sta SET_80STORE
 	jsr .check
-	!byte .C_138, 2, 1, 2, 1, 3, 2, 3, 2
+	!byte .C_skip, 2, 1, 2, 1, 3, 2, 3, 2
 
 	;; Test 7: read from aux
 	lda #7
 	sta SET_RAMRD
 	sta SET_80STORE
 	jsr .check
-	!byte .C_138, 2, 4, 2, 4, 3, 3, 3, 3
+	!byte .C_skip, 2, 4, 2, 4, 3, 3, 3, 3
 	
 	;; Test 8: read and write aux
 	lda #8
@@ -453,7 +583,7 @@ zpfromaux
 	sta SET_RAMWRT
 	sta SET_80STORE
 	jsr .check
-	!byte .C_138, 2, 1, 2, 1, 3, 4, 3, 4
+	!byte .C_skip, 2, 1, 2, 1, 3, 4, 3, 4
 
 	;; Our four basic tests, but with 80STORE and PAGE2 ON -------
 	;; (400-7ff is pointing at aux mem)
@@ -463,7 +593,7 @@ zpfromaux
 	sta SET_80STORE
 	sta SET_PAGE2
 	jsr .check
-	!byte .C_138, 2, 2, 1, 2, 3, 3, 4, 3
+	!byte .C_skip, 2, 2, 1, 2, 3, 3, 4, 3
 
 	;; Test A: write to aux
 	lda #$a
@@ -471,7 +601,7 @@ zpfromaux
 	sta SET_80STORE
 	sta SET_PAGE2
 	jsr .check
-	!byte .C_138, 2, 1, 1, 1, 3, 2, 4, 2
+	!byte .C_skip, 2, 1, 1, 1, 3, 2, 4, 2
 
 	;; Test B: read from aux
 	lda #$b
@@ -479,7 +609,7 @@ zpfromaux
 	sta SET_80STORE
 	sta SET_PAGE2
 	jsr .check
-	!byte .C_138, 2, 4, 1, 4, 3, 3, 4, 3
+	!byte .C_skip, 2, 4, 1, 4, 3, 3, 4, 3
 	
 	;; Test C: read and write aux
 	lda #$c
@@ -488,7 +618,7 @@ zpfromaux
 	sta SET_80STORE
 	sta SET_PAGE2
 	jsr .check
-	!byte .C_138, 2, 1, 1, 1, 3, 4, 4, 4
+	!byte .C_skip, 2, 1, 1, 1, 3, 4, 4, 4
 
 	;; Our four basic tests, but with 80STORE and HIRES ON -------
 	;; (400-7ff and 2000-3fff are pointing at main mem)
@@ -498,7 +628,7 @@ zpfromaux
 	sta SET_80STORE
 	sta SET_HIRES
 	jsr .check
-	!byte .C_138, 2, 2, 2, 2, 3, 3, 3, 3
+	!byte .C_skip, 2, 2, 2, 2, 3, 3, 3, 3
 
 	;; Test E: write to aux
 	lda #$e
@@ -506,7 +636,7 @@ zpfromaux
 	sta SET_80STORE
 	sta SET_HIRES
 	jsr .check
-	!byte .C_138, 2, 1, 2, 2, 3, 2, 3, 3
+	!byte .C_skip, 2, 1, 2, 2, 3, 2, 3, 3
 
 	;; Test F: read from aux
 	lda #$f
@@ -514,7 +644,7 @@ zpfromaux
 	sta SET_80STORE
 	sta SET_HIRES
 	jsr .check
-	!byte .C_138, 2, 4, 2, 2, 3, 3, 3, 3
+	!byte .C_skip, 2, 4, 2, 2, 3, 3, 3, 3
 	
 	;; Test 10: read and write aux
 	lda #$10
@@ -523,7 +653,7 @@ zpfromaux
 	sta SET_80STORE
 	sta SET_HIRES
 	jsr .check
-	!byte .C_138, 2, 1, 2, 2, 3, 4, 3, 3
+	!byte .C_skip, 2, 1, 2, 2, 3, 4, 3, 3
 
 	;; Our four basic tests, but with 80STORE, HIRES, PAGE2 ON ---
 	;; (400-7ff and 2000-3fff are pointing at aux mem)
@@ -534,7 +664,7 @@ zpfromaux
 	sta SET_HIRES
 	sta SET_PAGE2
 	jsr .check
-	!byte .C_138, 2, 2, 1, 1, 3, 3, 4, 4
+	!byte .C_skip, 2, 2, 1, 1, 3, 3, 4, 4
 
 	;; Test 12: write to aux
 	lda #$12
@@ -543,7 +673,7 @@ zpfromaux
 	sta SET_HIRES
 	sta SET_PAGE2
 	jsr .check
-	!byte .C_138, 2, 1, 1, 1, 3, 2, 4, 4
+	!byte .C_skip, 2, 1, 1, 1, 3, 2, 4, 4
 
 	;; Test 13: read from aux
 	lda #$13
@@ -552,7 +682,7 @@ zpfromaux
 	sta SET_HIRES
 	sta SET_PAGE2
 	jsr .check
-	!byte .C_138, 2, 4, 1, 1, 3, 3, 4, 4
+	!byte .C_skip, 2, 4, 1, 1, 3, 3, 4, 4
 	
 	;; Test 14: read and write aux
 	lda #$14
@@ -562,7 +692,52 @@ zpfromaux
 	sta SET_HIRES
 	sta SET_PAGE2
 	jsr .check
-	!byte .C_138, 2, 1, 1, 1, 3, 4, 4, 4
+	!byte .C_skip, 2, 1, 1, 1, 3, 4, 4, 4
+
+	;; Test 15: Cxxx test with everything reset.
+	lda #$15
+	jsr .check
+	!byte .C_3, 2, 2, 2, 2, 3, 3, 3, 3
+
+	;; Test 16: Cxxx test with SLOTC3ROM set
+	lda #$16
+	sta SET_SLOTC3ROM
+	jsr .check
+	!byte .C_0, 2, 2, 2, 2, 3, 3, 3, 3
+
+	;; Test 17: Cxxx test with INTCXROM set.
+	lda #$17
+	sta SET_INTCXROM
+	jsr .check
+	!byte .C_1348, 2, 2, 2, 2, 3, 3, 3, 3
+
+	;; Test 18: Cxxx test with SLOTC3ROM and INTCXROM set
+	lda #$18
+	sta SET_SLOTC3ROM
+	sta SET_INTCXROM
+	jsr .check
+	!byte .C_1348, 2, 2, 2, 2, 3, 3, 3, 3
+
+	;; Test 19: Cxxx test with "INTC8ROM" set
+	lda #$19
+	lda $C300
+	jsr .check
+	!byte .C_38, 2, 2, 2, 2, 3, 3, 3, 3
+
+	;; Test 1A: Cxxx test showing inability to reset "INTC8ROM" with softswitches.
+	lda #$1A
+	lda $C300
+	sta SET_SLOTC3ROM
+	jsr .check
+	!byte .C_8f, 2, 2, 2, 2, 3, 3, 3, 3
+
+	;; Test 1B: Cxxx test showing ability to reset "INTC8ROM" with CFFF reference.
+	lda #$1B
+	lda $C300
+	sta SET_SLOTC3ROM
+	lda RESET_INTC8ROM
+	jsr .check
+	!byte .C_0, 2, 2, 2, 2, 3, 3, 3, 3
 
 	!byte 0 ; end of tests
 
@@ -579,4 +754,28 @@ zpfromaux
 .memorylen = * - .memorylocs - 2
 	!word 0
 
+.cxtestdata
+	;; C800-Cffe
+	!byte $00, $c8, $4c
+	!byte $21, $ca, $8d
+	!byte $43, $cc, $f0
+	!byte $b5, $ce, $7b
+
+	;; C100-C2ff
+	!byte $4d, $c1, $a5
+	!byte $6c, $c1, $2a
+	!byte $b5, $c2, $ad
+	!byte $ff, $c2, $00
+
+	;; C400-C7ff
+	!byte $36, $c4, $8d
+	!byte $48, $c5, $18
+	!byte $80, $c6, $8b
+	!byte $6e, $c7, $cb
+
+	;; C300-C3ff
+	!byte $00, $c3, $2c
+	!byte $0a, $c3, $0c
+	!byte $2b, $c3, $04
+	!byte $e2, $c3, $ed
 } ;auxmem
diff --git a/audit/langcard.asm b/audit/langcard.asm
index 6d4496f..1283462 100644
--- a/audit/langcard.asm
+++ b/audit/langcard.asm
@@ -296,8 +296,8 @@ LANGCARDTESTS_NO_CHECK:
 	!byte $23, $34, $11, $23, $34		;
 	!byte $07, $0D, $ff			; Read $C087, read $C08D (read ROM, write bank 1)
 	!byte $53, $60, $54, $22, $61		;
-;	!byte $0b, $8b, $0b, $ff		; Read $C08B, write $C08B, read $C08B (read RAM bank 1, no write)
-;	!byte $11, $33, $11, $22, $33		; (this one is tricky: reset WRTCOUNT by writing halfway)
+	!byte $0b, $8b, $0b, $ff		; Read $C08B, write $C08B, read $C08B (read RAM bank 1, no write)
+	!byte $11, $33, $11, $22, $33		; (this one is tricky: reset WRTCOUNT by writing halfway)
 	!byte $ff
 
 	nop			; Provide clean break after data when viewing disassembly
diff --git a/audit/notes.org b/audit/notes.org
index f78b16a..c4805c8 100644
--- a/audit/notes.org
+++ b/audit/notes.org
@@ -192,3 +192,12 @@ Just switch them on and off, and test each, one at a time.
 On entry into AUXMEMTESTS
 SP: 01FE
 returned to 02A0
+* 80 column details
+Lores80 color differences: UtA2e: 8-29
+
+* apple2e.rom
+
+4000-40ff is zeros. I believe this corresponds to C000-C0ff
+
+
+
diff --git a/audit/resetall.asm b/audit/resetall.asm
index d8016bc..0cd0609 100644
--- a/audit/resetall.asm
+++ b/audit/resetall.asm
@@ -20,6 +20,8 @@ RESETALL
 	sta RESET_ALTZP
 	sta RESET_SLOTC3ROM
 	sta RESET_INTC8ROM
+	sta RESET_80COL
+	sta RESET_ALTCHRSET
 	sta SET_TEXT
 	sta RESET_MIXED
 	sta RESET_PAGE2
diff --git a/audit/softswitch.asm b/audit/softswitch.asm
index ae01479..9b912b7 100644
--- a/audit/softswitch.asm
+++ b/audit/softswitch.asm
@@ -60,6 +60,7 @@ SOFTSWITCHTESTS
 	ldx #$80
 	jsr RESETALL
 	jsr .fail
+	beq .wrtloopend
 +	dex
 	bne -
 
@@ -69,9 +70,10 @@ SOFTSWITCHTESTS
 	ldx #.testtimes		; test `.testtimes` times
 -	lda (.readloc),y
 	bpl +			;ok
-	ldx #$02		;TODO: create "LEAVE" fail message
+	ldx #$42
 	jsr RESETALL
 	jsr .fail
+	beq .wrtloopend
 +	dex
 	bne -
 
@@ -84,6 +86,7 @@ SOFTSWITCHTESTS
 	ldx #$82
 	jsr RESETALL
 	jsr .fail
+	beq .wrtloopend
 +	dex
 	bne -
 
@@ -96,9 +99,11 @@ SOFTSWITCHTESTS
 	ldx #$80
 	jsr RESETALL
 	jsr .fail
+	beq .wrtloopend
 +	dex
 	bne -
 
+.wrtloopend
 	dec .loopcount
 	bne .wrtloop
 
@@ -131,6 +136,7 @@ SOFTSWITCHTESTS
 	ldx #$00
 	jsr RESETALL
 	jsr .fail
+	beq .readloopend
 +	dex
 	bne -
 
@@ -143,6 +149,7 @@ SOFTSWITCHTESTS
 	ldx #$02
 	jsr RESETALL
 	jsr .fail
+	beq .readloopend
 +	dex
 	bne -
 
@@ -155,9 +162,11 @@ SOFTSWITCHTESTS
 	ldx #$00
 	jsr RESETALL
 	jsr .fail
+	beq .readloopend
 +	dex
 	bne -
 
+.readloopend
 	dec .loopcount
 	bne .readloop
 
@@ -180,6 +189,7 @@ SOFTSWITCHTESTS
 ;;; A = actual value read (which tells what we expected: the opposite)
 .fail
 	sta SCRATCH
+	stx SCRATCH2
 	txa
 	bmi +
 	+print
@@ -202,7 +212,14 @@ SOFTSWITCHTESTS
 	+print
 	!text " SHOULD "
 	+printed
-	lda SCRATCH
+	lda SCRATCH2
+	and #$40
+	beq +
+	+print
+	!text "NOT SET "
+	+printed
+	beq ++
++	lda SCRATCH
 	bpl +
 	+print
 	!text "RE"
@@ -210,11 +227,11 @@ SOFTSWITCHTESTS
 +	+print
 	!text "SET "
 	+printed
-	ldx .readloc
+++	ldx .readloc
 	ldy .readloc+1
 	jsr PRNTYX
 	+print
-	!text ";GOT $" 
+	!text ";GOT " 
 	+printed
 	lda SCRATCH
 	jsr PRBYTE
@@ -222,7 +239,6 @@ SOFTSWITCHTESTS
 	jsr COUT
 	lda #0
 	sta SOFTSWITCHRESULT
-	ldx #1
 	rts
 	
 .writeswitches
diff --git a/v0/index.md b/v0/index.md
index f37930c..9aa5422 100644
--- a/v0/index.md
+++ b/v0/index.md
@@ -39,3 +39,7 @@ We wrote $44 to main RAM in the three test locations used by the LC test. They s
 ## E000A
 
 This is a data-driven test of main and auxiliary memory softswitch operation. We initialize $FF, $100, $200, $3FF, $427, $7FF, $800, $1FFF, $2000, $3FFF, $4000, $5FFF, and $BFFF in main RAM to value 1, and in auxiliary RAM to value 3. Then, we perform a testdata-driven sequence of instructions. Finally we (try to) increment all test locations. Then we test the expected values of the test locations in main and auxiliary memory. For more information on the operation of the auxiliary memory soft-switches, see Understanding the Apple IIe, by James Fielding Sather, Pg 5-22 to 5-28.
+
+## E000B
+
+This is a the Cxxx-ROM check part of the auxiliary memory data-driven test (see E000A for a description of the other part). After a full reset, we perform a testdata-driven sequence of instructions. Finally we check which parts of Cxxx ROM seem to be visible. We check C100-C2FF, C300-C3FF, C400-C7FF (which should be the same as C100-C2FF), and C800-CFFE. For more details, see Understanding the Apple IIe, by James Fielding Sather, Pg 5-28.