From 3fe7aa4e6050fd055a8d794e1a53064a2e786e8e Mon Sep 17 00:00:00 2001
From: Zellyn Hunter <zellyn@squareup.com>
Date: Wed, 18 Jan 2017 20:57:26 -0500
Subject: [PATCH] auxmem: make sure LC test didn't touch main mem LC

---
 audit/audit.asm  |   2 +-
 audit/audit.dsk  | Bin 143360 -> 143360 bytes
 audit/auxmem.asm |  61 +++++++++++++++++++++++++++++++++++++++++++----
 v0/index.md      |   8 +++++++
 4 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/audit/audit.asm b/audit/audit.asm
index 5bfaa80..071f1f1 100644
--- a/audit/audit.asm
+++ b/audit/audit.asm
@@ -11,7 +11,7 @@
 	KSW = $38
 
 	LCRESULT = $10
-	LCRESULT2 = $11
+	LCRESULT1 = $11
 	AUXRESULT = $12
 
 	;; AUXMOVE locations
diff --git a/audit/audit.dsk b/audit/audit.dsk
index 016356d5e1b2336790d29831b96a69e77dabd67e..e3c98ddd1ab42f51870ef0df7ba69b8a8461e75d 100644
GIT binary patch
delta 1344
zcmZ8ePfXip6t@#%oF<{61Sx9*`4G~|x~f9k4jehqsfQf49kv~MKy&g9ap)rD(hX^_
zR@sn-w<?w<b*E1qNQqWUz!+WG5H^Vk7K!5!XAL_c?ZTyzwabK9v%SxhKdWSY*89Ep
zd++ytZ)TsL+2;xGif>52dB?K+`)phKfKS}muLQ8o$umm)t)$GDm9BG<Rk?UBYF2{S
zc0=Wm+>JAwd<kbd$K|gT__E$UZZDA^j_*l>-nU<CCZ90Ocg%xka@PDS&N4i?`lOkB
zz%aAs-xG`O`0vU5XnZdbe=23YL(>WQS=;8&v*+<c0sWaqqlbABqH+F?%<PK+464K~
zcrEcFyiGBP<u4TY@{HJlMGs!!#BRLMDPF?)qfF;RX1xbPVm(B2fevg(4-Npbdovti
z0IhL$%R$V;1G7GYrep2<?)X|l?!ev|Acl|l&0!R4i=FrzFP`(^p`%AWthg50?Kuxt
zSo4DH$EGJg4F$j%4(lE}q;qyq?=ao*$)xT!Z&N1{`5BP|!PH<gd~B^5gf+lalZQp9
zog?z>M~Zw;$&ZOsHT1C{dKI)fF7gWcOjrn-Ucx-&(R=BUad}per)v6`&D}&(X*&XE
zIE}we+detghGgg_`XP;ePEVjeo&(j33P45M(q-Q};SFIzRD{-sV7gn1aO(N0bl3NK
zz?GN~-HDbf0ZDh(Uv+U<s`*2aI}5=~cb>@vkMHcr6k}~rEH4K-*sHfO`tTpbq)<2^
z-&Ig3C386FL9vwW*GKPr&``>Dqu~_zBwg=%Gwi`S3&8g&=fZN25(p{79Ga6p?Ro=7
z{v>xz`g?PNrPVFnC=s>MBo(b9GAJiqi(Hv*3AKi9ounW`XeB8&G-6drxj?p5y)4pl
z;i+m^WK%VEmdJc@>G9_Ou;rJqUA02yx3r}#TD3mEvhr)GYLR&cwFIXb=%B-T=(IYi
zHwpz!D{4hY*C&xkHrngY36IDNQcfC(4!(LG5KafIL(_AamNXfSusP|=D7ugnR5D*!
zguJvEMF7^K1J`oG>dFqO?vk=rudnIHYD}}N5nU%{xlwlz%_ve@f8Su_%)GK{lp1PD
zBL#JrN^MEE`UcpR^m*T9cyIN+GQCVdm(#$ph<aG48kVXXboX;IbAsc}OX2~g&Jrl6
z`vE~cQKmMEx^;XAFs{10w?_LdE&sCPjDwxv56FrGw1kGCZo*C=Krd>BrEl%gI_cg1
z-Wz9KOLck>V!&zY4b!adTE{04biF{^pG?<iKysR~tr`Wbn5V1%*nj2vS%pqDYn4V>
gwe+e%D%GOHG0SxI7j5pbv9H(|`<RWn{tdFse;YloT>t<8

delta 1187
zcmZutO=ufO7@d`3d7a2cZEa8@*;?b!C}{{H?IA}W5}&rEKcw`KgVAb28fZ~T4^;}a
zTBFwBY_PRZNTD#aHfY;SB0C{zLS*k+T1#v1&sbU&yC)xgiCB6m!L8fbO^b3U3^Vh+
z@4cD#zWgqm-(?XiO|b7XGt&2LW<Gym><%FEPa+_10zzJXixwBX8+()9#(60tr+7*F
zuy5jI5k3OoTX3rgXUOk716XwGQ4!t(V21p0r5xnvpwH*$rR~0CfX_(*_WV?@Xh3<t
z(E9_Zm{44S6$^^1uzv-*@x46?xkH5z0u<c}xg8%N&-O^`9G5tl3-X_4@Cxk9Q(bhQ
zT}x3=RN>7kyrIG5{%s8^fily$u?iK29LDRA^vF|`KsBkT-s2AHp(!__A0k2iIMjpW
zV=qcZ&Wj4fVArfe62*X+4M-vwIHnE>i@~<J0o`+WMtM$gLpZPSoy>D$xAN%S$`=JG
zGl@50A%qQB=$*u~3Xabz3Z7Qv%i`x-+^8V-DcplekyW@i1nymF^2poKoNz_FE_8AN
z33jdv`00Tg;-3D+XQjrG*WP<Vn-!t+#A{Z%&3gj((KT-TnJiN3B>Ne)D%NQxA~xvm
zh&tW3#SMtRROpfcogW?gVo2PCi^Z@VP@uFG9*mt`j1*pyK_TKfomJ%X)TDe-OdR0p
z<^Ds=spMtugFiWt<(dNiO5p~xSb>oqE|GP^`uJQAm(03BE|sO@md*^k9$kexLxJzI
zzAgNU(m$xALfnLu8#qh9yoU#_hKJIEqqQ8}sw1_%jZDoH0hg9e$4)S5X(M**Xj=G9
zGmIVUPSrN=s>^D-raO0kE&r&^f08T4hr(&$HmchWTJU6}@v&E51cat)qJ?#BX}#k0
zyVR0&H6Eisd>!Wwrv())RLh>e9Oo#w6(2pF79QN+M0OJyTC4R~_e=>YA%=!@9TB75
z@)6Cdd9sn=u~;{Up<4B}TGvojZPqBQBwZRFWlGW)!^h};Y53^WGNQix2Nr5e57&@m
zqpEE=s&4r)x;E3o|Cy(#FQarX-;2)t@reG@bd+{;=doveY5A8;AETM*Ns;?LP!igf
zx<)fm1A0xf9DRMq<4Ny~3|;8vt+!|h0a<j)tu`Tc)6u+KX+hVk-tpgDG_OD<&1$Gt
yRjbKf^q)sgoar)jL_KR}+fW_dwvcJpd<`+Y=>I-5%_P2I63jy;5%@d8fPVn1pJE;W

diff --git a/audit/auxmem.asm b/audit/auxmem.asm
index 1b9cd7f..b352b46 100644
--- a/audit/auxmem.asm
+++ b/audit/auxmem.asm
@@ -23,12 +23,12 @@ AUXMEMTESTS
 	+print
 	!text "LC FAILED BEFORE:SKIPPING AUXMEM LC",$8D
 	+printed
-	beq .skiplc
+	beq .afterlc
 
 .auxlc	;; Run langcard tests in auxmem
 
 	lda LCRESULT
-	sta LCRESULT2
+	sta LCRESULT1
 	lda #0
 	sta LCRESULT
 	
@@ -37,11 +37,10 @@ AUXMEMTESTS
 	lda $C08B
 	lda #$44
 	sta $D17B		; $D17B is $53 in Apple II/plus/e/enhanced
-	lda #$55
 	sta $FE1F		; FE1F is $60 in Apple II/plus/e/enhanced
 	lda $C083		; Read and write bank 2
 	lda $C083
-	lda #$66
+	lda #$44
 	sta $D17B
 
 	jsr .zptoaux
@@ -51,8 +50,60 @@ AUXMEMTESTS
 	sta ALTZP_OFF_W
 
 	jsr .zpfromaux
+
+	lda LCRESULT
+	bne +
+
+	+prerr $0008 ;; E0008: We tried to run the langcard tests again with auxmem (ALTZP active), and they failed, so we're quitting the auxmem test.
+	!text "QUITTING AUXMEM TEST DUE TO LC FAIL",$8D
+	+prerred
+	sec
+	rts
 	
-.skiplc
+	;; Check that the stuff we stashed in main RAM was unaffected.
++
+	lda $C088		; Read bank 1
+	lda $D17B
+	cmp #$44
+	beq +
+	pha
+	+print
+	!text "WANT BANK1 $D17B"
+	+printed
+	beq .lcerr
+
++	lda $C080		; Read bank 2
+	lda $D17B
+	cmp #$44
+	beq +
+	pha
+	+print
+	!text "WANT BANK2 $D17B"
+	+printed
+	beq .lcerr
+
++
+	lda $FE1F
+	cmp #$44
+	beq .afterlc
+	pha
+	+print
+	!text "WANT RAM $FE1F"
+	+printed
+
+.lcerr
+	+print
+	!text "=$44;GOT $"
+	+printed
+	pla
+	jsr PRBYTE
+	+prerr $0009 ;; E0009: We wrote $44 to main RAM in the three test locations used by the LC test. They should have been unaffected by the LC test while it was using auxmem, but at least one of them was modified.
+	!text ""
+	+prerred
+	sec
+	rts
+	
+.afterlc
 
 	;; Success
 	+print
diff --git a/v0/index.md b/v0/index.md
index f40cd16..3866f3c 100644
--- a/v0/index.md
+++ b/v0/index.md
@@ -27,3 +27,11 @@ We tried to put the language card into read bank 2, write bank 2, but failed to
 ## E0007
 
 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.
+
+## E0008
+
+We tried to run the langcard tests again with auxmem (ALTZP active), and they failed, so we're quitting the auxmem test.
+
+## E0009
+
+We wrote $44 to main RAM in the three test locations used by the LC test. They should have been unaffected by the LC test while it was using auxmem, but at least one of them was modified.