WebSVN – Kolibri OS – Diff – /kernel/trunk/core/taskman.inc

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2021. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2022. All rights reserved. ;;
 ;;  Distributed under terms of the GNU General Public License.  ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 9710 $
+$Revision: 9715 $
         mov     esi, -TASKMAN_ERROR_TOO_MANY_PROCESSES
         test    eax, eax
         jz      .err_0
         mov     [slot], eax
-        shl     eax, 8
+        shl     eax, BSF sizeof.APPDATA
-        lea     edi, [SLOT_BASE+eax]
+        lea     edi, [SLOT_BASE + eax]
         mov     [slot_base], edi
 ; clean extended information about process
         mov     ecx, sizeof.APPDATA/4
         xor     eax, eax
         mov     esi, -TASKMAN_ERROR_OUT_OF_MEMORY
         test    eax, eax
         jz      .err_hdr
 ; add new process to the list
-        mov     ebx, [sys_proc+LHEAD.prev]
+        mov     ebx, [sys_proc + LHEAD.prev]
         __list_add eax, ebx, sys_proc
 ; fill the structure fields:
         mov     ebx, [hdr_emem]
-        mov     [eax+PROC.mem_used], ebx
+        mov     [eax + PROC.mem_used], ebx
 ; write that main thread of app belongs to new process
         mov     ebx, [slot_base]
-        mov     [ebx+APPDATA.process], eax
+        mov     [ebx + APPDATA.process], eax
 ; initialize the thread list of process: at this moment it consists only of one main thread
-        lea     edx, [ebx+APPDATA.list]
+        lea     edx, [ebx + APPDATA.list]
-        lea     ecx, [eax+PROC.thr_list]
+        lea     ecx, [eax + PROC.thr_list]
         list_add_tail edx, ecx
 ; allocate space and copy app header data locals and cmdline string there, put pointer to exec_params of new thread
         mov     eax, [cmdline_size]
         add     eax, sizeof.APP_HDR
         stdcall kernel_alloc, eax
-        mov     [ebx+APPDATA.exec_params], eax
+        mov     [ebx + APPDATA.exec_params], eax
         mov     edi, eax
         cmp     [eax+6], word '00'
         jne     .check_01_header
         mov     ecx, [APP_HEADER_00.start]
-        mov     [ebx+APP_HDR.eip], ecx
+        mov     [ebx + APP_HDR.eip], ecx
         mov     edx, [APP_HEADER_00.mem_size]
-        mov     [ebx+APP_HDR._emem], edx
+        mov     [ebx + APP_HDR._emem], edx
         shr     edx, 1
         sub     edx, 0x10
-        mov     [ebx+APP_HDR.esp], edx
+        mov     [ebx + APP_HDR.esp], edx
         mov     ecx, [APP_HEADER_00.i_param]
-        mov     [ebx+APP_HDR.cmdline], ecx
+        mov     [ebx + APP_HDR.cmdline], ecx
-        mov     [ebx+APP_HDR.path], 0
+        mov     [ebx + APP_HDR.path], 0
         mov     edx, [APP_HEADER_00.i_end]
-        mov     [ebx+APP_HDR._edata], edx
+        mov     [ebx + APP_HDR._edata], edx
         ret
  .check_01_header:
         cmp     [eax+6], word '01'
         je      @f
         cmp     [eax+6], word '02'
         jne     .fail
 @@:
         mov     ecx, [APP_HEADER_01.start]
-        mov     [ebx+0x08], ecx
+        mov     [ebx + 0x08], ecx
         mov     edx, [APP_HEADER_01.mem_size]
 ; \begin{diamond}[20.08.2006]
 ; sanity check (functions 19,58 load app_i_end bytes and that must
 ; fit in allocated memory to prevent kernel faults)
         cmp     edx, [APP_HEADER_01.i_end]
         jb      .fail
 ; \end{diamond}[20.08.2006]
-        mov     [ebx+APP_HDR._emem], edx
+        mov     [ebx + APP_HDR._emem], edx
         mov     ecx, [APP_HEADER_01.stack_top]
-        mov     [ebx+APP_HDR.esp], ecx
+        mov     [ebx + APP_HDR.esp], ecx
         mov     edx, [APP_HEADER_01.i_param]
