diff --git a/src/0000Boot/0000Kernel.BIN.C b/src/0000Boot/0000Kernel.BIN.C index b81cd642..786b33e0 100755 Binary files a/src/0000Boot/0000Kernel.BIN.C and b/src/0000Boot/0000Kernel.BIN.C differ diff --git a/src/0000Boot/BootMHD2.BIN.C b/src/0000Boot/BootMHD2.BIN.C index 55518702..5309078d 100755 Binary files a/src/0000Boot/BootMHD2.BIN.C and b/src/0000Boot/BootMHD2.BIN.C differ diff --git a/src/Compiler/Compiler.BIN b/src/Compiler/Compiler.BIN index c66aee7d..2b1751f5 100755 Binary files a/src/Compiler/Compiler.BIN and b/src/Compiler/Compiler.BIN differ diff --git a/src/Doc/HelpIndex.DD b/src/Doc/HelpIndex.DD index 34b75169..397afe8a 100755 Binary files a/src/Doc/HelpIndex.DD and b/src/Doc/HelpIndex.DD differ diff --git a/src/Doc/Tips.DD b/src/Doc/Tips.DD index 3d6cc834..3cc4d0df 100755 --- a/src/Doc/Tips.DD +++ b/src/Doc/Tips.DD @@ -8,7 +8,7 @@ $WW,1$$FG,5$$TX+CX,"Tips"$$FG$ * See $MA-X+PU,"Key Map",LM="KeyMap;View;\n"$ for a list of defined keys. Define your own keys in $LK,"MyPutKey",A="MN:MyPutKey"$(). See $LK,"Keyboard Devices",A="HI:Keyboard Devices/System"$. -* $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. +* $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 fa00a48a..ea94576f 100755 Binary files a/src/Kernel.BIN.C and b/src/Kernel.BIN.C differ 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 9e9d613f..6b292a45 100755 Binary files a/src/Tmp/Zenith-Latest.iso and b/src/Tmp/Zenith-Latest.iso differ diff --git a/src/Zenith/DevInfo.CC b/src/Zenith/DevInfo.CC index f11e4a8b..d292bafd 100755 --- a/src/Zenith/DevInfo.CC +++ b/src/Zenith/DevInfo.CC @@ -242,8 +242,8 @@ public U0 MemBIOSRep() LBtr(&sys_semas[SEMA_DEV_MEM],0); "\n$$PURPLE$$BIOS Memory Report 15:E801$$FG$$\n" - "0000000000000000-%016X\n", 0x100000 + m01[0] << 10 - 1; - "0000000001000000-%016X\n", SYS_16MEG_AREA_LIMIT + m01[1] << 16 - 1; + "0000000000000000-%016X\n", 0x100000 + m01[0] * 1024 - 1; + "0000000001000000-%016X\n", SYS_16MEG_AREA_LIMIT + m01[1] * 64 * 1024 - 1; if (m20->type) { @@ -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