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

 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
-$Revision: 846 $
+$Revision: 847 $
 ;;    - Pci32.inc     PCI functions
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                                                      ;;
-;;                  16 BIT ENTRY FROM BOOTSECTOR                        ;;
-;;                                                                      ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-use16
-		  org	0x0
-		  jmp	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
+use32
+org 0x100000
-include "boot/bootge.inc"      ; german system boot messages
+mboot:
+  dd  0x1BADB002
-end if
+  dd  0x00010003
+  dd  -(0x1BADB002 + 0x00010003)
+  dd  mboot
+  dd  0x100000
-include "boot/bootcode.inc"    ; 16 bit system boot code
-include "bus/pci/pci16.inc"
-include "detect/biosdisk.inc"
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  dd  __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
-;;                  SWITCH TO 32 BIT PROTECTED MODE                     ;;
+           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
-; CR0 Flags - Protected mode and Paging
-	mov ecx, CR0_PE
-; Enabling 32 bit protected mode
-	sidt	[cs:old_ints_h]
+           cmp eax, 0
-	cli				; disable all irqs
-	cld
-	mov	al,255			; mask all irqs
-	out	0xa1,al
-	out	0x21,al
-   l.5: in	al, 0x64		; Enable A20
-	test	al, 2
-	jnz	l.5
-	mov	al, 0xD1
-	out	0x64, al
-   l.6: in	al, 0x64
+           mov ecx, sz_nopse
+           jbe .fault
-	test	al, 2
+           mov eax, 1
-	jnz	l.6
+           cpuid
-	mov	al, 0xDF
+           bt edx, 3
-	out	0x60, al
+           mov ecx, sz_nopse
-   l.7: in	al, 0x64
-	test	al, 2
-	jnz	l.7
+           jnc .fault
+; ENABLE PAGING
-	mov	al, 0xFF
-	out	0x64, al
-	lgdt	[cs:tmp_gdt]		; Load GDT
-	mov	eax, cr0		; protected mode
-	or	eax, ecx
-	and	eax, 10011111b *65536*256 + 0xffffff ; caching enabled
-	mov	cr0, eax
+           mov ecx, 32
-	jmp	pword os_code:B32	; jmp to enable 32 bit mode
-align 8
-tmp_gdt:
-	dw     23
+           mov edi, _sys_pdbr+(OS_BASE shr 20)-OS_BASE
-	dd     tmp_gdt+0x10000
+           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_pgdir+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:
-	dw     0
+           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:
-	dw     0xffff
-	dw     0x0000
-	db     0x00
-	dw     11011111b *256 +10011010b
-	db     0x00
-	dw     0xffff
-	dw     0x0000
-	db     0x00
-	dw     11011111b *256 +10010010b
-	db     0x00
+           hlt
+           jmp _hlt
-include "data16.inc"
+sz_invboot db 'Invalid multiboot loader magic value',0x0A
-use32
+           db 'Halted',0
-org $+0x10000
+sz_nomods  db 'No modules loaded',0x0A
-align 4
+           db 'Halted',0
-B32:
-	   mov	 ax,os_stack	   ; Selector for os
+sz_nommap  db 'No memory table', 0x0A
-	   mov	 ds,ax
+           db 'Halted',0
-	   mov	 es,ax
-	   mov	 fs,ax
+sz_nopse   db 'Page size extensions not supported',0x0A
-	   mov	 gs,ax
+           db 'Halted',0
-	   mov	 ss,ax
-	   mov	 esp,0x3ec00	   ; Set stack
 ; CLEAR 0x280000 - HEAP_BASE
-	   xor	 eax,eax
+       ;    xor   eax,eax
-	   mov	 edi,0x280000
+       ;    mov   edi,0x280000
-           mov   ecx,(0x800000-0x280000) / 4
+       ;    mov   ecx,(0x800000-0x280000) / 4
-	   cld
+       ;    cld
-	   rep	 stosd
+       ;    rep   stosd
-	   mov	 edi,0x40000
+       ;    mov   edi,0x40000
-	   mov	 ecx,(0x90000-0x40000)/4
+       ;    mov   ecx,(0x90000-0x40000)/4
            mov ebx, cr4
            or ebx, CR4_PSE
            and ebx, not CR4_PAE
            mov cr4, ebx
 ; ENABLE PAGING
 	   mov eax, sys_pgdir-OS_BASE
 align 4
 bios32_entry	dd ?
 tmp_page_tabs	dd ?
-use16
+;use16
-org $-0x10000
+;org $-0x10000
-include "boot/shutdown.inc" ; shutdown or restart
+;include "boot/shutdown.inc" ; shutdown or restart
-org $+0x10000
+;org $+0x10000
-use32
+;use32
 __DEBUG__ fix 1
