WebSVN – Kolibri OS – Diff – /kernel/branches/kolibri_pe/kernel.asm

 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
-$Revision: 847 $
+$Revision: 848 $
   dd  0x100000
   dd  __edata - OS_BASE
   dd  LAST_PAGE
   dd  __start
 align 16
 __start:
            cld
            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_pgdir+PG_SW-OS_BASE
+           mov dword [_sys_pdbr-OS_BASE+(page_tabs shr 20)], _sys_pdbr+PG_SW-OS_BASE
            mov ebx, cr4
            or ebx, CR4_PSE
            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:
            db 'Halted',0
 use32
 ; CLEAR KERNEL UNDEFINED GLOBALS
        ;    mov   edi, endofcode-OS_BASE
        ;    mov   ecx, (uglobals_size/4)+4
        ;    rep   stosd
-; SAVE & CLEAR 0-0xffff
-       ;    xor esi, esi
-       ;    mov   edi,0x2F0000
-       ;    mov   ecx,0x10000 / 4
-       ;    rep   movsd
-       ;    xor edi, edi
-       ;    mov   ecx,0x10000 / 4
        ;    rep   stosd
         ;   call test_cpu
 	   bts [cpu_caps-OS_BASE], CAPS_TSC	;force use rdtsc
         ;   call init_BIOS32
-           mov dword [sys_pgdir-OS_BASE], PG_LARGE+PG_SW
+       ;    mov dword [sys_pgdir-OS_BASE], PG_LARGE+PG_SW
-           mov dword [sys_pgdir-OS_BASE+4], PG_LARGE+PG_SW+4*1024*1024
+       ;    mov dword [sys_pgdir-OS_BASE+4], PG_LARGE+PG_SW+4*1024*1024
-           mov ecx, 32
+       ;    mov ecx, 32
-           lea edi, [sys_pgdir-OS_BASE+0xE00]
+       ;    lea edi, [sys_pgdir-OS_BASE+0xE00]
-           mov eax, PG_LARGE+PG_SW
+       ;    mov eax, PG_LARGE+PG_SW
-@@:
+;@@:
-           stosd
+;           stosd
-           add eax, 4*1024*1024
+;           add eax, 4*1024*1024
-           loop @B
+;           loop @B
-           mov ebx, cr4
+;           mov ebx, cr4
-           or ebx, CR4_PSE
+;           or ebx, CR4_PSE
-           and ebx, not CR4_PAE
+;           and ebx, not CR4_PAE
-           mov cr4, ebx
+;           mov cr4, ebx
-	   mov eax, sys_pgdir-OS_BASE
+;           mov eax, sys_pgdir-OS_BASE
-           mov ebx, cr0
+;           mov ebx, cr0
-           or ebx,CR0_PG+CR0_WP
-           mov cr3, eax
-           mov cr0, ebx
-	   lgdt [gdts]
+;           or ebx,CR0_PG+CR0_WP
 	   jmp pword os_code:high_code
+;           mov cr3, eax
 ;           mov cr0, ebx
 align 4
-bios32_entry	dd ?
+;           lgdt [gdts]
-tmp_page_tabs	dd ?
+;           jmp pword os_code:high_code
 	   rep stosd		     ; access to 4096*8=65536 ports
 	   mov	ax,tss0
-	   ltr	ax
-           xchg bx, bx
+	   ltr	ax
            mov ecx, 1280*1024
            fastcall _balloc
            call init_kernel_heap     ; FIXME initialize heap after pager
            call _init_mm
+           mov [pg_data.pg_mutex], 0
+           mov esi, 0x100000
-           mov [pg_data.pg_mutex], 0
+           mov ecx, (_leave_bootscreen-0x100000)/4
+           mov edi, 0x10000
+           cld
+           rep movsd
+           jmp far 0x60:_enter_bootscreen;
+align 4
+__setvars:
+           mov ax,os_stack
+           mov dx,app_data
+	   mov ss,ax
+           mov esp, __os_stack
+           mov ds, dx
+           mov es, dx
+           mov fs, dx
+           mov gs, dx
+; SAVE & CLEAR 0-0xffff
+           xor esi, esi
+           mov   edi,0x2F0000
+           mov   ecx,0x10000 / 4
+           rep   movsd
+           xor edi, edi
            xor eax, eax
