From c7c5497a84b5ffe5aa8ca2f588b24e3415c00ce9 Mon Sep 17 00:00:00 2001 From: xmm15 Date: Sat, 22 Feb 2020 03:10:55 -0600 Subject: [PATCH] swap aux and vga rom font --- ...o => Zenith-latest-2020-02-22-03_10_44.iso | Bin 38995968 -> 38995968 bytes src/0000Boot/0000Kernel.BIN.C | Bin 189376 -> 189376 bytes src/Compiler/Compiler.BIN | Bin 194240 -> 194240 bytes src/Kernel.BIN.C | Bin 189312 -> 189312 bytes src/Kernel/KMain.CC | 16 ++++++++-------- 5 files changed, 8 insertions(+), 8 deletions(-) rename Zenith-latest-2020-02-22-03_07_38.iso => Zenith-latest-2020-02-22-03_10_44.iso (99%) diff --git a/Zenith-latest-2020-02-22-03_07_38.iso b/Zenith-latest-2020-02-22-03_10_44.iso similarity index 99% rename from Zenith-latest-2020-02-22-03_07_38.iso rename to Zenith-latest-2020-02-22-03_10_44.iso index 45c9cc6140bb95ff36f75fc9cd703664a5b3cea5..daf3a9914ac4096ff79e68220d265df11f3db983 100755 GIT binary patch delta 4959 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 Xgb7HZ@!$`31_q#<-1hDLOq?MAA7YU) delta 389 zcmX?bocq9W?g=LBZTo!{4V}0*A7uK-xLJqkqpu(X14F1s_nQ~*|NZ|Td)S(RVY6NU zqcBrR&}PGANkKLRm&DZE{LKL+JGmKyH*+pw_N_swNw-(KCznB&C!zjVX&SLYc$nKX4KFZ?Pz zeZzc4*6qF*7)6wrq&>DLe`0(tG(BI7NqT!KD^o`!bESgk_781Lf*hik_x}B#!N9@5 z&@H>6`R{*^V2}T%`=^WbGifkRn{MCFB*s`jJ*=O}NIwLq(5IW%6-aqD9}Mv5W_1EG gJ-QtNJUbbI5;`D>#)CiD85n?aYTLK>GjWCh0Oi(}vH$=8 diff --git a/src/Compiler/Compiler.BIN b/src/Compiler/Compiler.BIN index 0266346bfa31822969e8e3a2c7e15766d7854834..1ffd3df7ef9e9d5d05cf5089cd2f9045a495566b 100755 GIT binary patch delta 80 zcmX@`mixe4?hV}2So7j@Q*$>9OmlH!w4NM#V=rU%<{9 delta 80 zcmX@`mixe4?hV}2SQ$WIv%oYLCq{vnpi z+s=Y5tAfyC=)SfQ0*fqh>8T)C38qlxVlTV%u(;ot5S{JMVaeVC07A1OK74qAh9e=o zQA3|c8pM15EZeSKfIlj}k;|5@w--P@YkXv`5Y5@?91nG{t`F`k)2YtW``GBREhEp6 ze_vY>QzmwdSL!-aZpXrtO$gDsl@hEF`g5fwU-{qn*!|b%c3068i4H*YO`;g)Xe!~P z#}W#4CY{FQNjj;Vw6I`O#?Zx@zg3H-bW$`m4unnoSk8e3{xB2nmr8-4EH?$}cy$F7 zS#ZZ9Z>s`9#!Uf!wiaAcTIp+ma);QlXg6NDwUp22TVci~Box9&FG8Q)G@k~u{SIC` z0L>s6i=x&cDC2X3@TpSB*h2V=X}BVp?&cC4jU5L&uYU)dO2NfLtMJSUgi8{BkeMON zzQ#}?AG6^RCw%AiW%zxekV^Hl(zdQe)^#U)&v%mCi$Tz<8# z`?P7VFr#WyYW%a{)nZ;jd>hRg#Jk*g4C>W34;!T}68Ec`c-3fC?SQ}TCK%vy8uZ53 OB!mps#?KAn?BFkXMda%M delta 607 zcmY+8Ur19?9LLY^9ItmW)7h?WqNSFJfjO2|f*_gD?r_)4e-F_tqQr;{oJkU)vJ&dH zX&qt@MdCxg6egVNgq3Uv&6h@kMZHunlOEh^53XV9?T#Yo>G%D9KVN=)N5aODuyLYR z{CTOl%zntoLO21e3MZ624?>-?y889orlz?U>XC<4x4KPuU1GkIGawvCZS6bg(P4>o zoJtaMOwW~`$$SX1*yYEB{E#q(hC=pyxCjdebcg7YuYkozO8_LA<5jR@p1QqV_;n|J z>TMBj{i|%hdJ+Dncog&Mea7KWl4( zxpTXo)M*;Zy&ZHfw4nyNyjqTv5?xXWU4o zc(Ly6acjo@+THa`iJLI&Vcp-Gguqlb6tcOsl>(UOy1rW>I!m*%Y_>MuR0Cy3JQ(CX z4M4K+2`4}2fI=~yjI}_uMHmdG_uq^b^LJ+;VkXg~#HWW~Ov-qf21`B*cle=B*E*3 HabCx7R5$C1 diff --git a/src/Kernel/KMain.CC b/src/Kernel/KMain.CC index cd7f20b6..ef071cc6 100755 --- a/src/Kernel/KMain.CC +++ b/src/Kernel/KMain.CC @@ -43,7 +43,7 @@ U0 SysGlobalsInit() StreamPrint("#exe{Option(OPTf_WARN_PAREN,ON);}"); }; - pow10_I64=CAlloc(sizeof(F64)*(308+308+1)); + pow10_I64=CAlloc(sizeof(F64)*(308+308+1)); for (i = -308; i < 309; i++) pow10_I64[i+309] = Pow10(i); @@ -75,17 +75,17 @@ U0 SysGlobalsInit() U0 SysGrInit() { I64 i, j; - text.font = MAlloc(256 * 8); //256 U64s - MemCopy(text.font, *SYS_FONT_PTR(U32), 256 * 8); + text.aux_font = MAlloc(256 * 8); //256 U64s + MemCopy(text.aux_font, *SYS_FONT_PTR(U32), 256 * 8); for (i = 0; i < 256; i++) for (j = 0; j < 8; j++) - text.font[i].u8[j] = rev_bits_table[text.font[i].u8[j]]; + text.aux_font[i].u8[j] = rev_bits_table[text.aux_font[i].u8[j]]; - text.aux_font = sys_font_std; + text.font = sys_font_std; - text.font[10] = text.aux_font[10]; //"Return" symbol - text.font[255] = text.aux_font[255]; //Block symbol ÿ + text.aux_font[10] = text.font[10]; //"Return" symbol + text.aux_font[255] = text.font[255]; //Block symbol ÿ text.border_chars[2] (I64)='ÄͳºÚÉ¿»'; text.border_chars[10](U32)='ÀÈÙ¼'; @@ -97,7 +97,7 @@ U0 SysGrInit() text.buffer_size = text.screen_size * 4; //buffer for 32-bit, but only 16 colors now. text.raw_screen = CAlloc(text.buffer_size); text.fb_alias = sys_vbe_mode.framebuffer; - + MemSetU32(text.fb_alias, BLACK32, text.screen_size); text.vga_alias = CAlloc(text.rows * text.cols * 8); }