-        mov     [ebx+APP_HDR.cmdline], edx
+        mov     [ebx + APP_HDR.cmdline], edx
         mov     ecx, [APP_HEADER_01.i_icon]
-        mov     [ebx+APP_HDR.path], ecx
+        mov     [ebx + APP_HDR.path], ecx
         cli
 .l1:
         bsf     eax, [edx]
         jnz     .found
         add     edx, 4
-        cmp     edx, thr_slot_map+32
+        cmp     edx, thr_slot_map + 32
         jb      .l1
         popfd
         xor     eax, eax
         ret
 .found:
         btr     [edx], eax
         sub     edx, thr_slot_map
-        lea     eax, [eax+edx*8]
+        lea     eax, [eax + edx*8]
         popfd
         ret
         stdcall kernel_alloc, 0x2000
         test    eax, eax
         jz      .fail
         mov     [process], eax
-        lea     edi, [eax+PROC.heap_lock]
+        lea     edi, [eax + PROC.heap_lock]
-        mov     ecx, (PROC.ht_free-PROC.heap_lock)/4
+        mov     ecx, (PROC.ht_free - PROC.heap_lock)/4
         list_init eax
         cmp     eax, ecx
         jbe     @B
         mov     eax, edi
         call    get_pg_addr
-        mov     [edi-4096+PROC.pdt_0_phys], eax
+        mov     [edi - 4096 + PROC.pdt_0_phys], eax
         mov     ecx, (OS_BASE shr 20)/4
         xor     eax, eax
         rep stosd
         mov     ecx, (OS_BASE shr 20)/4
-        mov     esi, sys_proc+PROC.pdt_0+(OS_BASE shr 20)
+        mov     esi, sys_proc + PROC.pdt_0 + (OS_BASE shr 20)
         rep movsd
-        mov     eax, [edi-8192+PROC.pdt_0_phys]
+        mov     eax, [edi - 8192 + PROC.pdt_0_phys]
         or      eax, PG_SWR
         push    ecx
         mov     esi, ecx
         list_del esi
-        mov     esi, [esi+PROC.dlls_list_ptr]
+        mov     esi, [esi + PROC.dlls_list_ptr]
         call    destroy_all_hdlls
         ret
 align 4
 get_pid:
         mov     eax, [current_slot]
-        mov     eax, [eax+APPDATA.tid]
+        mov     eax, [eax + APPDATA.tid]
         ret
 pid_to_slot:
 ;Search process by PID.
         push    ebx
         push    ecx
         mov     ebx, [thread_count]
         shl     ebx, BSF sizeof.APPDATA ; multiply by size
-        ; add 2*32 cause:
-        ; [TASK_TABLE; TASK_TABLE + 32) isnt a task actually
         ; skip first process in the task table
-        ;mov     ecx, 2*32    ;sizeof.TASKDATA
         mov     ecx, sizeof.APPDATA
 .loop:
 ;ecx = offset of current process info entry
 ;ebx = maximum permitted offset
         cmp     [SLOT_BASE + ecx + APPDATA.state], TSTATE_FREE
         jz      .endloop ;skip empty slots
-        cmp     [ecx + SLOT_BASE + APPDATA.tid], eax;check PID
+        cmp     [SLOT_BASE + ecx + APPDATA.tid], eax
         jz      .pid_found
 .endloop:
         add     ecx, sizeof.APPDATA
         cmp     ecx, ebx
         mov     esi, [current_slot]
         mov     ebx, esi      ;ebx=esi - pointer to extended information about current thread
         mov     edi, eax
-        shl     edi, 8
+        shl     edi, BSF sizeof.APPDATA
         add     edi, SLOT_BASE
         mov     edx, edi      ;edx=edi - pointer to extended infomation about new thread
         mov     ecx, sizeof.APPDATA/4
         mov     edi, edx
         mov     ecx, 11
         rep movsb             ;copy process name
-        mov     eax, [ebx+APPDATA.tls_base]
+        mov     eax, [ebx + APPDATA.tls_base]
         test    eax, eax
         jz      @F
         push    edx
         stdcall user_alloc, 4096
         pop     edx
         test    eax, eax
         jz      .failed1;eax=0
 @@:
