From 4637e1f6a39d81d02705cc0926ff8c427dc60f60 Mon Sep 17 00:00:00 2001
From: "Sergey Semyonov (Serge)" <ion2@mail.ru>
Date: Sun, 10 Aug 2008 05:23:24 +0000
Subject: [PATCH] splitting kernel into sections

git-svn-id: svn://kolibrios.org@851 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/branches/kolibri_pe/boot/boot         | Bin 0 -> 7060 bytes
 kernel/branches/kolibri_pe/boot/boot.asm     |  69 ++++++
 kernel/branches/kolibri_pe/boot/bootcode.inc |   4 +-
 kernel/branches/kolibri_pe/boot/init.asm     | 135 +++++++++++
 kernel/branches/kolibri_pe/const.inc         |   1 +
 kernel/branches/kolibri_pe/data16.inc        |   2 +-
 kernel/branches/kolibri_pe/data32.inc        |   6 +-
 kernel/branches/kolibri_pe/fs/parse_fn.inc   |   2 +-
 kernel/branches/kolibri_pe/kernel.asm        | 225 +++----------------
 kernel/branches/kolibri_pe/ld.x              |   9 +-
 kernel/branches/kolibri_pe/makefile          |  85 +++----
 11 files changed, 293 insertions(+), 245 deletions(-)
 create mode 100644 kernel/branches/kolibri_pe/boot/boot
 create mode 100644 kernel/branches/kolibri_pe/boot/boot.asm
 create mode 100644 kernel/branches/kolibri_pe/boot/init.asm

