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

    cld
    rep stosd
+}
 align 4
-proc fs_exec_EX stdcall file_name:dword, cmd_line:dword, flags:dword
+proc fs_exec stdcall file_name:dword, cmd_line:dword, flags:dword
            locals
              save_cr3      dd ?
              slot          dd ?
              slot_base     dd ?
              app_cmdline   dd ? ;0x00
              app_path      dd ? ;0x04
              app_eip       dd ? ;0x08
              app_esp       dd ? ;0x0C
              app_mem       dd ? ;0x10
+             app_i_end     dd ? ;0x14
            endl
            stdcall load_file,[file_name]
            mov  ecx, -ERROR_FILE_NOT_FOUND
            test eax, eax
            jz .err_file
-           mov [file_base], eax
-           mov [file_size], ebx
-           pushfd
+           mov [file_base], eax
-           cli
+           mov [file_size], ebx
            lea ebx, [app_cmdline]
            call test_app_header
            mov eax, 1
            xchg eax, [application_table_status]
            cmp eax, 0
            jne .wait_lock
+           pushfd
+           cli
            call set_application_table_status
            call get_new_process_place
            test eax, eax
            mov ecx, -0x20      ; too many processes
-           jz .err_hdr
+           jz .err
            mov [slot], eax
            loop .copy_process_name_loop
 .copy_process_name_done:
            mov ebx, cr3
-           mov [save_cr3], ebx
-     if GREEDY_KERNEL
-           stdcall create_app_space,[app_mem],[file_size]
+           mov [save_cr3], ebx
-     else
-           stdcall create_app_space,[app_mem],[app_mem]
-     end if
+           stdcall create_app_space,[app_mem],[file_base],[file_size]
            test eax, eax
            jz .failed
            mov   ebx,[slot_base]
            mov   [ebx+APPDATA.dir_table],eax
+           mov   eax,[app_mem]
+           mov   [ebx+APPDATA.mem_size],eax
-           mov   eax,[app_mem]
-           mov   [ebx+APPDATA.mem_size],eax
+if not GREEDY_KERNEL
+           mov ecx, [app_i_end]
+           mov edi, [file_size]
+           add edi, 4095
+           and edi, not 4095
-           mov ecx, [file_size]
+           sub ecx, edi
-           mov eax, ecx
+           jna @F
            shr ecx, 2
-           mov esi, [file_base]
-           mov edi, new_app_base
-           cld
-           rep movsd
-           and eax, 3
+           xor eax, eax
-           jz @F
+           add edi, new_app_base
+           cld
+           rep stosb
+@@:
+end if
-           mov ecx, eax
-           rep movsb
+; release only virtual space, not phisical memory
 @@:
-           stdcall kernel_free, [file_base]
+           stdcall free_kernel_space, [file_base]
            lea eax, [app_cmdline]
            mov eax,[process_number]  ;set result
            ret
 .failed:
            mov eax, [save_cr3]
            call set_cr3
+.err:
+           popfd
 .err_hdr:
            stdcall kernel_free,[file_base]
-           popfd
 .err_file:
            xor eax, eax
            mov [application_table_status],eax
            ret
 endp
            sub  edx,0x10
            mov  [ebx+0x0C], edx                ;app_esp
            mov  ecx,[APP_HEADER_00.i_param]
            mov  [ebx], ecx                     ;app_cmdline
            mov  [ebx+4], dword 0               ;app_path
+           mov  edx, [APP_HEADER_00.i_end]
+           mov  [ebx+0x14], edx
            ret
  .check_01_header:
            mov  [ebx+0x0C], ecx                ;app_esp
            mov  edx,[APP_HEADER_01.i_param]
            mov  [ebx], edx                     ;app_cmdline
            mov  ecx,[APP_HEADER_01.i_icon]
            mov  [ebx+4], ecx                   ;app_path
+           mov  edx, [APP_HEADER_01.i_end]
+           mov  [ebx+0x14], edx
            ret
 .fail:
            xor eax, eax
            ret
 .failed:
            xor    eax,eax
            ret
 endp
 align 4
-proc create_app_space stdcall, app_size:dword,img_size:dword
+proc create_app_space stdcall, app_size:dword,img_base:dword,img_size:dword
            locals
              app_pages   dd ?
              img_pages   dd ?
              dir_addr    dd ?
            jnz @B
            mov edi, new_app_base
            shr edi, 10