-        mov     [edx+APPDATA.tls_base], eax
+        mov     [edx + APPDATA.tls_base], eax
-        mov     eax, [ebx+APPDATA.process]
+        mov     eax, [ebx + APPDATA.process]
-        mov     [edx+APPDATA.process], eax
+        mov     [edx + APPDATA.process], eax
 endp
 align 4
 common_app_entry:
         mov     ebp, [current_slot]
-        mov     ebp, [ebp+APPDATA.exec_params]
+        mov     ebp, [ebp + APPDATA.exec_params]
         test    ebp, ebp
         jz      .exit
 ; APPDATA.exec_params have first thread only,
 ; so second and next threads don't get here (they jump to .exit)
-        stdcall map_process_image, [ebp+APP_HDR._emem],\
+        stdcall map_process_image, [ebp + APP_HDR._emem],\
-                [ebp+APP_HDR.img_base], [ebp+APP_HDR.img_size]
+                [ebp + APP_HDR.img_base], [ebp + APP_HDR.img_size]
-        mov     esi, [ebp+APP_HDR.path_string]
+        mov     esi, [ebp + APP_HDR.path_string]
-        mov     edi, [ebp+APP_HDR.path]
+        mov     edi, [ebp + APP_HDR.path]
-        mov     ecx, [ebp+APP_HDR.filename_size]
+        mov     ecx, [ebp + APP_HDR.filename_size]
         cmp     ecx, 1023
         jc      @f
         mov     ecx, 1022
 @@:
         push    esi
         test    edi, edi
         jz      @f
-        stdcall is_region_userspace, edi, [ebp+APP_HDR.filename_size]
+        stdcall is_region_userspace, edi, [ebp + APP_HDR.filename_size]
         jnz     @f
         mov     al, '/'
         stosb
         rep movsb
         mov     byte [edi], 0
 @@:
         call    kernel_free
-        mov     edi, [ebp+APP_HDR.cmdline]
+        mov     edi, [ebp + APP_HDR.cmdline]
         test    edi, edi
         jz      .check_tls_header
-        lea     esi, [ebp+sizeof.APP_HDR]
+        lea     esi, [ebp + sizeof.APP_HDR]
-        mov     ecx, [ebp+APP_HDR.cmdline_size]
+        mov     ecx, [ebp + APP_HDR.cmdline_size]
         cmp     ecx, 256
         jb      .copy_cmdline
-        mov     edi, [ebp+APP_HDR._emem]
+        mov     edi, [ebp + APP_HDR._emem]
         add     edi, 4095
         and     edi, -4096
         sub     edi, ecx
         dec     edi
         cmp     word [6], '02'
         jne     .try_load_dll ;.cleanup
         call    init_heap
         stdcall user_alloc, 4096
         mov     edx, [current_slot]
-        mov     [edx+APPDATA.tls_base], eax
+        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
 ; { Patch by Coldy, For DLL autoload
 .try_load_dll:
 ; Test app header version
-        mov     ecx, dword[ebp+APP_HDR.img_base]
+        mov     ecx, dword[ebp + APP_HDR.img_base]
         cmp     dword[ecx+8], 2
         jne     .cleanup
 ;if APP_HEADER.version = 2 => load lib/dll.obj & change eip to APP_STARTUP_THUNK
         DEBUGF 1, 'K : App header version 2\n'
         stdcall load_library, dll_lib_path, 0
         sub     eax, 4
         mov     eax, [eax]
 ;.change_eip:
         mov     ecx, [current_slot]
-        mov     ecx, [ecx+APPDATA.pl0_stack]
+        mov     ecx, [ecx + APPDATA.pl0_stack]
         mov     [ecx+REG_EIP], eax
 ; } End patch by Coldy, For DLL autoload
 .cleanup:
         stdcall free_kernel_space, [ebp+APP_HDR.img_base]
         stdcall kernel_free, ebp
         mov     ebx, [current_slot]
-        cmp     [ebx+APPDATA.debugger_slot], 0
+        cmp     [ebx + APPDATA.debugger_slot], 0
         je      .exit
