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: 6332 $
+$Revision: 6339 $
         xor     eax, eax
         mov     [process], eax
         mov     eax, [app_size]
-        add     eax, 0x3FFFFF
+        add     eax, 0x1FFFFF
-        shr     eax, 22
+        shr     eax, 21
         mov     [app_tabs], eax
-        stdcall kernel_alloc, 0x2000
+        stdcall kernel_alloc, 0x3000
         test    eax, eax
         jbe     @B
         mov     eax, edi
         call    get_pg_addr
+        mov     [edi-4096+PROC.pdt_0_phys], eax
+        lea     eax, [edi+4096]
+        call    get_pg_addr
-        mov     [edi-4096+PROC.pdt_0_phys], eax
+        mov     [edi-4096+PROC.pdt_1_phys], eax
-        mov     ecx, (OS_BASE shr 20)/4
+        mov     ecx, 2048
-        xor     eax, eax
-        rep stosd
-        mov     ecx, (OS_BASE shr 20)/4
-        mov     esi, sys_proc+PROC.pdt_0+(OS_BASE shr 20)
-        rep movsd
-        mov     eax, [edi-8192+PROC.pdt_0_phys]
-        or      eax, PG_SWR
+        xor     eax, eax
-        mov     [edi-4096+(page_tabs shr 20)], eax
+        rep stosd
-        lea     edx, [edi-4096]
+        lea     edx, [edi-8192]
         mov     esi, [app_tabs]
 .alloc_page_dir:
         call    alloc_page
+        test    eax, eax
-        test    eax, eax
+        jz      .fail
-        jz      .fail
+        or      eax, PG_UWR
-        or      eax, PG_UWR
+        mov     [edx], eax
-        mov     [edx], eax
+        mov     [edx+4], dword 0
         mov     edi, [tmp_task_ptab]
         stdcall map_page, edi, eax, PG_SWR
         mov     ecx, 1024
         xor     eax, eax
         rep stosd
 proc destroy_page_table stdcall, pg_tab:dword
         push    esi
         mov     esi, [pg_tab]
-        mov     ecx, 1024
+        mov     ecx, 512
 .free:
         mov     eax, [esi]
         test    eax, 1
         jz      .next
         test    eax, 2
         jz      .next
         test    eax, 1 shl 9
         jnz     .next                     ;skip shared pages
         call    free_page
 .next:
-        add     esi, 4
+        add     esi, 8
         dec     ecx
         jnz     .free
         pop     esi
         mov     esi, [esi+PROC.dlls_list_ptr]
         call    destroy_all_hdlls
         mov     esi, [esp]
         add     esi, PROC.pdt_0
-        mov     edi, (0x80000000 shr 20)/4
+        mov     edi, 1024
 .destroy:
         mov     eax, [esi]
         test    eax, 1
         jz      .next
         and     eax, not 0xFFF
         stdcall map_page, [tmp_task_ptab], eax, PG_SWR
         stdcall destroy_page_table, [tmp_task_ptab]
         mov     eax, [esi]
         call    free_page
 .next:
-        add     esi, 4
+        add     esi, 8
         dec     edi
         jnz     .destroy
         add     ecx, 4095
         shr     edx, 12        ; total pages
         shr     ecx, 12        ; image pages
         mov     edi, page_tabs
-        shr     esi, 10
+        shr     esi, 9
         add     esi, edi
 .map_image:
         lodsd
         and     eax, -4096
+        or      eax, PG_UWR
-        or      eax, PG_UWR
+        stosd
-        stosd
+        movsd
         dec     edx
         loop    .map_image
         test    eax, eax
         jz      .fail
         or      eax, PG_UWR
+        stosd
+        xor     eax, eax
         stosd
         dec     edx
         jnz     .map_bss
         jnz     .copy_filename
         add     esi, ecx
+        jmp     .check_cmdline
+.copy_full_path:
+        mov     esi, [current_slot]
+        mov     esi, [esi+APPDATA.cur_dir]
+        mov     ebx, 1023
+        mov     al, '/'
+        stosb
+.copy_path:
+        dec     ebx
+        jz      .finish_path
+        lodsb
+        stosb
+        test    al, al
+        jnz     .copy_path
+        mov     byte [edi-1], '/'
+        cmp     ecx, ebx
+        jbe     @F
+        mov     ecx, ebx
+@@:
+        lea     esi, [ebp+sizeof.APP_HDR]
+        xor     eax, eax
+        rep movsb
+        stosb
+        jmp     .check_cmdline
+.finish_path:
+        xor     eax, eax
+        stosb
         jmp     .check_cmdline
+.copy_filename:
+        cmp     byte [esi], '/'
         jne     .copy_full_path
 .copy_filename:
         rep movsb
         stosb
         mov     [tls_data_l+7], ah
         mov     dx, app_tls
         mov     fs, dx
 .cleanup:
-        stdcall free_kernel_space, [ebp+APP_HDR.img_base]
+;        stdcall free_kernel_space, [ebp+APP_HDR.img_base]
-        stdcall kernel_free, ebp
+;        stdcall kernel_free, ebp
 .exit:
         popad
         iretd

Subversion Repositories Kolibri OS

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