From 01503fddff030fb702a71a3a3f33aa70374790e9 Mon Sep 17 00:00:00 2001
From: Zellyn Hunter <zellyn@squareup.com>
Date: Wed, 21 Dec 2016 20:26:22 -0500
Subject: [PATCH] langcard: move explicit logic into data-drive test

---
 audit/audit.dsk    | Bin 143360 -> 143360 bytes
 audit/langcard.asm | 200 +++++----------------------------------------
 v0/index.md        |  98 +---------------------
 3 files changed, 22 insertions(+), 276 deletions(-)

diff --git a/audit/audit.dsk b/audit/audit.dsk
index ffcb84a3d5da21ee99c4653f5057ba64f5ecca68..d5a319674e0e7afc620bc2b99c90cc10879d3e5a 100644
GIT binary patch
delta 1513
zcmZvaZ%i9?7{{+YS`G>dSR<>W{iT{oh%ay~iZLeW)bQe>G0wObn$Y7%Qs0=PzA@oN
zt4oo%-BP?{Ziy!6WRcrADY`hfgrrA%z-_cW=+$iUXJl@Su~09*F^Eu~yB3FJ$uIZ2
z=lgt~-}C)Fcadc(vP{JoTjD3%qu)^cYt;B)<gi;JuBY!}gOnnPW@!~iozgwbAFVo2
z8SfTb>3BCEt$O|WQGA&oP7!BD@qqRxZ6he5<?<*#Ll6VnU%@y@OIYjxmj0nzEO3ql
zM<zIelD?$&+fQNMOC1PvD;OGacd_(o0+vW{^O#$}=bYRsK3B=z!{TPN@+>jFh9NP2
z-^|s{V`Km7DoDoTQKvwFI_oqFmZEK}YPojg+m4a+V7D}nt0GX>xJga4g2*l5lgs$T
zE!@00atkNyaa(x$!~#y(v});htU1Im5Kz?Gs5%U{>NM)q3XP;+!78bJWL;W}aEoAg
zIei;zjS``y?_jM?BJ}hM)~NEt+NFU+2{D{7JlX{XCioyS@lsUn!gP!|-HBcb@vO@i
zen0d@RRsOEC30weYg)^po=|YOiz?Q))%)9sqTk$X#do^QtqS%d{(#Mjj|5yLh%7-a
zSFzzxga1%vZHaOnFXxMEYip=K1YJuL4|3<3Aa{W&oM$xh!@>ndTHiLD(4GF4>FSg|
zONcTA;uUxV!5BKZ1zM0>f})#DVF`)~Hy_mG88jS19UEQLColr;wt02#4m@=ie2L0{
zL?q~j09O~_`)c-uNd~dKV}yBZf3JDEb!~bhFg-@3ecOgt@@;n_pa#p-*Z-$r&;a($
z0@ycef!~+GYkR=RUhr1{!)D{ZA4cx(?Ff||x<h*$szvxWIHvJ*4-q9|_7xj_y-Og@
zI*~7gj{buP7X87%tdN_P7IB>e`B<Yy?T9&0Gi#8jm6cwY$67U1*ibtQ-$QlA+?oTu
zWoCO=(Cz4BORtDMX*f_nYura1D=lFDgGc=DEn@Y#xC5=T#$oAr0+v|M_05{Ya6u`F
z>U)hAv5oU>n}d7`qzcs5Ydj$xOTZHSW%dn7IMAED&|Z8wN{9^qYE8>`Heanjs|!N}
z;+Z))EeuU6W0T`nI3i4yGFKVC&*QQ44F8qK=i(Vz7)r*?0$%p`p5~buIWv`)rxYP6
z&!q%i$>}*Emro`YC8eY|3#{1pu6qvy2{`!erbhnRCdzKTK1P9s9UZ;MGefDdOA~^g
z6_VMEE~}Z6&;N`8@DRJ;i}d(wd1e>KAN2UcmIAhAO`A~!RTboXO4T{bVOmLN=Wbjv
z&5r%}%QZ{;`C@6mXvJ5Vd`6ytLa?Kzl#H%U-moxLRRkrSpOJMno3UnKp0d+qDreqP
z$Yk|{FceM8&gtc$sA_UIsF;B;tYoI;Oj1dSX2_3to1WnrZN|L&&WTpjoj}lL@;OU6
QW_Uk0ytYe**IrluFHeZ~uK)l5