-__DEBUG_LEVEL__ fix 1
+__DEBUG__ fix 1
-include 'init.inc'
+__DEBUG_LEVEL__ fix 1
+include 'printf.inc'
+include 'core/mm.asm'
+include 'core/init.asm'
+align 4
+proc test_cpu
+           locals
+              cpu_type   dd ?
+              cpu_id     dd ?
+              cpu_Intel  dd ?
+              cpu_AMD    dd ?
+           endl
+           mov [cpu_type], 0
+           xor eax, eax
+           mov [cpu_caps], eax
+           mov [cpu_caps+4], eax
+           pushfd
+           pop eax
+           mov ecx, eax
+           xor eax, 0x40000
+           push eax
+           popfd
+           pushfd
+           pop eax
+           xor eax, ecx
+           mov [cpu_type], CPU_386
+           jz .end_cpuid
+           push ecx
+           popfd
+           mov [cpu_type], CPU_486
+           mov eax, ecx
+           xor eax, 0x200000
+           push eax
+           popfd
+           pushfd
+           pop eax
+           xor eax, ecx
+           je .end_cpuid
+           mov [cpu_id], 1
+           xor eax, eax
+           cpuid
+           mov [cpu_vendor], ebx
+           mov [cpu_vendor+4], edx
+           mov [cpu_vendor+8], ecx
+           cmp ebx, dword [intel_str]
+           jne .check_AMD
+           cmp edx, dword [intel_str+4]
+           jne .check_AMD
+           cmp ecx, dword [intel_str+8]
+           jne .check_AMD
+           mov [cpu_Intel], 1
+           cmp eax, 1
+           jl .end_cpuid
+           mov eax, 1
+           cpuid
+           mov [cpu_sign], eax
+           mov [cpu_info],  ebx
+           mov [cpu_caps],  edx
+           mov [cpu_caps+4],ecx
+           shr eax, 8
+           and eax, 0x0f
+           ret
+.end_cpuid:
+           mov eax, [cpu_type]
+           ret
+.check_AMD:
+           cmp ebx, dword [AMD_str]
+           jne .unknown
+           cmp edx, dword [AMD_str+4]
+           jne .unknown
+           cmp ecx, dword [AMD_str+8]
+           jne .unknown
+           mov [cpu_AMD], 1
+           cmp eax, 1
+           jl .unknown
+           mov eax, 1
+           cpuid
+           mov [cpu_sign], eax
+           mov [cpu_info],  ebx
+           mov [cpu_caps],  edx
+           mov [cpu_caps+4],ecx
+           shr eax, 8
+           and eax, 0x0f
+           ret
+.unknown:
+           mov eax, 1
+           cpuid
+           mov [cpu_sign], eax
+           mov [cpu_info],  ebx
+           mov [cpu_caps],  edx
+           mov [cpu_caps+4],ecx
+           shr eax, 8
-include 'printf.inc'
+           and eax, 0x0f
-include 'core/mm.asm'
+           ret
 endp
 align 4
 high_code:
 	   mov ax,os_stack
-	   mov bx,app_data
+           mov dx,app_data
 	   mov ss,ax
-	   add	esp, OS_BASE
+           mov esp, __os_stack
+           mov ds, dx
-	   mov ds,bx
+           mov es, dx
-	   mov es,bx
-	   mov fs,bx
+           mov fs, dx
+           mov gs, dx
-	   mov gs,bx
-           mov dword [sys_pgdir-OS_BASE+(page_tabs shr 20)], sys_pgdir+PG_SW-OS_BASE
-	   bt [cpu_caps], CAPS_PGE
-	   jnc @F
-           or dword [sys_pgdir-OS_BASE+(OS_BASE shr 20)], PG_GLOBAL
+           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
+         ;  or dword [sys_pgdir-OS_BASE+(OS_BASE shr 20)], PG_GLOBAL
 	   mov ebx, cr4
-	   or ebx, CR4_PGE
+         ;  mov ebx, cr4
-	   mov cr4, ebx
+         ;  or ebx, CR4_PGE
-@@:
-	   xor eax, eax
-	   mov dword [sys_pgdir], eax
-	   mov dword [sys_pgdir+4], eax
+         ;  mov cr4, ebx
-	   mov eax, cr3
-	   mov cr3, eax 	  ; flush TLB
-           mov edx, 0x3fB
-           mov eax, 3
-           out dx, al
+@@:
-; MEMORY MODEL
-           mov ecx, 1280*1024
-           fastcall _balloc
+         ;  xor eax, eax
-           mov [_display_data], eax
+         ;  mov dword [sys_pgdir], eax
+         ;  mov dword [sys_pgdir+4], eax
            mov ecx, (unpack.LZMA_BASE_SIZE+(unpack.LZMA_LIT_SIZE shl \
-                    (unpack.lc+unpack.lp)))*4
+         ;  mov eax, cr3
-           fastcall _balloc
+         ;  mov cr3, eax           ; flush TLB
            mov [unpack.p], eax
            mov edx, 0x3fB
 	   rep stosd		     ; access to 4096*8=65536 ports
 	   mov	ax,tss0
+	   ltr	ax
+           xchg bx, bx
+           mov ecx, 1280*1024
+           fastcall _balloc
+           mov [_display_data], eax
+           mov ecx, (unpack.LZMA_BASE_SIZE+(unpack.LZMA_LIT_SIZE shl \
+                    (unpack.lc+unpack.lp)))*4
+           fastcall _balloc
+           mov [unpack.p], eax
-	   ltr	ax
+; MEMORY MODEL
            call init_kernel_heap     ; FIXME initialize heap after pager
