From fbe5ed0c014b05cb3dfc12761e9d42d5ec963a12 Mon Sep 17 00:00:00 2001 From: Robert Pengelly Date: Sat, 17 Aug 2024 12:29:01 +0100 Subject: [PATCH] Fix for CRLF line endings --- build/chimaera.img | Bin 368640 -> 368640 bytes build/chimaera.vhd | Bin 34120704 -> 34120704 bytes src/boot/freeldr/core/ll.asm | 3 +++ 3 files changed, 3 insertions(+) diff --git a/build/chimaera.img b/build/chimaera.img index 399d6a4daed734870072e8915f8deeb3d4caf39c..22dc4e8216c8515c6ef85f20b3fe396b8ace4c87 100644 GIT binary patch delta 2143 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 F{{c2gU#$QD delta 4644 zcmaLZ3s@B80><%~-DUR!mYW(Xu5v{7PyjL_Q*F8;c8^^iwk32{ z=qyR%tK|Q8MMlO9TkpT{-k+b_ulMhFWTvG}nUrbEnw4ey`+lP|>mo_ICM|PX+7#P= z*&icqm?=qDW=x$raoQvsUTso@|BcVR!DQ*))NQhEzP#=h5jyp+OY41WMd@3Z&GwI_ z^)CI~(s0y2_8TzmbN*>F{yMF}f8PI|_U~7Gr6c_xR~#TM!NgVa8;e9skab9G&3LWO zqEvoowzp_+TQI7&)Y!D=EcFx3nn68LC?aK}DvE?_`HUD>lfhaSF4$;pqQ|?^8@<7EC z+h*4K@l9Wh>083fF&I4=gC(qu(dzU!7A#(L>wbPUEEdFMU@13!xDJMfbz9O#R}f%Q>1@IkXSNd2Z*L|uF~%0FYpxdYenKo<{O z#shukl60fi8r6QH+uDA-yQi>A+faMaJ)$8%d>rX&(iycq>WSsz!odRuEHPVq?@OIt zI@6e)r5y>%i_yB&kt@U%@)K&o3b80MX#no`<{YPzVyx_+7hW$+tj+zl8bA52s@Uq8P-M0HQYI9uJuWeO{Pu9nQT29MWo4MX1)t$2 z|M>Ngh8G59YftvaqT+l7S2t|IsH|_4+OQp?W$K!T#Kgd0{?P7gj#OU>3ABV@pdIW7 z6;Ei8YFa5q#uf+18u2_FNc5x|ysh>g?Qm#b5-!LWkQc9gp=PfXNdxWPHXOz6r7BWbZb1B
eF!$x3s;Fb z!Rdyh2eiY6qn~S$>LaVfpyda3WnUU&XJ&hMdJi-NSnQ{Egi0qj<<7O5%JyMlzVc-q zJIvC_YENi{C2nv2IAd&Oh-H{D!s4tnS?n!4!lllGdJJ7HQs;?G`++P^tjXeS#ACfW z%++MHnt0;S&=5;ype4o8kr$BSI9-&6fxRU_lB<>nTHKBHy{<-`Yro{o%$nXaCcvVN z!L2e@1z2Y1xEtO3U5)aeJ53gCuz#lsJFybXR;X`ZBgOU<24T`+j?>OMS^DeR9H;$D z^R{Mc^Fm!s!n#D?-X`lEr>n3gQ}BPTAw=C;BBBEQbLNexG^wAK2xYK;Sfp> zH}A6S2$r^_+6q%sN2ty=ah`6QMZLLA*n&nBbk^8TR@d*cs14sgFWFO|?(duT8NQx}7dVNMW9`LfAN=j&vHLn;i#p-eF z6Bwl_DPxM&xH7TdP;6atz51(13{*qPg_%R8cQ~qCM9IZ!M!6U}(vV>H;W=MqDB1UE zP)KsJduLYflfN%sn_()^w4aP6d$c3Q`lIo#KjZ>^eWzMiE-oKh8z1M(kL1l#JQH@r z*CbUdZoDS@s_{uU4E!c0A6H646*bN)hRC(*B(I1&zc${f1)K0lDpj@deW&812;3rk z`37A1Nlv1cdPSnFs9U{wEEKiHE6U~J>J6*KXjxagZnaS4+YAYDdkch8sY|%L{UwR7 zZpRP0?Xac$nU5+NAE6|l_5=ui3l#V8&tI*Zx8Z-q>Mbl6Qa-!)d6J?qdc?(<)Z>r zh>FlsRE+LH_oDmI{b(6lj#i)t(1XZ@9zrY8!)O&ML2guvJg5wnBQIKw9zhl8QM3j< zhSs8WNJWpMC(x7VDfBdY20e?`qYbDMZA4XQ6M7Ckk6u78qL)xL+KjfKm(eTeRaAqv zqSw$iv>m;U-axge4(&j1qI&cedK1kk&Tx4(B08cc1`ZvZPZG%aB#~S| zE+j+AMPwLBBEyM7Mv!D;CnL$lWE2@q#*ne(5;BgACn+SATuLU8%gE(qBDsQGNhXmr z;vnf{GP#OeO|BtR$W$_oWDqBrPBKXrnL(~4Gf6hdA+yMAaviyz%pr40F1dlsBlF1u zawAztZX!36Tga{CHgY>zMD8GWlDo)aayQ8%OGrK`AcdreEG5O{9&#_akK9j|k>z9s zd4N1fT;w6Lk~~aSkrLu2rNl$ZNICJ6)#MRUK^`S*$YW$JSw~dzIC+9RNuDB4lV`}Y zWIfqHD#=DtMK+P=$n)d{@*;VORFlnQ3wfEmLS7{`WGi`%Y$Myr>*NhmOX|oD@+PS# zZ;`jjJEVd5$WF40G?FIrE_sjaCVR+U@;>>1d`OzfN91F&kL)KcSw1Vn6NL bc{#V`&I`Y9&a`Wz7RAh;;>3TIw#femCbDyi diff --git a/src/boot/freeldr/core/ll.asm b/src/boot/freeldr/core/ll.asm index c94b283..9c0c4cb 100644 --- a/src/boot/freeldr/core/ll.asm +++ b/src/boot/freeldr/core/ll.asm @@ -346,6 +346,8 @@ _load_line: and si, si jz .L12 + dec si + mov ax, word ptr [_load_line_data + 0] xor dx, dx @@ -355,6 +357,7 @@ _load_line: add ax, si adc dx, 0 + inc si div cx push es -- 2.34.1