delta 2432
zcmZ`(Z)_7~7{9h_*L7RB%8=sz^j(25{>jL`?1P#S!9Y?ZG8Df^=GtCL45t5xgb_L=
zQ&5gfYYfB>UdV`??vfQy#*&%d+S_(vZEx+BG7<w{FsNC11=JAS=5yC>V_Qis*L$Dm
z_dLJn`906uuDklKyZWAvBA@?AIOO@ZI5=deR^N68ZyOrEDj7N;#x{^*B}+)Ljijh&
ziCeKvByM3(g<0ZmtdYbzwkvGg>tqQTxNwr;3nwK=1IR{pGuf?Uw~)aqLqqXn2h(JG
z><Df*><m0|UMGlei1Uw}r^JUg6``j$UVr2~PY|cXe_j0=+h0zm6|lC44kk-!!;~gW
z5qfrNni)h>(=K#-8l9bHKMA`itHVXDab&FyQIlQcV5erV4iL804x~DQTA#G*k3!{C
zBMB8#8{jQb8{r+eMQtM4kHhdV1Z5#9L|)WUo5_pC)E1I?+Fg8s7<!om$Iw>US8gG3
z&Heje!YjLVGy&EL9nLBi@yUHL)q*TDJsMlu!CJ_YE{HQf)ekp;k+PC!*OF%%$i}CA
z4P;o|uNpgp$Z$X<8rb!usAU3xfS@L`pv6^!4p$0AqQ=(k6g1+8id;+=RSy-*>WgMJ
zM8rBLa2?w@u?u}*M_c_NLKdUVFKfb3a_b%TF_0dBmKgwAW)$GTJn(Q1xM2<%B7|9d
z+<eYSbQ3-5-&D389W-&F4juL5L+5s(ul+%NnPuHi{?ALg<_N~b6#B*Qy40?pH8q>8
z%_`MwTf1rh`$2bEUEq%2CfResx~Qz(MLn=*vv!!x1N;1J?%CUS!R#0gwXi3{(28Ki
z+l2jM2{6Be4*GDt(54)!(MLWIWuJ1WL6i>{1Edy(d_cln>?Rm{w~GBD3=d<XIwzRs
z;5}n?MJY_c*TE8D+ldb9ct^0Je02b{5_~zW?)VmIwM3{t@~FQTqu>TCk)Fsax^|iL
zFd(^=5_HXj55Xv)!vM6nMldOj7?9|}`|>T8qTfAuC!ovFtOvi6?VQ+?4=+cnym*r=
zB?#0uA8kZUUeLs<q^dx>y^1E4sKbj-#22DX=$IEDW>4p%19Rjrpr9AOlMi2k`n-5I
zkXIqzi(8)|Ux|M8;;pi@K)xS0<pW+s|9G)EU-~Lk;lri*rp#!a4{wK5tI-=ijNbhZ
z5pLA%fH9*gH(PHbE49et#$`flj}|q$u?97{VeLf&gs4!98wM)qda6V%+ABMqZm_G7
zPq7#ERAVjr)Q$f{l$%9l@I9k7P)`cm`n71vjor^|Kn%nyg-{JLdGG<InX=5t*FYXe
z5o-3}9rD7R3^P`$b3(?-4lR1q146@J9Q0}ep>x{mklO=7=Qgnzo%Sd~>(O@}d@S3k
zp4f9mRiQFyP{tnovF7bByS`UGf2g&VXY76SXhNcU3E4SWYkhr@CCSC;-Vr`DGNb_J
zu|`LflQ=e-6mIfyTH;d@J;Dj&e3Vl1yjEi=&Dc4*H`1@1T{RXpq(5C#7Z~Q^H|WbW
z7m*+o&_)M<28IXeWFl6;Dkk}xLL!}_Gf6?>7f7Di^I_@ujd&sxr-vt{g>+X2X@w`W
zG~<;(K_b8}Axfnq5uT4K4du81vxF;S?~R784bxJBjwIp|C&Y6y&Z`7~rP>90iCnt=
zW$AKCfSns3Ph|LLuH|`&LeJ}|fFnl%jwKZv9RXQ3a1`da{ydHXjvNO#mT|}wU@u5v
zmPb9B=0<rs!X=~1>L@J+->NkSH`nUbMhASZ(8K1<*-;=T%|O1oW!nReMcb1r4Xg!A
z1AD>J20;44TN41!A_BN8oG6a-v>?!2Ix0vM)S9u!_*f!2IVgXIE)U#LY(HPk{a#hh
zMn^i%4MQO8j1cAHk}xu<zyyJ(`B-|KlY~TEkw(svCwWyEP02Tfj>An&rA0B3l=4?i
z5F*b21ztYTm-zS?7mx5!Mm`4n>T1_#?Bck*pmSv_q;m&a98aed%Sl}K8Lm@Z!*%LP
F)BlJo2BQD~

