WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-A/trunk/kernel.asm

 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
-$Revision: 1678 $
+$Revision: 1683 $
 include "boot/bootcode.inc"    ; 16 bit system boot code
 include "bus/pci/pci16.inc"
+include "detect/biosdisk.inc"
-include "detect/biosdisk.inc"
+diff16 "end of code16  ",0,$
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                      ;;
 ;;                  SWITCH TO 32 BIT PROTECTED MODE                     ;;
-        dw     0x0000
+	dw     0x0000
-        db     0x00
+	db     0x00
-        dw     11011111b *256 +10010010b
+	dw     11011111b *256 +10010010b
-        db     0x00
+	db     0x00
+diff16 "end of tmp_gdt ",0,$
+include "data16.inc"
-include "data16.inc"
+diff16 "end of data16  ",0,$
 use32
 org $+0x10000
 align 4
-align 4
+B32:
-B32:
+diff16 "32-bit code start ",0,$
-           mov   ax,os_stack       ; Selector for os
+	   mov	 ax,os_stack	   ; Selector for os
-           mov   ds,ax
+	   mov	 ds,ax
-           mov   es,ax
+	   mov	 es,ax
-           mov   fs,ax
+	   mov	 fs,ax
-           mov   gs,ax
-           mov   ss,ax
-           mov   esp,0x3ec00       ; Set stack
-; CLEAR 0x280000 - HEAP_BASE
+	   mov	 gs,ax
-           xor   eax,eax
+	   mov	 ss,ax
-           mov   edi,0x280000
+	   mov	 esp,0x4ec00	   ; Set stack
-           mov   ecx,(HEAP_BASE-OS_BASE-0x280000) / 4
-           cld
-           rep   stosd
+;-------------------------------------------------------------------------------
-           mov   edi,0x40000
-           mov   ecx,(0x90000-0x40000)/4
-           rep   stosd
+	   call preinit_mem	; (init.inc)
-; 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
-           mov   edi,0x1000
+	   call test_cpu	; (init.inc - to be moved to bus/CPU.inc)
-           mov   ecx,0xf000 / 4
+	   bts [cpu_caps-OS_BASE], CAPS_TSC	;force use rdtsc
-           rep   stosd
 	   call init_BIOS32	; (init.inc - to be removed later)
            call test_cpu
-           bts [cpu_caps-OS_BASE], CAPS_TSC     ;force use rdtsc
+; PCIe extended config space access
-        movzx   ecx, byte [esi-1]
+	movzx	ecx, byte [esi-1]
-        mov     [NumBiosDisks], ecx
+	mov	[NumBiosDisks], ecx
-        mov     edi, BiosDisksData
+	mov	edi, BiosDisksData
-        rep     movsd
+	rep	movsd
 ; GRAPHICS ADDRESSES
-        and     byte [BOOT_VAR+0x901e],0x0
+	and	byte [BOOT_VAR+0x901e],0x0
-        mov     eax,[BOOT_VAR+0x9018]
-        mov     [LFBAddress],eax
+	mov	eax,[BOOT_VAR+0x9018]
 	mov	[LFBAddress],eax
 ;==
-	cmp     [SCR_MODE],word 0100000000000000b
+	cmp	[SCR_MODE],word 0100000000000000b
-        jge     setvesa20
+	jge	setvesa20
 	mov	eax, 0xDEADBEEF
-	hlt
-;        ===  EGA, VGA & Vesa 1.2 modes not supported ===
-      setvesa20:
-;        mov     [PUTPIXEL],dword Vesa20_putpixel24  ; Vesa 2.0 24bpp modes
-;        mov     [GETPIXEL],dword Vesa20_getpixel24
+	hlt
-;        cmp     [ScreenBPP],byte 24
+;        ===  EGA, VGA & Vesa 1.2 modes not supported ===
-;        jz      v20ga24
+setvesa20:
-      v20ga32:
+v20ga32:
-        mov     [PUTPIXEL],dword Vesa20_putpixel32
-        mov     [GETPIXEL],dword Vesa20_getpixel32
-; -------- Fast System Call init ----------
-; Intel SYSENTER/SYSEXIT (AMD CPU support it too)
-;           bt [cpu_caps], CAPS_SEP
-;           jnc .SEnP   ; SysEnter not Present
-;           xor edx, edx
-;           mov ecx, MSR_SYSENTER_CS
-;           mov eax, os_code
-;           wrmsr
-;           mov ecx, MSR_SYSENTER_ESP
-;;           mov eax, sysenter_stack ; Check it
-;           xor     eax, eax
-;           wrmsr
+	mov	[PUTPIXEL],dword Vesa20_putpixel32
-;           mov ecx, MSR_SYSENTER_EIP
+	mov	[GETPIXEL],dword Vesa20_getpixel32
-;           mov eax, sysenter_entry
-;           wrmsr
-.SEnP:
-; AMD SYSCALL/SYSRET
-;           cmp byte[cpu_vendor], 'A'
-;          jne .noSYSCALL
 ;           mov eax, 0x80000001
