From 5d9f613f3ead073f59fec55868275c283038368b Mon Sep 17 00:00:00 2001 From: kieron Date: Sat, 20 May 2017 19:59:18 +0000 Subject: [PATCH] :D git-svn-id: https://spexeah.com:8443/svn/Asuro@154 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c --- Asuro.iso | Bin 5156864 -> 5156864 bytes lib/libpconsole.a | Bin 64564 -> 64564 bytes lib/libpmultiboot.a | Bin 29040 -> 29040 bytes lib/libpsystem.a | Bin 140320 -> 140320 bytes src/lmemorymanager.pas | 4 ++-- src/pmemorymanager.pas | 4 ---- 6 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Asuro.iso b/Asuro.iso index c29ffba10ac1abdb292149f340221c7969b36659..90aabfa47b3b04cd7439c912995f49c4f4382c64 100644 GIT binary patch delta 9112 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 delta 9112 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 Z`n~~e&-jM0z3&^u_Q@cJX8t_Q1ONyc=g9y7 delta 694 zcmdn;gL%sj<_Yr5Miv$umE<`<^kf5m@y*d3KbWB$vCZ!mY-XA)&(8-E*lfVh$O4v` zU?;xWTR05DF<36XdAIm9m>%)X+0xsNYp%-GxXc7~O<08uXMHH^-Up zhL{6#kg-)1*g=~o*vYbk-MhgRV&G(u6X$y_0_y~GqJ8H& zrfiDjgm@36A}1I8Ejb5~ z0R=X11sg&}x8@&0k86V%LVe`p;5Pc z3MA?tOm}A7%s=fMBRF6lOc#V$1Tukp_6KB5TbL%FSilR89f&Ch!LpkTmd|J09Jurj z!~}!o)d;5^UF8RN>g4w!-jf}AST@(J-w*XBFz`b+ODTYjY|snYeC%>3!uHJTMlx{A Z`n~~e&-jM0z3&^u_Q@cJX8t_Q1ORLT=*<8C diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index c9295cfbe2c167f9cf7df97933eeac8c8405cf84..bebe8e73152b885aebb120acda7708cf78593be1 100644 GIT binary patch delta 480 zcmezHi1EWC#tHJw#-^qlmHb&j^kfAivCUnqf0^N&1)PVOpd9hdwLI?-oL2r{Fpk*f z1)STNCi{!>z?GJY{zH}Jx6sSiS1>fOG&MFfhFJyHCNGE3R;#GRxH(_`3nSd1T17dS zYs5EiRndWQ#5Vs@KMvzaY`&u{jLgwwocz~}f3ggV&}KE=eT;mjK+6$!Z&onUgsB$W zoMh_G0=Mp_jTGbLe0hP*Z>=sN9C6d;56m~>o8Q}WAv6m)FNSf%7oT^7vp1i20~!Q! z!yP8R%?jQp5r#4Q^1+meZPp4njo|QwEaru}L~Qe^#8iZgM`}BQ0}i$M*|1Oph5inv P$u)W0a9=FUJI@3FPTz^( delta 480 zcmezHi1EWC#tHJwMiv$umHb&j^kfAivCUnqf0^N&1)PVOpd9hdwLI?-oL2r{Fpk*f z1)STNCi{!>z?GJY{zH}Jx6sSiS1>fOG&MFfhFJyHCNGE3R;#GRxH(_`3nSd1T17dS zYs5EiRndWQ#5Vs@KMvzaY`&u{jLgwwocz~}f3ggV&}KE=eT;mjK+6$!Z&onUgsB$W zoMh_G0=Mp_jTGbLe0hP*Z>=sN9C6d;56m~>o8Q}WAv6m)FNSf%7oT^7vp1i20~!Q! z!yP8R%?jQp5r#4Q^1+meZPp4njo|QwEaru}L~Qe^#8iZgM`}BQ0}i$M*|1Oph5inv P$u)W0a9=FUJI@3F;sJ_# diff --git a/lib/libpsystem.a b/lib/libpsystem.a index 5c9f616bce37d778b17b6f8680a9aaeb81f4c04b..df77ff272d30e28dd65d17ae594762c570ef177a 100644 GIT binary patch delta 2713 zcmZuzZETc95Y8MRSbC)(X@P2bU?M7VwrMYx7|KbiQb-F?z|@e^^dqzh6h(uO7>*E# z1e1E)8n+n4)>KdkrM)!{5Rj7sq4ru%VnJ!q0zxEd%KgwN!31Y_-tD#Z?$7P>?CvwO zGqdw<)5S?m7bgX?$L0Ba?Q^=a^uLN{xyS24*mKpT|7H4kSgam@veTfj=b}rrJw1h2 z(0I?h;qkN=yc?hQ&@VTCfiEvNk2Z_Q!WpW;`T8yZQ z7aIxXS<=m#@#2YQTd28Om6xDdMPpH3a!tevQdLoD2TWbSr$`(^`B!^Ew6(j{+bg3i zlS1gXXT3P zlmP#FCmk9I|N4K;&LtbZPvWrIL2Ep!aTEJC%!tNK{VKSbV=M-0D^+aE3FD9kBDSU9 z=pNtN0b<`a6KqObrtr0tsI-8y(h}YsV~EmSV~G0QV~B`g?nXD>(c zn-E1Z_y3WsRw<2%)hUhF#ENdWnzBD;f){Qs1m*dhBN=YyKk^@0NL=H!FAVmE@sfxD-I3qzts%`B~eu9c+RpbPh*&o=;>mnzd>ZIxy4c=#E z>@o1D{L@ERe-v93Nye`1NXAxQNXEX~nT*{TO|Yu`at5f1*e&CpxrXJJ?hh64G&WC9ZdC&y$cwdqYn`G z*aHye1Ly$hG@|DzD{q;cXDp))Ry;S-AR&`DESL{xl3YG&vXye152EPLgWqmqE7qRvC{-Axg=@w^jhRd!#K}Ig>Oh1sPicshIHwWZU3p;_@;`F-vrD zXW~0+V26R!j&Mx{40jkwz%(SRs0OES$WbpyDjYX%Tn9bIO(gPB7Nk2+BTsLHPG0iC z24{(``WmDO{z}R1Tc8fRH^CQtbu^R&&tubOn^EGNlB5yYq?xJM{XX#5h!rLTMkx?H z&+GaEltuZ~PH^ilCR=}Em$h!ZB-p7JyYb;}dyv>3Ym-K7(~UDf0&cL9$U0oL*V@!j z5;Qj5I5z|xApiNqv1w)lpVF+3mZ(pgh)WxxlM`!{Xp+y5kV;^H%27=j3aXO)F=_+9g)a6D{}9w6(Megm_0J9agY~XyYo(og?wCL0VMEXAAUMMdD_1{nDsb#&5wD zb9%gC-O@Y~-_Ey4U&NDlVA*_rk7Z?I_H@_f5qE0x4A(XT_1ke;u8*HZ2{$w?y|Z2B L9f|(gt^wD7Bde&J delta 2713 zcmZuzZETc95YC(+SbC)(X@P2bU?M7Vwzd~b4CN$MDWrucU}{Kd`Vra$ilRYC3`Yn= zf=NAYjav+2Ybq#&(%u>e2*^o+PB7XO3loFc4?SN{&_25>OaH5QmV2BYggsYW`d_AxgGK7GCprxZdoH*{+f$Qy z1&w#l9Uf18!Mou(5B+lU=lk+<^Jue(ESRnuynmU!2JFveAak0aO5Mvpz(zC@_wu_` zte_8!ACU!K2rWt#W#d!T6<-O6*ZuY4=z=t7a`HoZAmYVUVqsBNc+oFrm&R&gQHv2( z@nR#PJd3+oGhRHwYzsA4tMU>wt7t6BORkDoL8>Y$?SLus`4ovmDE}%ih_-gOdV58b zh5V}$Lak*9q1G}M`uI%}${Q;bYOYm7Ym{TQRt&AVY|IW-{m8NdwS^E~d(DC@yKiKBFWel9m&}0^U2tEJCm_Hq6t=&U&;Vg5xZ&JGuN>E(!C_koa{|( zN;n?Rf*Aat5gQgsRzniQG%t3zrb3}6)`rBzPT8nniR!i=WP}huDa{mXT z>3zVL4r#3yFvkU)SB)o`6JkyZ&FCI6=y&xAxNNgv3CJuv-JVu z9(w@7d;lFFoksLLY2_`G^R#8O!HQ=`8YE;AhXwQCbdt+QO}0{Q^+6Qr66OAAr&*;fNUH5Ok7q5DQ1Z- z?o51VHEcJK+7Yg4{?ksPv7U9;ahL!=W`x}7!h z=m8tm_gbt&dID*J9~8PG@Wj`)Aa%tOiem7HQ?W953~J>-7|x4|m>Una+3aW@iElRP zK!Wt~*Go=+YrP@P@y3XxpLRs9oE#-Wydx4hYenv!u_DBc6!CXCA`?1Ci4gCI#A8+@ z`=S*g&Jm$!K^@lo1Z`YJ8cKq_y4T?=y>JH7xpO4mHAssJ`D}qct4Q1ou3s9}%J@yV zY)+5Yty`K$;@kNa>5F*cHY}aT@3E{*%%0}DG~!N8n(o?apnf|}&GqrKDB*^trFWLg Myd%*+%QfKo4~pZfq5uE@ diff --git a/src/lmemorymanager.pas b/src/lmemorymanager.pas index 6ddec1ed..dc7d5dd7 100644 --- a/src/lmemorymanager.pas +++ b/src/lmemorymanager.pas @@ -30,12 +30,12 @@ var i : uint32; begin - console.writestringln('VMM: INIT BEGIN.'); + console.writestringln('LMM: INIT BEGIN.'); For i:=0 to MAX_ENTRIES-1 do begin Memory_Manager[i].Present:= False; end; Memory_Start:= uint32(@util.endptr); - console.writestringln('VMM: INIT END.'); + console.writestringln('LMM: INIT END.'); end; function kalloc(size : uint32) : void; diff --git a/src/pmemorymanager.pas b/src/pmemorymanager.pas index d5fbb71f..d51d3741 100644 --- a/src/pmemorymanager.pas +++ b/src/pmemorymanager.pas @@ -73,10 +73,6 @@ begin PhysicalMemory[i].MappedTo:= 0; end; while uint32(mmap) < (address + length) do begin - console.writehexln(mmap^.base_addr); - console.writehexln(mmap^.length); - console.writehexln(mmap^.mtype); - console.writestringln(''); if mmap^.mtype = $01 then begin set_memory_area_present(mmap^.base_addr, mmap^.length, True); end else begin