From 4c5d9c51eb4c3d15574923f734592345efcdc688 Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Tue, 21 Aug 2018 02:00:54 +0300 Subject: [PATCH 1/1] Fix memory manager init, so now it works on more hardware. Also kernel now requires 11-12 mb ram to boot. --- Boot486/2run.sh | 1 + Boot486/boot0.S | 2 +- Boot486/run.sh | 2 +- Dsw/Mod/Linker.odc | Bin 29618 -> 29617 bytes System/Mod486/Kernel.odc | Bin 85129 -> 85557 bytes 5 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Boot486/2run.sh b/Boot486/2run.sh index 8a26c50..b14f800 100755 --- a/Boot486/2run.sh +++ b/Boot486/2run.sh @@ -15,4 +15,5 @@ bochs -q \ 'ata0-master: type=disk, path="../BlackBox.img", mode=flat' \ 'com1: enabled=1, mode=file, dev=serial.txt' \ 'display_library: x, options="gui_debug"' \ + 'magic_break: enabled=1' \ 2> bochs.log diff --git a/Boot486/boot0.S b/Boot486/boot0.S index 9ff81fa..ef70f6b 100644 --- a/Boot486/boot0.S +++ b/Boot486/boot0.S @@ -19,7 +19,7 @@ .set BootDiskDxAdr, 0x7e06 .set BootDiskCxAdr, 0x7e08 .set MemoryMapAdr, 0x7e0A -.set ImageBase, 0x1000000 +.set ImageBase, 0x100000 # =========================================================================== # # Stage 1 diff --git a/Boot486/run.sh b/Boot486/run.sh index 43e93b0..2044e8a 100755 --- a/Boot486/run.sh +++ b/Boot486/run.sh @@ -1,4 +1,4 @@ #!/bin/sh set -e -qemu-system-i386 -s -m 64M -hda ../BlackBox.img -hdb ../minix.img +qemu-system-i386 -s -m 16M -hda ../BlackBox.img -hdb ../minix.img diff --git a/Dsw/Mod/Linker.odc b/Dsw/Mod/Linker.odc index d12dca6dc38d83fe43b25f1152e5aae25ee904e1..38b5cb8a5bf178528c7db01afbc4b76a43a87bbb 100644 GIT binary patch delta 58 zcmdn=oN?oG#tHR|dJ`MsIBSX+7&sXi7)mBScV(2DtjlQ6sZzkezz-CXnOw?vf{}f* N9g`RH=1x}4JOB*N59$B_ delta 58 zcmdn^oN?20#tHR|`V$-CIBSa-7&sXi7)mETcV(2HtjlQ6san9mzz-CXom|Rzf{|mh N9g`RH=5|)CJOB-v5AXm0 diff --git a/System/Mod486/Kernel.odc b/System/Mod486/Kernel.odc index 77388ed98d55d1e2dd0556fd1a324b05035455aa..c90117495382ea0cc1789a0a0d8c0f480224102f 100644 GIT binary patch delta 3994 zcmcgvU2Ggz72a9@G;7B+lAY9b(&)%0>Z~(y)^=^gxk@KhBEM7bcV5>-ozM3OcXF$5|es1QPemr^9uN=SX+4I%N9Cn`lkoO5Sq zcKp*)`oL;u_spGh?)kaj`R<)(pYOW&y{>OL(Vr|m_qC^bB1=*v7KudO%Rcv)bo6GH zk4YB>UVTD}JdA@sz<=*^e8~N(^c|`DQ*?XY9qPE=AwA&V?S4D@ZU;~F4!O@fq)L;I z;=|}5sSJ?RPtrNOq;8V_hF5foq$4=3H}<&u&H=3>`r{7%pm&Hr(L2Cv2mg8S>!{!L z0%`s<%CGk2qzU)MzWHeMP2r3G`{5f-DT*pxq%wn-C;cOkl7Xb4t0>(@R`H6KNcuZo zp8GP59j38gcc65Pq&!~Hqa>}<*vClf$6311kYwZ4eL6y!4%5^k+c@4uNAM@|AnLw% z=%uLC!=LXz*V}^{kqFJ-{MN-`=*Q#)0WlNzSp_X*-r&Cg=#cYfJSv%s;U|(#xke^r6mkKIm>SY7u%c%lb zemGtrN!Xf&Os=F}R10y;YEHeF$)Vd!ZaynppDm7Mi;FTkIyDu4N`Wm{%BL|A3{1_X z#jI!(cBF2RBjPB3-~#z{Sw zCa|E16`Bs^9n<0cj_Hn(Pfuy@d~WAvr8AB*ennn28Jja2 z#(z+>O}$=~hvDOaZl-R_rjB_~{!rMFr z8KVY}sT-A+F-C%_Va=1EQ^V1U;UD2U$eu#LZ@Zu9NqyseDs$w6O5IfS|Hgn5YB*V}p2rb14H6;3sXgn`lGgNe0!0PB^fVEXf{SFax_!fM zbWup$>q3S1NX}c<*5+Zd;}&`%N(hBWwyh1*{rwM5OOGH(=VenviZNK-^N=m7z#qH4 z&a1b!N7{TMuOQQUY7o#3&BrUZzP&VpT`4x5aMJH*fkyIZSP=`k#H!lLH5)l}G`{_P zS?cH8x8HG4GXyV0TLupsj5wb>3vvx*C#MLf@*34yY4fQ93n@$r*%<+~#>_f15JVMr zdQ&rX+9)g!7EN1p=h)>`RxU8jNL9|7C3?PW<2DlZQ_NgdTPmIgZV;Xiu?Ecv{@Xjp z#`ajyQ7f&RcmQjd*LInV^S)OGNA@)lF$C({_v6xGKL6_P_#5t{{0nzK>Hh2Pu*9Fa zeW){2*KPi**A90JI3;-P-U&yDLDiIY0V$*XtF;?Siu4#V$}=-=$z@VH|_>ChU4P(Bw&9$C+A^2apvsQ%rqUuTI`SH z>~sGP>JJ?^bWw~}Tj+2lc#T5d!D_V5rELz{ADsKts`d8fF>x-Z@FWhqv$6|H^ l_Z>k{!TkJ3KO5vzuP+}E&#+Yd(4Aqf|NNKkYp?%_{|9xkU={!X delta 3405 zcmai0U2GIp6yDj|!q6_iEkbF^Z4K@0vMsw>f=I-2c zzH`oZe(t?_rS{d!wHNZ%y3oaQ&#xOj#94TY#S%Jn@s8j6_cOGc>ufX^zy$$QMi);G0`d$#=>QL-=?Z35B z4R=M88g_Elex9DUMYNx69xENMZ=s%zXL~*dsoEBleZAIVu{Pn#X@%8xT=~|(sudRN zUis68AKyt*7zDILh((|pKX(Kyd+os*y zzi89$i9MY5Zs6NJTGM>|5pDVG<<8Eyl#`t#DW^RoG#oh?jEwf#c%ILx(&Vg@q~w&7 zD01#3onP$t&dN$!PDV0nSjuMQseu#I9x^aI91?vIro@BhNOX8m^p8bF;!7r`(-Vm) znF!;)D51YBk~~@?9xq{Ue{h`ixDND!zxZMh;0W#u_})zfw%tYCb~~w%22*0hZyG`E zYV)y_luYXO(IowCvE{jf4+2}PYNXU9^r*rI+%7u7OwlhFzs^VHoUELb!*VL4%oApY zF+8o#m?RVA1ex`akxU}3%8DJ~21G~!y!j$~W%^8p_ltu9syaz5FdQ94vH;tzZ%*Wu zgepg+^t4=|N+xh8rYec_w9rnx{iNMcF*S5p1F%om2&EYhVaU3m8${;pdSO)f;3Q}A zrx4CbvVbM0)w6bkrD!QFhzS48Y6-|vwu-R|x}X|YV~b@#h_5eHv>qItUuwy(9yF_R zh}r(IfSF*Cb70_1Wvq;;U}R7z6LqKU1s2RWt0*|c+AGY;hW@khvD&|sqPH{~9a;YV z$ZRfgn)N!XWP$y3vPNfl$*Ke%fQxmH`$9rgmXf|HWmJkM?TZC z*V+q8^!7E#Xt&QF6|(A4I|#&rN5nD+y%)0XG8-d+Xc{m8_L=~=?@uW5qzZkjBd{^3 zd&$hX3({kvP=sTi&7dhW9!T?)lj!Q;A5PO4@WDiLab=c?R&7(?2TdC)h@+p|)aX1gE;)Do*nhh4jLql2SE+U8moApJ^fKFn55 z;@;;ljwYFOnY6$VDKPYap2CU4WRT(#6c*cptCOp(12!OUV6BP%cw;@yTs@ZuQ8N$- zQXlzGnq=BZhw*VYo`Iy_Te?@|fEOHPvlDt0%aZl02dAh5+Z!Iifk!5e{kVKQGpopk z5HSVJ0bq=0Gi_b$Tx6%N35jk&%=qdeLZvV(C@>tS?rV*CGYgnfJ=*e+3gMP;P;4-h zs**TPCDfVfAc!6=KXhVpwvCL=BywajGnJP~I-`rM( zdZiQ$*!YDG8@C|#wozkmtvQ@wsv|=BWv*t zhr7%aw$(Ab9AGVW6?zz{Dr<~!xb9_;dz?$y7^Ljf7hFCUJRv7>?KKvN$%^dfD=sf&gdHVtyEErtxjl#9RzCedI>pam~=uC&v)R&LRzm81Mj SHy*|SOS8*u+Or@1K>r7pCc#ty -- 2.29.2