diff --git a/audit/langcard.asm b/audit/langcard.asm
index 35982ba..bd0df7f 100644
--- a/audit/langcard.asm
+++ b/audit/langcard.asm
@@ -9,7 +9,7 @@
 	+print
 	!text "48K:SKIPPING LANGUAGE CARD TEST",$8D
 	+printed
-	beq .done2
+	beq .jdone
 	;; Setup - store differing values in bank first and second banked areas.
 +	lda $C08B		; Read and write bank 1
 	lda $C08B
@@ -20,15 +20,15 @@
 	+prerr $0003 ;; E0003: We tried to put the language card into read bank 1, write bank 1, but failed to write.
 	!text "CANNOT WRITE TO LC BANK 1 RAM"
 	+prerred
-	beq .done2
+	beq .jdone
 	lda #$33
 +	sta $FE1F		; FE1F is $60 in Apple II/plus/e/enhanced
 	cmp $FE1F
-	beq +
+	beq .dotest
 	+prerr $0004 ;; E0004: We tried to put the language card into read RAM, write RAM, but failed to write.
 	!text "CANNOT WRITE TO LC RAM"
 	+prerred
-	beq .done2
+	beq .jdone
 +	lda $C083		; Read and write bank 2
 	lda $C083
 	lda #$22
@@ -38,180 +38,11 @@
 	+prerr $0005 ;; E0005: We tried to put the language card into read bank 2, write bank 2, but failed to write.
 	!text "CANNOT WRITE TO LC BANK 2 RAM"
 	+prerred
-	beq .done2
+.jdone	jmp .done
 