-;           cpuid
+; -------- Fast System Call init ----------
-;           test edx, 0x800  ; bit_11 - SYSCALL/SYSRET support
+.SEnP:
-;           jz .noSYSCALL
+; AMD SYSCALL/SYSRET
-           mov ecx, MSR_AMD_EFER
+	   mov ecx, MSR_AMD_EFER
-           rdmsr
+	   rdmsr
-           or eax, 1   ; bit_0 - System Call Extension (SCE)
+	   or eax, 1   ; bit_0 - System Call Extension (SCE)
-           wrmsr
+	   wrmsr
-        ; Bits of EDX :
+	; Bits of EDX :
-        ; Bit 3116 During the SYSRET instruction, this field is copied into the CS register
+	; Bit 31..16 During the SYSRET instruction, this field is copied into the CS register
-           mov [LFBSize], 0x800000
+	   mov [LFBSize], 0x800000
-           call init_LFB
+	   call init_LFB
-           call init_fpu
+	   call init_fpu
-           call init_malloc
+	   call init_malloc
 ;-
-           stdcall alloc_kernel_space, 0x51000
+	   stdcall alloc_kernel_space, 0x51000
-           mov [default_io_map], eax
+	   mov [default_io_map], eax
-        sub   eax,ecx
+	sub   eax,ecx
-        shl   eax,2
+	shl   eax,2
-        mov   [CPU_FREQ],eax          ; save tsc / sec
+	mov   [CPU_FREQ],eax	      ; save tsc / sec
 ;       mov ebx, 1000000
 ;       div ebx
-; ¢®®¡é¥-â® ¯à®¨§¢®¤¨â¥«ì®áâì ¢ ¤ ®¬ ª®ªà¥â®¬ ¬¥áâ¥
-; á®¢¥àè¥® ¥ªà¨â¨ç , ® çâ®¡ë § âªãâì «î¡¨â¥«¥©
-; ®¯â¨¬¨§¨àãîé¨å ª®¬¯¨«ïâ®à®¢ ...
+; faster division possible:
-        mov     edx, 2251799814
+	mov	edx, 2251799814
-        mul     edx
+	mul	edx
-        shr     edx, 19
+	shr	edx, 19
-        mov [stall_mcs], edx
+	mov [stall_mcs], edx
 ; PRINT CPU FREQUENCY
 ; STACK AND FDC
-        call  stack_init
+	call  stack_init
-        call  fdc_init
-; PALETTE FOR 320x200 and 640x480 16 col
-;        cmp   [SCR_MODE],word 0x12
-;        jne   no_pal_vga
-;        mov   esi,boot_pal_vga
-;        call  boot_log
-;        call  paletteVGA
-;      no_pal_vga:
-;        cmp   [SCR_MODE],word 0x13
-;        jne   no_pal_ega
-;        mov   esi,boot_pal_ega
-;        call  boot_log
-;        call  palette320x200
+	call  fdc_init
 ;      no_pal_ega:
   no_st_network:
-        call init_userDMA	; <<<<<<<<< ============== core/memory.inc =================
+	call init_userDMA	; <<<<<<<<< ============== core/memory.inc =================
-        mov     esi, boot_uDMA_ok
+	mov	esi, boot_uDMA_ok
-        call    boot_log
-;	call pci_ext_config	; <<<<<<<<< bus/pci/pcie.inc
-;-------------------------------------------------------------------------------
-        call rs7xx_pcie_init    ; <<<<<<<<< bus/ht.inc
+	call	boot_log
 ; LOAD FIRST APPLICATION
-        stc
+	stc
 .ok:
-        ret
+	ret
 end if
+diff16 "End of 32-code ",0,$
 include "data32.inc"
+__REV__ = __REV
-__REV__ = __REV

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-A/trunk/kernel.asm – Rev 1678 → 1683