From 740abdf3e466a2d90786398c7e8984d5765fc09c Mon Sep 17 00:00:00 2001 From: Zellyn Hunter Date: Sat, 4 Feb 2017 23:15:08 -0500 Subject: [PATCH] Just skip auxmem test if auxRAM==mainRAM bug found --- audit/audit.dsk | Bin 143360 -> 143360 bytes audit/build | 2 +- audit/detect.asm | 3 +-- audit/notes.org | 3 ++- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audit/audit.dsk b/audit/audit.dsk index 65ec533819acde8d5347076e62e12be4226ec09a..a220100d2dbc66d0b038577920cda7fa4b7e8373 100644 GIT binary patch delta 3783 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 dm!mR_618+W!^~={{>|Suk-)_ delta 3697 zcmZuzeQXow8Nc)SGatl+6dV)C8)!sAX&Ydr87&obD>ACrQPH*kRSr!mlN{H4IBF%N z*=sqP0*3;pPNkEot7~^0ekmbhZGvCrg6Y+r0=1o|<$P6(}oo~ll3k}lcvo}G`< zS=QbA{+{ReeEi<`-n+ncYv8(dh$Q{eZ(<_BsSG#9gw5P%OxVJG&WO{jB}iQO8v}+5 z*RicqWwg4RHv!V_V$A{p=$Ki%tt0B>O*P+&>SqQi_o4lg%Gd(Hb4*(=wgAZGnPcP3 z(JM^T^qDJ6%rHcb935j~q*^9TFsk1q`oRN8Ee^$`)hK4ot{7Fyy@gRIl@VLq;r(KO z%P|shJ$;o?9TK6YuQ94!A`0nG7}Y8f6X{PGtyLO`6uOrtA6WoNiWC5IM~D}T)bdF)ihvUE(0O5^z94|kzEKO)97?R`d6pOfxpN4 z(j(9~cNI6xU4v_Z`vk5N+^3AbwpzKgJ0|Ukp+u)x!>)nCk=VpGhz@qGxPonTAL1J* zWc{W~h=~>G8-5qHt+KJJ1F=mW7aHh7H+i0FY8>baH?ix(&Fnp)h5_$BQeHb$iOrFw z5QmGKB!;D2YVb-dZ>mG2$=w@0{NH3;ht z-Ycwwa$3+ie$-gMb2)w34Ge;HNl(Y5r()8R0p#gK%0A8YvHG<@M7|GNBQy50;G-pY zqYfX};g+)C%R0<&G%Yh?8t*c#@xx%c1E^CaD)9qqF(Ob6CD>U^bf-53aB5P03%tV1 zR70x={jA^NVaY>=!!0JXw_l@BXFuxeKio{6K0AGG>NHm1K!4cqSo3zxgkJ5}%EF|b zLVQ0u+5av@i4Lwj##v&>*X;p-g6d`VnH*3 z2$rEoVZmHzXNOmw)Ha7F-<=9g!)7`(b#R)U#M_f4(Z?NVzYiXo*E-OPzVIa6fmx0M z{5Bh^e9=3?nuqb#GW;UnX3H+_)Axk99k@Sv}JFy5*ltx=Tl*(1OuNW8rj9s4dwp?`jd_Dr%{4?d)yG46DS zCrEJCn6aIkogEmk-{N>n*|vvsZu{NV4Cf;SSNr{x>)y5b%1~<7Lekp7OF5 zlUcJy%wtpPX6+^#=KW>$dp+%QRLJE1@;O)ddq-#I(y3Ek5QhbE7TAdNg{Sb*Smt}z z9J0Uz7M`}-b_LjJw9E(3-#xzYG(K-c+zUPzLC?)g*PJN7_wHN0P?g<*5ASLz$0$4C z0jlbQ2k0k#VY_NZu0HoC{FCKtpP%mFY%z3q8#IcRJP$S-tbi4DgD-x&92ir6u9;ov zWS_PYUNQ4?sSl3W`WY~;aiMr0%J<T z|M@BJG570xM<95FNFNx}Rzpk|dTTFQ(iK>-V$=sj!;%#}H!=FuoWRk&eXR4@b#?F)Tqjq&A|Lz$R|y>Sxl>!y150=uQ3?l@9YcY?$D?DmVGx zX_JVU`;TqhnKq7yji_JVJ}`E>erDtjDX;VtrM%Vi11Z64u{__Eyr=~ogR^g((li?Sm$?vl}+_6Wx$YEdw5jp2j@I zJXoWe(0*)ur5kVq+H+ht7za0MCKT${zCwTKmc|%`1ef#O`Wj2iVwE+q7BkxYg4=-C zl|q+vl3~!Im7%Y@wGYse9`J9HK4Vz3^f_;;T4#oDF8J``H&yLy4l%<7@mu0#h#647 zag&5qSU((MP7=g``XBEQ)l44YFIV+eZ(z5GH2a`9!?ucD>`y(& z!~fF0l1#ndWj|r%D{Aj?`sjk3FDRKyLOz=+ z3I_ztriA$Tgpiig!l^6qjP4cXcRSbDKzf)*aaov-2T}f*)8Y5gl8}fD4M~ajQmLq3 z3jpt9;Qd9wSqyx*2sn>{R7x&V{-OuYWz+gSo+`*WXlHC(&Lm_E6PoqDF5q~O;DrW%*A--azqFvBOhMGZOmiu-GSxe zX(5!7BPr~4A$0bvE+Oa?rHkc_Phf@cvMsLaf-dP9VP0K5lb~ey#yV$(k6y6wkJqhz zbTL5Br@SLblupJAaVeQo{winmj6y1|j21QEhw9)RK*xnpVhA^UtqwimqetVJOXKlN zvXF@9l0Zq1kH!m1HY237Nqu9eqj4o8#8q`v78Iq}QE4KmqvQJ4qvcEzhjgu4OZs?v zRV^raXjMa9lupDmc(3W3Q7B}E(S!iSLzF0=Sk(Yh7rO>aBAY4TOh1wZOAE@*RRCKq zsT4RIf==tDWs>?fjOSz_A5Y7r1U?#6&*rX1@v=nTJAYX(9rl5KKdaCEQF=TRzX+W{ z0ZLNN6qM9e-L5FIu%HFj28Wre;Zh!F7xbrSTvfBVLTQ^RN@B5J@%cL?XGY?%Gm|1_ lLHi&y>_r&xe_!piFN9TK^#%DAvi?=Fp8SxkH_X~e;(u4NhvEPL diff --git a/audit/build b/audit/build index fa35bf9..f7f4fe6 100755 --- a/audit/build +++ b/audit/build @@ -53,7 +53,7 @@ case "${1-none}" in mame -rompath $ROMPATH apple2 -flop1 ./audit.dsk -skip_gameinfo -debug ;; "oe") - (head -c 24576 /dev/zero; cat audit.o; head -c 65536 /dev/zero) | head -c 65536 > $TMPLS/Apple\ II/Apple\ IIe-test.emulation/appleIIe.ram.bin + (head -c 24576 /dev/zero; cat audit.o; head -c 65536 /dev/zero) | head -c 65536 > $TMPLS/Apple\ II/Apple\ IIe-test.emulation/appleIIe.mainRam.bin sed -e 's|||' $TMPLS/Apple\ II/Apple\ IIe.xml > $TMPLS/Apple\ II/Apple\ IIe-test.emulation/info.xml ;; "none") diff --git a/audit/detect.asm b/audit/detect.asm index a9cdc9f..bff523f 100644 --- a/audit/detect.asm +++ b/audit/detect.asm @@ -43,9 +43,8 @@ beq ++ + +prerr $000C ;; E000C: $400 main memory and $300 aux memory seem to write to the same place, which is probably an emulator bug. - !text "MAIN AND AUX ARE SAME RAM" + !text "BUG:MAIN AND AUX ARE SAME:PRETEND 64K" +prerred - jmp end .has64k lda #64 diff --git a/audit/notes.org b/audit/notes.org index c4805c8..8342a44 100644 --- a/audit/notes.org +++ b/audit/notes.org @@ -21,8 +21,9 @@ D747 F0 D74B D7 D768 85 D76E 65 -* Links to things to test +* TODOs and Links to things to test ** TODO [[https://groups.google.com/d/msg/comp.sys.apple2/RMnus8p6xp8/TDfD2HVtDwAJ][csa2: question on HGR behavior with enhanced 128K Apple //e]] +** TODO Check whether c8-cf sticks after reading c3xx but c3 is only active due to the whole c3 ROM switch * Language card operation