diff --git a/kernel/branches/kolibri_pe/boot/boot b/kernel/branches/kolibri_pe/boot/boot
new file mode 100644
index 0000000000000000000000000000000000000000..5ee998df2201cb4fb2814d7c6d7e1987d1167922
GIT binary patch
literal 7060
zcmb_B3shTGw&z~LO`1}|v{h>z!*NFM@<U_N4^oKqFJ){k{XC|E{m_=HRiwU<^wA|&
zXy_BfS5keW<BXr1KuQWErOFy1XrQJB`xJHNt<}+o&lf^17t=?pwE+r~`}Vmvd^*#a
zuD51R<($3u+57B$_V3<!*HIMuchg&Iug*s(9+6Q=>2~egXO>`jYK1)`fR|t;gMvSd
za+Ygw7k5`w6rb1ptn0gX=AxvB_Z98kW!j53Y{qzhp{Zo=zGAG`J)kq_^jI3R)U(v+
zOwZpx@aEh{aN6RfxTmMXE1&(3n!R3p!+ZRHbisM2|A7O0r5MN)jS&6thIQF1H)Z4O
z^;y%vYcApGb9)@To5%3q`odyMp_zoph22hkBIvC5^o4jw(?w?pyIqZZqw8B-#|I1C
zA=h!;#6{r}wVwK*$L@AIabL416m*50*n!XS$D5pZ)rOo$vmeRQZP~hILf{6g_v61m
z2d1C!K3<Wt9+&D$F*@X`cX}H6V2Dr0YqD0{zbb15B;6rru+Mc7=dRhjA{{T&EhD6`
z-6>y#NCch7T+Qhi=v93uJWUrGz+<5cICs;gW%%v^zAxkn@wkx(A2_fhEI4th9$U}j
z5U@6SaDCH7e8L%Ye(S0CIMQdSz1W~%xcJ@&QqwZi^!j^K^?Go349ZMhtiN}0n*JV~
zZ&*;zr{IMP+|JOpbc`xJcHZFvt@W<HMpp`UxawWaVJ9AdlN<2LYzUeIONKgeZd&TH
zzc}CpzAo6`Ku+-3gM0&aHApOQnlr>_fTC6Dk3A(9sc!GnkK?-^TCru(!h14^!Pgm!
z7PzMSqW_o^HxLcSoNjmcxUA!^$u3^d=V_=XE*x<6g(kSkEsqE;dn1n*U@214bx0<<
z`Q!CYw{B|t<)G8v?+o>UXM>*e&b~fR5HCtgy>A)|gfPfUwt%Z*F_f~}Q(x~49&<T(
zBCkXL#zSyP#x@Pv`-gC26S!IEPnjMz9$f1P+d+q9k;kD!#4D4=R?1GqCp->d084ot
zlmu92?>`O)*9ZIS`iK5ZCcD^-^`(X-`00K73o%!)x2SNB4q=^6hc`S7nI?w|d_m&v
z429D%<jGws7)Y;&iP$ZfonNqP_nvK%xvqw0r`zd<Ty{fJ20hNk6r8`N*j#9m_raoi
zPZLB4IHX`TG`c_)b~U-c_Il5;dg2GX1ot@```z^z*LyJU2zi?MkZZu%*XXJ95Pwgc
z0irJh<DiQKi0C`s=z{!4IKN=qv;aa_7cJD6F4XH&CW;O(T#|~<JDeep1Nb55OCje|
zaBkKLY?!uz^LK5-H%|O?gdL4dM6n|*ud&J-2*FjIl100>;i=jMA}L;w%LmULk;-Ax
z&CoqRV!mR2U~W;8TX`-H@)u)4;Nht2R|#y~xEz4#dU+4zs`~Fk6A|Gj9x)p>Loz@f
zobWWeN!f<}+}BX!2ktMPRyGb?Pcr^n2*&{5biqyHCC7OHns>^y*g?dc4o^d~=a}20
zL)R<t|GL3*>BG~Vm~_PJ$-awmEaLb&5y$vl`1dztWBGuu&4*YIx`FI67^P%dzHAwW
zHvz~f(${6-za`ssgZrL3{gq_%3*cL+fKGUDf3v4)fOorwNOyo{6PBv5zusf-3psdf
zhyE|P+yqX+ZVzcbjy~tNI&`=X3a%d?;`{KrRjU^?dmz4^U<&qx8k>d&NDV@ELeDwT
z?`{MnACh+g_P9ZyS?Y$Q$zF2`oGdqYXo!8#Qk~5t+EX29;@}JNk)*D4=quIjGj`8F
zNSn$90?_~r`Nbi+Yv;}~4#v2Qj{`Uzk8;33#wB?l<mDmyD+mSlpD2A|=PoWP@AvlR
z<sCej*W24G<7EMcF)|DjD3fte{Mk2=^D+HJY1iTio#%>*N=u81xbrf9@`S$6WAa1M
z=vfe&u%AHEbz=7^BLp&H`s6)Akmbq!xU#AH0Dl*Z4=4D=-q+_zgS_X$Ad-QDQ}!Q(
zo546ZZ*sq=EG@09XySZ{pG;z0+;n+{k&Z)WCq~R)6X@9(|H!2ledZz<2W5UgjLSsh
zWf{K&rcaL#_?OLOr|kO-SjPzeXEOgXxNc@9Oan3wb7?}^r=NbhU&3jotgCCB*c<Z~
zP{Bo@VSJK5x{IVhEdD^1Q$Y0lV;tbZXxB9PvuC%IZ8>{(QXWh+PR1XokO61UPxuRw
z6qt@f3XlYti2tO%SUwPWk^*OA@s!S!G5{cX$SE*&pI8b^Y@@G93XmL#U8#&@z%=_0
z=8*)5#TTTAccxOnI8RQ2gOe<QqO`QMqHF8{fml3a@{mE3`sI+v;t$jqF6Rs2BP}hE
z0kQbY@{w=8iA>5v3S1K(@NedH|3V5t2E^hIQqP0+sdD^_{-Rz{5dwdWPu?G#@$tyV
z*Z2cSBe8uB8RhDjygbOKNhHZ%Qaw*|7HGeglvY%fHhGarVBWk*Py(jV!~|(vC^G(3
zX8FA5;sx>RuOWeBB7s=AC;fj=9@m~Y4Ko>RNFn1C`2mZNO~$5XQA8-|6@*~r5v(^F
zt%>iUo+N*ZSNKtE!NNsxXS48~*la|Wkph1!>bW`XOVdc&$iMuUBmAeh)f&`T=oYoV
zm6oJ(4Utwlr)SRAlEjCsQMKtuUr-@@Acmvc{hMpF2Q-F13}0SZ_4^v_vl3YK(ZBxi
z4$AinHek7tVbM>_vpB;axZ&@)O~Usgw>3du6`$qjmVRuSqF<8eEZOkVbA-o5-vNbS
z6utCZAz$=0Dg?dA8M=CI9(+sbrQ?Mxk>$D>#OJPDv#<?q=tO)^lIooK<`@;8zf)Ap
zEi6}&3A{kH%w#Jv6+EI$bXe(ol@`8=`dPbzkJsy~*ml~{LHn9%;dInXD}??iTa(K0
z)x%o$h*rf5o@lb4+sSHLQxo})Q3u<tET`G-EILTR%*;VBt0hW;L`j;Btp2%sY7(rY
zqNcJ6wNV>7NA1K+OBp-NjM^z=ep&*Oka>>;lp}LKTb?=Fkz`4Pb-p9s!mt5mwnGC}
z&vca2CL;i|96`#oh_%mju+>V|J`0vCnzfJGVO5l8w$lquii$I6Ia|GfVKu)4aoA8<
z{c3A~9xN8YZc(h(zM|m@{7)ifO=_)%wU#ln&FjcA$Gp6=Sjlpl_Y_>a8bT}NM%h4o
zX%-=^riHcBFqM!V1&7D0XCdS(R%)4K;l)2C`+bQ_IL?>C2+#e=Uz2)(IvlYqX+w$*
z6z3at2nW#NF7v839M`dxCiq^0FKR2NJAxF!A0_zD0Saqtbk9?4MiFD4Yk!ui(LN{b
zFD3irr0Ue8nrb+{`V!X;?-a<|rOsep(Uj1kD^?-z!BIy^T-&Il?x;otrdp;}<7YDz
zmbq-kV>EczTBgG0*<_h#o@ouJS*uYrE5ctJx*-2%2m|B3PFi?>+~-ybzZ)09M_WbE
zx4ruNrI*b2n{KzB%7gS}t%G^iQ|gRFP&*$E$*pCMYQjm@L3PFGsKcb(xRDUH=h|P<
zEEsiksL|`gm#YKzqXZ*hciS=`MGkjasO3hbiEdF=pEC5Os3KolhgAES;ep{uwSU!9
zesvriQ}-*)Q)krF$91o1wtp}Kbu&>V#@)<qDl(@_^CoHDFU_?uOL5gywjn99n#$LZ
z6j<vBBxEJ(ELF)Nepeynjmz=P0{9UbR%N|Q3oFMn;O>@$Zf3tKGqaniRT+)Bz5-SL
z=D_MDI79m@jY*xMeN9uM0K9iIBv}SzmW5!+_i2x6tYdjHlAi&X1ZsuCvF+fj^_s)!
zqVG+WkUQqjozN0h5-qoZ7T=&U{Q4w4UDCdZ(C<=(D|RwZpf+V^eY~NoHM#vE^g#l;
z+ytw&d+z!JSCp~DK0vWG>ln61!PY!Rvvq14TdhriDN$v!j?Om!!a6#~yhbjVhoL$v
z`b3RXp)6;=!@+WO^K5L*nk2T4vi+5!d~waKtOMD?OQ1-R4YQmzah^?VQ*SWz_9Q{O
z;tahnb#bSHis~_r`jU9~c37e4;PAON|2StjLmHzY!Wp2u{V&&s^avgKf_oobK#1!=
zNr3ep@wdf6WB=gz3?Q`Yk+&SRp`Q>!0wG}J4ax-K5`);9?0W#UFQ=NDLgT&{kasr9
zZO=gj+x`p7kG?mk_Dd2LVE%}Z7b%4C(I?THW5g&c3s0ps>SWJ+(^{_LYR;-`Y+2S8
zcam!_hli9Q(lftAE1@q=pc)B1979dB+tepJF#>s&weJ!*+F)ymoZo3Ub8gR_bnt4+
zWf^u67)`;Tcr_?So55{2nX-pZ(a5}tty@h(^^ol@jRv~2?<KlwPkhyCr8f=<*`vZ8
zqiqU_zb#H$Sgu;T+{V`B5TQ*l-Mqy{Zl{IYDTPl)h1FMue;x}kZ_%i;k}7`?S#IO3
znZKSVnv+gze?5<lWKonkJ`f)ljtj(7<<E&!`9F!M{5c9%3f3sBQA8d+pN{x4;|2SO
zZ&$o<bi~&jFVu_(x6@qRZ|H93ZMtFJONn;ci)ILQBff!np?JhM9xpsGBD{Rnw}vUt
z1ZN4ol<x?DhXDM7@*QJ@>=C|_;;cdC<29|Q1K!ev6(gOiXOf7v$01+c40rCUt+)KL
zxe{7mQ+Q;@_KI#Eg}(EmTZIQlu1X0dreeg^GOyB{nEE!&0*KKVd1B^p_E!O~gYCMv
z!7!zu9)ZLV{%4q(QqhK!H@2^XB6`%?tqT39+-jVqseFe@z{Ub|nsJw=@&YpM)>JAe
z;~vf7J)#$Bgww;mm*a%m;SR%M;q75ZCFMo4gcHNW#gwpZd~hr(v|c3^{&tv{L7p?^
z<7+LmDx#x~{pYN@T8%pV-{s>uQZrVI=HFYPN2|mCQ9hn+VXZ@Xgs((y^tGBAXuj9d
zpwYfvKEBa%FEm$cAa7~F6ki>%4ymg_kHjtH$z-}ZKpqu?&xmlR!%vE&nQvpo{iv3C
zmV%Y8Wu7A|Q_DP0RqGB=gBjBO&P9A1<Af8D4#PsBGvYW5_nRqv9vQq{+6_c}f24(@
z(yl$?I0U;1!pX>>7=1%{HsUL0-h_vgg&8~$5n;gV*ZiZ<2$Ej*YZH^-5Va7doq`~8
z_c6br;b~Q}bofha*H1cTBl4nUj6aD>R7UD#znMN6u1Y)|uh2W*kB3wv(OVZ0=0}KM
zS4Fsj<j*1alL3alG3G^#a8HB;IC@1GyF$?U5uZ*ed<(EfNQ{(cLJgQ7jb;BvDf_va
ztT?TbgD2|>F2|Rx6xyzkH%175vH2$B0m}~pe}yy*FSj-EiDz!*ay|hd8I%N8=RgzD
z2=84HYNhi%SA;`Xp&kCzM)6jPbtKyiT}QfDyUJGWw~ov)tE?ll&2eq?hMuI#bMTI*
zIjo6T$7Wk@ZHf1O7Po1rg<c7N-qUeIEgFDSc|%~=PU(yQgKd=5p5PTq%T^`c0cEcJ
znGH%m^G=(KvZ!6OnY=Gy8{LMIj&yMahBHS_b(Y)Ms`a8&d6on3l(*iranmn*=IqFO
z)bx1eIrHunt!v@U#fSKAg%-80?U|EoTFXY6=WXyxpoRA=YuS9!oKp2gqn7>1JpaYj
z%$=IX7gsB~1cfz7RTwW(=9$ZvR~Vn6;98>ClpIzAZwqQ92%Da0QIsg6A6lxfYT*0S
zEO^&1hwoF|cjTp6g*@{SBEQh(-(|5M1kx8R_?80WX80rDyU1?=nQ}K!+=<gEse~~$
zXf*w68TnxmhnB;<qmcYB*&XCdTFGuxVPP@aQB+v4zwjE$uF@TxY2VX3iuM)kK|6Mo
M6q@%Jm`c$90XpzVI{*Lx

literal 0
HcmV?d00001

diff --git a/kernel/branches/kolibri_pe/boot/boot.asm b/kernel/branches/kolibri_pe/boot/boot.asm
new file mode 100644
index 0000000000..230bb91736
--- /dev/null
+++ b/kernel/branches/kolibri_pe/boot/boot.asm
@@ -0,0 +1,69 @@
+
+format MS COFF
+
+
+include '../macros.inc'
+
+$Revision: 849 $
+
+__REV__ = __REV
+
+include "../proc32.inc"
+include "../kglobals.inc"
+include "../lang.inc"
+
+public _enter_bootscreen
+public _leave_bootscreen
+
+public _bx_from_load
+
+extrn __setvars
+
+section '.boot' code readable align 16
+
+
+_enter_bootscreen:
+
+org 0
+
+use16
+           mov eax, cr0
+           and eax, not 0x80000001
+           mov cr0, eax
+           jmp far 0x1000:start_of_code
+
+version db    'Kolibri OS  version 0.7.1.0      ',13,10,13,10,0
+
+include "bootstr.inc"     ; language-independent boot messages
+include "preboot.inc"
+
+if lang eq en
+include "booteng.inc"     ; english system boot messages
+else if lang eq ru
+include "bootru.inc"      ; russian system boot messages
+include "ru.inc"          ; Russian font
+else if lang eq et
+include "bootet.inc"      ; estonian system boot messages
+include "et.inc"          ; Estonian font
+else
+include "bootge.inc"      ; german system boot messages
+end if
+
+include "../data16.inc"
+
+include "bootcode.inc"    ; 16 bit system boot code
+include "../bus/pci/pci16.inc"
+include "../detect/biosdisk.inc"
+
+;include "boot/shutdown.inc" ; shutdown or restart
+
+           cli
+
+           mov eax, cr0
+           or eax, 0x80000001
+           mov cr0, eax
+
+           jmp pword 0x08:__setvars
+
+align 4
+_leave_bootscreen:
diff --git a/kernel/branches/kolibri_pe/boot/bootcode.inc b/kernel/branches/kolibri_pe/boot/bootcode.inc
index 9f2646bdcd..c238d5e6e8 100644
--- a/kernel/branches/kolibri_pe/boot/bootcode.inc
+++ b/kernel/branches/kolibri_pe/boot/bootcode.inc
@@ -32,9 +32,9 @@ putchar:
 print:
 ; in: si->string
         mov     al, 186
-        call    putchar
+        call    word putchar
         mov     al, ' '
-        call    putchar
+        call    word putchar
 
 printplain:
 ; in: si->string
diff --git a/kernel/branches/kolibri_pe/boot/init.asm b/kernel/branches/kolibri_pe/boot/init.asm
new file mode 100644
index 0000000000..81d6e358d9
--- /dev/null
+++ b/kernel/branches/kolibri_pe/boot/init.asm
@@ -0,0 +1,135 @@
+
+format MS COFF
+
+include '../macros.inc'
+
+$Revision: 849 $
+
+include "../const.inc"
+
+public __start
+
+extrn  _high_code
+extrn  __os_stack
+extrn  _boot_mbi
+extrn  _sys_pdbr
+
+extrn  _gdts
+extrn  __edata
+
+section '.init' code readable align 16
+
+use32
+
+align 4
+
+mboot:
+  dd  0x1BADB002
+  dd  0x00010003
+  dd  -(0x1BADB002 + 0x00010003)
+  dd  mboot
+  dd  0x100000
+  dd  __edata; - OS_BASE
+  dd  LAST_PAGE
+  dd  __start
+
+align 16
+__start:
+           cld
+
+           mov esp, __os_stack +(0x100000000-OS_BASE)
+           push 0
+           popf
+
+           cmp eax, 0x2BADB002
+           mov ecx, sz_invboot
+           jne .fault
+
+           bt dword [ebx], 3
+           mov ecx, sz_nomods
+           jnc .fault
+
+           bt dword [ebx], 6
+           mov ecx, sz_nommap
+           jnc .fault
+
+           mov [_boot_mbi+(0x100000000-OS_BASE)], ebx
+
+           xor eax, eax
+           cpuid
+           cmp eax, 0
+           mov ecx, sz_nopse
+           jbe .fault
+
+           mov eax, 1
+           cpuid
+           bt edx, 3
+           mov ecx, sz_nopse
+           jnc .fault
+
+; ENABLE PAGING
+
+           mov ecx, 32
+           mov edi, _sys_pdbr+(OS_BASE shr 20)+(0x100000000-OS_BASE)
+           mov eax, PG_LARGE+PG_SW
+@@:
+           stosd
+           add eax, 4*1024*1024
+           loop @B
+
+           mov dword [_sys_pdbr+(0x100000000-OS_BASE)],   PG_LARGE+PG_SW
+           mov dword [_sys_pdbr+(0x100000000-OS_BASE)+4], PG_LARGE+PG_SW+4*1024*1024
+           mov dword [_sys_pdbr+(0x100000000-OS_BASE)+(page_tabs shr 20)], _sys_pdbr+PG_SW+(0x100000000-OS_BASE)
+
+           mov ebx, cr4
+           or ebx, CR4_PSE
+           and ebx, not CR4_PAE
+           mov cr4, ebx
+
+           mov eax, _sys_pdbr+(0x100000000-OS_BASE)
+           mov ebx, cr0
+           or ebx,CR0_PG+CR0_WP
+
+           mov cr3, eax
+           mov cr0, ebx
+
+           mov ebx, [_boot_mbi+(0x100000000-OS_BASE)]
+
+           mov edx, [ebx+20]
+           mov esi, [ebx+24]
+           mov ecx, LAST_PAGE
+           test edx, edx
+           jz .no_mods
+.scan_mod:
+           mov ecx, [esi+4]
+           add esi, 16
+           dec edx
+           jnz .scan_mod
+
+.no_mods:
+           add ecx, 4095
+           and ecx, not 4095
+
+           lgdt [_gdts+(0x100000000-OS_BASE)]
+           jmp pword 0x08:_high_code
+
+
+.fault:
+;           push ecx
+;           call _lcls
+;           call __bprintf
+_hlt:
+           hlt
+           jmp _hlt
+
+sz_invboot db 'Invalid multiboot loader magic value',0x0A
+           db 'Halted',0
+
+sz_nomods  db 'No modules loaded',0x0A
+           db 'Halted',0
+
+sz_nommap  db 'No memory table', 0x0A
+           db 'Halted',0
+
+sz_nopse   db 'Page size extensions not supported',0x0A
+           db 'Halted',0
diff --git a/kernel/branches/kolibri_pe/const.inc b/kernel/branches/kolibri_pe/const.inc
index 3d20d5e62b..d50d5c9e06 100644
--- a/kernel/branches/kolibri_pe/const.inc
+++ b/kernel/branches/kolibri_pe/const.inc
@@ -198,6 +198,7 @@ OS_TEMP             equ 0xDFC00000
 kernel_tabs         equ (page_tabs+ (OS_BASE shr 10))   ;0xFDE00000
 master_tab          equ (page_tabs+ (page_tabs shr 10)) ;0xFDFF70000
 
+BOOT_BASE           equ 0x00010000
 LOAD_BASE           equ 0x00100000
 OS_BASE             equ 0xE0000000
 
diff --git a/kernel/branches/kolibri_pe/data16.inc b/kernel/branches/kolibri_pe/data16.inc
index 974119f4c8..7dc22ec955 100644
--- a/kernel/branches/kolibri_pe/data16.inc
+++ b/kernel/branches/kolibri_pe/data16.inc
@@ -12,7 +12,7 @@ flm               db 0
 preboot_lfb       db 0
 preboot_bootlog   db 0
 boot_drive        db 0
-bx_from_load:     dw 'r1'  ; структура для хранения параметров- откуда гашрузились, берется ниже из bx ; {SPraid}[13.03.2007]
+_bx_from_load:     dw 'r1'  ; структура для хранения параметров- откуда гашрузились, берется ниже из bx ; {SPraid}[13.03.2007]
                            ; a,b,c,d - винчестеры, r - рам диск
                            ; # диска... символ, а не байт. '1', а не 1
 
diff --git a/kernel/branches/kolibri_pe/data32.inc b/kernel/branches/kolibri_pe/data32.inc
index 5d675a5e6b..578b1ee57f 100644
--- a/kernel/branches/kolibri_pe/data32.inc
+++ b/kernel/branches/kolibri_pe/data32.inc
@@ -171,10 +171,10 @@ end if
 IncludeIGlobals
 
 align 16
-gdts:
+_gdts:
 
-	dw     gdte-$-1
-	dd     gdts
+        dw     0x67; gdte-$-1
+        dd     _gdts
 	dw     0
 
 ; Attention! Do not change the order of the first four selectors. They are used in Fast System Call
diff --git a/kernel/branches/kolibri_pe/fs/parse_fn.inc b/kernel/branches/kolibri_pe/fs/parse_fn.inc
index 142f687304..1e0f5196f4 100644
--- a/kernel/branches/kolibri_pe/fs/parse_fn.inc
+++ b/kernel/branches/kolibri_pe/fs/parse_fn.inc
@@ -40,7 +40,7 @@ proc Parser_params
 locals
   buff db 4 dup(?)		; for test cd
 endl
-  mov eax,[bx_from_load+OS_BASE+LOAD_BASE]
+  mov eax,[_bx_from_load+OS_BASE+BOOT_BASE]
   mov ecx,sysdir_path
   mov [ecx-64],dword 'sys'
   cmp al,'r' ; if ram disk
diff --git a/kernel/branches/kolibri_pe/kernel.asm b/kernel/branches/kolibri_pe/kernel.asm
index 5c4e6d4b14..897bace85f 100644
--- a/kernel/branches/kolibri_pe/kernel.asm
+++ b/kernel/branches/kolibri_pe/kernel.asm
@@ -74,14 +74,14 @@ max_processes	 equ   255
 tss_step	 equ   (128+8192) ; tss & i/o - 65535 ports, * 256=557056*4
 
 
-os_stack       equ  (os_data_l-gdts)	; GDTs
-os_code        equ  (os_code_l-gdts)
-graph_data     equ  (3+graph_data_l-gdts)
-tss0	       equ  (tss0_l-gdts)
-app_code       equ  (3+app_code_l-gdts)
-app_data       equ  (3+app_data_l-gdts)
-pci_code_sel   equ  (pci_code_32-gdts)
-pci_data_sel   equ  (pci_data_32-gdts)
+os_stack       equ  (os_data_l-_gdts)    ; GDTs
+os_code        equ  (os_code_l-_gdts)
+graph_data     equ  (3+graph_data_l-_gdts)
+tss0           equ  (tss0_l-_gdts)
+app_code       equ  (3+app_code_l-_gdts)
+app_data       equ  (3+app_data_l-_gdts)
+pci_code_sel   equ  (pci_code_32-_gdts)
+pci_data_sel   equ  (pci_data_32-_gdts)
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -107,178 +107,29 @@ pci_data_sel   equ  (pci_data_32-gdts)
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+
+public __os_stack
+public _boot_mbi
+public _sys_pdbr
+public _gdts
+public _high_code
+
+public __setvars
+
+extrn _enter_bootscreen
+extrn _leave_bootscreen
+
+extrn _bx_from_load
+
 section '.flat' code readable align 16
 
-public __start
-
-extrn  __edata
-
 use32
-org 0x001001E0
+
+org 0xE0102000
+
 
 align 4
 
-mboot:
-  dd  0x1BADB002
-  dd  0x00010003
-  dd  -(0x1BADB002 + 0x00010003)
-  dd  mboot
-  dd  0x100000
-  dd  __edata;         ;__edata - OS_BASE
-  dd  LAST_PAGE
-  dd  __start
-
-align 16
-__start:
-           cld
-
-           mov esp, __os_stack-OS_BASE
-           push 0
-           popf
-
-           cmp eax, 0x2BADB002
-           mov ecx, sz_invboot
-           jne .fault
-
-           bt dword [ebx], 3
-           mov ecx, sz_nomods
-           jnc .fault
-
-           bt dword [ebx], 6
-           mov ecx, sz_nommap
-           jnc .fault
-
-           mov [_boot_mbi-OS_BASE], ebx
-
-           xor eax, eax
-           cpuid
-           cmp eax, 0
-           mov ecx, sz_nopse
-           jbe .fault
-
-           mov eax, 1
-           cpuid
-           bt edx, 3
-           mov ecx, sz_nopse
-           jnc .fault
-
-; ENABLE PAGING
-
-           mov ecx, 32
-           mov edi, _sys_pdbr+(OS_BASE shr 20)-OS_BASE
-           mov eax, PG_LARGE+PG_SW
-@@:
-           stosd
-           add eax, 4*1024*1024
-           loop @B
-
-           mov dword [_sys_pdbr-OS_BASE],   PG_LARGE+PG_SW
-           mov dword [_sys_pdbr-OS_BASE+4], PG_LARGE+PG_SW+4*1024*1024
-           mov dword [_sys_pdbr-OS_BASE+(page_tabs shr 20)], _sys_pdbr+PG_SW-OS_BASE
-
-           mov ebx, cr4
-           or ebx, CR4_PSE
-           and ebx, not CR4_PAE
-           mov cr4, ebx
-
-           mov eax, _sys_pdbr-OS_BASE
-           mov ebx, cr0
-           or ebx,CR0_PG+CR0_WP
-
-           mov cr3, eax
-           mov cr0, ebx
-
-           mov ebx, [_boot_mbi]
-
-           mov edx, [ebx+20]
-           mov esi, [ebx+24]
-           mov ecx, LAST_PAGE
-           test edx, edx
-           jz .no_mods
-.scan_mod:
-           mov ecx, [esi+4]
-           add esi, 16
-           dec edx
-           jnz .scan_mod
-
-.no_mods:
-           add ecx, 4095
-           and ecx, not 4095
-
-           lgdt [gdts]
-           jmp pword os_code:high_code
-
-
-.fault:
-;           push ecx
-;           call _lcls
-;           call __bprintf
-_hlt:
-           hlt
-           jmp _hlt
-
-sz_invboot db 'Invalid multiboot loader magic value',0x0A
-           db 'Halted',0
-
-sz_nomods  db 'No modules loaded',0x0A
-           db 'Halted',0
-
-sz_nommap  db 'No memory table', 0x0A
-           db 'Halted',0
-
-sz_nopse   db 'Page size extensions not supported',0x0A
-           db 'Halted',0
-
-org $-0x100000
-
-align 4
-
-_enter_bootscreen:
-
-use16
-           mov eax, cr0
-           and eax, not 0x80000001
-           mov cr0, eax
-           jmp far 0x1000:start_of_code
-
-version db    'Kolibri OS  version 0.7.1.0      ',13,10,13,10,0
-
-include "boot/bootstr.inc"     ; language-independent boot messages
-include "boot/preboot.inc"
-
-if lang eq en
-include "boot/booteng.inc"     ; english system boot messages
-else if lang eq ru
-include "boot/bootru.inc"      ; russian system boot messages
-include "boot/ru.inc"	       ; Russian font
-else if lang eq et
-include "boot/bootet.inc"      ; estonian system boot messages
-include "boot/et.inc"	       ; Estonian font
-else
-include "boot/bootge.inc"      ; german system boot messages
-end if
-
-include "data16.inc"
-
-include "boot/bootcode.inc"    ; 16 bit system boot code
-include "bus/pci/pci16.inc"
-include "detect/biosdisk.inc"
-
-;include "boot/shutdown.inc" ; shutdown or restart
-
-           cli
-
-           mov eax, cr0
-           or eax, 0x80000001
-           mov cr0, eax
-
-           jmp pword os_code:__setvars
-
-org $+0x100000
-
-align 4
-_leave_bootscreen:
-
 use32
 
 
@@ -341,8 +192,6 @@ __DEBUG__ fix 1
 __DEBUG_LEVEL__ fix 1
 
 
-org OS_BASE+$
-
 MEM_WB     equ 6               ;write-back memory
 MEM_WC     equ 1               ;write combined memory
 MEM_UC     equ 0               ;uncached memory
@@ -453,7 +302,7 @@ proc test_cpu
 endp
 
 align 4
-high_code:
+_high_code:
 	   mov ax,os_stack
            mov dx,app_data
 	   mov ss,ax
@@ -464,10 +313,9 @@ high_code:
            mov fs, dx
            mov gs, dx
 
-           push ecx
-           push ebx
+;           push ecx
+;           push ebx
 
-         ;  mov dword [sys_pgdir-OS_BASE+(page_tabs shr 20)], sys_pgdir+PG_SW-OS_BASE
 
          ;  bt [cpu_caps], CAPS_PGE
          ;  jnc @F
@@ -478,10 +326,6 @@ high_code:
          ;  or ebx, CR4_PGE
          ;  mov cr4, ebx
 @@:
-         ;  xor eax, eax
-         ;  mov dword [sys_pgdir], eax
-         ;  mov dword [sys_pgdir+4], eax
-
          ;  mov eax, cr3
          ;  mov cr3, eax           ; flush TLB
 
@@ -528,13 +372,14 @@ high_code:
            call _init_mm
            mov [pg_data.pg_mutex], 0
 
-           mov esi, 0x100000
-           mov ecx, (_leave_bootscreen-0x100000)/4
-           mov edi, 0x10000
+           mov esi, _enter_bootscreen
+           mov ecx, _leave_bootscreen
+           shr ecx, 2
+           mov edi, BOOT_BASE
            cld
            rep movsd
 
-           jmp far 0x60:_enter_bootscreen;
+           jmp far 0x60:0x00000;
 
 align 4
 __setvars:
@@ -589,7 +434,7 @@ __setvars:
     mov    [dword apm_data_16 + 4], dl
 
     mov    dword[apm_entry], ebx
-    mov    word [apm_entry + 4], apm_code_32 - gdts
+    mov    word [apm_entry + 4], apm_code_32 - _gdts
 
     mov    eax, [BOOT_VAR + 0x9044]    ; version & flags
     mov    [apm_vf], eax
@@ -804,6 +649,8 @@ __setvars:
 include 'detect/disks.inc'
 ;!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+           xchg bx, bx
+
   call Parser_params
 
 ; READ RAMDISK IMAGE FROM HD
diff --git a/kernel/branches/kolibri_pe/ld.x b/kernel/branches/kolibri_pe/ld.x
index 18a92d377f..ce23e74e06 100644
--- a/kernel/branches/kolibri_pe/ld.x
+++ b/kernel/branches/kolibri_pe/ld.x
@@ -9,7 +9,14 @@ SECTIONS
   . = SIZEOF_HEADERS;
   . = ALIGN(32);
 
-  .flat . + __image_base__ :
+  .boot . + __image_base__ :
+  {
+     *(.boot)
+     *(.init)
+     . = ALIGN(4096);
+  }
+
+  .flat :
   {
      *(.flat)
   }
diff --git a/kernel/branches/kolibri_pe/makefile b/kernel/branches/kolibri_pe/makefile
index e5f89bc4ae..5fb77e8dd6 100644
--- a/kernel/branches/kolibri_pe/makefile
+++ b/kernel/branches/kolibri_pe/makefile
@@ -1,48 +1,37 @@
-FASM=fasm
-FLAGS=-m 65536
-languages=en|ru|ge|et
-drivers_src=sound sis infinity ensoniq ps2mouse uart ati2d vmode
-skins_src=default
-
-.PHONY: all kernel drivers skins clean
-
-all: kernel drivers skins
-
-kernel: check_lang
-	@echo "*** building kernel with language '$(lang)' ..."
-	@mkdir -p bin
-	@echo "lang fix $(lang)" > lang.inc
-	@echo "--- building 'bin/kernel.mnt' ..."
-	@$(FASM) $(FLAGS) kernel.asm bin/kernel.mnt
-	@rm -f lang.inc
-
-drivers:
-	@echo "*** building drivers ..."
-	@mkdir -p bin/drivers
-	@cd drivers; for f in $(drivers_src); do \
-	  echo "--- building 'bin/drivers/$${f}.obj' ..."; \
-	  $(FASM) $(FLAGS) $${f}.asm ../bin/drivers/$${f}.obj; \
-	done
-	@mv bin/drivers/vmode.obj bin/drivers/vmode.mdr
-
-skins:
-	@echo "*** building skins ..."
-	@mkdir -p bin/skins
-	@cd skin; for f in $(skins_src); do \
-	  echo "--- building 'bin/skins/$${f}.skn' ..."; \
-	  $(FASM) $(FLAGS) $${f}.asm ../bin/skins/$${f}.skn; \
-	done
-
-check_lang:
-	@case "$(lang)" in \
-	  $(languages)) \
-	    ;; \
-	  *) \
-	    echo "*** error: language is incorrect or not specified"; \
-	    exit 1; \
-	    ;; \
-	esac
-
-clean:
-	rm -rf bin
-	rm -f lang.inc
+
+CC = gcc
+FASM = fasm.exe
+
+INCLUDE = include
+
+CFLAGS = -c -O2 -I $(INCLUDE) -fomit-frame-pointer -fno-builtin-printf -masm=intel
+LDFLAGS = -shared -s -Map kernel.map --image-base 0x100000 --file-alignment 32 
+
+
+KERNEL_SRC:=			\
+		kernel.asm	\
+		boot/boot.asm	\
+		boot/init.asm
+	   	
+
+KERNEL_OBJS = $(patsubst %.s, bin/%.obj, $(patsubst %.asm, bin/%.obj,\
+            $(patsubst %.c, bin/%.obj, $(KERNEL_SRC))))
+
+
+all: kernel.gz
+
+kernel.gz :kernel.mnt
+	7z a -tgzip kernel.gz kernel.mnt   
+
+kernel.mnt: $(KERNEL_OBJS) Makefile ld.x
+	ld $(LDFLAGS) -T ld.x -o $@ $(KERNEL_OBJS) 
+	
+bin/%.obj: %.asm
+	$(FASM) $< $@
+
+bin/%.obj : core/%.c
+	$(CC) $(CFLAGS) -o $@ -c $<
+
+all: $(SUBDIRS)
+
+.PHONY: all