From 8cd2eac996b679601c3475a5238e4501e6bb37ca Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Thu, 7 Nov 2019 22:40:03 +0100
Subject: [PATCH] keyboard part of CHRIN now preserves .Y

---
 STATUS.md                            |   2 +-
 bin/basic_generic.rom                | Bin 8192 -> 8192 bytes
 bin/basic_mega65.rom                 | Bin 8192 -> 8192 bytes
 bin/basic_testing.rom                | Bin 8192 -> 8192 bytes
 bin/basic_ultimate64.rom             | Bin 8192 -> 8192 bytes
 bin/kernal_generic.rom               | Bin 8192 -> 8192 bytes
 bin/kernal_mega65.rom                | Bin 8192 -> 8192 bytes
 bin/kernal_testing.rom               | Bin 8192 -> 8192 bytes
 bin/kernal_ultimate64.rom            | Bin 8192 -> 8192 bytes
 c64/aliases/,aliases_ram_lowmem.s    |   2 +-
 c64/kernal/iostack/f157.chrin.s      |   2 --
 c64/kernal/keyboard/chrin_keyboard.s |  13 ++++++++++---
 12 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/STATUS.md b/STATUS.md
index c2864db9..821d2fc9 100644
--- a/STATUS.md
+++ b/STATUS.md
@@ -132,7 +132,7 @@ NOTE: Even the 'DONE' routines won't support features described as missing in on
 | `$FFC6`   | `$F20E`    | `CHKIN`     | DONE     |                                                      |
 | `$FFC9`   | `$F250`    | `CKOUT`     | DONE     |                                                      |
 | `$FFCC`   | `$F333`    | `CLRCHN`    | DONE     |                                                      |
-| `$FFCF`   | `$F157`    | `CHRIN`     | PARTIAL  | no screen support, keyboard does not preserve .Y     |
+| `$FFCF`   | `$F157`    | `CHRIN`     | PARTIAL  | no screen device support                             |
 | `$FFD2`   | `$F1CA`    | `CHROUT`    | DONE     |                                                      |
 | `$FFD5`   | `$F49E`    | `LOAD`      | DONE     |                                                      |
 | `($0330)` | `$F4A5`    | `LOAD`      | DONE     |                                                      |
