From 8b25a60008200d07fcbc2f90af39e242100bb880 Mon Sep 17 00:00:00 2001 From: Samuel Date: Wed, 3 Jul 2024 16:06:12 -0500 Subject: [PATCH] Finalize changes for v1.2 --- Makefile | 5 +++-- README.md | 6 +++--- obj/kernel.o | Bin 117544 -> 117544 bytes obj/vmm.o | Bin 16700 -> 16596 bytes out/kernel/kernel.elf | Bin 7344756 -> 7344756 bytes source/kernel/include/CONFIG.h | 6 +++--- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 712112a9..bac25838 100644 --- a/Makefile +++ b/Makefile @@ -87,10 +87,11 @@ INITRD_OBJS = $(patsubst $(INITRD_SRC)/src/%.c, $(INITRD_OBJ)/%.o, $(INITRD_SRCS # Targets -# all - builds a proper kernel.elf file for release +# rel - builds a proper kernel.elf file for release # dbg - builds a kernel file (non-binary) for use with objdump or other examination tools (this target is most commonly used while testing new linking) -all: $(OUT_KERNEL)/kernel.elf $(OUT_INITRD)/initrd.img +all: rel +rel: $(OUT_KERNEL)/kernel.elf $(OUT_INITRD)/initrd.img dbg: $(OUT_KERNEL)/kernel_debug.elf $(OUT_INITRD)/initrd.img diff --git a/README.md b/README.md index cd0f8d44..42d5a36c 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,10 @@ Usermode and ELF loading **To build reduceOS, you need these packages:** `gcc`, `nasm`, `make`, `grub`\ **To run reduceOS, you need these packages:** `qemu-system` (emulation), or `grub-common` and `xorriso` (for building an ISO - does not work in QEMU!) -The makefile of reduceOS has two main targets for building - `all` and `dbg`.\ -The target to actually build the OS is `all`. If you need to do further debugging, use `dbg` (outputs debug symbols) +The makefile of reduceOS has two main targets for building - `rel` and `dbg`.\ +The target to actually build the OS is `rel`. If you need to do further debugging, use `dbg` (outputs debug symbols) -Run `make` to build the OS, or `make all dbg` if you're trying to debug it. +Run `make rel` to build the OS in a release configuration, or `make dbg` if you're trying to debug it. Finally, you need to launch the OS. This can be done in a variety of different ways, but the Makefile uses QEMU.\ Run `make qemu` to launch QEMU and start the OS. diff --git a/obj/kernel.o b/obj/kernel.o index 5b3e49815de74b6b29874f54e28c109a3d8302af..7d4d0047a0ec9004188d0a5d880ebce7cb5bcd73 100644 GIT binary patch delta 47 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 delta 7392 zcmZ9R33ye-6~|}Z%ezTP2njEHULY%h7qSY-76>3hG*T8>1tcs&5G6nW`2a7=haiiR zUZI6A5|+F{ArfxBPs@X6jc}R@5=D6 z*utt;Td_4k{YLjSSLTfBis{v96;q~69oIyaji2y%b!GLOw8tu{swRw2oBC*e6V>0T zwS2m^ez&#KWpA^p+)A}|DWz)f5csapXR9~ic#Y2UbpB)lFT=hB zN$SW#bSSY>>9?YoCqygdf+RqPFOI%6*opLUeDqssjeW_(;7gg!``g!S11r~z^j$-f z`s36GkDqtVW=hJ;76nK0-}egZ}y;jxB< zy@F{T2r5IMAfL^I3!py$Wj)A*ryC_aZ4$0VvgHj4Pn(26U-Iu85}s*D=mhgTA5{JT zC2)f+Cx?@f-XQZ2EoX{B={i8HxG@S<@m3#gWCF_!s-5kW$y%) zGePA;^za83U4>#|euZ+Ao-kxIN-UI!2zXiqJ*|UEyI@hbpr!l_1xoSeP zzXtWv!CQ?P7I?~@ZGO;3mdOZz1d@=!W;U89U^(n%kknoHsYIpM@G$ZzSYy^k9lXy& z0*i8uStGk)*VAX7f;D+ul;6NU4@pjh5m=OK8`cO5ZL|1)gl3dqp#&C5tGhAJX&8AI ze|YJQEqpa7=b-prfMRBl{WDY11z~0=dk2+%P&gGiW1*O#jBn0%Y-7Yesz_l$2cdN`s~a_9Gr5i3d4HXRGk-wksn93Jn>av65_{0 zvU*`mb$K3rD`78#B$y4ZpV^sqz7 zlo`D9LFFeX96Z&A6H#TuL^p6_{aX3rp>dXS@}Y3vusTiS+=Fy4i~C_YV{1P}@3PH( z_DW{=T{SAPsv4Vg?+6ah=jhfa>{3i;O^gtIi=UYQ(PT;TKdJ|#1 zFT84 zB|6q-d>PC>5WJ8%3CE%Ejjd}7_)wMNM&gXgQO@9QJPyI5AZ9mS2gPCS;%11Xgr!-< zaTqyDScX+R0AoyvXct<113pS*Y-sT_A!>lakBaCJT3iiM!ZWSnGPFhs&$fyy(KN+c zW))9FIi+c;RXhacl(6h3#hc)xgr!@>_3y{*)Y{{$^tOp?r;5C;gk3$cyJb2bc~e?v zd6YYEDrb||o00SMBCTTdnx08TUTh=zx_eTva$1CjtBo@t z)@%D47vvP~aIVKDrSJ{89HLc!q8Ua~t09EfDU6G?SHZb1P)?MZ@}U^lM%M-u z><+{bpBZ%!@f^Zks)l<+!*vc5@dE@I35IBMsxuK<@txb?JDxprsltX(EJ?)c+sYV|7J_4wR)ay62?sO_D=djI;e!bu zBrrD6x|#z+qX|GPvfXN|rkstkUIbR3RiiB5OqEe*8mb?d_>N20I;km{_8W+@5Eafy zNH9~NdrEDC?_~&A4dqJ+Pwl~rb}Z}!NHQc1!u1in7&{X3Fk~zwxGtnTSuKFG9J$Lr~7xxdA0FY-Q*XQHR) zP)}r6#FR{|d(NY+#rNfVJS{!ZR#@?tLoHo;gL62&Md*2KeU|%zb16Ml|F%9N$WI;Hdt6qe}ZY+V9mpoH&1(bKM`A+CM6`$G)iO9tWc$ zdmM@i>u~^|G$XO%{>IAn^ZoB@9qJ5fTTp?$tkLCGO&eK!TBGi;qwlbJh`V*U6}HPp zms`cupK4pFoAP|z9BXYB`cPG0mhW@fs5u^9o(L*I7wmPk^UIYSwo`z_4K3tIuh;iqsDe+;P635CUzU)_hc5jieX|x zp1L*OqpN76flVYD;L)1(zaY_}E5ct$)N6$`#}3>Lvi%;y`$)7u(9K;74L?B#8suq; zTr1p3BEdo72g3i7NT{(E$tENcb{D%$I8gl0ioH&_S^TF$uxq>8DD@p3Nc0PtiRTx? zMMjfZcw)rHTi5st#ot-%dxShoF@7kh{rCc=ovYM%+HLV≪dhk&spV*x``+W#~rp z&S0BU3l2l(lK`tRhHC*d#}_b(HtM942x=|mdBQHjp29vtz6jV(h0vZV$}Hi0ArD*( zTq}HD_($O`;Yr~qLjEy=^}>a5!gOJtuv37x>Mf3;!cju5Vm4GMoGP3toGV-?Tq=A< zXjVPybG5UbZNk06eTJC-e~5!m0R!I`o)z+`p#KZuCE-=!H6iyW#-#{53;F3w|5V{z zp?RuoECxp$8%Zn@en_&yOC;p)Vjm>Km3l{bO#ElW{#f|A_`enVd!Y+!i}m>$A^94y znJ8Wy$-B$l)FvmMI z^sEVRhP2P=gzEp2QXX{J?+d0B+l|;i3V$I{`=%*(b_Qzm&r7T|K*+x`u~QXdPY_Nf zQG2Q>cj7zvZFAs3)x8pOki=mAQ+QVV{9a^=uf=~^$X$ef{w0Qt5ylBqNVLaYg~Ykp zutR{h>MoAH!U4h&LVmrl;uPUb;giCp!qq~4;4pr(aGUT|;a=e>vMHX8GvfHlIF!0d z;!b`R-VlEz_A3r*im(-lIKQw!{GG+_ChSF`L&L=$B^*oITsq>ICY(jWzfkNY!sR4a zj+Ad8(eR7H9l|$+`-R7a9|`|0{06kyz*TYF5L)$6Z@vvQTVF_JCI7cF#ov$MfDMmAQ3!TI8pplg!9C|K)6Eu z>xD0i{}thD!qKmp*Y$Jy9!H%eTC&hJf%uwCG&vJDfk(0*RGG~Jx*oUzL8VMS5#Nz�bWlwag* z@4C|&R}zQMt2rf^;Z=qBBtm?g^Fm2W&pB*s%K5CD*Ev@btCw$w(hn|7qbil6)u_B04xaANd3-+d3mEeZ zVUFOH-W)G$rw08x(kb zhu*k)3mmL>a4_uJJ4)U~NeM?>u3#BLS*9YFcZI|g15I7I_qHU%@vWM)H8S7 z5Xa8_!itzsa~(!Wtdm~qO+5m;ao0McYm?w( l*SyYv(v+s>a>q`%%GqsgNzSe4g?A$Dw;1u!v}+qgo8XpL=Z(CM(|*XkDD%Cq3AG? z=+1VwEX%rTkDJ;thf)y)71ZpS*L6ir&`3r>(c;#%H12ngc<-veE^B?}yZ3MJ@BaPH zK6^9M@nMyw1C-~wyiy=buN=(Vt*2(yz3<=2!|R|V71!#D+q7xPCWnEw_B+`t`aoCA z-Q;j#$NEpFtE$_85TbZC!h0JHV71=+sgN!ADd~Ho(mAy?!Dhr7uBOhSHpeCA;k%d$ z*h=4>I7E4s)$4T0Wwk2vk?*S1qpUz^eW$r2rot!%ns z9Nknm7+_0hmjVXSNcLO6ca)+w1e*Kn(|0(1VKv2V?&dFl(@Bol9qjAzzG`7)Jb5+o zKaZYQ&yD|H*57&K&jXj=aN4df^pb;Cb?+C^h-5Mhg6OOxNbQo3$D*$n*4ShQ7iM?Svp|q zxF-)|><~Al%C+l(!qv*1Wkfz|!n;J&$P#xM=r~)7&t2^GU2l6W8|kz?xhs1_mTVUF z-VSWtrT4xSYwz3rJKa+Eey~?d{nZ)!T)gO0mU<*wZpu{OJTjcfkDWRiN-J6WQTv#1 zTTF0_ZFz8W%S!KUKc31ZRPS%{S# z8jRB?bxC>ZthD6fws1!XGHtB#*r1b<>6Bvty4KSo&`H=kw|lIvGFxwHf0}k4TF$h^ zEb90u{WJd^81Qr;iWMK9p#K)@JSnseEvKWET|6E^E10%w@WSn%V0f-5*M?SlMp|;& z%UZ`LPok9OC~`(Ea++g_Gd3%&>}A)kxfYD4ifFbNpN`ht^v>nM`X_VKGt6hgb&{pG zBav;X3hQQ?iSrmK&97dG_jRRuF~zVcCsO>| zE5*!!Rv(+O&Ev4-aTw>;)ns1d56?xWo`|K_*smuNaf{+>UZ>C4<(d?l&4$)4q955C zwb6c`A9ZH389O`NGdpnl16spU>Q=}uFS7IX{n*XAJF+H0JztOiJAQ2JS%cTaf~QHV zoA4!oYkHUEoh_xKtmAAl-D7d*VrehiaxRJz+1YbJ6vW!k?WXf=+t=4ANL_Y*8o7;% zaW3IVP^-Twp&lJeaTtsp<&IW0>B1;2EmTV`y)RR~8hW`Wk)4fdXr%S3{z`YERjS|B zW<5J_Q@8tm;JSPG7U%>nbG#%!5CS5AQD~-@lmg8GYk?KK0}g^(kcsj2;2X3X!ClZ3 z{owzfP3t@f$o6%fnk?CK^tka6k32l|5nz#I4gU*HG)!9ZXD0U!`O z1A;&>7z74`5D*H&z_VZo2nR#KFfbg5x<`PK;5je~j0R)CSTGJmg7F{O1}PvFq=8u=9n1z9U=GLxb3qo! z2J=7;m=6|!T(A%<0*iqe>wHQeXA@;U}Tx~_cV`IB8I9YX3pD12uRNebcCMr1k3KWbF= z7^m{Q zA24+n-|>UePNTW?mST_}9OfV2QnEbP*6XCquGH!H0ny04TQL0SI3M4Fr=P_0TCjX7 z|ELA)8u-H&taO@(Ij~Zm-TO9jQWCGfqbRs#k*ye9#`9W{w2$4bO=*;|eYfwS+#sIU zuIvx&bwnpsbY+VlAW3&?by9LyKN0;J9(f;mTDbMTvPJ&w0QY&Iyc<~lnNAAFPY$s? zOT8uOofA4Kw98e5{srFf0Nd5TA3i`Gc6;8B=*f?c*h_y>V*P17zo08LxQX|C&7zT# S_(ODE#8*p%-QTlt7X1fPw?x7K delta 3551 zcma);eOOdg9>?!*W)#p71{so9fk1&2Uok;Z#AQ^Ha1ud8c^Ls6M)1-Cnp-X=q9Re` zG0$Q?X|_*Uttoq5hfyV|u@X6s&ak8Hp}1pW##SojUvzy3X7Kg1jFdcG%ag?WI!BDuedX6n(b0+1!9A zx~FUifX&R#29BVa>_OmV%2mz>nTP4kwGLl+OL>ph{P6>wWJ|4OpHA^rilP(9;|~9Q z_KI?P%5|0gmu4QMr{Gp?2H8#xXAzV=uj7+rUPquh)gY@Hkd&IB2xpWA*79 zbZ@NwO)!%sF5alKulh}}oqfAlrZi>#l1)Ts*oBNpdXu?jS}2YEDRUD2!VYAvphL_r zYZ4;!vsRFvHK2Wn^<~x22v(83mYSK`G>J-Cv}qyvv)4^Q^fOaT&*Aocv$d&t9rEFA%|hFkN9dRk10BA+(HT z6-H2$QeBwjLOYa8tELluz73jZu>S(n&#sCiici)~r!`NVXxz>~_a#)SBxDOOoxDlDwmxa98|xZt+Tv zdUP>{K5ftwos&lWit6+EDQs6e(|w z5fgXaY_{90501p+DD_Lq!qnvQp3$~ps94eHwn3*t#S=DXbSv9Lz)sl9`#-SyhAe%0 zuP7?Y8_`NjNBLql>R6mi2l*o zv~=^y(K^ZEYMai=8p8*!%Me@5K5AU%@m!;0!@J$_P@0eUAs)*@o1VhEV1CnT+R08f zEvHB}p?QISXM-3S*zHqg=y5wFxgElD>})i@@RZSPP4i*H{=|71ryhOw{OZ>fHqt2A`rHKb*s zrvf}83Ln>Ox{BWfoZ8E5(Wx!;H+JJxGF@R&r)LpoWv8d&oqYIoFb;m_={?lI)_;11 zJQUMsv&khS-Z6zOMydOJBMrK-63>F6uf}#!iTg5ALn+Ftvu~?tiQ;u`FwuJ~R$~|(@lu47Nc*D$;+0yvvagt=c?V(P8cF0~Fgge2K zWL)ylevemYt9_gkQ(TR6TxZPY&zsa96vrz}>I7b}RIT+ky6WRvTy=3LT(xm+uFi4C zT{Y4YoQ|E=E|WTo=vSVQqYfZHo-ZVZSLUdLDVy&Ty>@*rn;kP!HUz$XMgA@B)-PY8TM;9CZPPY8TM z;1dF$5cq_^Cj>qr@GXbHCj>qr@CkuW2z)}|69S(Q_{fglJx34%cg7y(9tP!I;f z!Bb!q7!4x87%&!$1LMI2FcCz8N#JQP8AO3-Fa=BnF<=^)4r0L!5C>+0KY(~(0JFes zFb5=nXTV&L2%ZH=U>-1n=fHfB3>JVCkO~%pG_VMygT-J8$N-rj3uFTmSPF7LF31DR zz;a*)`M?5JfC5kmR$2p#eNlc5#*T|}85Q${OL8Z*^YF`Z zugbZV`&^M^y$|Dkci$ zYpy|#Tkl`PvM?t6I@a|j&%chLncVvZO25nVZ^&6>FDVd#Ed`<>iN244BS z9H2t-gYV@`_v#Lvw4}du8vbbXa_^f+Ya98Lo49%-&%cT3^Z5HWG4EJ@|0ZVohKJiQ z(;BOH7iyA;cifU?oWJO9BwyzF-6;B`)ul)7RAKwNZezIEPO9&(mf$5x z4_kFoa(_Pw{jYiS9n|@mSKg6dQw^@;K6mA}f_8tTlSbn&iP)Z%-jcMhSto_{yGqf& z#?Rlyc6IUlcd?E(YyLg-RN5ofEkDY${Hcb2sVfR_5%;;rqLzyJeRKzi-=A!&zkAU_ F`VWP8Q&a!| diff --git a/source/kernel/include/CONFIG.h b/source/kernel/include/CONFIG.h index 35778a4a..d7236726 100644 --- a/source/kernel/include/CONFIG.h +++ b/source/kernel/include/CONFIG.h @@ -10,6 +10,6 @@ #define VERSION "1.2" // DO NOT MODIFY THE BELOW LINES!!! -#define BUILD_NUMBER "194" -#define BUILD_DATE "07/03/24, 15:48:10" -#define BUILD_CONFIGURATION "DEBUG" +#define BUILD_NUMBER "198" +#define BUILD_DATE "07/03/24, 15:59:07" +#define BUILD_CONFIGURATION "RELEASE"