WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-acpi/kernel.asm

 format binary as "mnt"
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 6319 $
+$Revision: 6339 $
         call    init_mem
         call    init_page_map
 ; ENABLE PAGING
-        mov     eax, sys_proc-OS_BASE+PROC.pdt_0
+        mov     eax, sys_pml3-OS_BASE
         mov     cr3, eax
         mov     eax, PG_GLOBAL
         bt      [cpu_caps], CAPS_PGE
+        jnc     @F
-        jnc     @F
         or      [sys_pml2], eax
-        or      [sys_proc+PROC.pdt_0+(OS_BASE shr 20)], eax
+        or      [sys_pml2+8], eax
         or      ebx, eax
         mov     eax, cr4
         or      eax, CR4_PGE
         mov     cr4, eax
 @@:
         mov     [pte_valid_mask], ebx
         xor     eax, eax
         mov     dword [sys_proc+PROC.pdt_0], eax
         inc     eax
         cmp     eax, ecx
         jbe     @B
+        mov     [sys_proc+PROC.pdt_0_phys], sys_proc-OS_BASE+PROC.pdt_0
-        mov     [sys_proc+PROC.pdt_0_phys], sys_proc-OS_BASE+PROC.pdt_0
+        mov     [sys_proc+PROC.pdt_1_phys], sys_proc-OS_BASE+PROC.pdt_0+4096
         mov     eax, -1
         mov     edi, thr_slot_map+4
         call    PIC_init
         mov     esi, boot_v86machine
         call    boot_log
 ; Initialize system V86 machine
-        call    init_sys_v86
+;        call    init_sys_v86
         mov     esi, boot_inittimer
         call    boot_log
 ;-----------------------------------------------------------------------------
 ; initialisation IDE ATA code
 ;-----------------------------------------------------------------------------
 include 'detect/init_ata.inc'
 ;-----------------------------------------------------------------------------
-if 0
-        mov     ax, [OS_BASE+0x10000+bx_from_load]
-        cmp     ax, 'r1'; if using not ram disk, then load librares and parameters {SPraid.simba}
-        je      no_lib_load
-        mov     esi, boot_loadlibs
-        call    boot_log
-; LOADING LIBRARES
-        stdcall dll.Load, @IMPORT           ; loading librares for kernel (.obj files)
-        call    load_file_parse_table       ; prepare file parse table
-        call    set_kernel_conf             ; configure devices and gui
-no_lib_load:
-end if
         cli
 ; Display APIC status
         mov     esi, boot_APIC_found
         cmp     [irq_mode], IRQ_APIC
         je      @f
         xor     edi, edi
         mov     eax, 0x00040000
         inc     edi
         call    display_number_force
-; BUILD SCHEDULER
-;        call    build_scheduler; sys32.inc
-;        mov     esi, boot_devices
-;        call    boot_log
 include "detect/vortex86.inc"                     ; Vortex86 SoC detection code
-        stdcall load_pe_driver, szVidintel, 0
+;        stdcall load_pe_driver, szVidintel, 0
         mov     [timer_ticks_enable], 1         ; for cd driver
         sti
         jz      .not_found
         mov     ecx, eax
         cli
         call    sysfn_terminate
         call    unlock_application_table
-        sti
+;        sti
         and     dword [esp+32], 0
         ret
 .not_found:
         call    unlock_application_table
         or      dword [esp+32], -1
         mov     [esp+32], eax
         test    eax, eax
         jz      .nomem
         mov     ebx, eax
         shr     ebx, 12
-        or      dword [page_tabs+(ebx-1)*4], DONT_FREE_BLOCK
+        or      dword [page_tabs+(ebx-1)*8], DONT_FREE_BLOCK
         mov     esi, [img_background]
         shr     esi, 12
         mov     ecx, [mem_BACKGROUND]
         add     ecx, 0xFFF
         shr     ecx, 12
 ;--------------------------------------
 align 4
 .z:
-        mov     eax, [page_tabs+ebx*4]
+        mov     eax, [page_tabs+ebx*8]
         test    al, 1
         jz      @f
         call    free_page
 ;--------------------------------------
 align 4
 @@:
-        mov     eax, [page_tabs+esi*4]
+        mov     eax, [page_tabs+esi*8]
         or      al, PG_UWR
-        mov     [page_tabs+ebx*4], eax
+        mov     [page_tabs+ebx*8], eax
         mov     eax, ebx
         shl     eax, 12
         invlpg  [eax]
         inc     ebx
         inc     esi
         cmp     [bgrlockpid], eax
         jnz     .err
         mov     eax, ecx
         mov     ebx, ecx
         shr     eax, 12
-        mov     ecx, [page_tabs+(eax-1)*4]
+        mov     ecx, [page_tabs+(eax-1)*8]
         test    cl, USED_BLOCK+DONT_FREE_BLOCK
         jz      .err
         jnp     .err
         push    eax
         shr     ecx, 12
         dec     ecx
 ;--------------------------------------
 align 4
 @@:
-        and     dword [page_tabs+eax*4], 0
+        and     dword [page_tabs+eax*8], 0
         mov     edx, eax
         shl     edx, 12
         push    eax
         invlpg  [edx]
         pop     eax
         inc     eax
         loop    @b
         pop     eax
-        and     dword [page_tabs+(eax-1)*4], not DONT_FREE_BLOCK
+        and     dword [page_tabs+(eax-1)*8], not DONT_FREE_BLOCK
         stdcall user_free, ebx
         mov     [esp+32], eax
         and     [bgrlockpid], 0
         mov     [bgrlock], 0
         ret
         out     0x70, al
         in      al, 0x71
         add     ecx, edx
         movzx   edx, al
         add     ecx, edx
-        sti
+;        sti
         mov     [esp + 32], ecx
         ret
         mov     ch, al
         mov     al, 9           ; year
         out     0x70, al
         in      al, 0x71
         mov     cl, al
-        sti
+;        sti
         mov     [esp+32], ecx
         ret
         cmp     eax, edx
         jbe     new_port_access
 ;       pop     ebp
 no_unmask_io:
         popad                         ; end enable io map
-        sti
+;        sti
         mov     eax, [RESERVED_PORTS]
         add     eax, 1
         mov     [RESERVED_PORTS], eax

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/kernel.asm @ 4288 – Rev 6319 → 6339