From 42be6c6f8042e0e747835ea1de661236913b1cb7 Mon Sep 17 00:00:00 2001 From: David Schmenk Date: Thu, 8 Feb 2024 16:23:08 -0800 Subject: [PATCH] (re)Fix SANE ZP save/restore for Apple /// --- images/apple/PLASMA-2.1-BLD.po | Bin 143360 -> 143360 bytes images/apple/PLASMA-2.1-FPSOS.po | Bin 143360 -> 143360 bytes images/apple/PLASMA-2.1-INST.po | Bin 143360 -> 143360 bytes images/apple/PLASMA-2.1.po | Bin 819200 -> 819200 bytes images/apple/PLASMA2-FPSOS.PO | Bin 143360 -> 143360 bytes images/apple/PLASMA2.2mg | Bin 819264 -> 819264 bytes src/libsrc/sane.pla | 6 ++-- src/mk800 | 1 + src/mkbld | 3 +- src/mkrel | 1 + src/scripts/plot.4th | 51 +++++++++++++++++++++++++++++++ 11 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 src/scripts/plot.4th diff --git a/images/apple/PLASMA-2.1-BLD.po b/images/apple/PLASMA-2.1-BLD.po index 81e5f4f2d5c2bd4090d60996b1f8885b39e75117..ea7a6138d556ab4da777b40db4ade065f6602527 100644 GIT binary patch delta 914 zcmd6kOH0E*5XZA)YKt`1S`ozuqs7KnkkrSa)>mv26A0Omq*_m64}J(QiZ{WVV2^*zz&GLAh#WUo%@4k;rB}uxG8zlz@5yHzl8H>LQLX_NitdsJ^c|YV14YxYG5SWva zw1lQ@ITE5r1HOwh=x?hoYLo>LwW^C&GveAbU@@Cgml@4trp)TMI;j6uy4I@IJat>G zSw8Ex>9J!DE7Ycur{H`Ei=~#j)|Ee24o74d-V5|vz!gN@k#6Z8E+|-CZg*8jL(9Nj zo}$~n&UIs8>Q2)uOOoNTMp*MJs;#q2g*txVS~#bKdotvK*;5&m@#5l-IQERv8j!_D zR19Ban2cAQ3e%2PB0v^*ct_;z*O@7>Z8^be^sSjF4I3K;cqaD=m;%xr=6c{MHytUB z*a*!f0_hS?fC0>;vH~YLkcx%rSMqU{1pE&)SN=pZ9Fk#l;+th>Eb{y9h}*z-LVF3L W2^&pP9WagY%#g(36NJGt0-s+jQ_r3N delta 874 zcma)4-)qxQ6yCkGu9ICUo8TT)4xMWgC~K1XYpaz$bdf@Uxmm;)$=l>=g|qZc@|3wulKeY%dzxOCbiMM_IMkojHmg}E4Geto+9jNF<>i!9o^m{F=Xyd~kr|5j z_Jg*R8Ds=u$Zg=YN2*eoz>tv(U~?zpakPnXRFM-YJR%s1i_-F?rM{FZK2C`qI5G{V zBnk5+-^i}vqt{;;&v*2yzOi*UIajte%CZ=-%?DN|>hDWfFg4H!Er$+pCsVkYkxycj z4x^H;!*F+uAq_3)UDpgicfCFQ80ci%*>=!XIB@Rp04I!5;I(@Pq8AzrJXFTFhU^F$ z81h7}WxeLkI-o!(|A)CDy8D+m0ivmJ>1tM$neBSOiz);zsABnHCa)=qBC-y){U1Yr zsVs?GrDnB>MD+h<7cYADHu-UypevNbN9n8d+la>L&*LP$elkyCTw1t8$4UB~`~tR{ B{38GW diff --git a/images/apple/PLASMA-2.1-FPSOS.po b/images/apple/PLASMA-2.1-FPSOS.po index 64b0ea1d0a1ec9f8708fd9149dd4faeaeac610d4..6b3125e97751930b6a1243a4f6190508a3fdf701 100644 GIT binary patch delta 341 zcmZp8z|ru4V}lthtA~N80MlefrlU=4+t?V-@F*}Kz`q3yYz#L!89-{386Go$8Qb3o zF^XvGnXogZGBB(V=3_7rKYaGc<(t9BPM$e>(w||!=n7#GaS3q+aSbRbA}+FB&yH~x zJEQRQldg;f+7lQu7#M6mXnj!8V9?44VPME(urR5T5KaS8#=;?d!Uk%5!d03AY6jD@ z+!!}Y{1A(YU||aRAr{3F!Nv@t*&;YtLVip)b!XHN{2|7`BqGkhBmu+y$ove{F2K&xD9X;zCshfgr7|$A5awer6F+?R$mN^C$4;I(deWa^zvv2KDRDV*HE}&CDJ3qoUC)kj z7CWQl^pmcP1%}fYG8h8Vl^Pv z+n(Xh7{(|uF_w+LF_Dd-F$IXzfjEneVPX**-}GA^jGCNNfdVstcgmt%NfXf*9J((6ootyGDeBLS}FMX z2l+bsga8E;6ja>Y6yiZlkemY47%K%&zcAOJU{|mj6=SSQ+<;->0Wm~D#T<(gMDUpd z9aE1Seo$?o@B=eV3?PnxIRK&60?i-pLEvx)=>#$jfk7ICsmT&ele52%KMP3XvWbk0 Niv^e%mrY`v2LP4un{@yH diff --git a/images/apple/PLASMA-2.1.po b/images/apple/PLASMA-2.1.po index 7861feda1fc4fea8e16ab8472dc04fcc4ce1c64c..8e26f78258d0259d48ec7bf2c6d8935dc2d51e80 100644 GIT binary patch delta 3085 zcmeH@Jxjw-6o&KB-U?d9O{l}MLeUl^t#z|vI)y(-*I8>B+`aQlkl)NB2 zMBploy}sRn`f*=mza6W!V?2g{A!3A@?O6B*0!i&QA8y{}$$Fh9UgD8FB*rX*x)WKq z$aTKZy(n^r0_P7Hs9#AiISuLQ zuDkBmALb3U$nc1(mR+15)hsNa>=a}}#Z7^lj%(?Vk-Uu-85b}gVcr6|q}q^`pp^ev z%BBLk25Y`SPz^^7-UV(^H9Hkf$bo;WmCOSAN>6=T#AZ?#lOBLddoL{#j|6|-J=6y` zKQ9j=A|GD~+(BS<9#axSH{Ch^fhlYX&|G*Y*L)LB#1Db3i~u9R2rvSS03*N%FarON JKm#^c`7ecahaCU_ delta 4005 zcmZo@FluNp+Hi@L#oa)Xb2=k8i`FK#3N}XO&5b;D{F5i}a5VpyZvQXM2*gZ4%nZaV z+y6_m9#R17Xg_Mhy8WmPTf$^U*6C^&*iKAm5@h=~d4aCTvP*2cwhOFd{lqv*j)uT! r2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S2I4}r}JNwXLML)lJh diff --git a/images/apple/PLASMA2-FPSOS.PO b/images/apple/PLASMA2-FPSOS.PO index f33d76e66a6639d1ca206c6c9dd67af5509542ce..7d2acb62726bfe108fc6ffbfd8d5b67cf7ae4862 100644 GIT binary patch delta 326 zcmZp8z|ru4V}lthi-!TfK(iI=b}LrKle_{qIT=6#$_$Sgz>Mv}!i;aT^i0^9QW+Rl z2=g%*h#x+C-zK;~zlb^&&lMp1T#Mj0Sh0b-r$9i5C7lNH!FmUS^M0|4sZR`vh@ delta 330 zcmZp8z|ru4V}lth3j+`|Td{7pVr4wZEAWsL#Ao1Ocnqc)whIe0zRl9JU}s8YU|1o{ z$6zLY`0SC(H-nFzJahDDa^h;@dQehITxz>s9pfx^M#vpaVNxX_oCczdg+us+4bm8Z!Uk%3!d03AYHrh0+88&>{1c0b zU||aRCl3t{ z4qXHl7paT0IO(XM|AD?ssfd#Y-@WhN-S^&icQ-ZTre<8cCFHWM4qSdD?i5jK+@>}g zkEwx^q*hOABBBQ&wUU|)R|$S_KQepeug2%naGkVeM50C7%G98!LIxq9R+4r8TQvoJ`$*gMbou$QKVkTd zi;SqEI0>*D+k@CE!7zt#Jhs7an8B(5t>a1cTEu@It&@2bkwo+&`Vjq1GM{4KOJIb`D-fAZ7w$=ItE3EDC#A zK?+l*J94u8pZq~zq}|~Z3lOtzcR0nSD!|A(J?$3TiRn(lZ2v&A%N_2pc?J51@G2ucI12G2>a{@6J5OXhgFyiq803QWJg#Z8m diff --git a/src/libsrc/sane.pla b/src/libsrc/sane.pla index f1b91e8..44f9a05 100644 --- a/src/libsrc/sane.pla +++ b/src/libsrc/sane.pla @@ -840,9 +840,9 @@ def fpInit() (@fixupXS)=>1 = fpzpsave+$34 (@fixupXR)=>1 = fpzpsave+$34 zpSaveX // Clear XBYTEs - heaprelease(fpzpsave) - sane[9] = @zpNopSave//zpSaveX - sane[10] = @zpNopRestore//zpRestoreX + //heaprelease(fpzpsave) + sane[9] = @zpSaveX//zpNopSave + sane[10] = @zpRestoreX//zpNopRestore else // Apple II fpzpsave = heapalloc($0034) sane[9] = @zpSave diff --git a/src/mk800 b/src/mk800 index 01e7d5e..6aa860e 100755 --- a/src/mk800 +++ b/src/mk800 @@ -244,6 +244,7 @@ cat scripts/rod.4th | ./ac.jar -ptx PLASMA-2.1.po bld/scripts/ROD.4TH TXT cat scripts/bounce.4th | ./ac.jar -ptx PLASMA-2.1.po bld/scripts/BOUNCE.4TH TXT cat scripts/dbounce.4th | ./ac.jar -ptx PLASMA-2.1.po bld/scripts/DBOUNCE.4TH TXT cat scripts/hrbounce.4th | ./ac.jar -ptx PLASMA-2.1.po bld/scripts/HRBOUNCE.4TH TXT +cat scripts/plot.4th | ./ac.jar -ptx PLASMA-2.1.po bld/scripts/PLOT.4TH TXT cat scripts/hrplot.4th | ./ac.jar -ptx PLASMA-2.1.po bld/scripts/HRPLOT.4TH TXT #mkdir bld/examples diff --git a/src/mkbld b/src/mkbld index 32df408..5ae92ec 100755 --- a/src/mkbld +++ b/src/mkbld @@ -54,7 +54,7 @@ cat samplesrc/rpncalc.pla | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/samples/RPNCAL cat samplesrc/lz4cat.pla | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/samples/LZ4CAT.PLA TXT cat samplesrc/sfm.pla | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/samples/SFM.PLA TXT cat samplesrc/sfmsprt.pla | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/samples/SFMSPRT.PLA TXT -cat samplesrc/fppow.pla | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/samples/FPPOW.PLA TXT +#cat samplesrc/fppow.pla | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/samples/FPPOW.PLA TXT cat utilsrc/apple/mon.pla | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/samples/MON.PLA TXT #cat utilsrc/apple/zipchip.pla | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/samples/ZIPCHIP.PLA TXT @@ -62,4 +62,5 @@ cat scripts/rod.4th | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/scripts/ROD.4T cat scripts/bounce.4th | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/scripts/BOUNCE.4TH TXT cat scripts/dbounce.4th | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/scripts/DBOUNCE.4TH TXT cat scripts/hrbounce.4th | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/scripts/HRBOUNCE.4TH TXT +cat scripts/plot.4th | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/scripts/PLOT.4TH TXT cat scripts/hrplot.4th | ./ac.jar -ptx PLASMA-2.1-BLD.po bld/scripts/HRPLOT.4TH TXT diff --git a/src/mkrel b/src/mkrel index 09d43cb..bb9bb8b 100755 --- a/src/mkrel +++ b/src/mkrel @@ -148,6 +148,7 @@ cp scripts/rod.4th prodos/bld/scripts/ROD.4TH.TXT cp scripts/bounce.4th prodos/bld/scripts/BOUNCE.4TH.TXT cp scripts/dbounce.4th prodos/bld/scripts/DBOUNCE.4TH.TXT cp scripts/hrbounce.4th prodos/bld/scripts/HRBOUNCE.4TH.TXT +cp scripts/plot.4th prodos/bld/scripts/PLOT.4TH.TXT cp scripts/hrplot.4th prodos/bld/scripts/HRPLOT.4TH.TXT #mkdir prodos/bld/examples diff --git a/src/scripts/plot.4th b/src/scripts/plot.4th new file mode 100644 index 0000000..90e821f --- /dev/null +++ b/src/scripts/plot.4th @@ -0,0 +1,51 @@ +SRC" PLASMA.4TH" +SRC" CONIO.4TH" +SRC" FPU.4TH" + +: HLIN + ROT ROT 1+ SWAP DO + DUP I SWAP PLOT + LOOP + DROP +; +: VLIN + ROT ROT 1+ SWAP DO + DUP I PLOT + LOOP + DROP +; +: DRAWAXIS + GR + 2 COLOR + 0 39 19 HLIN + 0 39 19 VLIN +; +: PLOTDONE + KEY DROP + TEXT +; +: PLOT OVER 40 U< OVER 40 U< AND IF _PLOT ELSE DROP THEN DROP ; + +FPEXT XSCALE +FPCONSTPI 20 >FPINT FP/ XSCALE FPEXT! + +FPEXT YSCALE +-20 >FPINT YSCALE FPEXT! + +DEFER FUNC + +: PLOTFUNC + 15 COLOR + 40 0 DO + I DUP 19 - >FPINT XSCALE FPEXT@ FP* + FUNC + YSCALE FPEXT@ FP* FPINT> 19 + + PLOT + LOOP +; + +' FPSIN IS FUNC +DRAWAXIS PLOTFUNC PLOTDONE + +' FPCOS IS FUNC +DRAWAXIS PLOTFUNC PLOTDONE