From 32363328e94133392b45834bc410d4507c32362f Mon Sep 17 00:00:00 2001 From: xmm15 Date: Fri, 21 Feb 2020 02:09:06 -0600 Subject: [PATCH] MemBIOSTotal function renamed, rewritten, exported MemRep tab spacing fixed Added check for invalid results of BIOS call E801 AutoComplete shortcuts updated in Tips --- src/0000Boot/0000Kernel.BIN.C | Bin 191808 -> 191808 bytes src/0000Boot/BootMHD2.BIN.C | Bin 574 -> 574 bytes src/Compiler/Compiler.BIN | Bin 194240 -> 194240 bytes src/Doc/HelpIndex.DD | Bin 7113 -> 7103 bytes src/Doc/Tips.DD | 4 +- src/Kernel.BIN.C | Bin 191744 -> 191744 bytes src/Kernel/KExterns.CC | 2 +- src/Kernel/KMain.CC | 2 +- src/Kernel/KStart16.CC | 68 ++--- src/Kernel/Kernel.MAP | 446 +++++++++++++++---------------- src/Kernel/KernelC.HH | 5 +- src/Kernel/Memory/BlkPool.CC | 2 +- src/Kernel/Memory/MemPhysical.CC | 4 +- src/Tmp/Zenith-Latest.iso | Bin 39002112 -> 39002112 bytes src/Zenith/DevInfo.CC | 6 +- src/Zenith/Utils/MemRep.CC | 45 ++-- 16 files changed, 296 insertions(+), 288 deletions(-) diff --git a/src/0000Boot/0000Kernel.BIN.C b/src/0000Boot/0000Kernel.BIN.C index b81cd642c78608e48156ee5e49f9bf96646e3ae0..786b33e0912f457e4608af04426ec1f118695b52 100755 GIT binary patch delta 3209 zcmZ7&3sh9q_ULUg5foQc%dMv0&0cP zqzD)ko?n>^ABcZlISs-yCNWISEfvG?+5uc$8v+%MUx5oN%kqn*T}&XuFqQ@TvXN`n zZp8Jt7DbZ<=ad=Y#~oN17zVXmk91tPv#-Rav=!GThS4y3%jb+e!#p@-jx0ysZ@%;0 zh5VF|s1bAIPUO}oMm9Hr%&06k_o-CYeF@0pZAQUXzODH-(OVuI`rY18|1Jh4+)wcl zuBA8#5vkK&7<|UY(|7Ta+Z9`vH*q!Fm0HziPh42kkHRo-+^tc>rEPYKrgA**QX<5q z`oz~GU2CUdtn4YIl%JKg{7$uuQF_a|8Xd}-`yA1w24hqr4Ym%m)rg_+PYEe}TLoJq ze3tqWZ2sFSckRw|vOG9}<6F7r5iN(=aVmDRFm2Ulm??g;Dixqxlvj)3?qI=s7kb6; zXHm%^fpb0SJ0iBeq6hbH&&cw?E-XzMk>wvr2qS;5I+ zDZ;k&Ur1cm1F><682^F+LylkYZ8w8n~4le>a)qi!_}4+<R!qRN#GV61cB&9OV#Tp9#^vX3c-6E}oK#ml zMTuklLN8Igu+xbc288JMwBnj;4+-1jqr^SyAD%+NjkIxVL*}E6*nQ)PTE)plVt2p6 zo?z<1LzCgQuxx1F?79$HE_O-I(GA!O48zH-gLm|nI^7St^!Bs%45m@2x^v4TXHKxSS>t{eK zHpn*}V5anu156qRIkeFgjzf!-tAR>zebyQ8-0XY)IYd_0OLCY1rwABnt2=Z+l|;1w zz<%#A=F3A8Js=ajYscQ#kZVH_gZIKPwuI|zX^0mzK`s5!3tog;Da0G1oiR5lFAzR< z1C6Ae2TNVmhp>~R3=ZB`0g;B5fx!u`ON&w<9Bd+5k_v~yAGM6iT>aB00Tvks)3}H* z_U@=$n5dVzh{zkLR;=TAE51W}e5_weYgfT~cDmykG{?qv!)G>ndQ?u%VFvnf5_0Ax zsLeh=mLk@oxL+DhhfX`+G-*^WdR}ia;VZO9VUZo$+}m!eOr&&c9kkj18hYI(n5}{Z z(#?FxB0%Vo_lOUzcpaRi+#>LB@(%LDnUnvJ57QwrB(pZ;+7K2*_mqGamf^D!xJrC} z@mKE1R=VUAYLhUUMvKF3qsvx_D>R`T=E8njUJk2$;y*+qJdNXhmm-OG&MC;sE~dYf zgY>8EAB^Ix!dAYGemB!*GZerG4Xc1a=%O!IfFCr{w<=(!&%46!j!KY3NAD=e%5I_O zDj>pphO*j3sPL5L?u2wuVI_9#hUrqv zF7VM{N$cW4EB$m3a{Z=Wnj2vSjfR5*h8`w*MJn?pdALxrah!t9?9VJ6hDUDF_4uJ;gt=(j3 z{7Xyl&Cf*$MR*n=0AUh>JHo?>409Es8^MZj6yX3u4Z<3PM1)BQP6*>BN+%AJV1nbJ z?m@RIh_kvbLZrEw?7JP4xio**wkiPUle|6stLrk*5^A%PksQUn9ET_W93L#yja z5`01*){_JXr%OI3*FZ<7Hjrg-ndUc;uh30YBT4lx_hlHvDuXd0arx53#Rh}kxM;Cq zA)|RyI^IZ}0NSL}r-%z;dj2%=clY{(`fNs%P2mjjgL@c+nkw#E9t(_Yrx5Wz5~8=%i@lf&>gtvb#YVRhZJb z?@2Xe(5xTOaWx&^PdwmbDX5>^Bf-iScHH7PV?takHktC3JGR68ln>pp-5f?!L!noe`O2*h!3!Le-TL!7#Zf=r)43k{&KcKPolG3Zt+N`Hz{eKC;mCH7 zYej<`;hQd}`x=y5Uq?r%R1Q3O-yVFGk7iHzH7q%+s$v`eoO~@|3QSbM{3n1YIX|%+ zYUPo{F!)-2c6k!Kp}e*H2}nqp$Z@;B(Q%w)?8CQngTFT8oA1P{sye@;jZ3{j~ z$62c}6W@o8sG7{7%K1RYh5iq+M>QKXjXkddC;ylzV2+8WIky^pABbB|6pYz;5NNjW7sXlC07B8t-JqQEw(z4;aivEAAC+j?{T>ljo> z=R*t0DO>JH_Hxy>C~3FTrZrEJQ?4AF;zbD-Nx6Ua*v(Bwed$# z(w;WH{x|8wm=t1LyW51i=AQAqhD8e3VhU^<;;WHE!G!o^slA-vDIZOF9tz%0bvIU? zR@DJlQEC;Nhm9g)5_Nom{6y-j@VN4i)D(cv6?KII?qI{r7I;NVr_jhgUUWV-X;5ih z83OJX8dbG#CnhAiVmsP!qSYx~c1p`~UyX_oTc#*+F%@D!^fFNmT`F%&3xp}k$7%I2 zeZ>i^xD+9XrM3dS+A*LPOIi#mLwpF%LxD%UD2c;j$t^*YhRb=AT%8^Y_mt1mPlC?B z3Y6`u4*zl zZ(Sx&O>$9u%0B^~^Q*$%IZr+0?^DBt%$+M@^v_H|!BUZ^w`nsB zXHszu9V`SdG>y?3ReP3;((NQsDilQZ={~IA82furuftY~a zH?w#MR$_OQyP{{M>!U(D-E`by*`ZIznV#I3wb7zXtSg$L?dr17OHnRVJCGSb|4haGRKK(>p*{qts zY3#p4Q5su#&kAAkxqDN!!JT{Ix~sTP$nZR{$$7)UPN$}*>K5M^sWm2y|6D#ayv8Zv zk(oGo^8F)DZ~38(ORRJXZ7SrR`$dqYq&-;3>k$%1ziLE`4eHnS@Hl(V9wv^1)%3VC z9EKBYqW~4)?B|G;w@y0yG_p2cVD_$Xfy26;gf)Y5-@!F;G?LEaGQh}c-JKm6Sd49qwemN@G>v7cDF2yf~D z*x(Cbc7QInC>iF!sEQV+z`i;EX&F(`<0Cr(CK(1+iD9Aq?Gd#gAw(6!!n@I|$RtW_ zcp43OWKXd*sj!ZJiZtSKY;QL_Y(pnU)TH%XUoYN#qBRPw`2n2L)J9a_U_)te-fq%z zHlh|j8)D1CvuHqNp&hRIzH&4(q3oNr&~A7bdR-38(!sOr>paLL0QA5c#D|t|0tdDc z``*FZLa z&BP@dUk1;>yR@tfR`^7rskWOaO`4A));vOEZG1TWxeVBZvcHYsjfJgz3;h<*W-H{w zAPp@CfA}YTu^fCsp|6y~44*CXZ;m#jh>rfOu{M4aJzWlA-qW;^#7{;RZ3RqkPy97wd@2R0aIER2S)bOURZBLvz|&% z`f3HSXIq+Js++zY^Ts~vgkU@EeA4bNh}JKE3a=9EG7lEs4STUDtoJJHbM%Y~L0B4W zYxoirvpxHP6YG2E-dhkoyMGp@FLM2eI?xhr?%Ta-M2#)&EHJh5gQ(yT(m9Q5tEEY; zC?ZzIru9RHJ^C-Z152?+^ok0{u*Hv7l7oWQ>Jctvfxiv`vC^l>MU%dJ8j7ou$?O0- zp|1x&9*b!3bmGAdZXt1c&#TqHjP4L)^}mK<_W4pW8lT%%vNI?cXKwuwKP5?hKZK38 zq0g8(#^#A4Ui4gc*VvM-tzC*z$Ly6|WYFdL2t0)|k)A}FisXyrfiwZ>hsQYX z3Q`ABGtwTU-AL~stwf4J@<8H|Mtsmjaoix!&~azZXUe4ID{*x1Pv#0fb)dy@FM3zIm`oNBhjCoEl(u-I&# z#R=&Y8i_B|QBxzyc7ydCw;+0{IWeaoV?%7#Mo#FU)<%-!b_J2==H;x*%gWE6X(?E% zEp%uiPe3{iZ6cWvKzB8f7T8QJHgX->*}P^gpFPxen(TGge$lkgQf|h&EKB}NuVit8 zfflupGhQ{Q(E>_}Ot3`9MJHOKVj`DtLN!hMlpKO!HlY>aK{37BMiem6%62jpGjX(? z>^F8GmR}>9ZOP2aU&9F|y6FswgLm1dXGjNNma5K@_aT?f{fw-|q_f(85m$hBn9@O< zfnGdMf-qFlN$_vSi@tb)oP>DleGwCzO|vdynr(FPC6Wa7wB`~?McojN+_fJo4NZ1d zMy_RbMn0mcr|FkT3AEF1E|Umc<^Kiw0zLln1v!XC-G7BFL61LOA=!fM(L8d3KsR&| zUm^VwEFqjwM|X9Rb$FAJZjyn!XLggju!pVqlDrJChjv~iE3x!5u8|X1`rFsY`!w?+ zaiz7_Nu;M%s7FgY(~=m)2{t->o$SXdeRzWud2ar{HV7HDd56yJLB|5E>LC`yGSov< z*ZMJciy{*vEeql?HfDE|9M>V9)8CR>NTHeEq2p@m(n~y`h6VJJ?@3@Wu8Lh8Yl)AI l!4}hgZ^uRmuJZTMY);roBl}4VenGeQlK`k=te;rP{{Wp5s;B?} diff --git a/src/0000Boot/BootMHD2.BIN.C b/src/0000Boot/BootMHD2.BIN.C index 555187021dc7fce4b6915ea250f31f900f97e7d7..5309078d09aa654e3c394818f57dd2c4d5f401c6 100755 GIT binary patch delta 14 VcmdnTvX5nh9U~K?(qsq5e*htx1Zw~Q delta 14 VcmdnTvX5nh9V63U#mNqg{{Sa_1!e#M diff --git a/src/Compiler/Compiler.BIN b/src/Compiler/Compiler.BIN index c66aee7d172a5e900bc75e0ffc0fffd6ae11eecb..2b1751f507747ce4f33df5d1943916dd8095fb79 100755 GIT binary patch delta 162 zcmX@`mixe4?hUERj7*!;l;5N>vv4tO4(;5|2ITWjaQ9$jm>hZ|6v$b9;|~wZVrDL; z$*Z5vW42|`o9y$<6+~~I@@$vrS{%9NM{^4an!6;O@a_JvsD7D3G)I#vdM*ovhOs zC$D}wkC}miVY1INR}j5<%CmKrjEviz6&SDTu|zXXW85y|&zQr=;tOK-1TfB(WCpQx zvKW`vGe4ioxc$mY#@aOIyFgY*0F#{xE6@-IhV9c!n7(jKzs<z0R^-C1$FG$ maximizes a window. $FG,2$$FG$ closes AutoComplete. $FG,2$$FG$ brings back AutoComplete. $FG,2$$FG$ vertically tiles windows. $FG,2$$FG$ horizontally tiles windows. The $FG,2$ALT$FG$ keys are defined in $LK,"~/HomeKeyPlugIns.CC"$. You can customize them. +* $FG,2$$FG$ maximizes a window. $FG,2$$FG$ closes AutoComplete. $FG,2$$FG$ brings back AutoComplete. $FG,2$$FG$ vertically tiles windows. $FG,2$$FG$ horizontally tiles windows. The $FG,2$ALT$FG$ keys are defined in $LK,"~/HomeKeyPlugIns.CC"$. You can customize them. * If you make changes to ZenithOS files in your $FG,2$/Home$FG$ directory, generally you reboot to make them take effect. (You don't compile anything.) You should have two ZenithOS partitions on your hard drive because a syntax error in a start-up file will make the partition unbootable. Boot to the second partition or boot to a standard ZenithOS CD/DVD and use $LK,"Mount",A="MN:Mount"$() to mount your hard drive. @@ -93,7 +93,7 @@ $FG,2$Merge(\"C:/*\",\"D:/*\",\"+r+d\");$FG$ to check my changes. * You can access the word under the cursor at $LK,"ac.cur_word",A="MN:CAutoCompleteGlobals"$. -* You can reactivate $FG,2$AutoComplete$FG$ after closing it by pressing $FG,2$$FG$ or $FG,2$$FG$ if you have it defined. +* You can reactivate $FG,2$AutoComplete$FG$ after closing it by pressing $FG,2$$FG$ or $FG,2$$FG$. * $FG,2$$FG$ to toggle to/from plain text just the $LK,"CDoc",A="MN:CDoc"$ cmd under the cursor. See $LK,"::/Demo/DolDoc/TextDemo.CC"$. diff --git a/src/Kernel.BIN.C b/src/Kernel.BIN.C index fa00a48afcaedc04d0cf0c2e1e7324682a9a42ef..ea94576fc57bcb3e1e135151899a9f0381802802 100755 GIT binary patch delta 3172 zcmZ7&4Ompw^3LpDegtGw78Vesgu?KDB{8JL-%9}!AfSm0>gq=NiTpf$J?YVh7|VT{ zdDEl4>Pc8?{$W?WgrbX*i&;JJhtyKhO8K$k<%`gl+&6cl^6P%z+%sp+%$%7yGjmSq zWv|l9UK_@{ugVzjKW2)TT%~W($=><_0Y>v_^VwQx|IGNcUThFASBG&+>>+YQ@KnGJ z8xF)bfix!6CT|P%_J%F;-pB8H!lUwz@uNaLW}Q)0!O2gPuA~lwa2e8803=I=>6Nfk z>PwG>F6qhH8SsYu`t0EllQV?ls=m>2oM>#Pzi(ZHMhPwS;Z;?Ay6h|$!Eu~pO0|us zcH>g|A28C=P{})URLlWSUImULF5kV)=Q^uPT}*4}f1KkCoZ0aa=fQDzcH84Bi1wTA z0zauBbL8Y+d)yYHR%t>mH4$8&sy4Lgbk6D&qKPh{D5u!e(1B*ho!!67r`5hnMoB+p z21(a4J*C*J;gh-^bJ5Ia#kdWctj{X?+uh5YdV2u`TaRr0Ijk*R|Y>%2gSR{ zlpvlUCeIYX_i#wBd}^K<{JuP94^1`6^11B;`N&|+h_P=6 zNQF1D-6q9NO}E6ztvAwqkSvet9ts`Ov)vQN)r?ft5}%B`uyzlL;{^3oSEt!g6LvFf z{^=7QoOM-x?rcH4EtK6hWMsZ|PbiCfSw7tDhD_KB-g48A|IumNaGb_uc2Eu<97Bib zyU~$-GL?&y&i91t9ww{)*E8KUPW^fB5Sl+I@JrNh0;5MiEqV8b>u!;O=H92ENh;_a z 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 diff --git a/src/Kernel/KExterns.CC b/src/Kernel/KExterns.CC index 8c977a7f..c3d9cabb 100755 --- a/src/Kernel/KExterns.CC +++ b/src/Kernel/KExterns.CC @@ -11,7 +11,7 @@ import Bool DocUnlock(CDoc *doc); import Bool Ed(U8 *link_st,I64 edf_dof_flags=0); extern U0 ZenithErr(U8 *format,...); extern U0 ZenithLog(U8 *format,...); -extern I64 BIOSTotalMem(); +extern I64 MemBIOSTotal(); extern I64 BlkDevAdd(CBlkDev *bd,I64 prt_num=I64_MIN, Bool whole_drive,Bool make_free); extern CBlkDev *BlkDevCheck(CBlkDev *bd,Bool except=TRUE); diff --git a/src/Kernel/KMain.CC b/src/Kernel/KMain.CC index 481d7dfe..eb3995d3 100755 --- a/src/Kernel/KMain.CC +++ b/src/Kernel/KMain.CC @@ -149,7 +149,7 @@ U0 KMain() sys_os_version,sys_compile_time,sys_compile_time; TimerInit; - if (BIOSTotalMemQkr#.R|`SnSnjnxnnnnnnnnnnnnnn}(~%**N]~D&5AAGt;;Keeggg{}}}DJWYYYYYYYYYYY6[ƊҊي #(?BKQTV`e|81;66D[ffquu{019ǗҗKvjj/jPjbjijsjjjjjjjjjjjkkkk$k3k:k=k?kEkKkcklklkpkk,66DPgkmD V]]]]]]]]]]^ ^:^A^E^]^i^^^^^^^^^^ __,_?_L_]_t_z___``&`-`8`T`T```b`b`n`p`p`````````````` a"a)a0a6a9aaP,<ؓ*057P4#OOOOOOOOO $-385?*FRVZ^jr 5hhʼnˉ҉ىۉ#&)16LX[^^^^aiqx0;C^^lzXpXp~pppppppppppq qqq1q8qBqBqWqWqmq{qqqqqqqqqqqqqqrr'r1r4r4r;r?rQrt@W@WTW[WcWkWWWWWWWWWWWWWWWWXX X/XX gggggggghh hh7h;h@iiiiiiiiiij@!-LRR\etz( y y!y=yOyUypy{#06CNSYkkz}ȀӀ؀ހ 8 "3FK#R#RBRDRURZRhRRRRRRRRRRRRRRRSSSS S&S&S&S-S>S@%  >IM[^fTx>>bess$@EVV_msx`cw%)))-9H/=HLPTissuD"/(499JOOUt7777778,8:8H8Q8d8k8u8888888888X{SOSOlO|OOOOOOOOOOOOO@""19MW_glrttz,xxxxxxxy8{ZZ`^n4MVPPQ QEQUQaQqQtQwQ8>HPPPPPPPPPP<xZZuл`̈́2KZintv@   Fd2>>>)>0>N>_>n>{>>>>>>>?,?G?d???????@@;@@c@a@@@@@@AA?A?A^AeAAABAA.B5B:BPBXBXB}BBBBBBBCOCWCWCwCCCCCCC*D*D*D/D/D@D[DiDDDDDDDE"E-E-E@EYEmEEEEEEFFF6FQF\FtFFFFFFGGG9GQGgGiGGGGGGGGGG -HH&H&H7H7H:H>H,Ç݇,sz88<AK[[`jjjj$j1jH,Ç݇,sz88<AK[[4 Ȉˈшو, KKP#)#);)E)V)V)h)m)m))))))))))))))))))))))***G*\*\*n*u*|****a~(#22AAPF F L J Z -Ltڂڂ$CPZ^asT>>LS^ffx~!,5BK`jw 8"0{0{J{i{u{{{{{{{{{{{{{{{{{ ||!|$|'|*|*|4|7|I|H .JJ_knwPYi.GcdiL ,7H\`nˆSqZZZZZZZZZ [[[[![%[4[?[G[O[P[P[Z[       ) ? R k         '1AWm EI,fm,W^[N[NiNkN}NNNNH::CObmdˇև - 3IcgOOP P#P2P_PiPnPPPPPPPPPPPPPQQQ'Q3Q7QAQ-IXXXXXXYYYY$Y$Y-Y8YJYSY^YcYhYyYYYYYY %D!<JOR`eڨܨ2<CYtȩϩש bb -bbbGr%*?IS][k$+7>OV]nss'-44BQX^ppȤߤ&,8@e{ɥ4#,cXcXrXXXXXXXX'F'ITey .>>>QVW(PVvv5#2FNThwƖʖӖٖ$).OOP P!P'P,'28;C+В%%1<JT\```ceiin|L..JVp{ j%kXzzƅ̅ۅTWWW3WBWTWYWoWvWWWWWWWWW`HuaucukuuuuuuuuuuvvvcvGn-9B^p,...FFX`{{{ )C:C:e:::::.;q;;;;;;;<"<4<D<Y<r<<<<<<<<== |RRR;RERnÐÐې#))3:EJThjuuǑё@/;22P\it0';ACCI<NYS?S?[?y?????????jSSilxxzƙؙ "<HRHRVRdRiRoRRRRRR} +Ltڂڂ$CPZ^asT>>LS^ffx~!,5BK`jw 8"0{0{J{i{u{{{{{{{{{{{{{{{{{ ||!|$|'|*|*|4|7|I|H .JJ_knwPYi.GcdiL ,7H\`nˆSqZZZZZZZZZ [[[[![%[4[?[G[O[P[P[Z[       ) ? R k         '1AWm EI,fm,W^[N[NiNkN}NNNNH::CObmdˇև + 3IcgOOP P#P2P_PiPnPPPPPPPPPPPPPQQQ'Q3Q7QAQ-IXXXXXXYYYY$Y$Y-Y8YJYSY^YcYhYyYYYYYY %D!<JOR`eڨܨ2<CYtȩϩש bb +bbbGr%*?IS][k$+7>OV]nss'-44BQX^ppȤߤ&,8@e{ɥ4#,cXcXrXXXXXXXX'F'ITey .>>>QVW(PVvv5#2FNThwƖʖӖٖ$).OOP P!P'P,'28;C+В%%1<JT\```ceiin|L..JVp{ j%kXzzƅ̅ۅTWWW3WBWTWYWoWvWWWWWWWWW`HuaucukuuuuuuuuuuvvvcvGn-9B^p,...FFX`{{{ )C:C:e:::::.;q;;;;;;;<"<4<D<Y<r<<<<<<<<== |RRR;RERnÐÐې#))3:EJThjuuǑё@/;22P\it0';ACCI<NYS?S?[?y?????????jSSilxxzƙؙ "<HRHRVRdRiRoRRRRRR}  -!#-DDU^hlpw~LQ`*9JN^uyy~$oooo   &&*79,]{{,4@HPP[]x24FOOaaov$KKKKKLL8L8LDLUL`LlLlLyLLLLLLLLLLLM8M=MBMxv * **)*/*;*K*N*R*[*k*n*w*z*********+ +EEFFFF#F5F?FDFVFkFFFFFFFFFFFGGGG#G(G0G@jvnn 0zzәٙۙۙD##O]hlptx&.9DOXn&1IT[fkLQQQQQQQRRRRR%2DDVawwĕʕЕЕӕ|,;>_$4:JJ\_ddtz}8 ::HS^H=KPPj}L \ooooooop+p+p=pJpWp_pmppppppqqq$q3qhqoqqqqqqqqqqqrrrrr'r'r4rIrOrbrrrrrrrrrrrrrrss%s2s?sDsDsHsas@Zf??@@@@)@0@2@7@D@,("XX)XEXJXVX\X<$;h;hDhMhShXhdJ_Θ%6@Sfə$۔۔  -;Y;YDYQYbYX = ==#=/=5=8===C=F=K=K=X=\=_=_=e=DNN]bk|}h-11111 -2 22252I2L2^2f2m2222222222333"3)353A3K3K3K3l3l3u3w3w3333333333333333333344 4,4?4V4h4l4w44444444445 555LF4( #(.L+\+\9\>\@\O\Q\_\j\s\s\t\z\x7&&:?IPc||| +!#-DDU^hlpw~LQ`*9JN^uyy~$oooo   &&*79,]{{,4@HPP[]x24FOOaaov$KKKKKLL8L8LDLUL`LlLlLyLLLLLLLLLLLM8M=MBMxv * **)*/*;*K*N*R*[*k*n*w*z*********+ +EEFFFF#F5F?FDFVFkFFFFFFFFFFFGGGG#G(G0G@jvnn 0zzәٙۙۙD##O]hlptx&.9DOXn&1IT[fkLQQQQQQQRRRRR%2DDVawwĕʕЕЕӕ|,;>_$4:JJ\_ddtz}8 ::HS^H=KPPj}L \ooooooop+p+p=pJpWp_pmppppppqqq$q3qhqoqqqqqqqqqqqrrrrr'r'r4rIrOrbrrrrrrrrrrrrrrss%s2s?sDsDsHsas@Zf??@@@@)@0@2@7@D@,("XX)XEXJXVX\X<$;h;hDhMhShXhdJ_Θ%6@Sfə$۔۔  +;Y;YDYQYbYX = ==#=/=5=8===C=F=K=K=X=\=_=_=e=DNN]bk|}h-11111 +2 22252I2L2^2f2m2222222222333"3)353A3K3K3K3l3l3u3w3w3333333333333333333344 4,4?4V4h4l4w44444444445 555LF4( #(.L+\+\9\>\@\O\Q\_\j\s\s\t\z\x7&&:?IPc||| k^^̵ڵ%),/BW_bzƶɶ!!!%''+--133777:<<?DJMQSY\tɷ˷.4KZi~Ҹ +--Eacc{ƹƹ޹.337OmqsswϺԺԺ '>EScϻѻѻ )..F[}qռؼݼݼ ,,2=RWaqqҽڽ 'Ca~ƾƾ޾%%**`nwwӿ޿999Ijll !*9BBKVnp ,.6PS\a !8p{{{ $(?w,5::EIax -%,7<CCH{"4@D^p|.8]bbbmq6=HMrx57ac...38k((((2H_inn #+4999Uil~#-3JR[```|*;EKbjsxxxT|һһ  HkyƼ! (6EKS_eelppr4GP,7<JW`qD҆҆ކ (/4:|0$@FUZkos}8NXBBRZnz}PAQAAAAAAAB"B$B2B8B;BIBTr S,   _ @  0-5O(y  m m#m2m@mPmVmVmamlmomtm~mmmmmmmmmmmmmm -X7ff *,>@MRY[hjjz - 7Y[bdpp CSCScSmSpSxSSSSSSSSSSS TT'T5T?T?T?TOT $k{Z{ZZZZZZZZ[[5[H[d[[[[ @ddddddde e ee0KKTYbhhm,;B!'6~~5Jeoy%%255`̫ϫ٫&0:DT]ct̬׬LWf0~0~9~I~I~g~m~}~~~~~~~~h0?DT\\jtÔΔєٔD<I~~`*>==;=P=W=l=s=s========= >6>C>P>\>2Zccnr??cee5Pzzǃ΃"0tttuuuu'u<alńфքڄ8gqK@K@T@d@l@y@{@@@@\>>BUh{ -%@[vhX{{{| ||7|=|J|W|^|g|k|w|, :y6 %(+1ELOjtyǞ۞ (.M]ew  Hkkkk ll!l5lHlSl_lplulllllllllllmm!mEmMmMmYm]mamymmmmmmmmmmm -nn/n4n4n@nFnLnNn^n L**9AAN`ltz!<ny 9DKuSЋ" GKҀҀ#l"22FPTXevxȝםڝ&2:DRcv*9DZhhtß̟ϟ$CCCCCDDDDD&D/D/D5D9DJRcg{Ԃ݂ ,<NNRX`jjnrɃ˃уك +%,7<CCH{"4@D^p|.8]bbbmq6=HMrx57ac...38k((((2H_inn #+4999Uil~#-3JR[```|*;EKbjsxxxT|һһ  HkyƼ! (6EKS_eelppr4GP,7<JW`qD҆҆ކ (/4:|0$@FUZkos}8NXBBRZnz}PAQAAAAAAAB"B$B2B8B;BIBTr S,   _ @  0-5O(y m m#m2m@mPmVmVmamlmomtm~mmmmmmmmmmmmmm X7ff *,>@MRY[hjjz + 7Y[bdpp +CSCScSmSpSxSSSSSSSSSSS TT'T5T?T?T?TOT $k{Z{ZZZZZZZZ[[5[H[d[[[[ @ddddddde e ee 0KKTYbhhm,;B!'6~~5Jeoy%%255`̫ϫ٫&0:DT]ct̬׬LWf0~0~9~I~I~g~m~}~~~~~~~~h0?DT\\jtÔΔєٔD<I~~`*>==;=P=W=l=s=s========= >6>C>P>\>2Zccnr??cee5Pzzǃ΃"0tttuuuu'u<alńфքڄ8gqK@K@T@d@l@y@{@@@@\>>BUh{ +%@[vhX{{{| ||7|=|J|W|^|g|k|w|, :y6 %(+1ELOjtyǞ۞ (.M]ew  Hkkkk ll!l5lHlSl_lplulllllllllllmm!mEmMmMmYm]mamymmmmmmmmmmm +nn/n4n4n@nFnLnNn^nL**9AAN`ltz <ny 9DKuSЋ! GKҀҀ"l"22FPTXevxȝםڝ&2:DRcv*9DZhhtß̟ϟ#CCCCCDDDDD&D/D/D5D9DJRcg{Ԃ݂ ,<NNRX`jjnrɃ˃уك **8AAP~ƄՄ -$$+DIQYbir'("({͚Қךܚ$5O\ejot}͛͛қ -H}ΜΜ%#3?V_fr~Ýĝ͝ҝ)(sysyyyyyy* (-3[~ʴϴ "HHQhwõӵ"<AIIN\kƶֶ+4CdCdGdXdhdydddd,p !ii} -""FYeet{{+.Mlx(>TYe{%,BK#.8u/80:jjsʮ׮0,#e#e,e5eHeNeSe10 ((6@TZ\b2,8?$5CIO3@-9VVVV%V,V3V4VfCfOfWf`f`fhfwf{ffffffffffffffffg ggg g'g.g4g=gCgVggggggg:|>Y "%++5CJJJX;,#####$$<cck(5AMMZd1BGY]ees~=D&hhhhhhhhhii -i>LP_$$19<JMTX[_mty?(CCCCCCC@8EOܩܩA0 !&B<SvSviv|vvvvvvvvwCTct -9?ALgsDPE(MSSS[i{FH!ʎʎ؎ G'J i i%iFiXi_iiiui}iiiiiiiiiiiiiiijjjjjHX888899"9)9@9B9Y9Y9[9^9d9IOpjj.j1j?jZjhjujjjjjjjjjjj kkk&k*kBkDkjkrkykkJHK<#jjxݭ߭L4uuuuvv#v9v?vRvM4YbNZ *6]| -)=UY_mqw!!!VOBBdirr~οڿ߿߿ """*8FPSXerrP?LL%M(M6M?M?MVMgM~MMMMMMMMMMMNN!N$N`NQ` '/;?GSUUXdR6XXXXXY8Y?YJYYYcYyYYYYYYYYYY ZYZZ&ZZ7Z9Z9ZIZIZWZhZmZZZZZZZZZ [[0[5[D[W[z[[[[[[[[[[[[[ \ \\-\2\^\`\\\\\\\\\\\\S]S0 kkyT(҅҅ޅU ddddV0""6u|W7]  %@@NU[bjx~ˆˆ҈(X<555556!62646b6Y@+""//AAJZE +$$+DIQYbir&("'{͚Қךܚ$5O\ejot}͛͛қ +H}ΜΜ%#3?V_fr~Ýĝ͝ҝ((sysyyyyyy) (-3[~ʴϴ "HHQhwõӵ"<AIIN\kƶֶ*4CdCdGdXdhdydddd+p !ii} ,""FYeet{{+.Mlx(>TYe{%,BK#-8u.80:jjsʮ׮/,#e#e,e5eHeNeSe00 ((6@TZ\b1,8?$5CIO2@-9VVVV%V,V3V4VfCfOfWf`f`fhfwf{ffffffffffffffffg ggg g'g.g4g=gCgVggggggg9|>Y "%++5CJJJX:,#####$$;cck(5AMMZd1BGY]ees~<D&hhhhhhhhhii +i=LP_$$19<JMTX[_mty>(CCCCCCC?8EOܩܩ@0 !&A<SvSviv|vvvvvvvvwBTct +9?ALgsCPD(MSSS[i{EH!ʎʎ؎ F'J i i%iFiXi_iiiui}iiiiiiiiiiiiiiijjjjjGX888899"9)9@9B9Y9Y9[9^9d9HOpjj.j1j?jZjhjujjjjjjjjjjj kkk&k*kBkDkjkrkykkIHJ<#jjxݭ߭K4uuuuvv#v9v?vRvL4YbMZ *6]| +)=UY_mqw!!!VNBBdirr~οڿ߿߿ """*8FPSXerrO?LL%M(M6M?M?MVMgM~MMMMMMMMMMMNN!N$N`NP` '/;?GSUUXdQ6XXXXXY8Y?YJYYYcYyYYYYYYYYYY ZYZZ&ZZ7Z9Z9ZIZIZWZhZmZZZZZZZZZ [[0[5[D[W[z[[[[[[[[[[[[[ \ \\-\2\^\`\\\\\\\\\\\\S]R0 kkyS(҅҅ޅT ddddU0""6u|V7]  %@@NU[bjx~ˆˆ҈(W<555556!62646b6X@+""//AAJYE  - (2>L\BP`k(2[$0u#&#&+&;&K&]&l&u&&&&&&&&&&&''3'='R'\'q'{'''''''''((+(7(C(T(i(~((((((()")7)\)s)|))))))))))*\@nzOO O,O0OCOLOPORO]8AK -^ b 1 1+1/171X1e1v1111111122'2/2P2e2p2z22222222 -33%3=3A3F3F3W3W3j3|33333333333333344<4_@.: ` W[xQxQ|QQQaڐ $'03DDDKX[`]ёԑ֑ + (2>L\BP`k(2Z$0u#&#&+&;&K&]&l&u&&&&&&&&&&&''3'='R'\'q'{'''''''''((+(7(C(T(i(~((((((()")7)\)s)|))))))))))*[@nzOO O,O0OCOLOPORO\8AK +] b 1 1+1/171X1e1v1111111122'2/2P2e2p2z22222222 +33%3=3A3F3F3W3W3j3|33333333333333344<4^@.: _ W[xQxQ|QQQ`ڐ $'03DDDKX[`]ёԑ֑  -"0@NW^ccci}bD ZZn -c ~>>L[d4 -jjx}e8ZZhnw}fhRhxxyy,yLyRyLyiykyqykyyyyyyyyg0WWWW XXXXXht/$$$$$$$%+%L%]%%%%%%%%&&&&&"&i& @CGLX_j0I"3DUf{ϖږ"5G|~×ԗ ,<RReqk&Xjjååԥ #3UWtŦΦԦۦ2l@8DzzÏm|)D'7Zlnfbbb!b0biBiNi\ieiyiiiiijq`AU#$#$+$A$I$I$Q$`$l$$$$$$$$$$$r....1.4.>.L.W.o.w........///4/:/d/n/t/w/////////0&0+0?0W0n0000000 +"0@NW^ccci}aD ZZn +b ~>>L[c4 +jjx}d8ZZhnw}ehRhxxyy,yLyRyLyiykyqykyyyyyyyyf0WWWW XXXXXgt/$$$$$$$%+%L%]%%%%%%%%&&&&&"&h& @CGLX_i0I"3DUf{ϖږ"5G|~×ԗ ,<RReqj&Xjjååԥ #3UWtŦΦԦۦ2k@8DzzÏl|)D'7Zlmfbbb!b0biBiNi\ieiyiiiiijp`AU#$#$+$A$I$I$Q$`$l$$$$$$$$$$$q`jjjj$j1j.L.W.o.w........///4/:/d/n/t/w/////////0&0+0?0W0n0000000 1 11s0 OOO(O(Oalloced_u8s; diff --git a/src/Tmp/Zenith-Latest.iso b/src/Tmp/Zenith-Latest.iso index 9e9d613f826aa472babaf0eb55fdbfa94d443402..6b292a45690416f5884e48a3dd1bd9a32ac1addf 100755 GIT binary patch delta 15660 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 { @@ -269,7 +269,7 @@ public U0 MemBIOSRep() case MEM_E820t_PERM_MEM: "Perm memory:"; } - "%016X-%016X$$FG$$\n", m20->base, m20->base + m20->len - 1; + "%016X-%016X$$FG$$\n", m20->base, m20->base + m20->len - 1; m20++; } } diff --git a/src/Zenith/Utils/MemRep.CC b/src/Zenith/Utils/MemRep.CC index 1f2135b9..26b479cb 100755 --- a/src/Zenith/Utils/MemRep.CC +++ b/src/Zenith/Utils/MemRep.CC @@ -111,11 +111,11 @@ Bool MemRepTask(CTask *task,Bool override_validate=FALSE) "Stack\t\t:$$RED$$$$BK,1$$Overflow$$BK,0$$$$FG$$/%010X\n",j; "HashTable\t:%010X\n",HashTableSize2(task->hash_table); - "FPU\t\t:%010X\n",MSize2(task->fpu_mmx); - "DirCur\t:%010X\n",MSize2(task->cur_dir); + "FPU\t\t\t:%010X\n",MSize2(task->fpu_mmx); + "DirCur\t\t:%010X\n",MSize2(task->cur_dir); if (pdoc=DocPut(task)) - "PutDoc\t:%010X\n",DocSize(pdoc); + "PutDoc\t\t:%010X\n",DocSize(pdoc); if ((ddoc=DocDisplay(task)) && pdoc!=ddoc) "DisplayDoc\t:%010X\n",DocSize(ddoc); if (bdoc=DocBorder(task)) @@ -161,26 +161,26 @@ Bool MemRepTask(CTask *task,Bool override_validate=FALSE) m+=MSize2(task1->code_heap); } "TaskStructs\t:%010X\n",j; - "TSSes\t:%010X\n",k; + "TSSes\t\t:%010X\n",k; "HeapCtrls\t:%010X\n",m; if (n) "TaskQueues\t:%010X\n",n; - "BlkDevs\t:%010X\n",BlkDevsSize; - "Drives\t:%010X\n",DrivesSize; + "BlkDevs\t\t:%010X\n",BlkDevsSize; + "Drives\t\t:%010X\n",DrivesSize; if (blkdev.cache_base) "DiskCache\t:%010X\n",MSize2(blkdev.cache_base)+MSize2(blkdev.cache_hash_table)+ MSize2(blkdev.cache_ctrl); - "Clip\t:%010X\n",DocSize(sys_clip_doc); + "Clip\t\t:%010X\n",DocSize(sys_clip_doc); "AutoComplete:%010X\n",CallExtStr("AutoCompleteSize"); - "text.font\t:%010X\n", MSize2(text.font); + "text.font\t\t:%010X\n", MSize2(text.font); "text.raw_screen\t:%010X\n", MSize2(text.raw_screen); "gr.to_8_bits\t:%010X\n",MSize2(gr.to_8_bits); "gr.to_8_colors\t:%010X\n",MSize2(gr.to_8_colors); "gr.text_base\t:%010X\n",MSize2(gr.text_base); "gr.screen_cache\t:%010X\n",MSize2(gr.screen_cache); "gr.win_z_buf\t:%010X\n",MSize2(gr.win_z_buf)+ MSize2(gr.win_uncovered_bitmap); - "gr.dc\t\t:%010X\n",DCSize(gr.dc); - "gr.dc1\t\t:%010X\n",DCSize(gr.dc1); - "gr.dc2\t\t:%010X\n",DCSize(gr.dc2); + "gr.dc\t\t\t:%010X\n",DCSize(gr.dc); + "gr.dc1\t\t\t:%010X\n",DCSize(gr.dc1); + "gr.dc2\t\t\t:%010X\n",DCSize(gr.dc2); "gr.dc_cache\t\t:%010X\n",DCSize(gr.dc_cache); "gr.screen_image\t:%010X\n",DCSize(gr.screen_image); "gr.zoomed_dc\t:%010X\n",DCSize(gr.zoomed_dc); @@ -197,22 +197,19 @@ public U0 MemRep() CBinFile *bfh=mem_boot_base-sizeof(CBinFile); bfh(I64)+=bfh->file_size-1; - "$$BLACK$$Low Memory\t:0000100000$$FG$$\n$$ID,2$$"; - "Kernel\t:%010X-%010X\n",mem_boot_base-sizeof(CBinFile),bfh; + "$$BLACK$$Low Memory\t:00100000$$FG$$\n$$ID,2$$"; + "Kernel\t:%08X-%08X\n",mem_boot_base-sizeof(CBinFile),bfh; - "$$ID,-2$$$$BLACK$$HighMemory\t:0000100000-%010X$$FG$$\n", - mem_heap_limit; - "$LK,"SYS_FIXED_AREA",A="MN:CSysFixedArea"$\t:%010X-%010X\n", - SYS_FIXED_AREA,SYS_FIXED_AREA+sizeof(CSysFixedArea)-1; + "$$ID,-2$$$$BLACK$$HighMemory\t:00100000-%08X$$FG$$\n",mem_heap_limit; + "$LK,"SYS_FIXED_AREA",A="MN:CSysFixedArea"$\t:%08X-%08X\n",SYS_FIXED_AREA,SYS_FIXED_AREA+sizeof(CSysFixedArea)-1; - if (sys_data_bp) { - "$$BLACK$$Code Heap\t:%010X/%010X$$FG$$\n", - sys_code_bp->used_u8s,sys_code_bp->alloced_u8s; - "$$BLACK$$Data Heap\t:%010X/%010X$$FG$$\n", - sys_data_bp->used_u8s,sys_data_bp->alloced_u8s; + "$LK,"VBE framebuffer",A="FF:::/Kernel/KernelA.HH,framebuffer"$\t:%08X-%08X\n", text.fb_alias, text.fb_alias(U8 *) + text.buffer_size - 1; + if (sys_data_bp) + { + "$$BLACK$$Code Heap\t:%010X/%010X$$FG$$\n",sys_code_bp->used_u8s,sys_code_bp->alloced_u8s; + "$$BLACK$$Data Heap\t:%010X/%010X$$FG$$\n", sys_data_bp->used_u8s,sys_data_bp->alloced_u8s; } else - "$$BLACK$$Code/Data Heap\t:%010X/%010X$$FG$$\n", - sys_code_bp->used_u8s,sys_code_bp->alloced_u8s; + "$$BLACK$$Code/Data Heap\t:%08X/%08X$$FG$$\n",sys_code_bp->used_u8s,sys_code_bp->alloced_u8s; for (i=0;i