-        mov     [ebx+APPDATA.state], TSTATE_RUN_SUSPENDED
+        mov     [ebx + APPDATA.state], TSTATE_RUN_SUSPENDED
         mov     [ebx + APPDATA.state], TSTATE_RUN_SUSPENDED
         call    change_task
 .exit:
         mov     eax, [slot]
         mov     ebx, eax
         shl     eax, BSF sizeof.APPDATA
-        mov     [eax+SLOT_BASE+APPDATA.fpu_state], edi
+        mov     [SLOT_BASE + eax + APPDATA.fpu_state], edi
-        mov     [eax+SLOT_BASE+APPDATA.exc_handler], 0
+        mov     [SLOT_BASE + eax + APPDATA.exc_handler], 0
-        mov     [eax+SLOT_BASE+APPDATA.except_mask], 0
+        mov     [SLOT_BASE + eax + APPDATA.except_mask], 0
-        mov     [eax+SLOT_BASE+APPDATA.terminate_protection], 80000001h
+        mov     [SLOT_BASE + eax + APPDATA.terminate_protection], 80000001h
 ;set default io permission map
-        mov     ecx, [SLOT_BASE+sizeof.APPDATA+APPDATA.io_map]
+        mov     ecx, [SLOT_BASE + sizeof.APPDATA + APPDATA.io_map]
-        mov     [eax+SLOT_BASE+APPDATA.io_map], ecx
+        mov     [SLOT_BASE + eax + APPDATA.io_map], ecx
-        mov     ecx, [SLOT_BASE+sizeof.APPDATA+APPDATA.io_map+4]
+        mov     ecx, [SLOT_BASE + sizeof.APPDATA + APPDATA.io_map + 4]
-        mov     [eax+SLOT_BASE+APPDATA.io_map+4], ecx
+        mov     [SLOT_BASE + eax + APPDATA.io_map + 4], ecx
         mov     esi, fpu_data
         mov     ecx, [xsave_area_size]
         add     ecx, 3
         shr     ecx, 2
         rep movsd
         cmp     [thread_count], ebx
         adc     [thread_count], 0   ; update number of processes
         shl     ebx, BSF sizeof.APPDATA
-        lea     edx, [ebx+SLOT_BASE+APP_EV_OFFSET]
+        lea     edx, [SLOT_BASE + ebx + APP_EV_OFFSET]
-        mov     [SLOT_BASE+APPDATA.fd_ev+ebx], edx
+        mov     [SLOT_BASE + ebx + APPDATA.fd_ev], edx
-        mov     [SLOT_BASE+APPDATA.bk_ev+ebx], edx
+        mov     [SLOT_BASE + ebx + APPDATA.bk_ev], edx
-        add     edx, APP_OBJ_OFFSET-APP_EV_OFFSET
+        add     edx, APP_OBJ_OFFSET - APP_EV_OFFSET
-        mov     [SLOT_BASE+APPDATA.fd_obj+ebx], edx
+        mov     [SLOT_BASE + ebx + APPDATA.fd_obj], edx
-        mov     [SLOT_BASE+APPDATA.bk_obj+ebx], edx
+        mov     [SLOT_BASE + ebx + APPDATA.bk_obj], edx
         mov     ecx, [def_cursor]
-        mov     [SLOT_BASE+APPDATA.cursor+ebx], ecx
+        mov     [SLOT_BASE + ebx + APPDATA.cursor], ecx
         mov     eax, [pl0_stack]
-        mov     [SLOT_BASE+APPDATA.pl0_stack+ebx], eax
+        mov     [SLOT_BASE + ebx + APPDATA.pl0_stack], eax
         add     eax, RING0_STACK_SIZE
-        mov     [SLOT_BASE+APPDATA.saved_esp0+ebx], eax
+        mov     [SLOT_BASE + ebx + APPDATA.saved_esp0], eax
         push    ebx
         stdcall kernel_alloc, maxPathLength
         pop     ebx
         mov     esi, [current_slot]
-        mov     esi, [esi+APPDATA.cur_dir]
+        mov     esi, [esi + APPDATA.cur_dir]
         mov     ecx, maxPathLength/4
         mov     edi, eax
-        mov     [ebx+SLOT_BASE+APPDATA.cur_dir], eax
+        mov     [SLOT_BASE + ebx + APPDATA.cur_dir], eax
         rep movsd
