From 902f80e00764bc7f6956b67905626f0a37fda8d6 Mon Sep 17 00:00:00 2001 From: xmm15 Date: Wed, 19 Feb 2020 15:10:37 -0600 Subject: [PATCH] mon_start_days1(2) -> month_start_days(_leap) --- src/0000Boot/0000Kernel.BIN.C | Bin 190000 -> 190016 bytes src/Compiler/Compiler.BIN | Bin 194240 -> 194240 bytes src/Home/Registry.CC | 10 ---------- src/Kernel.BIN.C | Bin 189936 -> 189952 bytes src/Kernel/KDate.CC | 18 +++++++++--------- src/Kernel/Kernel.MAP | 4 ++-- src/Kernel/KernelC.HH | 4 ++-- src/Tmp/Zenith-Latest.iso | Bin 38944768 -> 38944768 bytes 8 files changed, 13 insertions(+), 23 deletions(-) delete mode 100755 src/Home/Registry.CC diff --git a/src/0000Boot/0000Kernel.BIN.C b/src/0000Boot/0000Kernel.BIN.C index 4f7c6e3fb1fb613fd4774c6d0e8e12c1d35269e8..da7facdbe8caa66679a351b415181e3560a74204 100755 GIT binary patch delta 358 zcmdmRhWo%7?g|p}~ z28PYzLDFK3Wt)vNI;2^g)=guatk5H}`EqjsBa7q)An$ye;^d50W2SEtC(mv5W4T`d zQ8C%NMRc=7TQVb5g0Xt@nf5kmM$OH^iys&>=`&6~*etr)>-twF#toYtZdJ1~GXU+{ zcVAe5(RK2r_wSj2yu%+n#6ZH^`PdotEEzv7F7XZ>*0~lZPGcrv6&?vfnTLPmT zJ5cOuI^#QG#vR*_R5NZDW;?*haPR=*_Qrn3AZsRp$=k1jEMy YSmd{FI?SXev7PG!vYIR_GDge7U)Rk%eOekaxaKadJkhF_T9BOJ;;hFlKK))7~b{$gnwh@dIO~;1`n*Hj8fdy8e}kalvMXTh*-09{)=> z@4GK7z{oK9();&J{w|vjfAA1v_H|L%&d1KEXUX_*yR8Fbxd4#f8o>CPpUKQ@^2bJz z?b{L<<=BCOSJN5a2{SI;ex#alyYTdf%}nCcv-24_x6kfpw6JFSH);FTQ;bIJ%>PR_ zOy|19=*bkcVS1e`qr~>yON=75jB?wX{F!2txBuG2bX8#c)5A|GToZIdF9jmOva8)0s@qCT?E&G(VGZ>vl}0K~;4rvLx| diff --git a/src/Home/Registry.CC b/src/Home/Registry.CC deleted file mode 100755 index cad524e6..00000000 --- a/src/Home/Registry.CC +++ /dev/null @@ -1,10 +0,0 @@ -$TR,"Zenith"$ -$ID,2$$TR,"SysMessageFlags"$ -$ID,2$sys_message_flags[0]=0; -$ID,-2$$TR,"SysRegVer"$ -$ID,2$registry_version=0.100; -$ID,-2$$ID,-2$$TR,"Once"$ -$ID,2$$TR,"Zenith"$ -$ID,2$$ID,-2$$TR,"User"$ -$ID,2$$ID,-2$$ID,-2$$TR,"AutoComplete"$ -$ID,2$ac.col = TEXT_COLS-30;ac.row = 15;$ID,-2$ \ No newline at end of file diff --git a/src/Kernel.BIN.C b/src/Kernel.BIN.C index e67dfb4db43390fb170aa7d0cd3f9529d4f42ae4..77807e2b5007ef7d1c2a4a4f7787cd0c4c93a255 100755 GIT binary patch delta 695 zcmZuuT}YE*6#mZperj{#4{q+$($q?lWQ{a1R%(_YrD#P4kqzBU3!UOViwJ3^u8V}+ z4!9uNlo)oAioVecX<-b!&?quevJ2^#1i@vA-h_Ql2VHb7Ue0;WbDoFyoWPXY{z}~~ z5#hTtDJjBOQrW97RI@(uEoD(+?L~sfTB?TujP6etKw|lpUz8d~kR7b^YKafoOzR+} zqX-BEiP+nA3NmrI%?!vYZqXQ{Yq+nO_WXi;()BUGhj6{^!m*?C7Agjn?45VF^|f9e#saj%O)COh-+ z3nin7x&0I2R!ijWl9Nn))VgcKFYcJc?oZuQlNbZOY}c|Avnz!1yNHEzSHp#1uorWG zL`Y|2^WV0`BPiI};ya7k<6qM%{Z`p1;FBMhMA>A!%u*KO!vXQYQeK$yLqWjgfDXHs zvXX+;)>zE5JvsZ=*M%6@c%{DxrVW%ZS;WxWgj| w4UJa0&SaCTnq`xv>blKTUsKh@AB>RMSdI9fK5zCDy~HO!l8i{z=9!fDFO{YXRR910 delta 674 zcmZWlTS!z<6utYLt5zdA<~(kebu}uXVKS`{4HY%g4|RIzM`SjRreu@ijL`#WG@U-0 zaP)ATK+sac#L((UC#DC&gdZ76mKydUJ%j?m$qM}uyJHGLe`~M3_F8*y$7_{;MCF!{ zf2JiWDkM+6tJ9dFVt2&1n1zbvr;wYn+LDI=2G6IHAhER4pBPW{Q?|dNQ;WJNo2cu@ z_z499>6^&y`XipM)1VVeG9}hNa!VE1g&m$;L^#_;NygNLU^%bsqFrV$ zrj|s-;@R}fx=0FwAQWWZm`xn|8dKz}J!elQgWt}Gwo04KwtkNc21*j^uTdMifv{#lD061quwsS%CKxcLF)2lJ7| t!o82sxSHSfA%herb_jyC>U^=yZmzKxmzpox_6q7P|B(rN^dpMf@CTIl2?PKD diff --git a/src/Kernel/KDate.CC b/src/Kernel/KDate.CC index ab122a01..5fc8a0b3 100755 --- a/src/Kernel/KDate.CC +++ b/src/Kernel/KDate.CC @@ -1,8 +1,8 @@ //See $LK,"::/Doc/TimeDate.DD"$ -U16 mon_start_days1[12]={ +U16 month_start_days[12]={ 0,31,59,90,120,151,181,212,243,273,304,334}; -U16 mon_start_days2[12]={ +U16 month_start_days_leap[12]={ 0,31,60,91,121,152,182,213,244,274,305,335}; I64 YearStartDate(I64 year) @@ -18,9 +18,9 @@ CDate Struct2Date(CDateStruct *_ds) i1=YearStartDate(_ds->year); i2=YearStartDate(_ds->year+1); if (i2-i1==365) - i1+=mon_start_days1[_ds->mon-1]; + i1+=month_start_days[_ds->mon-1]; else - i1+=mon_start_days2[_ds->mon-1]; + i1+=month_start_days_leap[_ds->mon-1]; cdt.date=i1+_ds->day_of_mon-1; cdt.time=(_ds->sec10000+100*(_ds->sec100+100*(_ds->sec +60*(_ds->min+60*_ds->hour))))<<21/(15*15*3*625); @@ -49,14 +49,14 @@ U0 Date2Struct(CDateStruct *_ds,CDate cdt) date-=i; if (YearStartDate(_ds->year+1)-i==365) { k=0; - while (date>=mon_start_days1[k+1] && k<11) + while (date>=month_start_days[k+1] && k<11) k++; - date-=mon_start_days1[k]; + date-=month_start_days[k]; } else { k=0; - while (date>=mon_start_days2[k+1] && k<11) + while (date>=month_start_days_leap[k+1] && k<11) k++; - date-=mon_start_days2[k]; + date-=month_start_days_leap[k]; } _ds->mon=k+1; _ds->day_of_mon=date+1; @@ -208,7 +208,7 @@ U0 TimeSet(CDateStruct *ds) PUSHFD CLI while (LBts(&sys_semas[SEMA_SYS_DATE],0)) - PAUSE + PAUSE while (CMOSRegRead(CMOSR_STATUS_A) & CMOSF_UPDATING) PAUSE diff --git a/src/Kernel/Kernel.MAP b/src/Kernel/Kernel.MAP index dca26d3b..eb443b5d 100755 --- a/src/Kernel/Kernel.MAP +++ b/src/Kernel/Kernel.MAP @@ -705,6 +705,7 @@ $LK,"PCIR_SUBSYS_ID",A="FL:::/Kernel/KernelA.HH,2385"$ $LK,"MDG_DISP_SIB_RIP",A="FL:::/Kernel/KernelA.HH,1711"$ $LK,"DOCEt_BLINK",A="FL:::/Kernel/KernelA.HH,1067"$ $LK,"DOCET_BLINK",A="FL:::/Kernel/KernelA.HH,1061"$ +$LK,"month_start_days_leap",A="FL:::/Kernel/KDate.CC,5"$ $LK,"mp_count_initial",A="FL:::/Kernel/KernelB.HH,222"$ $LK,"C:/Doc/MultiCore.DD",A="FL:::/Kernel/KernelB.HH,220"$ $LK,"JOBf_DONE",A="FL:::/Kernel/KernelA.HH,3314"$ @@ -1448,6 +1449,7 @@ $LK,"FUF_IGNORE",A="FL:::/Kernel/KernelA.HH,2738"$ $LK,"FUf_IGNORE",A="FL:::/Kernel/KernelA.HH,2710"$ $LK,"AAT_SUB_U32",A="FL:::/Kernel/KernelA.HH,2096"$ $LK,"AAT_SUB_U16",A="FL:::/Kernel/KernelA.HH,2094"$ +$LK,"month_start_days",A="FL:::/Kernel/KDate.CC,3"$ $LK,"UserCmdLine",A="FL:::/Kernel/KTask.CC,414",BI=299$ $LK,"GVF_FUN",A="FL:::/Kernel/KernelA.HH,980"$ $LK,"LAPICF_APIC_ENABLED",A="FL:::/Kernel/KernelA.HH,623"$ @@ -2462,10 +2464,8 @@ $LK,"COLORS_NUM",A="FL:::/Kernel/KernelA.HH,3101"$ $LK,"IEF_GOTO_LABEL",A="FL:::/Kernel/KernelA.HH,2080"$ $LK,"CMT_GOTO_LABEL",A="FL:::/Kernel/KernelA.HH,1811"$ $LK,"DriveIsWritable",A="FL:::/Kernel/BlkDev/DiskDrive.CC,206",BI=517$ -$LK,"mon_start_days1",A="FL:::/Kernel/KDate.CC,3"$ $LK,"BLKDEVS_NUM",A="FL:::/Kernel/KernelA.HH,2802"$ $LK,"HTF_GOTO_LABEL",A="FL:::/Kernel/KernelA.HH,820"$ -$LK,"mon_start_days2",A="FL:::/Kernel/KDate.CC,5"$ $LK,"FONT_HEIGHT",A="FL:::/Kernel/KernelA.HH,3731"$ $LK,"HTf_GOTO_LABEL",A="FL:::/Kernel/KernelA.HH,790"$ $LK,"ATAR0_LCYL",A="FL:::/Kernel/KernelA.HH,2462"$ diff --git a/src/Kernel/KernelC.HH b/src/Kernel/KernelC.HH index 04e82770..e1ddff13 100755 --- a/src/Kernel/KernelC.HH +++ b/src/Kernel/KernelC.HH @@ -751,8 +751,8 @@ public extern I64 FirstDayOfYear(I64 i); public extern I64 LastDayOfMon(I64 i); public extern I64 LastDayOfYear(I64 i); public extern I64 YearStartDate(I64 year); -public extern U16 mon_start_days1[12]; -public extern U16 mon_start_days2[12]; +public extern U16 month_start_days[12]; +public extern U16 month_start_days_leap[12]; #help_index "Time/Jiffies" #help_file "::/Doc/TimeJiffy" diff --git a/src/Tmp/Zenith-Latest.iso b/src/Tmp/Zenith-Latest.iso index 3a80ce64d2717e0b77981946f58a2fbc73bb94d2..fb2fbae0e558ce0cb2c5cb74ec0319cf7c5248e7 100755 GIT binary patch delta 5552 zcmZwL30xF)AII^X*@fj61r@<#HN_)E4n@=vkw9EiKn%0ILIouc@aU4i2U)G9d4w^Q zrj%WpC20D$no`s5!z1tVsO-+{uRnW1&cer4O$x_p0N zZ*cnt?WA{;@C}Auw}qX%JiMvJQaEJkFF#zkT3|H(>o8B?N6QhXbg3i-(t z<)JvGs~ovlIh&&PRP;TQu-8zj{G}?jGUE-UBEX7AE8pIwL`5pu`l0>G1^fbX?*U~< z3(uB_@0EnU%Aaz8L%k;wKes2UKQ~b<`fo+Jqa7J)TRRqy{euDnOe|ajjWPKHmS*W-kBbjd)7<# zYhN2(d}eKUm2|_L+~%b1_iYvCWSEoNoU{Yxe&%GDliQrMgI3MX_XJ+@RZ3;`A#0lF z@#xwi?;S{S$Z8ZfT1>MUef$<(qTD7$d4RFeZ-W%EfyM;CMP1AbZ1_c`F)vV9y_*+! z7hPgOpcD)2MzG&;QY^6>BN{E9v>O8(Eye~JQGSaqkq{(BLa_0o-v(VA4fZ{rqrv9m zIq6#zCxeYWe#c0$HpB>RwD?kpvBk6K`JD6F)y3#g&Bl+KG)9LSK@FoQ3VqzZFyCUa zS_%_OJ#Pt47Rz3&*%W75!x|^wT4q_scD4_7<6>b8cVa1?=>ph(mdHA7J-8Z}2P zWZl-5U5eUonpUmw?2~7Beh$wpoa5lXy|*Wt%ga$Q={El-GbYCO5iuvXIccqYTZK6p z=HxafE!N!6oD6evo0Ar2?q^PhIk`FU>MXU^F>c?RHQqeLH%TKt#(YzC^KN#DZZW8p z6y0KtY2Npdd4#BrH3l?VJREDZX|(u9tWoN>sEe_2zW4LkIN^I_CEi7sD2YR@Q5)12 zwL=cn9(6!BppK{$ibtJM7t|GXLpP%CQk3*C=KG!7CC>Fg2~wQvX;k`c#1V-`r$&p* z5{-&Ri$O_7QlrIwN#;f2f6rA`k`eB=r%Mzhp=6YTdPz~x+c@R7lN5=mM*BvK1*t|~ z&&#T7JO^K3mspmH`k*w_7xhE^k%k7KbSah%G^`DOt+nI6<5muIiIo{>5XzKd)GY7Y$Vkl+iucrMzD1FiWt_kE5GmrbaqaPZG4P#A7s=TTccUBT=C?e;#Vbnh8l zB0U=omLfgJ$n)DM#qu1Z%x}>puI5N_b;#y%;n)1})O(F}_HTC0Qp4ZVim}d3ir>CT zxL)U0_E_uG44^pa!tx5Afx5NH_OQlks z>)qn{{^5E0MeZ8kg@IGMveFveZBAOAZ%vq!VNPyy((=9gNs+(C2=JbLl=rS(V$>S6 z7CnvDq4fwC&QZ^xXVC`q9C{wTfL=r|p^a!0dKqm-ub@}a7F3Js&{nh!y@s}<9Y~^` z=ymi4dJ`GwE%Y|pg?6Jo=pD2d?L+UP_t5+31N0&K2z`t`L7$?}(0+6P9YlxF=jbpx zf{vnN=r}roPNFZ+m*^Bajn1I6=qvO!`Uagt-=go(_vi=oBl-#bjDA7q(XZ$N`VIY# z{y=}Ci|8-(H@bxWLH|LQ(Z9%zuAr-^eyJFxtUyF1R$?OoB#_ui5D6wBB$R}aa1ue9 zkVw*$G$TE9pjVB;835 zl0bTrM3O|3NebyjdXrSrhoq6dq#x-|G%|pslYu0I3?iB2CXz+6$zYO0h7cziN^T~@ z$Z(QN@<=`zK?=x7atkRWo>%KuPNT_f8L2kCSSmlPAcNmjAb*mJ9BB$$MdP!dMMNd##^B1u!yj6{)W(wwv)ElCV% zMPf-DX-(RYwxk_#koKelxq);fok%?COuCS+q#L=BbSFJX0_jN-NfJpWDWn(aO;Sl8 zl1BQHexyIq$N-W~29gYQ7cPG)zKwXkGidx{&uN#KjMZt4Ru5n`&u?{waAe}X95<0H zl8t+H3|5VvjrPnRj7|ADs_|x{O<_ZDXqb}>B{!2{*gb5xivNuAe|%Y3t@m49A+mCD QR8}6z$Dvsx)Cd0kFXAaWQ~&?~ delta 5504 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 GzyARfPXK%X