+           add edi, pages_tab
            add edi, pages_tab
            mov ecx, [app_tabs]
            shl ecx, 10
            xor eax, eax
+           rep stosd
-           rep stosd
+           mov ecx, [img_pages]
+           mov ebx, PG_UW
+           mov edx, new_app_base
+           mov esi, [img_base]
+           mov edi, new_app_base
+           shr esi, 10
+           shr edi, 10
+           add esi, pages_tab
+           add edi, pages_tab
+.remap:
+           lodsd
+           or eax, ebx      ; force user level r/w access
+           stosd
+           add edx, 0x1000
+           dec [app_pages]
+           dec ecx
+           jnz .remap
+           mov ecx, [app_pages]
+           test ecx, ecx
+           jz .done
+if GREEDY_KERNEL
+           mov eax, 0x02
+.reserve:
+           stosd
+           invlpg [edx]
+           add edx, 4096
+           dec ecx
+           jnz .reserve
 else
            mov edx, new_app_base
 .alloc:
            call alloc_page
            test eax, eax
            jz .fail
-           stdcall map_page,edx,eax,dword PG_UW
-           add edx, 0x1000
+           stdcall map_page,edx,eax,dword PG_UW
-           sub [app_pages], 1
-           sub [img_pages], 1
-           jnz .alloc
-           mov ecx, [app_pages]
-           and ecx, ecx
-           jz .next
-           mov ebx, edx
-           shr edx, 12
-.reserve:
-           mov dword [pages_tab+edx*4], 0x02
-           invlpg [ebx]
+           add edx, 0x1000
-           inc edx
-           dec ecx
-           jnz .reserve
-.next:
-           mov edi, new_app_base
-           mov ecx, [img_size]
+           dec [app_pages]
-           shr ecx, 2
+           jnz .alloc
            xor eax, eax
-           cld
+end if
            rep stosd
 @@:
            xor eax, eax
            ret
 endp
 align 4
 set_cr3:
            mov esi, [CURRENT_TASK]
            mov ebx, esi
            mov [filename], eax
            stdcall wait_mutex, pg_data.tmp_task_mutex
            mov edi, [tmp_task_data]
-           mov ecx, (2048+256)/4
+           mov ecx, (1024+256)/4
            xor eax, eax
            rep stosd
-           mov esi, [filename]
-           mov edi, [tmp_task_data]
-           add edi, TMP_FILE_NAME
-           mov ecx, 1024
-           rep movsb
            mov esi, [filename]
-           mov edi, [tmp_task_data]
+           mov esi, [filename]
-           add edi, TMP_ICON_OFFS
+           mov edi, [tmp_task_data]
            mov ecx, 1024
            rep movsb
-           mov esi, [cmdline]
            test esi, esi
-           jz @f
+           mov esi, [cmdline]
-           mov edi, [tmp_task_data]
+           test esi, esi
-           add edi, TMP_CMD_LINE
-           mov ecx, 256
+           jz @f
-           rep movsb
+           mov ecx, 256
-@@:
-           mov eax, TMP_FILE_NAME
+           rep movsb
-           add eax, [tmp_task_data]
-           mov ebx, [tmp_task_data]    ;cmd line
-           add ebx, TMP_CMD_LINE
+@@:
            mov eax, [tmp_task_data]
-           stdcall fs_exec_EX, eax, ebx, [flags]
+           lea ebx, [eax+1024]        ;cmd line
-;           stdcall fs_exec, eax, ebx, [flags], [ebp+8],\
+           stdcall fs_exec, eax, ebx, [flags]
            mov esi,[params]
            mov eax, [esi+0x08]       ;app_eip
            mov [edi+TSS._eip],eax    ;set eip in TSS
            mov eax, [esi+0x0C]       ;app_esp
            mov [edi+TSS._esp],eax    ;set stack in TSS
-           mov [edi+TSS._eflags],dword 0x1202
+           mov [edi+TSS._eflags],dword 0x3202
            mov [edi+TSS._cs],app_code  ;selector of code segment
            mov [edi+TSS._ss],app_data
            mov [edi+TSS._ds],app_data

Subversion Repositories Kolibri OS

(root)/kernel/trunk/core/taskman.inc – Rev 262 → 269