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

 format binary as "mnt"
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 5049 $
+$Revision: 5130 $
         call    init_mem
         call    init_page_map
 ; ENABLE PAGING
-        mov     eax, sys_pgdir-OS_BASE
+        mov     eax, sys_proc-OS_BASE+PROC.pdt_0
         mov     cr3, eax
         mov     gs, bx
         bt      [cpu_caps], CAPS_PGE
         jnc     @F
-        or      dword [sys_pgdir+(OS_BASE shr 20)], PG_GLOBAL
+        or      dword [sys_proc+PROC.pdt_0+(OS_BASE shr 20)], PG_GLOBAL
         mov     ebx, cr4
         or      ebx, CR4_PGE
         mov     cr4, ebx
 @@:
         xor     eax, eax
-        mov     dword [sys_pgdir], eax
+        mov     dword [sys_proc+PROC.pdt_0], eax
-        mov     dword [sys_pgdir+4], eax
+        mov     dword [sys_proc+PROC.pdt_0+4], eax
         mov     [LFBSize], 0xC00000
         call    init_LFB
         call    init_fpu
         call    init_malloc
-        stdcall alloc_kernel_space, 0x51000
+        stdcall alloc_kernel_space, 0x50000         ; FIXME check size
         mov     [default_io_map], eax
         add     eax, 0x2000
         add     eax, ebx
         mov     [proc_mem_tab], eax
-        add     eax, ebx
-        mov     [tmp_task_pdir], eax
         add     eax, ebx
         mov     [tmp_task_ptab], eax
 ; SET UP OS TASK
         mov     esi, boot_setostask
+        call    boot_log
+        mov     edi, sys_proc
+        list_init edi
+        lea     ecx, [edi+PROC.thr_list]
+        list_init ecx
+        mov     [edi+PROC.pdt_0_phys], sys_proc-OS_BASE+PROC.pdt_0
+        mov     eax, -1
+        mov     edi, thr_slot_map+4
+        mov     [edi-4], dword 0xFFFFFFF8
+        stosd
+        stosd
+        stosd
+        stosd
+        stosd
+        stosd
+        stosd
-        call    boot_log
+        mov     [current_process], sys_proc
-        mov     edx, SLOT_BASE+256
+        mov     edx, SLOT_BASE+256*1
         mov     ebx, [os_stack_seg]
         add     ebx, 0x2000
         call    setup_os_slot
         mov     ds, bx
         mov     es, bx
         mov     fs, cx
         mov     gs, bx
         xor     esp, esp
-        mov     eax, sys_pgdir-OS_BASE
+        mov     eax, sys_proc-OS_BASE+PROC.pdt_0
         mov     cr3, eax
         lock inc [ap_initialized]
         jmp     idle_loop
         mov     dword [edx+APPDATA.fd_obj], eax
         mov     dword [edx+APPDATA.bk_obj], eax
         mov     dword [edx+APPDATA.cur_dir], sysdir_path
+        mov     [edx + APPDATA.process], sys_proc
+        lea     ebx, [edx+APPDATA.list]
         lea     ecx, [sys_proc+PROC.thr_list]
-        mov     [edx + APPDATA.dir_table], sys_pgdir - OS_BASE
+        list_add_tail ebx, ecx
         mov     eax, edx
         mov     eax, [def_cursor]
         mov     [ecx+APPDATA.cursor], eax
         movzx   eax, word [MOUSE_Y]
-        movzx   ebx, word [MOUSE_X]
-;        mov     ecx, [Screen_Max_X]
-;        inc     ecx
-;        mul     ecx
+        movzx   ebx, word [MOUSE_X]
         mov     eax, [d_width_calc_area + eax*4]
         add     eax, [_WinMapAddress]
         lea     edi, [ebx+12]
         xor     eax, eax
         mov     edx, 0x100000*16
         cmp     ecx, 1 shl 5
         je      .os_mem
-        mov     edx, [SLOT_BASE+ecx*8+APPDATA.mem_size]
+        mov     edx, [SLOT_BASE+ecx*8+APPDATA.process]
+        mov     edx, [edx+PROC.mem_used]
         mov     eax, std_application_base_address
 .os_mem:
         stosd
         lea     eax, [edx-1]
         stosd
         mov     [esp+32], eax
         ret
 ;---------------------------------------------------------------------------------------------
-; check if pixel is allowed to be drawn
-;checkpixel:
-;        push    eax edx
-;;        mov     edx, [Screen_Max_X] ; screen x size
-;;        inc     edx
-;;        imul    edx, ebx
-;        mov     edx, [d_width_calc_area + ebx*4]
-;        add     eax, [_WinMapAddress]
-;        mov     dl, [eax+edx]; lea eax, [...]
-;        xor     ecx, ecx
-;        mov     eax, [CURRENT_TASK]
-;        cmp     al, dl
-;        setne   cl
-;        pop     edx eax
 ;        ret
 iglobal
   cpustring db 'CPU',0
 markz:
         push    ecx edx
         cmp     [edx+TASKDATA.state], 9
         jz      .nokill
         lea     edx, [(edx-(CURRENT_TASK and 1FFFFFFFh))*8+SLOT_BASE]
-        cmp     [edx+APPDATA.dir_table], sys_pgdir - OS_BASE
+        cmp     [edx+APPDATA.process], sys_proc
         jz      .nokill
         call    request_terminate
         jmp     .common
 .nokill:
         dec     byte [SYS_SHUTDOWN]

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm – Rev 5049 → 5130