WebSVN – Kolibri OS – Path Comparison – / – /kernel/branches/ Rev 848 and /kernel/branches/ Rev 849

Regard whitespace Rev 848 → Rev 849

 /kernel/branches/kolibri_pe/data32.inc
 ,8 → 269,12
 endofcode:
 gdte:
-__edata:  ;equ $-OS_BASE
+edata:  ;equ $-OS_BASE
+section '.bss' code readable align 4096
+org edata
 align 4096
 _sys_pdbr   rd 1024

/kernel/branches/kolibri_pe/detect/disks.inc
11,7 → 11,4
include 'dev_fd.inc'
include 'dev_hdcd.inc'
include 'getcache.inc'

; jmp __12345
include 'sear_par.inc'
;__12345:

 /kernel/branches/kolibri_pe/kernel.asm
 ,3 → 1,6
+format MS COFF
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Copyright (C) KolibriOS team 2004-2008. All rights reserved.
 ,10 → 107,17
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+section '.flat' code readable align 16
+public __start
+extrn  __edata
 use32
-org 0x100000
+org 0x001001E0
+align 4
 mboot:
   dd  0x1BADB002
   dd  0x00010003
 ,7 → 124,7
   dd  -(0x1BADB002 + 0x00010003)
   dd  mboot
   dd  0x100000
-  dd  __edata - OS_BASE
+  dd  __edata;         ;__edata - OS_BASE
   dd  LAST_PAGE
   dd  __start
 ,10 → 5486,7
 __REV__ = __REV
-uglobals_size = $ - endofcode
-diff16 "end of kernel code",0,$
+;uglobals_size = $ - endofcode
+;diff16 "end of kernel code",0,$
-align 16
-__end:

 /kernel/branches/kolibri_pe/ld.x
 ,0 → 1,34
+ENTRY(__start)
+OUTPUT_FORMAT(pei-i386)
+SECTIONS
+{
+  . = SIZEOF_HEADERS;
+  . = ALIGN(32);
+  .flat . + __image_base__ :
+  {
+     *(.flat)
+  }
+  __edata = .;
+  .bss  ALIGN(4096) :
+  {
+    *(.bss) *(COMMON)
+  }
+  /DISCARD/ :
+  {
+    *(.debug$S)
+    *(.debug$T)
+    *(.debug$F)
+    *(.drectve)
+    *(.reloc)
+    *(.edata)
+  }
+}