From b2a11da4220e699c865bd118bb8a7d41fa6d32fd Mon Sep 17 00:00:00 2001 From: kieron Date: Sat, 20 May 2017 14:08:57 +0000 Subject: [PATCH] ds git-svn-id: https://spexeah.com:8443/svn/Asuro@140 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c --- Asuro.iso | Bin 5156864 -> 5156864 bytes lib/kernel.ppu | Bin 2158 -> 2158 bytes lib/libpconsole.a | Bin 64564 -> 64564 bytes lib/libpmultiboot.a | Bin 27222 -> 27222 bytes lib/libpsystem.a | Bin 129474 -> 129474 bytes lib/vmemorymanager.ppu | Bin 4027 -> 4027 bytes src/vmemorymanager.pas | 16 ++++++++-------- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Asuro.iso b/Asuro.iso index 396db45457d1c000d497a46e542c834eedf347ae..28eea3708256a98255a4df8ad549f94d5234c821 100644 GIT binary patch delta 10691 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 delta 10663 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 Z`n~~e&-jM0z3&^u_Q@cJX8t_Q1OQP(=luWx delta 694 zcmdn;gL%sj<_Yr5M&_m)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_Q1OQJv=luWx diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index fa7bef0e8e8a5cb4d3f97a28c75caf52003aa013..734bf694579010b88a3fd4933141bccd33317954 100644 GIT binary patch delta 484 zcmcb1h4I=I#tHJw7N&+9l>}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#smNfCzW#m delta 484 zcmcb1h4I=I#tHJwM&_m)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#smNe1(kCE diff --git a/lib/libpsystem.a b/lib/libpsystem.a index 3100e1aada27404ba40d7d89ddbb829573ce7fb3..27b82fc14d7fdeed4a44b60f16f784d99daa09e3 100644 GIT binary patch delta 2508 zcmZuze@xX?6yMR3NYMAThB%jgLt{b=g+yU<^!A!8GTmcol$*Fcp?KBk%{eTl`6kt7 zIeFuTcQZ?6spJnTuH%Yr@cfYudC_Z@ju&muzl_3aS{9A6bMLv|_r8zy7w2<0=X1_I z=X3A(oxhWD{!T`C!SwR7lF#!_%~gL{xI9PvIQP%#Nsw6BGmRa$W-A8|z5!nGuQfQ$ z@$Yj^fU&O@=vd99ldFnMvKy247Y*rn9#rV~5<)CA<`?nOV?>33#Y>|swlYifFaH`; zF%d4Gt(!ul7({I44ee&0El%`zDjz9)M$IgJQbo~H3o>ZXdN+zrz?Xzo~~jV z*;^-#YG^~2=oGGApSFc~S_$zC2~p|UFLJ&(p$|(azu$?LpL3$B zi%#_1WhZ*^3L(5gxxy360aEwc;p?PXa!)uaeRS2C-+e8apCh)6yrj>o@8j)J143i< zB9btIM!+J8D_XMrMg-g|rVd+##)?fB-8YSVLSvblm>z}Uae5RqV#DL(T5FeXT>!>! z>qXOz|LOKnvTv{W`wtu8!-83PqG*C10h=d}6-{7g_!7AO`9>dK{ii`x-#cn}5V7ie zgVLG~w4vVnfi{FjF-T7)(2CkSbGc_F6!J zZqNsixZ-SmWEpzMw!(9O^d!+DLCJ6D0Vztg>X$R-!zamJ{TyLbCLS@(%E&^SDwc0s zi2|DxEknAf*e1n7n`P}%_?So)I_9i|>w`SfzIC#>Lx3Ip-b5@#`!Hi#4r ze8(CXR1|#HdRQxbRYBlYUYw+QghFFp9zF#YOBA^ForNyB^_yk6{kebPTi$aAIGpY@@*gF=-8x-qw8l@cQi}>wGI~OaMfOEEs(%epj@{BS}D!E zqq4FN(l0(oPh1aS(I&VEE>f}MDYZ`_U$2Mcr-ly3(G``xM);mig`Xf9emNE8=ZK;l zHI^*{ufREQmFPQ?VpqEk$WMdjz#4LdUs6)rR-ngKVjQXxzgMJIh0Pi?!_Dn!3S``oPP^51j2Hib~HxGjTPq2HAQT9M_s79HjBR z(5YG|JZ4%@nwK9QOS=LHhdAD=Y`OCUMC~BVzLoQBH)#gKDbU%h&ZB2Vvn9x>{BJk@qXmW;Q<&a&`VUxj*P+8 k+g8%>k delta 2508 zcmZuze@xX?6yMQ;OwjkXhB}viLt{b=l|*E7^!A!8GTn1Yl$*Lev3S+!%{eHh@g~(~ zIeFuTcQZ?6spJnTuH%Yr_(0PkFM7?=@uKbdmr+BXfbpXZ*Lr~b0=svPm-yg#QWL1IzYGz^0amak+EqDBk-mDb zSg>}OA`!3!YbROkoLfBhOfRs^4YTw~6-DC)2SwwCsPI)eIO?h$9Cg)-BU>~)-w&*M zGjR}ku83}y&T6?Vx;frj>k{2tE`YnF=(VMmWi4M(R#IG6tQO*{_lu009y`U)GHOP; zYJZ@iBm(njD2YHh=y_Gt(Y#n9fGr12DFm!BIHDuo+-WB2tDjHFzWQ=#t;`lZjWJEz z+Fm1m+eIan?FyyrWz8wu_fEt#Rk_6V12~w+|7S32S-E1#p(%Mw4#kCageKJ0{xF@4d@)1AR&-(Kn@f0IEJm0Z~Gue$0l7IT|cue$Ft;L8)2aiSM3#70|`t8%8i?#nbOQV zD$BP(`o-tyiR&RO-U^q%MJjeYrS>W0>ot)4)X>2=x}wro3*XbJ@Dn7%FQ=mX98r{` z#}uBm`DxG`SVNBROG;|l3G}#1j6+r8_lnf2uvvpm@2>M@HdV k@WsD7JiPwZ~eGe=I`g@I}R0cp!-g8%>k diff --git a/lib/vmemorymanager.ppu b/lib/vmemorymanager.ppu index f10dc57b13c9cd513e013ef2948b98e589772b48..7b151585acf3a3359362d8ab82b9ef4e903d5d73 100644 GIT binary patch delta 13 UcmdljzgvDn0@Fm_jY*OG0447Q00000 delta 13 UcmdljzgvDn0+Xfp#-vDo03+1|rT_o{ diff --git a/src/vmemorymanager.pas b/src/vmemorymanager.pas index a2af56ea..897abb59 100644 --- a/src/vmemorymanager.pas +++ b/src/vmemorymanager.pas @@ -57,15 +57,15 @@ var begin console.writestringln('VMM: INIT BEGIN.'); PageDirectory:= load_current_page_directory; - PageDirectory^[KERNEL_VIRTUAL_BASE + 1].Present:= True; - PageDirectory^[KERNEL_VIRTUAL_BASE + 1].PageSize:= True; - PageDirectory^[KERNEL_VIRTUAL_BASE + 1].Writable:= True; - PageDirectory^[KERNEL_VIRTUAL_BASE + 1].Address:= (1 SHL 22); + PageDirectory^[KERNEL_PAGE_NUMBER + 1].Present:= True; + PageDirectory^[KERNEL_PAGE_NUMBER + 1].PageSize:= True; + PageDirectory^[KERNEL_PAGE_NUMBER + 1].Writable:= True; + PageDirectory^[KERNEL_PAGE_NUMBER + 1].Address:= (1 SHL 22); - PageDirectory^[KERNEL_VIRTUAL_BASE + 2].Present:= True; - PageDirectory^[KERNEL_VIRTUAL_BASE + 2].PageSize:= True; - PageDirectory^[KERNEL_VIRTUAL_BASE + 2].Writable:= True; - PageDirectory^[KERNEL_VIRTUAL_BASE + 2].Address:= (2 SHL 22); + PageDirectory^[KERNEL_PAGE_NUMBER + 2].Present:= True; + PageDirectory^[KERNEL_PAGE_NUMBER + 2].PageSize:= True; + PageDirectory^[KERNEL_PAGE_NUMBER + 2].Writable:= True; + PageDirectory^[KERNEL_PAGE_NUMBER + 2].Address:= (2 SHL 22); console.writestringln('VMM: INIT END.'); end;