-        mov     [ebx+SLOT_BASE+APPDATA.event_mask], dword 1+2+4;set default event flags (see 40 function)
+        mov     [SLOT_BASE + ebx + APPDATA.event_mask], dword 1+2+4;set default event flags (see 40 function)
         inc     dword [process_number]
         mov     eax, [process_number]
-        mov     [ebx+SLOT_BASE+APPDATA.tid], eax    ;set TID
+        mov     [SLOT_BASE + ebx + APPDATA.tid], eax    ;set TID
         mov     eax, [slot]
-        mov     [ebx+SLOT_BASE+APPDATA.wnd_number], al
+        mov     [SLOT_BASE + ebx + APPDATA.wnd_number], al
         mov     ebx, eax
         mov     eax, [screen_workarea.bottom]
         mov     [ecx+12], eax
         mov     ebx, [pl0_stack]
         mov     esi, [params]
-        lea     ecx, [ebx+REG_EIP]
+        lea     ecx, [ebx + REG_EIP]
         xor     eax, eax
-        mov     [ebx+REG_RET], dword common_app_entry
+        mov     [ebx + REG_RET], dword common_app_entry
-        mov     [ebx+REG_EDI], eax
+        mov     [ebx + REG_EDI], eax
-        mov     [ebx+REG_ESI], eax
+        mov     [ebx + REG_ESI], eax
-        mov     [ebx+REG_EBP], eax
+        mov     [ebx + REG_EBP], eax
-        mov     [ebx+REG_ESP], ecx;ebx+REG_EIP
+        mov     [ebx + REG_ESP], ecx;ebx+REG_EIP
-        mov     [ebx+REG_EBX], eax
+        mov     [ebx + REG_EBX], eax
-        mov     [ebx+REG_EDX], eax
+        mov     [ebx + REG_EDX], eax
-        mov     [ebx+REG_ECX], eax
+        mov     [ebx + REG_ECX], eax
-        mov     [ebx+REG_EAX], eax
+        mov     [ebx + REG_EAX], eax
-        mov     eax, [esi+APP_HDR.eip]
+        mov     eax, [esi + APP_HDR.eip]
-        mov     [ebx+REG_EIP], eax
+        mov     [ebx + REG_EIP], eax
-        mov     [ebx+REG_CS], dword app_code
+        mov     [ebx + REG_CS], dword app_code
         mov     ecx, USER_PRIORITY
         test    byte [flags], 2
         jz      @F
-        mov     [ebx+REG_CS], dword os_code ; kernel thread
+        mov     [ebx + REG_CS], dword os_code ; kernel thread
         mov     ecx, MAX_PRIORITY
 @@:
-        mov     [ebx+REG_EFLAGS], dword EFL_IOPL1+EFL_IF
+        mov     [ebx + REG_EFLAGS], dword EFL_IOPL1+EFL_IF
-        mov     eax, [esi+APP_HDR.esp]
+        mov     eax, [esi + APP_HDR.esp]
-        mov     [ebx+REG_APP_ESP], eax
+        mov     [ebx + REG_APP_ESP], eax
-        mov     [ebx+REG_SS], dword app_data
+        mov     [ebx + REG_SS], dword app_data
-        lea     edx, [ebx+REG_RET]
+        lea     edx, [ebx + REG_RET]
         mov     ebx, [slot]
         shl     ebx, BSF sizeof.APPDATA
-        mov     [ebx+SLOT_BASE+APPDATA.saved_esp], edx
+        mov     [SLOT_BASE + ebx + APPDATA.saved_esp], edx
         xor     edx, edx; process state - running
 ; set if debuggee
         test    byte [flags], 1
         jz      .no_debug
         mov     eax, [current_slot_idx]
-        mov     [SLOT_BASE+ebx+APPDATA.debugger_slot], eax
+        mov     [SLOT_BASE + ebx + APPDATA.debugger_slot], eax
 .no_debug:
         mov     [SLOT_BASE + ebx + APPDATA.state], dl
-        lea     edx, [SLOT_BASE+ebx]
+        lea     edx, [SLOT_BASE + ebx]
         call    scheduler_add_thread
         ret

Subversion Repositories Kolibri OS

(root)/kernel/trunk/core/taskman.inc – Rev 9710 → 9715