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
 ;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     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+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

Subversion Repositories Kolibri OS

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