-	;; Test that we're reading the right things
-	
-+	lda $C088		; RAM read, bank 1, write disabled
-	lda $D17B
-	cmp #$11
-	beq ++
-	cmp #$22
-	bne +
-	+prerr $0006 ;; E0006: Read $C088 (read bank 1), but the language card is still reading bank 2.
-	!text "$C088: BANK 2 ACTIVE"
-	+prerred
-	beq .done2
-+	cmp #$53
-	bne +
-	+prerr $0007 ;; E0007: Read $C088 (read bank 1), but the language card is reading ROM.
-	!text "$C088: ROM ACTIVE"
-	+prerred
-	beq .done2
-+	+prerra $0008 ;; E0008: Read $C088 (read bank 1), but the check byte ($D17B) is an unknown value.
-	!text "$C088: UNKNOWN BYTE"
-	+prerred
-.done2	beq .done3
-++	inc $D17B
-	eor $D17B
-	beq +
-	+prerr $0009 ;; E0009: Read $C088 (read bank 1, write-protected), but successfully wrote byte ($D17B).
-	!text "$C088: ALLOWED WRITE"
-	+prerred
-	beq .done3
-
-+	lda $C080		; RAM read, bank 2, write disabled
-	lda $D17B
-	cmp #$22
-	beq ++
-	cmp #$11
-	bne +
-	+prerr $000A ;; E000A: Read $C080 (read bank 2), but the language card is still reading bank 1.
-	!text "$C080: BANK 1 ACTIVE"
-	+prerred
-	beq .done3
-+	cmp #$53
-	bne +
-	+prerr $000B ;; E000B: Read $C080 (read bank 2), but the language card is reading ROM.
-	!text "$C080: ROM ACTIVE"
-	+prerred
-	beq .done3
-+	+prerra $000C ;; E000C: Read $C080 (read bank 2), but the check byte ($D17B) is an unknown value.
-	!text "$C080: UNKNOWN BYTE"
-	+prerred
-	beq .done3
-++	inc $D17B
-	eor $D17B
-	beq +
-	+prerr $000D ;; E000D: Read $C080 (read bank 2, write-protected), but successfully wrote byte ($D17B).
-	!text "$C080: ALLOWED WRITE"
-	+prerred
-	beq .done3
-
-+	lda $C081		; ROM read, bank 2 no write
-	lda $D17B
-	cmp #$53
-	beq ++
-	cmp #$11
-	bne +
-	+prerr $000E ;; E000E: Read $C081 (read ROM), but the language card is still reading bank 1.
-	!text "$C081: BANK 1 ACTIVE"
-	+prerred
-	beq .done3
-+	cmp #$22
-	bne +
-	+prerr $000F ;; E000F: Read $C081 (read ROM), but the language card is reading bank 2.
-	!text "$C081: BANK 1 ACTIVE"
-	+prerred
-	beq .done3
-+	+prerra $0010 ;; E0010: Read $C081 (read ROM), but the check byte ($D17B) is an unknown value.
-	!text "$C081: UNKNOWN BYTE"
-	+prerred
-.done3	beq .done4
-++	dec $D17B
-	eor $D17B
-	beq +
-	+prerr $0011 ;; E0011: Read $C081 (read ROM), but successfully modified byte ($D17B).
-	!text "$C081: ALLOWED WRITE"
-	+prerred
-	beq .done4
-
-+	lda $C089		; ROM read, bank 1 write
-	lda $D17B
-	cmp #$53
-	beq ++
-	cmp #$11
-	bne +
-	+prerr $0012 ;; E0012: Read $C089 (read ROM), but the language card is still reading bank 1.
-	!text "$C089: BANK 1 ACTIVE"
-	+prerred
-	beq .done4
-+	cmp #$22
-	bne +
-	+prerr $0013 ;; E0013: Read $C089 (read ROM), but the language card is reading bank 2.
-	!text "$C089: BANK 1 ACTIVE"
-	+prerred
-	beq .done4
-+	+prerra $0014 ;; E0014: Read $C089 (read ROM), but the check byte ($D17B) is an unknown value.
-	!text "$C089: UNKNOWN BYTE"
-	+prerred
-	beq .done4
-++	inc $D17B		; bank 1 now holds $54 instead of $11
-	eor $D17B
-	beq +
-	+prerr $0015 ;; E0015: Read $C089 (read ROM), but successfully modified byte ($D17B).
-	!text "$C089: ALLOWED WRITE"
-	+prerred
-	beq .done4
-
-+	lda $C08B		; RAM read, bank 1
-	lda $D17B
-	cmp #$54
-	beq ++
-	cmp #$22
-	bne +
-	+prerr $0016 ;; E0016: Read $C08B (read bank 1), but the language card is still reading bank 2.
-	!text "$C08B: BANK 2 ACTIVE"
-	+prerred
-	beq .done4
-+	cmp #$53
-	bne +
-	+prerr $0017 ;; E0017: Read $C08B (read bank 1), but the language card is reading ROM.
-	!text "$C08B: ROM ACTIVE"
-	+prerred
-	beq .done4
-+	cmp #$11
-	bne +
-	+prerr $0018 ;; E0018: Read $C08B (read bank 1); byte should have been previously incremented from ROM ($53) to $54 because of lda $C089 after previous lda $C081.
-	!text "$C08B: PREVIOUS WRITE FAILED"
-	+prerred
-.done4	beq .done5
-+	+prerra $0019 ;; E0019: Read $C08B (read bank 1), but the check byte ($D17B) is an unknown value.
-	!text "$C08B: UNKNOWN BYTE"
-	+prerred
-	beq .done5
-++
-
-+	lda $C083		; RAM read, bank 2
-	lda $D17B
-	cmp #$22
-	beq ++
-	cmp #$54
-	bne +
-	+prerr $001A ;; E001A: Read $C083 (read bank 2), but the language card is still reading bank 1.
-	!text "$C083: BANK 1 ACTIVE"
-	+prerred
-	beq .done5
-+	cmp #$53
-	bne +
-	+prerr $001B ;; E001B: Read $C083 (read bank 2), but the language card is reading ROM.
-	!text "$C083: ROM ACTIVE"
-	+prerred
-	beq .done5
-+	cmp #$52
-	bne +
-	+prerr $001C ;; E001C: Read $C083 (read bank 2); byte should have been previously NOT been writable to be decremented from ROM ($53) to $52 because of single lda $C081 after previous lda $C080.
-	!text "$C083: PREVIOUS WRITE SUCCEEDED"
-	+prerred
-	beq .done5
-+	+prerra $001D ;; E001D: Read $C083 (read bank 2), but the check byte ($D17B) is an unknown value.
-	!text "$C083: UNKNOWN BYTE"
-	+prerred
-.done5	jmp .done
-++
 	;; Parameterized tests
 
