WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-acpi/core/taskman.inc

 ;; Copyright (C) KolibriOS team 2004-2015. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 6317 $
+$Revision: 6319 $
         xor     eax, eax
         cld
         rep stosd
+}
 _strlen:
         mov     ecx, 0xFFFFFFFF
         xor     eax, eax
         repne scasb
         mov     eax, 0xFFFFFFFE
         sub     eax, ecx
-        retn
         retn
 fs_execute_from_sysdir:
         xor     ebx, ebx
          filename_size rd 1 ;0x20
          cmdline_size  rd 1 ;0x24
-       endl
        endl
 xchg bx, bx
         mov     eax, [ebp]
         mov     [flags], edx
-        mov     [cmdline], ebx
-        mov     [filename], eax
-        call    lock_application_table
-        call    alloc_thread_slot
-        mov     esi, -0x20 ; too many processes
-        test    eax, eax
-        jz      .err_0
-        mov     [slot], eax
-        shl     eax, 8
-        add     eax, SLOT_BASE
+        mov     [cmdline], ebx
-        mov     [slot_base], eax
+        mov     [filename], eax
         mov     eax, [filename]
         stdcall load_file, eax
         mov     esi, -ERROR_FILE_NOT_FOUND
         test    eax, eax
-        jz      .err_0
+        jz      .err_file
         mov     [file_base], eax
         mov     [file_size], ebx
+        lea     ebx, [hdr_cmdline]
+        call    test_app_header
+        mov     esi, -0x1F
+        test    eax, eax
+        jz      .err_hdr
+        call    lock_application_table
+        call    alloc_thread_slot
+        mov     esi, -0x20 ; too many processes
+        test    eax, eax
+        jz      .err_0
         lea     ebx, [hdr_cmdline]
-        call    test_app_header
-        mov     esi, -0x1F
+        mov     [slot], eax
-        test    eax, eax
+        shl     eax, 8
-        jz      .err_hdr
+        lea     edi, [SLOT_BASE+eax]
         mov     [slot_base], edi
 ;clean extended information about process
-        mov     edi, [slot_base]
-        mov     ecx, 265/4
+;clean extended information about process
-        xor     eax, eax
+        mov     ecx, 256/4
-        cld
+        xor     eax, eax
-        rep stosd
+        cld
+        rep stosd
 ; write application name
-        lea     eax, [filename]
+; write application name
-        stdcall strrchr, eax, '/'  ; now eax points to name without path
+        stdcall strrchr, [filename], '/'  ; now eax points to name without path
         lea     esi, [eax+1]
         mov     eax, [process_number]       ;set result
         call    unlock_application_table
-        ret
-.err_hdr:
+        ret
         stdcall kernel_free, [file_base]
+.err_0:
+        call    unlock_application_table
+.err_hdr:
-.err_0:
+        stdcall kernel_free, [file_base]
-        call    unlock_application_table
+.err_file:
         mov     eax, esi
         ret
         sub     edx, thr_slot_map
         lea     eax, [eax+edx*8]
         popfd
         ret
 align 4
 proc create_process stdcall, app_size:dword
        locals
          process     dd ?
         mov     eax, [edi-8192+PROC.pdt_0_phys]
         or      eax, PG_SWR
-        mov     [edi-4096+(page_tabs shr 20)], eax
-xchg bx, bx
+        mov     [edi-4096+(page_tabs shr 20)], eax
         lea     edx, [edi-4096]
         mov     esi, [app_tabs]
         add     edx, 4
         dec     esi
+        jnz     .alloc_page_dir
         jnz     .alloc_page_dir
         stdcall map_page, [tmp_task_ptab], 0, PG_UNMAP
         mov     eax, [process]
         pop     edi
-        pop     esi
-        pop     ebx
+        pop     esi
-        ret
+        pop     ebx
+        ret
+.fail:
-.fail:
+        mov     ecx, [process]
-        cmp     [process], 0
+        jcxz    @F
         je      @f
-;;        stdcall destroy_app_space, [dir_addr], 0
+        call destroy_process
 @@:
         xor     eax, eax
         pop     edi
         pop     esi
         pop     ebx
-        ret
-endp
-align 4
-set_cr3:
-        pushfd
-        cli
-        mov     ebx, [current_slot]
-        mov     [current_process], eax
-        mov     [ebx+APPDATA.process], eax
-        mov     eax, [eax+PROC.pdt_0_phys]
-        mov     cr3, eax
-        popfd
+        ret
-        ret
+endp
         cmp     ecx, 0x8000
         jna     @F
         mov     ecx, 0x8000
 @@:
         mov     ebx, [offset]
-      ;     add ebx, new_app_base
         push    ecx
         stdcall map_memEx, [proc_mem_map], \
                 [slot], ebx, ecx, PG_SWR
         pop     ecx
 endp
 align 4
-common_app_entry:
 common_app_entry:
 xchg bx, bx
         mov     ebp, [current_slot]
         mov     ebp, [ebp+APPDATA.exec_params]
 .copy_filename:
         rep movsb
         stosb
 .copy_cmdline:
-        mov     edi, [ebx+APP_HDR.cmdline]
+        mov     edi, [ebp+APP_HDR.cmdline]
-        mov     ecx, [ebx+APP_HDR.cmdline_size]
+        mov     ecx, [ebp+APP_HDR.cmdline_size]
         test    edi, edi
         jz      .check_tls_header
         stdcall kernel_free, ebp
 .exit:
         popad
         iretd
-align 4
-tls_app_entry:
-        call    init_heap
-        stdcall user_alloc, 4096
-        mov     edx, [current_slot]
-        mov     [edx+APPDATA.tls_base], eax
-        mov     [tls_data_l+2], ax
-        shr     eax, 16
-        mov     [tls_data_l+4], al
-        mov     [tls_data_l+7], ah
-        mov     dx, app_tls
-        mov     fs, dx
-        popad
-        iretd
 EFL_IF      equ 0x0200
 EFL_IOPL1   equ 0x1000
 EFL_IOPL2   equ 0x2000
         mov     ebx, [slot]
         mov     eax, ebx
         shl     ebx, 5
         lea     ecx, [draw_data+ebx];ecx - pointer to draw data
-;        mov     edx, common_app_entry
-;        cmp     [ebx*8+SLOT_BASE+APPDATA.tls_base], -1
-;        jne     @F
-;        mov     edx, tls_app_entry
 ;@@:
 ; set window state to 'normal' (non-minimized/maximized/rolled-up) state
         mov     [ebx+window_data+WDATA.fl_wstate], WSTATE_NORMAL
         mov     [ebx+window_data+WDATA.fl_redraw], 1
         add     ebx, CURRENT_TASK     ;ebx - pointer to information about process

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/core/taskman.inc @ 6332 – Rev 6317 → 6319