From 158eeba82fff1046fd2ef0877bafe6c62fb4c629 Mon Sep 17 00:00:00 2001 From: kieron Date: Thu, 18 May 2017 15:32:27 +0000 Subject: [PATCH] Commit for safety. git-svn-id: https://spexeah.com:8443/svn/Asuro@107 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c --- Asuro.iso | Bin 5083136 -> 5083136 bytes lib/keyboard.ppu | Bin 3031 -> 2966 bytes lib/libpconsole.a | Bin 64564 -> 64564 bytes lib/libpmultiboot.a | Bin 27222 -> 27222 bytes lib/libpsystem.a | Bin 124006 -> 124006 bytes src/kernel.pas | 1 + src/memorymanager.pas | 8 ++++---- 7 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Asuro.iso b/Asuro.iso index 2ab4db1c330b6d481366f20b57226363c75fde4d..ac1edd924f84e4c133800a0566e67f9abc761e42 100644 GIT binary patch delta 9093 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 delta 9097 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 delta 680 zcmYLGNoZ416usxyIhEYMF_qwL6bzPA}snZ^SS^gMl>9B7qREq7{w&6%jOx zJ&XW5TC6Q%fP{_61c7Rxp5-}gUCL?~0CQ=vp#qHZo9>&J6OGKpVhYf{BiE)ixRvZ&mLk?QcO%rW8fVuPZmjlX}9wA<<0* zv7bK$d$VB)&2oOEb%|UTt#eNZLMkZsmS|0Gd)$u%K2a$g;W<5r zCjP0nblmrw=Ec`})M}B^#Xk4z$}K9M__9PR3Zi#?5l!ohIFaekxKy-Id_ diff --git a/lib/libpconsole.a b/lib/libpconsole.a index 6489aee4aaddb6f7e20a5cdc263147d609277df5..2ed8adb107ad322fee9863cddfe1f56eb6e02699 100644 GIT binary patch delta 694 zcmdn;gL%sj<_Yr5=BCCQmE<`<^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_Q1OS)(=rI5Q delta 694 zcmdn;gL%sj<_Yr5CI+S(mE<`<^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_Q1OV#X=J@~s diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index e2fe869ef597f434a2189297d5c6f187531df6b1..e215fd8ed7a40bf7749ba1b156a4cbff28fbe580 100644 GIT binary patch delta 484 zcmcb1h4I=I#tHJw=BCCQl>}Kq^yCZTVw-(f|1!fldP3WoCQI`0Kn27%+w=TlLY3td zg2{?)))P96D$8%Km#?p2Xkuwy|11?kU3fq18*}5Z9bv4kCD$9Xb{3`py$Ll-_#a@ z=@8q@qVLWE_gJ-=6yxT4lShn5B7b0>5#Kz~k_(}6i_KyfM|^X)vlQdxdK1CP3z&E& zzjj}{Ip0-~kc$5%L2UCG&(jFb2H)?9@H`L|ijdKZYe#U-B_f6N Sxx^hzd=@A+ZZ1fF#smNh2bFRF delta 484 zcmcb1h4I=I#tHJwCI+S(l>}Kq^yCZTVw-(f|1!fldP3WoCQI`0Kn27%+w=TlLY3td zg2{?)))P96D$8%Km#?p2Xkuwy|11?kU3fq18*}5Z9bv4kCD$9Xb{3`py$Ll-_#a@ z=@8q@qVLWE_gJ-=6yxT4lShn5B7b0>5#Kz~k_(}6i_KyfM|^X)vlQdxdK1CP3z&E& zzjj}{Ip0-~kc$5%L2UCG&(jFb2H)?9@H`L|ijdKZYe#U-B_f6N Sxx^hzd=@A+ZZ1fF#smOm-;~4v diff --git a/lib/libpsystem.a b/lib/libpsystem.a index 3486d37d43820c650a068d4162c8ee04e3bb6a20..d4d89b5b1edcb8785c28c8591af6e2f01e0676f5 100644 GIT binary patch delta 2376 zcmZuze@NVA80XQ*wW<4B>$;rbbx@N=x4YbFCdg@)WHp5i+rWvObLzqJz>I1!Z;RM4 zvfy>R;Fz=6PHZilFZ9w_+b#F&^v13zrq1@GKSWaE2E%P2*7N@Op5K%H^8GwM&*%B| zdEf8NT+Nudn(=jhda<|gwDYK4{3W4c8=J5{NKb;eb0m%Q<*yY6+V~Mvuz&KSX_kLq zumbe0FOa^HNd^~f)WHS@cW)e*{{`;wjPetT4qaGo<xmCa%$zD_?|@c(4S_{oBQnk9Ds zspb-IeOApS-dYB7WJP<_$Vj{ui*DD+5RgFowDfqtLl4#0xn2ePIx#p=mBofWj;pyO z26nMKdv#U>BVEg9<~U#hzRxY7@sI_CzR*And0)?@*+K=`*RzP}4A%YCc_1ylsRNqs zT`{2P-YMeSX0XeLaX^LtGa#`wC$k?}5obR##f)QmP>F%(RIkQyeQ*zED2sd0rAGI` zNi86?D+ddoTJ8XII7s-^G#farDMQTEBomtCN|Qp`e)jm8ld@ffY(HDkixDd-8nvP~ zFI!PvR3W@gcILir110pbYd6%El=+b*Q_pYK`2IhV@iyk4Xp#NOtNGVW4T7_~*zj#F zZ3JZa_Lvm!!8;MiDPB2k7MykID*9)%jDoXINMiLqoSRecgGA)q+`QD>kMpBI4&IZS zR+oS3-gvU^3ikJX6X6?!QBIckP`w8xkCWs*#L7xDM;3pT-HU%Tvy!E-ra?qXmZIE9 z1GONYNC&kcadH87uLAvUBnIr%T?#KzmjSDI!)nmtOtDk6-xnE4V08{}Ujt`=))*jr z;JD>1*)UvUx$F=_a0A{+bueAq!ajs)hu+<~WTtYKzFxO!vG4 zQNcl%w!#+Xdm{+6s2ry$UZmh`1@A70D>9`}6Ax5ElNv_63cQaAFDhs_(tMkAqv-Z7 z@2mlv^c9iPMA0-yww%c1vs)owxr>sVb)bYLb5!nt&s3a#Nx5q$q~3UnmMPi!x(2ui zhElKPEycvm#3*1y!3%^1<)CSAnB#J0TQCwMkM*uE>;gNS^ znO!WnjUQ{*9ZN_NUQ$6_9iZM;j(#Xc{A6jFBG#jq3^(?sFd)9s53w65t+w`%1ov6>%A$? z2(|Omhtb(kAF}1?h;KaK-e)ZrQH;C$^~A-znt8{7UW|kkVN{Lpt#3pLxnW&`5IX-d zoT7V#;}kDb7H|I!V(N`RJ?8T5-^0Hf^gE=1G*16DyOO8@`> delta 2376 zcmZuze@NVA80XQ*wW<4B>oR9}9n_@J?Jhmd1Ub!;tfsJG8#s}3PCZz6U`Dl=w?%9i zS@1euaLie3C$<*O7kX(dcgy`cy|F8bsk8m)50R9(!EhUh^}Ij6=U3@3-_PUoe4byQ z_x;|?)wG$bXrV9LKW7UlJ;|v5D*lsYwub45yIZy!FCB8$W^y_D^0k#q#e9 zR)D_s`O;T1$>5^RI@rMAuFd1ppEe5A>r{vYXMJqUJ)o!%kTG|RL`u`y51#8FlCeJ^6~ zcd&Ey+?vfn&eczm#2$l%cb$hUk2A2vZnwJ&OFZsZ3dKsi9X__;`^k*)kp9ni@T5Px7=dc5DRhwAOvsDiy67@VleV1pmW)m#$& zyV;$6IxB+V&gC<+AG84P=N8a-*aAXdXds5XzkAYbp@Qu1Uc__;>-y?Ekd~g61Dftx zHK6I9DdOF3u**kqKn4FZAh9(E%Rag)F8k;dGmh&)CHkLJy&5O@0kGxdY5$C*jl6tpALr3^7xaOlXoTO$urI*yCqU$#xa8{cJ@qMy#l4)QaA` zY(;fZh440IGuL$+D4~~KyP>wE%#SRYx_`6A_x+KKw=v&Di|kik&A)DH5S-o3hHh(V zBOpV!$E0`<-HAX}@#<-_;H*1g`J}PzQ{=YYqNM@9h?PPV}R^| zkykMT<`6elz zH0g$yO;SwM#H+Tz2}LR(MK~_X=J^Gtn|N;dYaTF%EMWDk8WQZ9<22T(Eh0xV-TMwi z1qWT)23wi;jUdpXa-61kk%F@oysI3p$dp1&++PVzY8de<@H{5GsG#9U^KH_NqT9Q? zqXul!S42t^MbjMFdNQ5QZi77KE=qFLffAO?QMnU7Q*rtw<<4EO^2SrNOv%nSG{8kL zlzJ_1DOOIg^5=P56DZk;W~7OtX`Fjo;HJ7-_!Z)zHdy{9QA9C{;>zGV{cr&cx4aw6 z>|()f{CGfjEFndBNdJpjbht150b!I%Z@lD-kW&tTeo%vC>$UH_=W-6Uu?^)rD zP&+?;1f31_AzPk~_{Q@cz1DIO#ki|aPh8BanYZ`r#YjjIM%DP<`bLzH6V@dNq4O`p zD|C-=oZ@B5;DPTTrrrqDV-DZ(J^Z^#&P<3k_&Z!l3Xs=MKxYy$@r#A_-qJ!BzlMb6 TNq0ffs!^gOpW(;uLNw(+ohl_2 diff --git a/src/kernel.pas b/src/kernel.pas index 02280c46..fbbc2b05 100644 --- a/src/kernel.pas +++ b/src/kernel.pas @@ -56,6 +56,7 @@ begin kfree(pint2); console.writeintln(pint^); kfree(pint); + pint2:= kalloc(128); util.halt_and_catch_fire; STI; diff --git a/src/memorymanager.pas b/src/memorymanager.pas index d7136712..a49c60f3 100644 --- a/src/memorymanager.pas +++ b/src/memorymanager.pas @@ -45,8 +45,8 @@ var miss : boolean; begin - blocks:= size div 8; - rem:= size - (blocks * 8); + blocks:= size div ALLOC_SPACE; + rem:= size - (blocks * ALLOC_SPACE); if rem > 0 then blocks:= blocks + 1; kalloc:= nil; for i:=0 to MAX_ENTRIES-1 do begin @@ -58,7 +58,7 @@ begin end; end; if not miss then begin - kalloc:= void(Memory_Start+(i * 8)); + kalloc:= void(Memory_Start+(i * ALLOC_SPACE)); for j:=0 to blocks-1 do begin Memory_Manager[i+j].Present:= true; Memory_Manager[i+j].Length:= 0; @@ -86,7 +86,7 @@ begin INT 13 end; end; - Block:= (uint32(Area) - Memory_Start) div 8; + Block:= (uint32(Area) - Memory_Start) div ALLOC_SPACE; if Memory_Manager[Block].Present then begin If Memory_Manager[Block].Length > 0 then begin bLength:= Memory_Manager[Block].Length;