-	lda #<.tests
+.dotest	lda #<.tests
 	sta 0
 	lda #>.tests
 	sta 1
@@ -375,8 +206,9 @@
 
 	lda ($0),y		; Done with the parameterized tests?
 	cmp #$ff
-	beq .over
-	clc
+	bne +
+	jmp .over
++	clc
 	tya
 	adc $0
 	sta $0
@@ -385,10 +217,10 @@
 +	jmp .outer
 
 .datatesturl
-	+prerr $001E ;; E001E: We initialized $D17B in RAM bank 1 to $11, $D17B in RAM bank 2 to $22, and $FE1F in RAM to $33. Then, we perform a testdata-driven sequence of LDA and STA to the $C08X range. Finally we (try to) increment $D17B and $FE1F. Then we test (a) the current live value in $D17B, (b) the current live value in $FE1F, (c) the RAM bank 1 value of $D17B, (d) the RAM bank 2 value of $D17B, and (e) the RAM value of $FE1F, to see whether they match expected values. $D17B is usually $53 in ROM, and $FE1F is usally $60. For more information on the operation of the language card soft-switches, see Understanding the Apple IIe, by James Fielding Sather, Pg 5-24.
+	+prerr $0006 ;; E0006: This is a data-driven test of Language Card operation. We initialize $D17B in RAM bank 1 to $11, $D17B in RAM bank 2 to $22, and $FE1F in RAM to $33. Then, we perform a testdata-driven sequence of LDA and STA to the $C08X range. Finally we (try to) increment $D17B and $FE1F. Then we test (a) the current live value in $D17B, (b) the current live value in $FE1F, (c) the RAM bank 1 value of $D17B, (d) the RAM bank 2 value of $D17B, and (e) the RAM value of $FE1F, to see whether they match expected values. $D17B is usually $53 in ROM, and $FE1F is usally $60. For more information on the operation of the language card soft-switches, see Understanding the Apple IIe, by James Fielding Sather, Pg 5-24.
 	!text "DATA-DRIVEN TEST FAILED"
 	+prerred
-	beq .done
+	jmp .done
 	
 .printseq
 	tya
@@ -435,8 +267,18 @@
 	;; (All sequences start with lda $C080, just to reset things to a known state.)
 	!byte $08, $ff				; Read $C088 (RAM read, write protected)
 	!byte $11, $33, $11, $22, $33		;
+	!byte $00, $ff				; Read $C080 (read bank 2, write disabled)
+	!byte $22, $33, $11, $22, $33		;
+	!byte $01, $ff				; Read $C081 (ROM read, write disabled)
+	!byte $53, $60, $11, $22, $33		;
+	!byte $01, $09, $ff			; Read $C081, $C089 (ROM read, bank 1 write)
+	!byte $53, $60, $54, $22, $61		;
 	!byte $01, $01, $ff			; Read $C081, $C081 (read ROM, write RAM bank 2)
 	!byte $53, $60, $11, $54, $61		;
+	!byte $0b, $ff				; Read $C08B (read RAM bank 1, no write)
+	!byte $11, $33, $11, $22, $33		;
+	!byte $03, $ff				; Read $C083 (read RAM bank 2, no write)
+	!byte $22, $33, $11, $22, $33		;
 	!byte $0b, $0b, $ff			; Read $C08B, $C08B (read/write RAM bank 1)
 	!byte $12, $34, $12, $22, $34		;
 	!byte $07, $0D, $ff			; Read $C087, read $C08D (read ROM, write bank 1)