+           call _init_mm
+           mov [pg_data.pg_mutex], 0
-           call _init_mm
+           hlt
            mov [pg_data.pg_mutex], 0
 ;include 'boot/rdload.inc'
 ;!!!!!!!!!!!!!!!!!!!!!!!
 ;    mov    [dma_hdd],1
 ; CALCULATE FAT CHAIN FOR RAMDISK
-        mov [_rd_base],     OS_BASE+0x100000
-        mov [_rd_fat],      OS_BASE+0x100000 + 512
-        mov [_rd_fat_end],  OS_BASE+0x100000 + 512 + 4278
-        mov [_rd_root],     OS_BASE+0x100000 + 512*19
         mov [_rd_root_end], OS_BASE+0x100000 + 512*33
 	call  calculatefatchain
-  mov ax,[OS_BASE+0x10000+bx_from_load]
+ ; mov ax,[OS_BASE+0x10000+bx_from_load]
-  cmp ax,'r1'		; if using not ram disk, then load librares and parameters {SPraid.simba}
+ ; cmp ax,'r1'           ; if using not ram disk, then load librares and parameters {SPraid.simba}
-  je  no_lib_load
+ ; je  no_lib_load
 ; LOADING LIBRARES
-   stdcall dll.Load,@IMPORT		    ; loading librares for kernel (.obj files)
+;   stdcall dll.Load,@IMPORT                 ; loading librares for kernel (.obj files)
-   call load_file_parse_table		    ; prepare file parse table
+;   call load_file_parse_table               ; prepare file parse table
-   call set_kernel_conf 		    ; configure devices and gui
+;   call set_kernel_conf                     ; configure devices and gui
 	; name for OS/IDLE process
 	mov dword [SLOT_BASE+256+APPDATA.app_name],   dword 'OS/I'
 	mov dword [SLOT_BASE+256+APPDATA.app_name+4], dword 'DLE '
-	mov edi, [os_stack_seg]
+        mov edi,  __os_stack-8192+512
 	mov dword [SLOT_BASE+256+APPDATA.pl0_stack], edi
 	add edi, 0x2000-512
 	mov dword [SLOT_BASE+256+APPDATA.fpu_state], edi
 	   stdcall map_page,tss._io_map_0,\
 		   (tss._io_map_0-OS_BASE), PG_MAP
 	   stdcall map_page,tss._io_map_1,\
 		   (tss._io_map_1-OS_BASE), PG_MAP
-  mov ax,[OS_BASE+0x10000+bx_from_load]
+;  mov ax,[OS_BASE+0x10000+bx_from_load]
-  cmp ax,'r1'		; if not rused ram disk - load network configuration from files {SPraid.simba}
+;  cmp ax,'r1'           ; if not rused ram disk - load network configuration from files {SPraid.simba}
-  je  no_st_network
+;  je  no_st_network
-	call set_network_conf
+;        call set_network_conf
-  no_st_network:
+;  no_st_network:
 ; LOAD FIRST APPLICATION
 	call  set_lights
      ;// mike.dld ]
 ; START MULTITASKING
-if preboot_blogesc
+;if preboot_blogesc
-	mov	esi, boot_tasking
+;        mov     esi, boot_tasking
-	call	boot_log
+;        call    boot_log
-.bll1:	in	al, 0x60	; wait for ESC key press
+;.bll1:  in      al, 0x60        ; wait for ESC key press
-	cmp	al, 129
+;        cmp     al, 129
-	jne	.bll1
+;        jne     .bll1
-end if
+;end if
 	   xor	ebx,ebx
 	   or	ecx,-1
 	   mov	edx, OS_BASE+0x70000
 	   call fileread
-	   mov	esi, restart_kernel_4000+OS_BASE+0x10000 ; move kernel re-starter to 0x4000:0
+   ;        mov  esi, restart_kernel_4000+OS_BASE+0x10000 ; move kernel re-starter to 0x4000:0
-	   mov	edi,OS_BASE+0x40000
+   ;        mov  edi,OS_BASE+0x40000
-	   mov	ecx,1000
+   ;        mov  ecx,1000
-	   rep	movsb
+   ;        rep  movsb
-	   mov	esi,OS_BASE+0x2F0000	; restore 0x0 - 0xffff
+           mov  esi,OS_BASE+0x2F0000    ; restore 0x0 - 0xffff
-	   mov	edi, OS_BASE
+           mov  edi, OS_BASE
 	   mov al, 0xFF
 	   out 0x21, al
 	   out 0xA1, al
 if 1
-	   mov	word [OS_BASE+0x467+0],pr_mode_exit
+       ;    mov  word [OS_BASE+0x467+0],pr_mode_exit
-	   mov	word [OS_BASE+0x467+2],0x1000
+       ;    mov  word [OS_BASE+0x467+2],0x1000
 	   mov	al,0x0F
 	   out	0x70,al
 __REV__ = __REV
 uglobals_size = $ - endofcode
+diff16 "end of kernel code",0,$
+align 16

Subversion Repositories Kolibri OS

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