diff --git a/bin/basic_generic.rom b/bin/basic_generic.rom
index 075bec045f52902291b01cb5d79d0a585ba77da9..a31fe15d746e46110270dec69edf6803cd4c5f8b 100644
GIT binary patch
delta 114
zcmZp0XmFU|!MJy#ryAqljRkxxjC(iNv%F!H-1~l|y~3sc8LJfLuT{u>xkwR2?|rYZ
zcXA8c1eP7|eQGvKuyZp4m8)<}WM<quc^mgLAUT&u7f7Dwu>z88yrw{D8(wuGM&rpT
L@>M{g`|^qamB=i^

delta 114
zcmZp0XmFU|!MJ0hryApqjRkxxj5{{hv%F!H-0^;;y~3sc8LJfLuT{u>xkwR2?|84U
zV{!}I1eVS3eabgWuyZp4m8)<}WM<qkc^mgLAUT&u7f7Dwu>z88yrw{D8(wuGMx)6o
L@>M{g`|^qag*PmB

diff --git a/bin/basic_mega65.rom b/bin/basic_mega65.rom
index 31f6c4df7248f6e41126940a2371d17dce745201..99e680052db0785dd9257def1adc819aec51125d 100644
GIT binary patch
delta 13
UcmZp0XmHq&EYD~>IYoXB03ihgnE(I)

delta 13
UcmZp0XmHq&EYD~(IYoXB03iSbm;e9(

diff --git a/bin/basic_testing.rom b/bin/basic_testing.rom
index eeeba8125060c0162b25a3076549287740696821..cdefb4d70704133289b05a186f39d298351ee3f3 100644
GIT binary patch
delta 68
zcmZp0XmHrz$HLP4&PQ-^5Q`4uq|Nm#XPFqMPxfVxV4O608M`Hre8BDulu+S_U;$FK
VJZ_AP(>EXCoiE5}JUK;v4geq@7S#X%

delta 68
zcmZp0XmHrz$HLO_&WB}k5Q`3D@8)`zvrLSWCi}8SF!oMf#%>8DAFw+EB~&;fSb$V5
Vj~gT7q|HZo=L<3#O-_-Y0{|DZ7M}nB

diff --git a/bin/basic_ultimate64.rom b/bin/basic_ultimate64.rom
index 025ea811a31f6306a9774d5d19d6ce69e04550ac..e809611de914ae319d6e0940bce0d3182174ccc6 100644
GIT binary patch
delta 170
zcmZp0XmFU|q0#YSrM<$X{~4<k=C4)g{jf+8NH4WI`TqmYB6%=#nWe()6$%|23;0+V
zJ2uy|ykV5YrbnUUgF?sT7PblO%^!TYzcVCER%ExCY{1SoIhOqxP@@WmEi+^9<RtE3
w#*WF`xSs*Zxjec+@-&YXkYwXE1(G(r?To#fkMPbHWHg?fB3}g*x-YK?0L|w_T>t<8

delta 170
zcmZp0XmFU|q0#(drM<$X{~4<k=C4)g_^?P3NH4WI`TqmYB6%=#nWe()6$;H83;0+V
zn>W|9ykV5YrbnUqgF^G<7PblObsv2GePc+NtjKON*?^sGaxD8XphguATV}?N$w}P7
wjLnm`aX$l+b9r=u<Y^u&Aj!sS3M6fK+Zj7HAK{%Z$Y?Y<MZO9sbYET(0R3%5^Z)<=

diff --git a/bin/kernal_generic.rom b/bin/kernal_generic.rom
index 4c51d8d2e0c8c4c5dd77ea404ed798be7719bd16..b6899f92c3a3ef95646a5619e3706fdf3ce28a68 100644
GIT binary patch
delta 1680
zcmZ8ie@s(X6z=PzEk%)*pGAJ%IpzQrQ5Hk8Ics!^dZW(hCN9CZs9VV}E;ErCvxu2>
zgbjgR9K|0AG(6Wwf~#Rh&@_UJj>o264a-n5qLU)brMIBI@;2yB+qo?J=jGmW@A>Yz
z-}%1#Dy@}P_jTS_s)%k>svr;fm7kbhsL==l?w2&xPV>+VI@2Zg>jqeq1Fs^FqKde8
zNro<`c*`W(#=3TEWr6BZjvu#->xS&D=&0i6k<4H!;H&^ih&IkT`gMH9DRVtvS=*2p
zI~J(e^V`7MRrmXU^c0Q^UjL?}Mpwvf?Df^@(Pba%^`Wo)=(^8o5L?&UTitr(^5chI
zbi$AN!%O|XKGUPE&S1Odo+-MI1`2pwq~Lr-ctdN@Kt)Jobv&*hCPUiXQC}#p*XK0D
z?mSamA61Z31w=RiR-6V&Q;bH*+lFM$No<B?mQ_lPX0Qt@H4ACiCS?IPNR90^+SIM&
zk|A&9QuYJ_#o}|etT~8MC!Gcl$6&w5?~COI<seJ#4$|yq!)=aHqr>u<k-2d8<0_M{
zAg<5U-yLMpXen6`{T6qK?2T@C<#QFi9274g{fPUC#G#~sdl-GIxQ8O4+tT|XGRb^n
zPLi30W72~#y+AHZ&7{mIbD5+t<|VGSV@u3t9r>8o5h-q`ejAgP;VhD1YCM=104@%w
z#vy2hQ|I9;@3s3V-$$Pb)y0nD5Tm;oe1X1p3(eKmSSVip42DK6ooF}HTwjfu3NSF5
zLW5$lff~FG7MuN;U_s}--Uh7mi$7Ddc!S1D8v8Z-4V0-$oc)^6h7OHaqj>#@6ww3}
zjm%8I8;RANp5|7eOKu)(#_)=u&1FN9iYrtY;60?myi*@uY#<NJi}GvLYUF<mxA?^0
zwL{C|B8eqqGS7Hi7K+)MAkiX(vJVhzeB$c=rKChsP6YmwavU!i4<#H_K{3+ye`Jey
z1_e0Godc*yBq!pJami#+Ldurm0IF469n4hKRieGpNqPK{+O5GGCR!ccF;Lrws@U07
zq7^SR?a+!{O}n+dhaJ$P@HHkCOPK8FPf?FQBu5Zsr9TJfcbrN{;1<-X;sx0Nh(<4J
z32{>T46g}_P2pr9Q9K@j0rJo~axZZ^hGPDhLh*j=_XB%)F93w>w;^bY40fpEdB6jC
z(P@Z)yapsqNM1KX^120~`YHEMk`R_xRnqH=_5<K^_m{Rdu`buj?xK{CDgkk6@bGs>
z&a|E5?3d4J>^<d+d0+vSTFBF+C0r?)mwaR0JO+Z1)9T`6YuzmQJvU!gDae&>-cn{2
z9K}FcOo%e{Ll9dOn+p|A;93=w(g5VQSp-nuiwQW^no`0Qk>e>DQIZ1szL>J&oeEX#
zg3^KF3KgoyM<&n<NwXJClbIl!>h!X}v_*nN@HSJuw}tAwPP{)Lw#c)oB0A*_)DI^)
z?JaCnx<fWwu4aRE7gEn1C1Tw)ux@6=x--JoEnDuwYsj0ao1*8j(*ul$r_Yg!xk)md
zdQ~{m=qMH`Lsxp~On{{}*Xc%!6f1bC>#W>nb5);iM8W59zYd>xmHpCQp_OB49$KxU
zj48BE6>r*Q@s_<0EgyIFRu%M|y(uH6^d9a7>(FKmyGTrFi8H=eJ&n_Cp2}%<o-9n0
z=0IOLBcf3vmwVsN3FywB;>j9B@l)20sQo1Roe?!{c0#0^U9ihU#{sY#-t<?~%Qz3I
zPoK-}C!Og9+(j~)zL?ub(lhp%{(Ui3qt)Juj}m9bN^Tb!$@l=at<UT<!LQ*AhR<dA
zKZrfJlq6^6$Ak?Vvh5dSeb#(kkphAy2ea~$rx-poj?E0~M{xZVu44GE4?iTAvNEz$
l8J@$+bNKQ+zI;B9mjv+RDI7E0Jm}O28qI6d5C7uF{sy6iF5dtE

delta 1664
zcmZ8ieNa?Y6yLWG_5&ey<!kv^xfLRiA0Ul6Q;m>{o88nbn)V-kr8(eWGm)cBQ;Fp|
zxJ5!26BH)c+1KpSK<hXr>kK1`IxMAJP4f#19bA>M_AaPzeG1!oyV^AU^XA-h@A=(x
ze&=`Yt0}1|@tooHR!Q_AtAx7AMSdb<zDgws_`F+XcNj;e(Ri15KK2reX~LysG-e^U
znwVqrEUO-%a^~Hn_6byjj6vK!9y?-lqFs`QM<*C81)LEgNjm*g-+VjW+-hv#Yj!s#
zCya%vH~#V4^0F&~$GhiVzj&tMU|no6x2i8tuR%Ql)E7Ws2azw}(2CCGHm65}TtR%@
zkM;-AU}S4BFkl#c#}V#S4I6X=G*rmrVhQI<!b@tc3Nk`%te(f!#GuX09StaPeF29N
zP8S#w2dIQvWk7@rV8@|#t1M`gyrE6yT1ka=k*QRwQw@2SNp<t6_jPFwH$?TFb?Wpt
z$x&^=l7;LJI4t6Qwx}(Pk{>v<J&yu#zUNLLfgAFLS$c1n=Co-qKMGKNlj*Y<=E6C*
zY7K$H!~w(k-Z0alg=CIyDfcP)NY^;?a~VAw7LOp!P0t-ShYTUl4djqKBT?67_qz(2
zWVSvpC7wlm?rRZxfm~R|lS;jhODDx~PjmKz<#BJtlCH${nsVk|gfocAuy@<c5b&@?
z){j6N9I-uo&9Ey#`2l)Quv?le3Y!9hFHqNMqWS7N6UC+Xz|^bhghgzmT7RRd!nQ{+
zp~HTEBmSF-zfz+(NE6&D+iBY%N|)W7?X=K=wvXGP2zRvkkR6I=f-jSBX(?*_8YwYm
zW&S8bS3Epcjp4=N3ReYk%D7qv18*c-jq5d$&E4dhv1qPcwxi%JrGr85IyFm-23p5_
zJmYbt;<GhFph-}ow~&(Q$;<v1k`@j5F7%&}eR#pR67Y!(3URM}EK|HbEWl-+JU~Tl
zWdHO%oRJhIrIn9_kX?2*F+;7_sy^9GdAvdHRpFHr&Zgct$n8B@>~6NI#Ust@)S|a}
zle&LL6Z9lf#$Cx2Az1e@Iu=yq2O_Kq=HdK<tw~AT9J?$Y@o523??){PCu{EESHog+
zBp9d^_eEiVLsUkFlh<NM=C4Wgkl|nu*ux(HfHH0?!xd3ujVvApJdhKe0uRXPl3S(7
z>8v8BbKq*2^!(x$B66xtd9i3S0N(d}RnZ~V=a;anC{0lzAif;l@zc((jzgU7_#u_;
zSk-(USb(h-ayMlGXC=?24wmIIMI=U=AE+}@0SvuCF`6vER-D2X>I>r}sltVdC$L=x
zsWbxb9VP+9_GAIWxirnn6_fAN%rQ<0q}-df`0Z+0^g`CaZnX@F<DC=eiGtaaew_ee
z8R|7YfvFb?Cc)oEHU4%Q>v!PIA+g<;K_$`QTS<d(lf%}|Zo4lKtLan@OzAw@b3uwu
zX(mkRjOdh3i%e-{sS7V5i_=%@a@h};7!R*pYdYrclCktt@7paRWf>>?X&iu3sKlKh
zKtTt5Xjafqp{}lgc#2)^+^Y5^&==4vGBQu1GFd!p^NHtd1E_S|)n8j^I&jv9nAE?c
zA7+NOsU8D>iX(u;keNKKQ|{S2)zMQk#X88mO!qU;S5A*;jL7BxY2yTR<)PS8hbY!b
zorv06Q20KPGc%H+-SomK104tSUU<W2WmR(Bq#-Mp+f2H%3b~)j?X3CSha}6q#qjS7
zDeFsYPP~ga%u6_d+%#{1V=HEK8{k*ah2e7?{s-bQY$d7LbK@cdtBmazWJUJu*kTC;
zO}1qhr1}}&K91uV*4)GmllV)9e-Gecax~kVlgzN0Rps$j1$@<P9v6l1tw|hrqix8c
O5>%?^r>;NZ$Nm8deI>2{

diff --git a/bin/kernal_mega65.rom b/bin/kernal_mega65.rom
index d05ad7ccd5242d0f8f76f49dfdf575d73775ac99..7295e4f1f54a6888783500a1d78729d481c5b52c 100644
GIT binary patch
delta 1448
zcmZ8hYfKbZ6rS1H2hc@#dAPHHaMh|PY)hpz*fa$ziPYSvP5Pq-6Gv&<X}bO~O==pW
zXc#p#Q0&FRVn~(=v+j_pYpKP>V8vj|+N$HDgz9SW0YYk<5y6?+9ogPtOVjkv&ADgh
zJLkLK`R=W)sI3U?Fk7coAq1unYu=GlN)QYK_xOo=-Z}D;WDg3rEW@(76&^y5%pQ9n
z)_F59!~p*&>_rPLh40>rf%0eJou&vQS;0OPc1&7ExK3c#LKH|hwhR;!C^IE>UgOsp
z3)`JXsM@cZv(lFqoDCgo5{1e&#fv}NP`<994K-T6c}I^6y+)Ny2{su#i3>dv1?@T*
zn!y?C<Iu23fZbZ?I#{ZOZs3$h4gDfA$(9$vR`ii|^@6Ad{(K(#lI;?jR#eD$fGc5C
zL*H39xUZ^kKxN)C*$B)V+*X<>Na(2mzKODJO>|UkAfn+1YJ+VkJg$1ksFZr5!Q}o6
z_1Vtb9x2d29*&{|DZ9#6=@`ZaS*XV0y2KpEB}O02@rg(p97hd~Bgxe7;&y{0Do!oj
zSFOzE#QU?Xu}pYdt<Veu8Z^wutf!8^1KPos)+#}g!KFdTE)tx?1_Ld$n9htz!PAj0
zHdr5M0Y_Du0W;5qpXA?8d~S-QODlmC2Mb?-TXEq!7ZGl7m%-Y};Nans{?peZKvo9p
z2E}D0C;18a97gb#yBlJ%{jx&^m!D!B+&j_djdk^Hj>$bpOI<@A?=DTV+sGrR!kIV!
ziwP`Ph=L!F;xoeo=u>AdS%eNbm*e%6v)DTOF@o+pUweht>p{X0R~rx4nB@6M;EWcb
zWD3egj`LypXvWacj4Cp+*8dOUN<wO9{sU=)t0xUWijIdTZu`e)aI41PW}!k{72HP0
zGLCNkRwcmuDpt)WQd}ETB{a+CGSD-|GJw`QTV==L@D|ghvl0cT;ui?G=~-v%g*41o
zjtggfTTDW)uf`;VeLGEqb**?fw^40o9y!q6o|#EnX&q;V&<|P5$y?}N);8O&7zo6`
zC#W*J#T|&%ojQ23>kP?VJVS8(-c=NCIQ#!p_Oje*g_T`Zyvc6@_EEM9OsQ;ylq~#O
zFpb_=AdmrcXF*Zkv~q&D>xeUaqLGL)I4+4Z{<Oo67Yy*C#jZ7O<M8F!A-n7R2Rk_a
z0|p=TCN~5F$m=R0ccFII+i2WXMh>7wbau_0$1Au_XxFe5l5MP+X1SvbjTISdhU-<q
zH!C*SKPj{&Wv^Bk;aABiT$9pq@hjXla6B%O+!dw^|5T4XE+%g|HZQg=^3lr{omAN%
zD18QL9V43Yn7Xhx*FT@zKmv`>YnNPA!P8M1o*(lQ13j|y^tr)-9$F&H@GN`A;Bw8V
zR_QLq_p}gS)PFC8JU8of)Z}*4QBCNG<VcFZM>a`MaSNX7kSD|%)bHL*dQe8rkL360
zM$UUFUL`P$9d`&7<u;Om?%v!&5;d7Dw%x;gq76Lkp2+)<Bp;%U`5ux+d-AuF)97A)
z{;SgpzXD7v!YMo=;UvV%MI-7rqISnkz65`SR0798^NaBCiVECmvrhuRs{?H;0P_f4
z2;)Zpn~KoEQnaVQ<0x0*{z+J^K<i`ZQDGkn7c6<XMuB@3Zz1JfNqLJY=+odI<1lU1
QALR*#AYPw&perx_23BspP5=M^

delta 1448
zcmZ8hZA=tL7~Z|*?mWuL9bb3HaWGb^sL&#|ek6@xH4&SM*dI-5`olp<yGfx*o3{AF
z25fHCVnpg-3mBSX!y4{TIZCLWsZ~sDSzGG@Ex~{WYC$fo$pWpnyLWJ%<+L&VGkNFT
zectz(=Y3}CO6y942a-&xA_Reo*`x#6#T11QJnW<DdHck3Qc9=rt8r9LYKFD=kEFts
zF0Etu+z0}`DR>QgjQP7CXrN?1RBaHEWCC6Vw$B+SxDH@fgA7R1w+ISxoW9Jmyy0}3
zr_KHaQ+KK<!}>yAu=8wVd)w}98`e~n@7%HKG;T0{`5GM)uIN?D<7^_BjS80}2HIm_
zWRYY{4}+tA3Vf;t2f;cuI7Cv#O7JH?O0>KID)2j|O<9vFc=R}Uf(;0bYfI%Z;E3zh
z@HeK{UBe0#74)jXOcCB-DALG4W6T0z3C=V(IwzHr)OhHja?(5!dZZN6<C5jVNrP)1
zUp0Sk4o9GGCNzmZTlV3W%`pOFJ6X68g*)O;Ij+?E5RQNOX`SPg&T%4<y6dmdIpP9K
zer<JlDd(SDVohWs+v>0rAwtPt0*|TnWr8GU-yD#V{S+s$0jJ-JI@v&v2wIhC$%(+?
zW8nvR>_Uw}v`U-7Z&Bb`0C%IpASVh#+%2$uu5;jck+Ww|1af4+JK(1|$wxgY;9QLo
z6$zX--YeJSlv_3h+?pjtU`_by2U_6jo0=TJs%0yEzIS7Cikbc#m)dhuKMoVYf((3j
zikul9!|&PMbP+ygUqjYzdx2@`V?Um>Z+OuYs|QI65m%iF9W=<P2_U11jLbk;&v7k8
zJ}1&OwBXXTj9veOI1-S$#b+R`aMPR)u*P(y_CN6%tWXhY7R)DA!4N*1c4lvnLV<k>
z5wFG1aIL6JXp)n*fJ@UX0-jh$vurya+Gn_VSt9(R*C|*&-_d+MnXvsQDqL>aXArKm
z95e`_mTJR*x0wuQ2-l_O&|+^}dOB_L=pOwAf19y}zKic?>^IkFpi2Yq<DHpbxw<rO
z_tA@iKAOAHM{)gC#SCe<^#9+PtKC|Jl^tcg!Dj#|Q*0Sf6;`ArBflMJ_?0Yy?!seP
z>vOco1?rwHiuiZ~HI7JJ6h*$|<F*9^D)IA<t@cA+-_drCe+!WV4s#>03xDJ&qHD0=
z*k%Q%RdNnX%rZfIgdaGz)QSpqit^gBTyCn4@@6`+-OoC|l<R<Yl?Wu6r<<HCcLq6$
zPSZ^gDniTB2*8m!p*1m#>M#<1mh8eE$x2$^=I(&=QR1!JC_sLyC(idL?mn?JF*Fk0
zjj1ATb%GVW3fl=b&O=X(;F`z?1H{C;9zWecBOY^Zr-!k}<uMkh1dB^t8_8YGCztiV
z6Uk5KorX`iT+T^VXcx1kh`@{G(kv;(bM122&*JY~d+B0q&Avv5@a^n3mQ_a1jS|<@
z;??d3x~sR(ollz&jq>qUFw+~(sif%{yeGGi_Ta<06|{!$=jOhoMfkNqiwNChM8ZW#
zmK%E1uSadRVZMlbgiM^oKk_Tc@Yd(Kl9!$YK-NsWCl4$)#)J@g1jsOqF|ZCF&MUO-
zRN#?0SRIC@hp<?IeK?f2a@E@r_(`NHpQ&2MR24ArYZd-E1CytG<2;2Z>gC1XW08e_
E0W*uRi2wiq

diff --git a/bin/kernal_testing.rom b/bin/kernal_testing.rom
index 12cfea8691ae602ad32ab380743d41c60431bf2c..ae006d3f0f0052537067f38ad9c9f4e6b40e6ddb 100644
GIT binary patch
delta 619
zcmZutT}V@581|d<xa{aQwRD#44Z4VlE6OgCXtRiZI2U1bVGt~qvAQYhqUeVVn^<(Q
zoex^%ptU^XY+z{zGLjJmi%nS^M?nUO7U}BZJKrp)BW!*1x|`?yectDN-yUa=)3;}<
zNTLqN6g@F`Gz0+>-ps7jo+?s4Y+ZFDyMYgZ=s$fDiT<~(3}`zNaSPgoMCBC9>n#5p
z0U`krU(laGJMn~Gsps`KE@s~Uq2H!HT=J~V7XJR$G)1hiBU_O8I0zF661bOxLOxt6
z4Ic3h4s#&qgs*cjkOO(OBr89;HpHZ@hO-Rs7`n}NZMYn6El3Zc<Oykli-z+&rM_~Z
zp|EB~_)c-m()YZoSC2zg6}Y$NfB_u8qK;A_S>xt1#ccfQ54_jdWMUcz^Gr!FP}Tx=
z>@jwtI36=@(51<fPe#NH{%q<-6g$lu^|1nLahb1itHRBA*1Qkd@s`>ShG%Nq7!K54
zU!Nw@D{yPkS??emrEpARAsf?L*NN;(Pn`qtw$k4F=Y_*Xm{un0TM)7-OY0~?(@M7C
z9IA|y(gT9H%d&}WbH%dbW?$gJAxWi>NUD6a%&U6jNT4xV?V3~NkyOkh-;D%dN^5jM
zKat+ik3*MrscO{*$Csgb1-h1{NpDKZc*mh*K~DB>e={<f0=ksEos1%{8Y-h>j1bm;
zc}yukZd!)%9HR+O3-OmU7LQOm%CS^dUBug(5-6c8HidNTl>5yVoheNOw<h>kgtENw
Pj0i9AYb&66JY$7_S#u}N

delta 599
zcmZutZD>+a81^`GT5f)=rk42%{fNdQ#zr(E?TbFRKVtnV2n<_TAVm?2KEP;3MHh4j
z5*m@Icgzce$^9dR6w!xn5Z6J_7J+NDyb;%9YnsHeqxG{t&-<Qpp7%NL^90-hcWCEk
zR!+KLrtah6(FBahF(<8Df38k+F-Nl<+X1>Lu;EiD5F38cO@Z_y7I&dO#0n=-MQQz?
z1h6u&_`K>k>cP`0p`%{CeqrYAFS0QE=Av&+@!RhovMh|O+KRSB<d7O3$`Fy^UKwhY
zSSyz}9865AVZ6+IT7=Ou#G6lX;j6kA(XSnvGZgP=293_rWDDH*&OLxe$M_{&*PQEf
zEhSydXL9!-ClcGMthhR<2#P-5l5F#g`}kB2W=o5r#RE5G?lt)^F{I43iQ93(YT0K=
z<#Rx)+2L#w1;wc1AKT*jJ58xE)yKz#=%x%mVX6%F6=q1vqzRuHBZQ|nMR8fEYll_%
zcKd$(uH9=UB-Fxm*0cq>5RJK*;cIx8-e#bd4pgWyMnk~01WxSJ51=%Ds$Z}4OY!%5
zL<^oX459_>Hf~T|k|@PvysB>cG~jvT9^}NEOuH$bHuX{*HC<chm$)b3EhXoJ2{=OF
zXo()FOt*OeIfa1Pg>?2tOnbjDhw6|QraQV2vJ2I<1fjf8>^zHF({dy42tH=rNVmCc
v?ZH>Hx9~RGOY~e=wnddx=f2&lH25XPTVld1jH1HuGLyp39DwF<!2y2&cW)Vp

diff --git a/bin/kernal_ultimate64.rom b/bin/kernal_ultimate64.rom
index 1d79fd746ad105ff1016c31f80bb9ebc9ace6510..5383cfde2eaf7a33409b075a29c5ed2bbfd964b8 100644
GIT binary patch
delta 793
zcmW+zUr1A76u)<O+ucm@PA#{r{0b9U1*=9Fh~`5i^##2OJzSz9!J>yKNzw(amZV4@
zv8fp2wkx}Vu=GJnR{EfAL*f=@1v5%)l|`N9+FhF6zWMSy=R3c1zVqkjIpjGMnd4X=
zdBZJl-p??ih-Ve1OR{~~pcaPZS<_oE25<>kH1-Pz_YU+rt1HX+HT`zSi^U4kW2!S)
z(`3e!ar&Xxj2-~;1G<w&f3gxUhmLwf5i<&>@j?m>q>-{tDP+lvw!5`n4o|IE5x%U6
zavySQ5e{AdCHJp;I0a-Ezf7m9w6svXZ8>ka`jzA?CwHbmeuB)Om5<&K+LuGk8hxg~
zE{gIS6xJggPSbYedBv@ff=gy{ku#A?f@4$AA=QY(%)GEFN_r2I%=@lY5)$eys9{-Y
z!1Fn>Ae<oewr$4PDsmIi*3Rc=!sow|1zRKQCRHVQJX_+XI8d@k(NkJes%N{I<YP|T
z!zNYhaJRw1Yh=8%x^WP`)5u{t3w1$V;-hmw^P<yG#3ti9I3{$pD#*W^1JxR^UwaQ>
z?8x|ppRVGBFgu}x1r3rNW&NycG+K6mr6#k{%-RZk!kW1Dth3W2AS25fjO5>@eS0NS
zl=IBDfyyP+-(o1>bMfz*4QkFV){0$Cfu{V~k7Oz0C5`S%ce_x2%$9<6($a<|(|K*4
zl0^B4AqAry_A{)-njU%!998|B1G6tk?dF;4r;tzcgJh$pa|*=?RYR~s#id$PM&cEw
ziT>iOxZioxA83+QKvOZbP+`34x$uzRt`vzWHT)?4@LafS$d9Hob`f=eJPoghuNdM*
zsuSH?L0i{Q--`Uw8<$^s6R7c5IOcOrK6)8Ppv7*)6xOQ-85pMpl5zgD4uuIJhZ1R8
zhG$lz?fS!Liw<LE8v3IC9zDM06epwrn?K_g4VP;;0(gu(tK3@k1F#0IHC(HcYu(M^
XOb*`#T<|HFlo*j=-2WE-a!daKcMX3U

delta 775
zcmXX^ZAep57`}IR?!ynfQ)73UdMZ;{2}8sr#1ANvI#hp!ew?5}!SyH1OwvUeDoup*
z#}BA+*^NySwEfB$S)k~UxQV3Jgc8%HQRn9LE^Xe<tUu3r&-*^_;XUv3xN2NAqaQf-
z0bby?vP&5TAvo`6dPK|T6gkx=%_l7qeLpndRsA4ea(t*SFFQZW7~kq{f47>Bdy^`4
zae`-)qINgwGk^gC+yp#Uz*8a`CGYu8@2COz6u7bmh7=$jlq9@i07r_{J`PUqngP76
zB542=siPdY|4SM?h@dlqPZ+o8RQaYxirprsZh8;LOjj;BBhol9toy%odO>Ln)T{LB
zj0gyU>MegYT#ohBNixZvoR*XQOsCv1EcnxquVHv>224fQWC4LzB2AG`BQ3g_H2D<X
z&k@cDWAA4GQKuhH``J#}!~ACp=wCObiu&bi8c7ZDF%VKfZXC8mf^FJxuu&t!H1kc~
z4ru0P18(JQ))8iz-$SC-%Y+e)9ec==+{MSSkFUZ%_{*vB*Bu=$9_U$Cr^i*6JbiNn
z6k%j(GbWY*9V%Y2)UrjmAR~b{GRi0pWvo(kWfo_aDsCqHvRo-)!?JnAt+Sn0@T<(i
zT1>vv%vouNRC+Yg7@Q-N7ko?7*zk--Y!jMX;4v=E5!u`?-1|s;&=&3De>&1b{QQJQ
zOaSAfS%d7cKrpMErAPFTfz{i@VuVwyrB%`b@M&~5g-WT2NkPuFe2d6jNZv-?{w{}c
zsa_|?1XO`~>iX*vI-lF22sczJ3jNzn>jjH5a!@qg0dJIq8OCwQ`a<W71lon`tSL^O
zEfS8}Y|{qW5U$9cEgUBanwy9gx<osl9+Fi+cBz}FxoAZ+`k6ZViaqBEzH5FIxOn&~
z$2%j?unrqln5@F*1P1Wy{M>>S0yjxhG1p}0noe>s8iT)gVDeW_SY!~xl<lwl;WqvP
DRNQWu

diff --git a/c64/aliases/,aliases_ram_lowmem.s b/c64/aliases/,aliases_ram_lowmem.s
index 34f5c632..71ba917c 100644
--- a/c64/aliases/,aliases_ram_lowmem.s
+++ b/c64/aliases/,aliases_ram_lowmem.s
@@ -89,7 +89,7 @@
 	.label C3PO      = $94  //          flag - is BSOUR content valid
 	.label BSOUR     = $95  //          serial bus buffered output byte
 	.label SYNO      = $96  //          -- NOT IMPLEMENTED --
-	.label XSAV      = $97  //          -- NOT IMPLEMENTED --
+	.label XSAV      = $97  //          temporary register storage for ASCII related routines [!] usage details might differ
 	.label LDTND     = $98  //          number of entries in LAT / FAT / SAT tables
 	.label DFLTN     = $99  //          default input device
 	.label DFLTO     = $9A  //          default output device
diff --git a/c64/kernal/iostack/f157.chrin.s b/c64/kernal/iostack/f157.chrin.s
index 32da72d0..f4deafb3 100644
--- a/c64/kernal/iostack/f157.chrin.s
+++ b/c64/kernal/iostack/f157.chrin.s
@@ -8,8 +8,6 @@
 // CPU registers that has to be preserved (see [RG64]): .Y
 //
 
-// XXX keyboard part currently does not preserve register Y, to be fixed!
-
 // Reads a byte of input, unless from keyboard.
 // If from keyboard, then it gets a whole line of input, and returns the first char.
 // Repeated calls after that read out the successive bytes of the line of input.
diff --git a/c64/kernal/keyboard/chrin_keyboard.s b/c64/kernal/keyboard/chrin_keyboard.s
index dcefc146..40966536 100644
--- a/c64/kernal/keyboard/chrin_keyboard.s
+++ b/c64/kernal/keyboard/chrin_keyboard.s
@@ -7,7 +7,10 @@
 chrin_keyboard:
 
 	// Save .X
-	phx_trash_a
+	stx XSAV
+
+	// Save .Y
+	phy_trash_a
 
 chrin_repeat:
 
@@ -35,7 +38,8 @@ empty_line:
 	// (and don't forget to actually print the carriage return, so that
 	// the cursor advances and screen scrolls as required)
 
-	plx_trash_a
+	ply_trash_a
+	ldx XSAV
 	clc
 	lda #$0d
 	rts
@@ -47,8 +51,11 @@ not_end_of_input:
 	// Return next byte of waiting
 	tay
 chrin_keyboard_return_byte:
-	plx_trash_a
 	lda (LXSP),y
+	tax
+	ply_trash_a
+	txa
+	ldx XSAV
 	jsr screen_code_to_petscii
 	clc
 	rts