diff --git a/v0/index.md b/v0/index.md
index 8399439..7455619 100644
--- a/v0/index.md
+++ b/v0/index.md
@@ -22,100 +22,4 @@ We tried to put the language card into read bank 2, write bank 2, but failed to
 
 ## E0006
 
-Read $C088 (read bank 1), but the language card is still reading bank 2.
-
-## E0007
-
-Read $C088 (read bank 1), but the language card is reading ROM.
-
-## E0008
-
-Read $C088 (read bank 1), but the check byte ($D17B) is an unknown value.
-
-## E0009
-
-Read $C088 (read bank 1, write-protected), but successfully wrote byte ($D17B).
-
-## E000A
-
-Read $C080 (read bank 2), but the language card is still reading bank 1.
-
-## E000B
-
-Read $C080 (read bank 2), but the language card is reading ROM.
-
-## E000C
-
-Read $C080 (read bank 2), but the check byte ($D17B) is an unknown value.
-
-## E000D
-
-Read $C080 (read bank 2, write-protected), but successfully wrote byte ($D17B).
-
-## E000E
-
-Read $C081 (read ROM), but the language card is still reading bank 1.
-
-## E000F
-
-Read $C081 (read ROM), but the language card is reading bank 2.
-
-## E0010
-
-Read $C081 (read ROM), but the check byte ($D17B) is an unknown value.
-
-## E0011
-
-Read $C081 (read ROM), but successfully modified byte ($D17B).
-
-## E0012
-
-Read $C089 (read ROM), but the language card is still reading bank 1.
-
-## E0013
-
-Read $C089 (read ROM), but the language card is reading bank 2.
-
-## E0014
-
-Read $C089 (read ROM), but the check byte ($D17B) is an unknown value.
-
-## E0015
-
-Read $C089 (read ROM), but successfully modified byte ($D17B).
-
-## E0016
-
-Read $C08B (read bank 1), but the language card is still reading bank 2.
-
-## E0017
-
-Read $C08B (read bank 1), but the language card is reading ROM.
-
-## E0018
-
-Read $C08B (read bank 1); byte should have been previously incremented from ROM ($53) to $54 because of lda $C089 after previous lda $C081.
-
-## E0019
-
-Read $C08B (read bank 1), but the check byte ($D17B) is an unknown value.
-
-## E001A
-
-Read $C083 (read bank 2), but the language card is still reading bank 1.
-
-## E001B
-
-Read $C083 (read bank 2), but the language card is reading ROM.
-
-## E001C
-
-Read $C083 (read bank 2); byte should have been previously NOT been writable to be decremented from ROM ($53) to $52 because of single lda $C081 after previous lda $C080.
-
-## E001D
-
-Read $C083 (read bank 2), but the check byte ($D17B) is an unknown value.
-
-## E001E
-
-We initialized $D17B in RAM bank 1 to $11, $D17B in RAM bank 2 to $22, and $FE1F in RAM to $33. Then, we perform a testdata-driven sequence of LDA and STA to the $C08X range. Finally we (try to) increment $D17B and $FE1F. Then we test (a) the current live value in $D17B, (b) the current live value in $FE1F, (c) the RAM bank 1 value of $D17B, (d) the RAM bank 2 value of $D17B, and (e) the RAM value of $FE1F, to see whether they match expected values. $D17B is usually $53 in ROM, and $FE1F is usally $60. For more information on the operation of the language card soft-switches, see Understanding the Apple IIe, by James Fielding Sather, Pg 5-24.
+This is a data-driven test of Language Card operation. We initialize $D17B in RAM bank 1 to $11, $D17B in RAM bank 2 to $22, and $FE1F in RAM to $33. Then, we perform a testdata-driven sequence of LDA and STA to the $C08X range. Finally we (try to) increment $D17B and $FE1F. Then we test (a) the current live value in $D17B, (b) the current live value in $FE1F, (c) the RAM bank 1 value of $D17B, (d) the RAM bank 2 value of $D17B, and (e) the RAM value of $FE1F, to see whether they match expected values. $D17B is usually $53 in ROM, and $FE1F is usally $60. For more information on the operation of the language card soft-switches, see Understanding the Apple IIe, by James Fielding Sather, Pg 5-24.