From 797c0f66fcf40fb1be238dcfcb33896daf989a8d Mon Sep 17 00:00:00 2001 From: kieron Date: Sat, 20 May 2017 13:52:05 +0000 Subject: [PATCH] - git-svn-id: https://spexeah.com:8443/svn/Asuro@138 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c --- Asuro.iso | Bin 5156864 -> 5156864 bytes lib/console.o | Bin 14672 -> 14672 bytes lib/console.ppu | Bin 16074 -> 16074 bytes lib/libpconsole.a | Bin 64564 -> 64564 bytes lib/libpmultiboot.a | Bin 27222 -> 27222 bytes lib/libpsystem.a | Bin 129474 -> 129474 bytes lib/pmemorymanager.ppu | Bin 2278 -> 2278 bytes lib/vmemorymanager.ppu | Bin 4027 -> 4027 bytes src/console.pas | 2 +- src/pmemorymanager.pas | 4 ++-- src/vmemorymanager.pas | 12 ++++++------ 11 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Asuro.iso b/Asuro.iso index 0ec27bba8183c97b76bfc56466b3419ff5b0e9ae..4944e07df0e55405d37d4b9fc0f393a405a3e5fa 100644 GIT binary patch delta 9335 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 delta 9386 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 delta 14 WcmcambfIX&3r5EOn_n`fn*#tn8V6Yb diff --git a/lib/console.ppu b/lib/console.ppu index 6b2854d6c8afcc18ca2b3a998271fd643ad09a1c..2004e70cf2e72c9a7e3398001972d3e47f64d1d5 100644 GIT binary patch delta 14 VcmX?Ad#ZLq5c4Weg^i)5b^tWX20#D+ delta 14 VcmX?Ad#ZLq5Oc{>nT?^Pb^tcz2BH7} diff --git a/lib/libpconsole.a b/lib/libpconsole.a index c04132f05f96df771f96efe07821b59982615942..06521a5b9d094a49a1a27339f14fbf76bcb59e2f 100644 GIT binary patch delta 700 zcmdn;gL%sj<_Yr578Vv8mE<`<^kf5m@y*d3KbWB$vCZ!mY-XA)&(8-E*lfVh$O4v` zU?;xWTR05DF<36XdAIm9m>%)X+0xsNYp%-GxXc7~O<08uXMHH^-Up zhL{6#kg-)1%ym_a44b*_7qNj|y}=b?>|~Hb=X)*!>j!h9edj?q2}Vhq;{wYe9FSS> zL-@dEZHnZCmu3fzxuvHI0pRC z2;4md5`hn%)X+0xsNYp%-GxXc7~O<08uXMHH^-Up zhL{6#kg-)1%ym_a|2K2nFJc3`dV?#(*vTM=&i7md)(_@H`_6-K5{!~I#|4%{I3Tm$ zhwy>T+7!tNF%zUBFBYnzK~G{+;z@*7y;Ow6<^vf}nFrIwH!sdHKp6TqUk(~#z))5# zIR}ve1vzg88$w36<{v_jYl9d>2IQ*JmN*CpWc1sPcM!jWIA6P8!8j6|fAxKZa18jN z5x9E_Bmy5ycV^toKkXbNIA9)37lc>@GJ$*c2V_lKm?ocCzzdEeh$#obvYQQ-&u82m zxbzOh1cT+(2&W!h~bf<_RQ-> cGH}cKz5#8|_=d2(?;FJS$smVj{yfbD0IX!`1ONa4 diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index e130c83d6c6b04b9105834494bde020eea8fcac6..6e12f9da714e90389fc0b31e9867f5e6f897d8e4 100644 GIT binary patch delta 484 zcmcb1h4I=I#tHJw78Vv8l>}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#smNscb1R< delta 484 zcmcb1h4I=I#tHJw28JdZl>}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#smNi;go3r diff --git a/lib/libpsystem.a b/lib/libpsystem.a index 3da9b8684f4602fc7d1327333132464c340856fa..45b5911e8ce2119eeb5f64621061f6cd73001c48 100644 GIT binary patch delta 2508 zcmZuze@xX?6yMQ;OwjkXhB6m^Lt{b=l|*4<^!6GoGTn1&l$*Lev3S+!%{eTl@g~(~ zIeFuTcOy$>spJnTuH%Yr`23L$dC_Z@ju&muzl_3aS{9A6bMLv|_r8zy7w2<0=X1_I z=X3A(oxhWL{!V6i{`B(l^3U^6=BmFeT%IF-%>8qE5+oM%PGiTc*~-C#Z-7_)YYk3w z{QH~}VC<`fI#x63Dtzl49F27jj>bC0kuA1Ae;!!f z2I3&{d=cFsoz?PLbVIzo!6o`Oo&|SV$!m)(%UZguqO7!HsalAy$uBbM`|T7z%cvji zZTNwPk_hC|P!fSE(DSNkq##9A-I?U^beGV` z-a27aLmRS0Ur(xkEMc*}o>B2xubFxHlr6+lN{FXPh)U0Xk@LlIeON*T15UL3oDaay0@5=BXhrQ^bGfGyig=Y99*~VQfrOdn=IH)im1CU`x@AiioB_Vc z4f+5QSDdYnEJF|3R(KAOo+Mf%DEaL?AVsNG{W2pDK1ufK=Ln-R@rY?wMi$squ>#vl z6xyU{8PbI%HYpa`EbErQ$3&_iM>wR~mgURrF!jL7rI|KIE$IIL8REi zcdmj#MZssSgVn-U69iu4#Yw71C^Y8f;gevoM4@Zn8R(WJJNjwE* z_o)=FI3;p+=`NM}IEJl~Z~Gue$0l7IT|cvpN3!H!Yhk_)SM8P70SQb6%C+mEmD0>R zDyud^`o-tyiR&RO+yocFMJjeYrS>W0>-CWQ)X>2=x}wt80N>N8@Dn7%FQ=mX98r{` z#u!bDrmz31D4d`)|7>BCF?-i+4VY3F!aC1i*146^l zzY{J1e|Hy(gjV90le?T9A~GF**Qz?Kn9`w)yr(KBcH5N^o62Yf$p1u}9A+_Nfx&ct7UK;j=JOsF$de9T|hG k$qOM*+=7-Q66*I8zkA2rLiO8Bdt!H!o;h;jE(}il4{7Oa5C8xG delta 2508 zcmZuzZETc95Y7~BMOwH^%mE>m*MbeLO`(;qCZt}@w6P-Oh+vfjNRFaCHT6PB(FWu~ z)dVH<(zV?LQJ@j1d{pg{F2$rAA3{pcdIp8`tjX~Ut3?fHwWf-*JNw?f*Z8aROlO{% zoq2ZOyKpz>!rh$6+$oF77JpuFYPR~zBFjDE$Ju{QNrB|N?kslPnxPy#^al9EzgB;i zZ)*pT7XC zb^~z`d4Y&+kj`oaEVd!hTJI7)8_$7zN$G0~Ez2rfT(P9QqD(Es-xv_tb-i{JZO3?GFZlHOwWDr{pnNkQ?Q)pO6yt&Ox)ZaLVlKqX9&{~rxdYj^! zwzZ>9{I-KiD%%xK+l!jhw*Q^99omz&BYVll-hEkL_!jXsvOH{gHFPwzp-@ zWwdS5Tt?dx%)ibhuD9c09{-=gsAUz11qUYOEjW-6)*+fucgMqYM(c<%yq!7Z@phKd z$lf|>R6`rGL{C?`e=K3Ko~~i>S+|*azDH~wdP$#G-^V+{282iI zL^NpxjetdySG8pM%_z8+O&+!gkCd7&x^5Zygh!@oVtNz?N9j?}hz*X8YOP(qeGwSH zqZds#{--+wslI*U?>}sW4+~}$h>~%71ZzCFPpbhoh540gPNr&0_EEE&`fFO z9hH?EA@kyM^d$5U=5K;a;35?}o>Kc1^7T4MeQM}n99=Q#uZQpHRQL&!k(bj^0gfof zQDb>B_zIi{SDC&eX?C^ip!_ss4y++Z_$4K^Yy)~+CB~sD@q0yTRoJXSGu+yd!GO>( z^zMXs1LlX|G?QUqL}m^G!s|z+9I0|gX3Crg#9$W z7dli6#m7twO7rr=V;NTf;Q+^bl_z(dfSA2TpG4hWAq|@SkMctjTyk$0^nr`MD;bSy zMHI?G0f#g43OTwiOH4K*Nd|o~+6y-*3K2&%LF}=!ihZ&KIo^+1a_}4s73n1^Wk*Ng kTIxc`leb}43JLZ5iI3eiw^02y)1LTP$}>}rk3oOde-_(ea{vGU diff --git a/lib/pmemorymanager.ppu b/lib/pmemorymanager.ppu index 5b33d802651bced862adf4fab0a07be4ff98d1cc..d275bcd96c8ecbc859bb6fb04a1501d56b45b8b4 100644 GIT binary patch delta 13 UcmaDR_)Ks@0+Y7q#-tVw04ACQ^Z)<= delta 13 UcmaDR_)Ks@0#m!u#-tVw04PrdIRF3v diff --git a/lib/vmemorymanager.ppu b/lib/vmemorymanager.ppu index f142b07da46e7a0ed2d30e1939a87664a7644193..f82c226e941de285edc4823624f0feb5a406ac22 100644 GIT binary patch delta 13 UcmdljzgvDn0@FRujY*OG04J#hNdN!< delta 13 UcmdljzgvDn0#k|G#-vDo03{v-+yDRo diff --git a/src/console.pas b/src/console.pas index e1086ba5..281c59ce 100644 --- a/src/console.pas +++ b/src/console.pas @@ -181,7 +181,7 @@ var begin for c:=0 to 7 do begin - Hex[c]:= 255; + Hex[c]:= 0; end; c:=0; Res:= i; diff --git a/src/pmemorymanager.pas b/src/pmemorymanager.pas index 2bf9e266..be0525cb 100644 --- a/src/pmemorymanager.pas +++ b/src/pmemorymanager.pas @@ -54,9 +54,9 @@ begin console.writestring('4MiB Block Added @ '); console.writeword(i); console.writestring(' ['); - console.writeword(i SHL 22); + console.writehex(i SHL 22); console.writestring(' - '); - console.writeword(((i+1) SHL 22)-1); + console.writehex(((i+1) SHL 22)-1); console.writestringln(']'); exit; end; diff --git a/src/vmemorymanager.pas b/src/vmemorymanager.pas index 1825956f..2e03e725 100644 --- a/src/vmemorymanager.pas +++ b/src/vmemorymanager.pas @@ -85,7 +85,7 @@ begin exit; end else begin PageDirectory^[page_number].Present:= true; - PageDirectory^[page_number].Address:= block SHL 4; + PageDirectory^[page_number].Address:= block-1; PageDirectory^[page_number].PageSize:= true; PageDirectory^[page_number].Writable:= true; rldpd:= uint32(PageDirectory) - KERNEL_VIRTUAL_BASE; @@ -97,18 +97,18 @@ begin console.writestringln('New Page Added:'); console.writestring('- P:'); - console.writeword(page_number); + console.writehex(page_number); console.writestring('-->B:'); - console.writewordln(block); + console.writehexln(block); console.writestring('- P:['); console.writeword(page_number SHL 22); console.writestring(' - '); - console.writeword(((page_number+1) SHL 22)-1); + console.writehex(((page_number+1) SHL 22)-1); console.writestring(']-->B:['); - console.writeword(block SHL 22); + console.writehex(block SHL 22); console.writestring(' - '); - console.writeword(((block+1) SHL 22)-1); + console.writehex(((block+1) SHL 22)-1); console.writestringln(']'); end; end;