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

Regard whitespace Rev 849 → Rev 848

/kernel/branches/kolibri_pe/ld.x
File deleted

 /kernel/branches/kolibri_pe/data32.inc
 ,12 → 269,8
 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,4 → 11,7
include 'dev_fd.inc'
include 'dev_hdcd.inc'
include 'getcache.inc'

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

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