From 275e22ab997a4e99320cbbdec14bfccd0fb77785 Mon Sep 17 00:00:00 2001 From: Bobbi Webber-Manners Date: Thu, 14 Oct 2021 19:10:11 -0400 Subject: [PATCH] Merge part 1 of PR 121 'XF2MAIN, ENTAUX ...' --- applecorn.po | Bin 819200 -> 819200 bytes applecorn.s | 28 +++++++++++----------------- auxmem.init.s | 25 +++---------------------- 3 files changed, 14 insertions(+), 39 deletions(-) diff --git a/applecorn.po b/applecorn.po index f2ef00adf70e1f5c2f91d9b0722204c13e85836a..9d6863f59a1dfd325e8e8d6858e73773e71d74f5 100644 GIT binary patch delta 3621 zcma)8e^e7k9^c(yc0dvQ1rexjtp`M?P^%Rckr0AGR)YKzZF?7AwawLfZN00{N3F&_ z!}HY8c*i-kf?fA1y0p=twN_8tRL_&ewyxR}1B73JKp+XLwYJ69+-%U==lREFCNrP; z%y(wK-|x=%yK6MgG8$*uc7#kkjXi-S&%^SQLMLEG7nUi3$*vM}R>Oc^} zt>b0skjaoy$0G>^{_fbivG~h!#pIaSxF;Y!UmgW#hKF7Kdn7S_PYD?Zsa~=Z4MHk5 z;1wH)iVd=g4G52_*dVXlK%TDq3r>8xhkOd3wy)ABV||r=*~YZwvH(5tJb3M%?8r_# zs;nkB2Q`p%;P1i88gepBt0rUR?@4?cTv1J~e87KQP0o@pllTs(PXH6)5xw{Decnc==8{_*Rw4SV82yj(AhyI^uW zpyhQVcyl~hAU`8vAN(R7q~NFEP&}9>4@guqj7|V*Ih3$N@(=YJ91Uv|K!G5k_c4zYa=*G36kVZ!6Q$;pacg(K1~G>k1qF{L+ti| zC~GwO80-|b+dRtte)$kQ@(eH%<$jnt3tSJ6Fr{-DriEO&DTB*^6P^W25*@x;jA)Ad zftoTvt^1a`C2%C=4^Vvp1>i8#FPzbIj|ruY`Jm}pFr83&Pk!_)Sc(%#UN}4(9Eo)d zP7kC`<|haWbEMsh*(2}f8u@V|NjU~jo}UA@;>6tnm@^kt;_Kmm=7Q;{8=eccWtBA3 zY%?dCr`cIKht*z0Dh!)v+c_g8G_x4$t~6T(LP=`P7l|NcF!KbB$nykmx5;Rs8QRl8 z3UQ?w-b_QgKM9TV!0!mhAUre=s7dy9$w3A1aypm<^eq2y1oP&D82I{p5DhK!LEN~S zqmCMzgZskV;Lsnz@ej)2mHA*Y!3JQ54ord_>0lI$SpX6iFS@~EXYEAo$AqEQPV{$% zSZ?a6;|}W=gfc{sQS)0QB;zqbM%M&ck;lX(e5M$|>k)VR25&*#Lb!bam`1Q`;S1?V z4`Bh2D~~$N@+zy%VJ54r4GuG?vf2rAXqEL#!W>p*Jx7>FSD}Yl#%dm}N%%k4z?JDB zF5|JnW2%tC=2w?VTPuI$tHo$`x8x?BlqgPD;`k8^SA2%D1#ConjF)se>X3A@IV7DL z9D5dm%EY6Nb!fs)AobUwxi1L?GGQH>KS$_WR%($8; z)#bx_?l99rtGv3R#aRVeGchC&pUwbrV~~WxfaY6PvWHCan{+Z8*Y6Nx_Y%tjOlyHv|hVCJmlCvdZR`3b_Dy*%i_eXt_~ zM9B#x%pMKmQ2`;EeM^Fq;O0dj^hvb6fy07_Yb&p|RakaiYumQ_n5CY<8!U&BDe%}L zFl~GyFBcbB01rf3(v;rV2E|3l!f}}(dJdZ+IWqfEN3w4{o|Xsc;9ZT=TCcX5EY@pn zrriv2s@%WZ(r6zq+%c3(W`CLq(le}1b++B=%+4*8+QQsYjZx>!Db#3;g-(@Pttl!p zmN<)Zi)oGVd1tn!sJKwK!dT{1>k3xbpYMRFDvuW{#FB@fwg_XmK#|tegGH zPQFtBTn^KYR7&G8Euae96D=~7j|?$ zaYUO(W}4I>EA-bHI5itgfs0W?e9{G9$p%TVCL6@XA_25d81_xps@2r$Kd#604Y&CD z0!bk$XEsp6NDYWv{XbG^)=hq2xxe1}j^FpT|1gJ9H#*q}ri;q-9x3;K{I-9DnZ$I_ zncfP1Ta)P$Weu?Rm`)_Ix>3%@H^pCK8yP@VdRa0k1wYV$DWRW8X2l@u;3W;njJU6V zkc~#EB$(aQIbhlY%TBoA#vBk&pq|MAvlMf?YcU+X7!2Aa=tm`Yn?rE}>fk^Qn3?;*v)x~Hw|D!||6ccKSClIrl?5)X>qXakSGmiKMjyJ4xh}dKu0hu? zF3=Ox^NTCFC#z>^&x)Rts}_UH_?APxg(dmh4)tov{(7i4H$O+W12LL>)l$u_L%p<4 zl^s~rSEMS{1QzyXYiLcerlO&5X&wrK?G1hEkuImqc)eFwP`tCXcUehpu`#|+tDy@5 z|8!@migMM)fA{5SR-jg+*6NHG`vOaKMaDk2R##MFq6>^7W4~LAW=(^r8P*;g)b7xRi82%} z2K^nkK-}ru@74!Hi4PY;8qpQeq$o5nJtzu=Fg=nH zhdDwB_T4_(^7V4S@zPSV>sm8dCGPJ}rgx=Sp=_X}yixa6aZj&gXFbUm6 z+6lG;H|xZML)7iS8wVwIso8EDhqRsThR!8mhH|#sGFI8at1P|zVq1vkxkiPa%5vLg zq0a;Kg2stjf~b`dh=Qqk=ncmA!s0yebjk@g`etC;gX&u4#?){Ws$3{zMDdFdgK?pB zw;&}IAw)6?+Va5UQsmk1I0}X5cHzen_ey?k=YSNk{s3L#Wxtn_V&0=E6lDZtD#f^k z@L&cqh-KUs`bZy(9*i3*X)u-C<7R)B209u3P~lp?oK%QO^EX6K5Dc)3;DvLY>It2FuX&&H@>A-NObF4av@a zSdUf{3J)Aw3KAlBd4zbX*u#YE7WD^*58Q>R`QRyHmj{;QgXd$uXFQ#x7{c9SJm@K+ zE3?MSk<0+Xuqhv;Oqe)OyH@&SWbKue1lpUb7=&YVpp+Ot2v_TXIyq~gzB*OTU>1Uj z)pz17W}8Ia9jKq)`9=hrd{_kROl5>furnA;p@&W#P!Og;_=67oiAeUsR|>#RX?(i? z6ojww?g*wIWdya}3zsbeD+uU@A1_0;p#J7Eq&2cFst^>xKNo_zTLi`@T|Ao)-91$4 zuYKVcu3o)-^)!Q>@tyS@Mdc5@oBCJvhYh3;2(9wg<`!Ga{+6;8FMZuhhYir_18{Z`NR}V4)%P`i_^-AQUi?M`Lw&RMlPBbs+c zesrn`VtPTFWK}wy0ZGwi9sr#g>&^uH`wd&630A z;`n0te0sdpM1k(OyQpv&?f3@W61Yet29P(Pf*fV}fiqivv`3-gQEVxODd2VS^asVT zga#W#Jn=kiSr{dz1Tqu&ctK^2b2=zz-2GxR|F9H^qQuh|SHnFtNFKpOC9s};2miYS zrjTZ$1lHug^d0lfcbsHh>SQB0s;QHxFkyYl$(a$l%u=LDzU&ZyI#O%x1VNI?$^(WF zF9P1#s$kG%>|6sgK=NfgwuVTzV6zTB2BJj#4;?IsZW&S3HnoU~+JpF}4kj&VZmJ(q zG#{)N6~@pM%j01kOk5E*>EJ;0(Km@D&o+K#-ClNf|5w&m%7`T^LR|Q{Qn+AtXv}uw z<6Gc-T)GV^Q!7HU-qrQITiU~&vzGN3TWI>7uqnK!6efg=2!upD6plMp3e#4-PYiO_ z37U=pQ{~tOFShR_*^NLHxk+_S9lv~&f%0Y zxHNpx?YN-~qB*)AYeb`?w8t9R=qT&K=gMG0xcUA}xPA^3F6p`~De=kalB}@N;RM#% zjYLuF%RwWm@9_tu>z*(z}QozC5A}VqKgBjur)jDM-*%kISFrmR8P|_6s%s(lh;t3_5j8D5E1%MR zdFAbtHNU)_wicAP18ZUV^s~wy48rGtX+m(00Vc+T`{4~4HXm0TVAQgZZbTsyM+LW_ ztxt8;+V-WnY8p=3j@s!Hwj;!>_#FdWnv}&yNIDzjq4cu6U*^p9kiPhmVfw=og9WmZ zK7?R1>WM!Jf7u`G8~+Os5d`2d9h{#U(q8LGby;kVG?%5p4m#ST23wbNu5ib+OSbdo zb#P@4-CI!Tqvw38jZQxl~+)p(d*5e%TR1!H0I;3LXF1+2FLE7}3N9zf$Rjxus|_A9pmgZr45Z-o0kZpuq? zpm{9p**JQDi60D}@@R5dE`)50ZR=r@KFlP@BAUqd$r=wtB*z&^-N*L{ko(r&OZJe> zQCf)ld(&+S@+vST@-Zqw3=@1~JxrZ-#?r`1cy>8llUCQqEhDcD`vO$khyK!Mr%p7g zC0-C7;tJ)r$?y6YuUz9j<#2h*esOQNaM#EohD==?AP;Fe66GfBNaD_Nn3o<>eM;+J zL?>0i{P>?ir20-vK^H;cpUS36Ar=es$9I)5 z_t9y}5Fe8bPB$v6nR?H-%3(CtR6*5$o2=7^w^hMZK-&5$n58NnY@%qA9+9loEH9`!#osd!PI7 zWOTy)vHObK@BYCZ>q+!1_r!W~JO!^SDo|(;JHP=H1`>0=1qR zFH6~}_dJ;yWw+G5LIg5-y99}xnHAE*q#t*mR8zmW%SHl|g2XN%ItaPW=e1rztG%-Q zIp2F8Et$3WNj0H8?AO+5qa_7-@J+@$9s%6(zUMIpg90BTDZ7M%yGDBe9r5vxOXGxc zi+@WJ`3xzJFv#&_m)%3+i4bih5NUz~LKLS&{em>gDYUXo^=>ro#~WXO%kmcc%nHI{ z86`QKWEn%OPnw4o`z(^&i8`;B7?6ri=>PsX`?|C08I)&NOW3QBoX_~1sEu$)--dk&Fku~)b^WnS5?E)L28 zL<}&N@c46OBV3q3mO1GYVuAtGBvo*`neHK$c*BQdjBrWT5g$8A2I<0FmQtO)2Yx>Z znkIp-POT8+%}Wonx5=~=9b}Od4AK4tBTU#G=`v=c3jy>=p!JTtuy1Hm==Oi=|D2R= zQd~D5ELXpJQVh{D#7uFqc-Q~5I5yntAM_8A()4xJ*XM(rVzB;1xFLi%ru7#6B!2SS zOa955RsPMvvc+%rU-aYnO|T&0_K@X%$M-{)iNm9^2U};6fGcIA@tgRyP4JPZNk1D% zH!UZ_dV&T|`SI7AU|P~izmSQl{dQ%8WIQ}^=zb`Eu+721Fvkjp_XMH^&Yob#l*s~d~2l*p7 zXA3NN+BAIhKxTxUvH|--V;{{@t@Bax$kCL(>R5L95ec#@)Ugs^AGcGgu;d&&wm=nV zAHkhl;H%)*BL3A@__jR$cq=T8*)P@w1Clxxu_8`>5mo}uhu?aU?3T3WUxbgIo@au? zH2HwKMU!u<*trj;dF)IkGLwnSWFj+}$V?_OlZnh^B0nV^VY$dmCNlL8;{Tb6{E=iL S]1 @@ -111,10 +113,10 @@ ENTAUX MAC LDX $0101 ; Recover alt SP TXS CLI ; Re-enable IRQ after XFER - LDX STRTBCKL - STX STRTL - LDX STRTBCKH - STX STRTH +* LDX STRTBCKL ; No longer needed +* STX STRTL ; $03e0-$03FF reserved for memory +* LDX STRTBCKH ; switching +* STX STRTH EOM * Macro called on re-entry to main memory @@ -217,14 +219,6 @@ MAINZP MAC - - - - - - - - diff --git a/auxmem.init.s b/auxmem.init.s index 47d76b4..2f09ddd 100644 --- a/auxmem.init.s +++ b/auxmem.init.s @@ -12,10 +12,6 @@ ZP1 EQU $90 ; $90-$9f are spare Econet space ZP2 EQU $92 ZP3 EQU $94 -** COL,ROW needs to be in X,Y order -** TO DO: will be moved to VDU space -*COL EQU $96 ; Cursor column -*ROW EQU $97 ; Cursor row STRTBCKL EQU $9D ; *TO DO* don't need to preserve STRTBCKH EQU $9E @@ -172,27 +168,12 @@ PRHELLO LDA #