WebSVN – Kolibri OS – Diff – /kernel/trunk/kernel.asm

 ;           btr [cpu_caps], CAPS_FXSR   ;test: disable sse support
                                         ;all sse commands rise #UD exption
 ;           btr [cpu_caps], CAPS_PSE    ;test: don't use large pages
 ;           btr [cpu_caps], CAPS_PGE    ;test: don't use global pages
 ;           btr [cpu_caps], CAPS_MTRR   ;test: don't use MTRR
-;           btr [cpu_caps], CAPS_TSC    ;test: don't use TSC
+;           bts [cpu_caps], CAPS_TSC    ;test: don't use TSC
            call init_memEx
            call init_page_map
-           mov eax, sys_pgdir     ;+PG_NOCACHE
+           mov eax, sys_pgdir
            mov cr3, eax
            mov eax,cr0
            or eax,CR0_PG
            mov cr0,eax
            call init_kernel_heap
-           call init_kernel_heap
+           call init_LFB
-           call init_LFB
+           call init_mtrr
            mov edi, eax
            mov esi, szKernel
            mov ecx, 16
            rep movsb
-           clts
-           fninit
-           bt [cpu_caps], CAPS_FXSR
-           jnc .no_FXSR
-           stdcall kernel_alloc, 512*256
-           mov [fpu_data], eax
-           mov ebx, cr4
-           mov ecx, cr0
-           or ebx, CR4_OSFXSR+CR4_OSXMMEXPT
-           mov cr4, ebx
-           and ecx, not (CR0_MP+CR0_EM)
-           or ecx, CR0_NE
-           mov cr0, ecx
-           mov dword [esp-4], SSE_INIT
-           ldmxcsr [esp-4]
-           xorps xmm0, xmm0
-           xorps xmm1, xmm1
-           xorps xmm2, xmm2
-           xorps xmm3, xmm3
-           xorps xmm4, xmm4
-           xorps xmm5, xmm5
-           xorps xmm6, xmm6
-           xorps xmm7, xmm7
-           jmp .set_cr
-.no_FXSR:
-           stdcall kernel_alloc, 112*256
-           mov [fpu_data], eax
-           mov ebx, cr4
-           mov ecx, cr0
-           and ebx, not (CR4_OSFXSR+CR4_OSXMMEXPT)
-           and ecx, not CR0_EM
-           or ecx, CR0_MP+CR0_NE
-           mov cr0, ecx
-           mov cr4, ebx
 .set_cr:
            mov edi, irq_tab
            xor eax, eax
            mov ecx, 16
         call   build_scheduler ; sys32.inc
-; LOAD IDT
-        lidt   [cs:idtreg]
-;The CPU to this moment should be already in PM,
-;and bit MP of the register cr0 should be installed in 1.
-;finit ;reset of the FPU (finit, instead of fninit)
-;fsetpm ;enable PM of the FPU
-;finit ;reset the registers, contents which are still equal RM
+; LOAD IDT
-;Now FPU too in PM
+        lidt   [cs:idtreg]
-; DETECT DEVICES
+        cli
         mov   esi,boot_setmouse
         call  boot_log
+        call  setmouse
+        mov  [pci_access_enabled],1
-        call  setmouse
+        stdcall get_service, szHMouse
 ; SET PRELIMINARY WINDOW STACK AND POSITIONS
 ; SET UP OS TASK
-        mov  esi,boot_setostask
-        call boot_log
-        ; name for OS/IDLE process
+        mov  esi,boot_setostask
-        mov  dword [0x80000+256+APPDATA.app_name],   dword 'OS/I'
+        call boot_log
         mov  dword [0x80000+256+APPDATA.app_name+4], dword 'DLE '
         mov eax, [fpu_data]
         mov  dword [0x80000+APPDATA.fpu_state], eax
+        mov  dword [0x80000+APPDATA.fpu_handler], 0
+        mov  dword [0x80000+APPDATA.sse_handler], 0
+        ; name for OS/IDLE process
+        mov  dword [0x80000+256+APPDATA.app_name],   dword 'OS/I'
+        mov  dword [0x80000+256+APPDATA.app_name+4], dword 'DLE '
+        mov  dword [0x80000+256+APPDATA.fpu_handler], 0
-        mov  dword [0x80000+APPDATA.fpu_handler], 0
+        mov  dword [0x80000+256+APPDATA.sse_handler], 0
         mov  dword [0x80000+APPDATA.sse_handler], 0
 ;set fpu save area
+        mov esi, eax
+        bt [cpu_caps], CAPS_FXSR
+        jnc .no_sse
-        add eax, 112
+        lea edi, [eax+512]
-        bt [cpu_caps], CAPS_FXSR
+        mov  dword [0x80000+256+APPDATA.fpu_state], edi
-        jnc .no_sse
+        mov ecx, 512/4
-        add eax, 512-112
+        jmp @F
 .no_sse:
+        lea edi, [eax+112]
+        mov  dword [0x80000+256+APPDATA.fpu_state], edi
+        mov ecx, 112/4
-        mov  dword [0x80000+256+APPDATA.fpu_state], eax
+@@:
-        mov  dword [0x80000+256+APPDATA.fpu_handler], 0
+        rep movsd
         mov  dword [0x80000+256+APPDATA.sse_handler], 0
         ; task list
         ret
 sysfn_shutdown:         ; 18.1 = BOOT
      mov  [0x2f0000+0x9030],byte 0
+  for_shutdown_parameter:
+     call stop_all_services
   for_shutdown_parameter:
      mov  eax,[0x3004]
      add  eax,2
      mov  [shutdown_processes],eax
      mov  [0xFF00],al
      popad
-     ret
      ret
 r_f_port_area:
      mov   [edi+8],ecx
      xor   eax, eax
-     ret
      ret
 free_port_area:
      dec   ecx
    ril1:
      mov   [esp+36],ecx ; return in eax
      ret
 drawbackground:
        inc   [mouse_pause]
        cmp   [0xfe0c],word 0x12
        je   dbrv20
    ret_rdtsc:
      mov   edx,0xffffffff
      mov   eax,0xffffffff
      ret
 rerouteirqs:
   buttontype         dd 0x0
   windowtypechanged  dd 0x0
 align 4
-align 4
+  cpu_caps    dd 4 dup(0)
-  pg_data  PG_DATA
-  heap_test   dd ?
+  pg_data  PG_DATA
-  cpu_caps    dd 4 dup(0)
+  heap_test   dd ?
 endg

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm – Rev 212 → 214