From 9fa2e575325714dd6535e67067cfb60061787930 Mon Sep 17 00:00:00 2001 From: xmm15 Date: Fri, 21 Feb 2020 03:35:33 -0600 Subject: [PATCH] IRQ's -> IRQs. MemBIOSRep GiB ceiling Zenith-Latest ISO now timestamped --- ...o => Zenith-latest-2020-02-21-03_34_16.iso | Bin 39002112 -> 39002112 bytes src/0000Boot/0000Kernel.BIN.C | Bin 191296 -> 191296 bytes src/Compiler/Compiler.BIN | Bin 194240 -> 194240 bytes src/Kernel.BIN.C | Bin 191232 -> 191232 bytes src/Kernel/KMain.CC | 2 +- src/Kernel/KTask.CC | 2 +- src/Kernel/Kernel.MAP | 2 +- src/Kernel/MultiProc.CC | 4 ++-- src/Zenith/DevInfo.CC | 2 +- vboxmnt.sh | 2 +- 10 files changed, 7 insertions(+), 7 deletions(-) rename src/Tmp/Zenith-Latest.iso => Zenith-latest-2020-02-21-03_34_16.iso (99%) diff --git a/src/Tmp/Zenith-Latest.iso b/Zenith-latest-2020-02-21-03_34_16.iso similarity index 99% rename from src/Tmp/Zenith-Latest.iso rename to Zenith-latest-2020-02-21-03_34_16.iso index af12a1fb69f552bcec315b5d453fea34fc2d5ad7..2232a3858fdd710cfdbfb3487fc7792bd497d993 100755 GIT binary patch delta 5483 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 diff --git a/src/0000Boot/0000Kernel.BIN.C b/src/0000Boot/0000Kernel.BIN.C index 382b5934d22f8447e955d4f194a37de12546c407..382538d274a15ee0516dc0dd90571c9a93e3dbea 100755 GIT binary patch delta 416 zcmX?bjr+hg?g=LB9~UlHF>vDEe30oQ<7OSE_&7$D%{>YGSefptZ1zcOS7tq+D8|Gv z`QlWu&F?yM8JWH*O^)pjW7@_rd26>Hi=>hm)ASF;j1rsWdrBCgqKqM%pY&$QGwN>k zU;9U&Dfq=?$1c&$Nq4_8u^yEI8D=!Y@ zf$fF&c8$B(}3H%p#TZ?pf} zKl)7ijFTO^L^mhh{mR73DGf5raJKm7;s*(=%nS?+o3A}>OJMxFJ=Tqpg_FrCXnV3h zqa-^}pf-$AUmQrU&1HNh%%rWneQG0Py9mn@QLt;ox0_F6%&}rTwSCD2#(H+9NS(6!xL-R)7KOpKm$n#-s@-ER(4;`R-5m?roE0J`pavpc3Om$5Lq&)IK#SZMD?YC`oNKF}S9HrdGFeOMN<%bI$LZ@0)44 zX|>$6IB;OKO=rKf?_C^pD{p)Y1(Ji+)w7DO~2U@gjfnB=KC(3K47#lq9 z7Ll#b{m2)^pB^{asWFI0t!EeuS!5$`wz#-&E*YO>TBO+{Uk1eZ{&|39d)p%{>apy~ z_6l~c!)IS;kLbG;!sAT{+4ByT=%>#srN)B`@p8^Y+$H`vRH_pksac|=^Ct@suk}b1 z$zt?Gvq=TX_J%XpnL_#YHVTQ%{`zzpgFRzaNQjZ4B*aDY=nWnC&r8kiNiqtn9BY}e zplG^VWl%1OpYM%0i+vAU;U9yhX%$8753?@+K7Z42Nn>@L7Ps@p>-5^U^6Et2_^c$A zW?&+Zsx15Oi9)C3PaZ&y{rzP6tB&+bJau5vKW`=yT59LzO~Z>9uhi;n@6-a;uTo}B zy+NoEl}`%{-68ncCHTd_^C6w$ak+;uXQt8XIB^C6DSY_G3&_TFTnn0I1O@)e`_5jisLS1j{7v5Wsi zu3KrhJ;tDiZY0Y!FL25WxBSaPjF2p!c&W#ev~$a@k9Y2nvANV6Vked171@+Zii^BM zU(j@hd+$>C6;=^&OJ4oti){WJdT2uUz5j#BXqf45q>ll}jSR-eIBV-!Fpe?3MSSkBkQXby6DLyW%SW;a#K K54-8ex_<%dTs9E^ delta 861 zcmYjPYe-Z<6u#%oy?d**b*tG&8kyOPS}4=33=J!CE4TOd#LcxeR1ir;C@Ktpq}dB^ zI@OxekBq1!7--5eG<*DtvZ5>qD|!*4MQYJ&8{2~B&&+v!=ljl?vd8AK$L1r6dW}9I zX2t?DZ^KW(UAWf+Uf#6gxfM54elV*Ew4%I{obkr0eUz`w9w20g^n14bw1L8x?K-8C zSc<&2`~o2xC>oGDnqS@*joKP%DMm+)o%dA608qnHlAmUI@ZMpuo-GpZk&W#e)6LI=t_PnYT#pvKAz zw^@D#M)UZl+&GjpMx;48@3>)NGkp-n4|iTuAxtLwc|U4C?;yAMpo15`*rK8A`shuE zNy0XEmxE2l6vgYV>P~2V9h=#nQRojSijmqA2or4V8D)}kn)_05JvF}dEgrlU^zWAq z?)JxxUH@NsWb?!y(?TI7vbr_1efsqI62>wxo{W(LOBk4nki&gn7i#KY1$%i7Y`ppB z4OJRq4?@&PE#_aqE;xm&7NDXq4sJPEpaAS*={&frfg+q~ut-xYDyacZLG8iy2@OePtask_flags,TASKf_KILL_TASK); diff --git a/src/Kernel/Kernel.MAP b/src/Kernel/Kernel.MAP index 8ed1d867..9a972d48 100755 --- a/src/Kernel/Kernel.MAP +++ b/src/Kernel/Kernel.MAP @@ -2949,7 +2949,7 @@ FF&F&F7F7F:F>F ll/l4l4l@lFlLlNl^lL**9AAN`ltz <ny 9DKuSЉ! GK~~~~"l"22FPTXevxțכڛ&2:DRcv*9DZhhtÝ̝ϝ#AAAAABBBBB&B/B/B5B9BJRcg{Ԁ݀ ,<NNRX`jjnrɁˁсف **8AAP~ƂՂ $$+DIQYbir&("'{͘Ҙטܘ$5O\ejot}͙͙ҙ -H}ΚΚ%#3?V_fr~Ûě͛қ((swswwwwww) (-3[~ʲϲ "HHQhwóӳ"<AIIN\kƴִ*4CbCbGbXbhbybbbb+p !i}i}}}}}}}}}}~ ~~,""FYeet{{+.Mlx(>TYe{%,BK#-8u.80:jjsʬ׬/,#c#c,c5cHcNcSc00 ((6@TZ\b1,8?$5CIO2@-9TTTT%T,T3T4TdCdOdWd`d`dhdwd{dddddddddddddddde eee e'e.e4e=eCeVegeeeee9|>Y "%++5CJJJX:,!!!!!"";cck(5AMMZd1BGY]ees~<D&fffffffffgg +H}ΚΚ%#3?V_fr~Ûě͛қ((swswwwwww) (-3[~ʲϲ "HHQhwóӳ"<AIIN\kƴִ*4CbCbGbXbhbybbbb+p !i}i}}}}}}}}}}~ ~~,""FYeet{{+.Mlx(>TYe{%,BK#-8u.80:jjsʬ׬/,#c#c,c5cHcNcSc00 ((6@TZ\b1,8?$5CIO2@-9TTTT%T,T3T4TdCdOdWd`d`dhdwd{dddddddddddddddde eee e'e.e4e=eCeVegeeeee9|>Y "%++5CJJJX:,!!!!!"";cck(5AMMZd1BGY]ees~<D&fffffffffgg g=LP_$$19<JMTX[_mty>(AAAAAAA?8EOܧܧ@0 !&A<StStit|ttttttttuBTct 9?ALgsCPD(MSSS[i{EH!ʌʌ، F'J g g%gFgXg_gigug}ggggggggggggggghhhhhGX666677"7)7@7B7Y7Y7[7^7d7HOphh.h1h?hZhhhuhhhhhhhhhhh iii&i*iBiDijiriyiiIHJ<#jjxݫ߫K4sssstt#t9t?tRtL4YbMZ *6]| )=UY_mqw!!!VNBBdirr~νڽ߽߽ """*8FPSXerrO?JJ%K(K6K?K?KVKgK~KKKKKKKKKKKLL!L$L`LP` '/;?GSUUXdQ6VVVVVW8W?WJWYWcWyWWWWWWWWWW XWXX&XX7X9X9XIXIXWXhXmXXXXXXXXX YY0Y5YDYWYzYYYYYYYYYYYYY Z ZZ-Z2Z^Z`ZZZZZZZZZZZZS[R0 kkyS(҃҃ރT bbbbU0""6u|V7]  %@@NU[bjx~††҆(W<333334!42444b4X@+""//AAJYE diff --git a/src/Kernel/MultiProc.CC b/src/Kernel/MultiProc.CC index 56806f59..471859f0 100755 --- a/src/Kernel/MultiProc.CC +++ b/src/Kernel/MultiProc.CC @@ -138,7 +138,7 @@ U0 MPInt(U8 num,I64 cpu_num=1) throw('MultCore'); } PUSHFD - CLI //Multitasking safe because each core has a local apic and IRQ's are off + CLI //Multitasking safe because each core has a local apic and IRQs are off while (*(dev.uncached_alias+LAPIC_ICR_LOW)(U32 *)&0x1000) PAUSE *(dev.uncached_alias+LAPIC_ICR_HIGH)(U32 *)=dev.mp_apic_ids[cpu_num]<<24; @@ -149,7 +149,7 @@ U0 MPInt(U8 num,I64 cpu_num=1) U0 MPIntAll(U8 num) {//Generate interrupt for all but own core. PUSHFD - CLI //Multitasking safe because each core has a local apic and IRQ's are off + CLI //Multitasking safe because each core has a local apic and IRQs are off while (*(dev.uncached_alias+LAPIC_ICR_LOW)(U32 *)&0x1000) PAUSE *(dev.uncached_alias+LAPIC_ICR_LOW)(U32 *)=0xC4800+num; diff --git a/src/Zenith/DevInfo.CC b/src/Zenith/DevInfo.CC index 4dddd7b7..220d3b89 100755 --- a/src/Zenith/DevInfo.CC +++ b/src/Zenith/DevInfo.CC @@ -277,7 +277,7 @@ public U0 MemBIOSRep() if (MemBIOSTotal < 1024 * 1024 * 1024) "%03d MiB\n", MemBIOSTotal / 1024 / 1024; else - "%04d GiB\n", MemBIOSTotal / 1024 / 1024 / 1024; + "%04d GiB\n", CeilU64(MemBIOSTotal / 1024 / 1024, 1024) / 1024; } public U0 MemPageRep() diff --git a/vboxmnt.sh b/vboxmnt.sh index c682de2b..b4ce63cc 100755 --- a/vboxmnt.sh +++ b/vboxmnt.sh @@ -9,5 +9,5 @@ sudo cp -r /mnt/* src/ sudo umount /mnt sudo qemu-nbd -d /dev/nbd0 sudo chown -R v:v src/* -mv src/Tmp/MyDistro.ISO.C src/Tmp/Zenith-Latest.iso +mv src/Tmp/MyDistro.ISO.C ./Zenith-latest-$(date +%Y-%m-%d-%H_%M_%S).iso