-           hlt
+           mov   ecx,0x10000 / 4
            rep   stosd
 	mov   [BytesPerScanLine],word 640*4	    ; Bytes PerScanLine
 	cmp   [SCR_MODE],word 0x13	    ; 320x200
 	je    @f
 	cmp   [SCR_MODE],word 0x12	    ; VGA 640x480
 	je    @f
 	mov   ax,[BOOT_VAR+0x9001]	  ; for other modes
 	mov   [BytesPerScanLine],ax
 @@:
 	mov	esi, BOOT_VAR+0x9080
 	movzx	ecx, byte [esi-1]
 	mov   [BgrDataHeight],eax
 	mov    [mem_BACKGROUND],4095
 	stdcall kernel_alloc, [mem_BACKGROUND]
 	mov [img_background], eax
-	mov	[SLOT_BASE + 256 + APPDATA.dir_table], sys_pgdir - OS_BASE
+        mov     [SLOT_BASE + 256 + APPDATA.dir_table], _sys_pdbr - OS_BASE
 ;include 'boot/rdload.inc'
 ;!!!!!!!!!!!!!!!!!!!!!!!
 ;    mov    [dma_hdd],1
 ; CALCULATE FAT CHAIN FOR RAMDISK
 	call  calculatefatchain
   ; READ TSC / SECOND
 	mov   esi,boot_tsc
 	call  boot_log
 	cli
 	call  _rdtsc
 	mov   ecx,eax
 	mov   esi,250		    ; wait 1/4 a second
 	call  delay_ms
 	call  _rdtsc
 	sti
 	sub   eax,ecx
 	shl   eax,2
 	mov   [CPU_FREQ],eax	      ; save tsc / sec
 ;  je  no_st_network
 ;        call set_network_conf
 ;  no_st_network:
-; LOAD FIRST APPLICATION
-	cli
+; LOAD FIRST APPLICATION
 	cmp   byte [BOOT_VAR+0x9030],1
 ; UNMASK ALL IRQ'S
 	mov   esi,boot_allirqs
-	call  boot_log
 	call  boot_log
 	cli			     ;guarantee forbidance of interrupts.
-	mov   al,0		     ; unmask all irq's
+        mov   al,0                   ; unmask all irq's
 	out   0xA1,al
 ;        mov    [dma_hdd],1
 	cmp	[IDEContrRegsBaseAddr], 0
 	setnz	[dma_hdd]
 	mov [timer_ticks_enable],1		; for cd driver
-;        stdcall init_uart_service, DRV_ENTRY
 	sti
 	call change_task
 	 mov   bx,word [boot_y]
 	 add   [boot_y],dword 10
 	 mov   ecx,0x80ffffff	; ASCIIZ string with white color
 	 mov   edx,esi
 	 mov   edi,1
-	 call  dtext
+         call  dtext
 	 mov   [novesachecksum],1000
     mov    eax,ecx
     call   pid_to_slot
     test   eax,eax
     jz	   .not_found
     mov    ecx,eax
+    pushfd
     cli
     call   sysfn_terminate
     mov    [application_table_status],0
-    sti
+    popfd
     and    dword [esp+32],0
     ret
 .not_found:
     mov    [application_table_status],0
     or	   dword [esp+32],-1
      mov   eax,0xffffffff
      ret
-rerouteirqs:
-	cli
+rerouteirqs:
 	mov	al,0x11 	;  icw4, edge triggered
 	out	0x20,al
 	call	pic_delay
 	out	0xA1,al
 	call	pic_delay
 	out	0x21,al
 	call	pic_delay
-	cli
 	ret

Subversion Repositories Kolibri OS

(root)/kernel/branches/kolibri_pe/kernel.asm – Rev 847 → 848