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

 ;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 897 $
+$Revision: 908 $
 EFL_IF      equ 0x0200
 EFL_IOPL1   equ 0x1000
 	   ret
 .fail:
 	   xor eax, eax
 	   ret
 align 4
 proc mnt_exec stdcall file_base:dword, file_size:dword, \
                       path:dword, cmd_line:dword, flags:dword
            mov eax, ecx
            ret
 endp
 align 4
-proc pe_app_param stdcall path:dword, raw:dword, ex_pg_dir:dword, ex_stack_page:dword
+proc pe_app_param stdcall path:dword, raw:dword, ex_pg_dir:dword, ex_stack:dword
            locals
+             slot        dd ?
-             slot        dd ?
+             slot_base   dd ?
-             slot_base   dd ?
+             pl0_stack   dd ?
            endl
            mov [slot_base], eax
            mov edi, eax
            _clear_ 256     ;clean extended information about process
-; write application name
-           lea eax, [path]
+; write application name
-           stdcall strrchr,  eax, '/'  ; now eax points to name without path
+           stdcall strrchr,  [path], '/'  ; now eax points to name without path
            lea esi, [eax+1]
            test eax, eax
            jnz @F
            lea esi, [path]
            mov [ebx+APPDATA.dir_table],eax
            ;mov   eax,[hdr_mem]
+           ;mov   [ebx+APPDATA.mem_size],eax
-           ;mov   [ebx+APPDATA.mem_size],eax
+           mov ecx, 1
+           call @core_alloc@4
            lea edi, [eax+OS_BASE]
-           lea edi, [eax+OS_BASE+8192]
+           mov [pl0_stack], edi
            mov [ebx+APPDATA.pl0_stack], edi
            mov ecx, [def_cursor]
            mov [ebx+APPDATA.cursor],ecx
            xor ecx, ecx
+           call @core_alloc@4
-           call @core_alloc@4
            lea edi, [eax+OS_BASE]         ; FIXME
            add eax, OS_BASE                              ;FIXME
            mov esi,[current_slot]
-           mov esi,[esi+APPDATA.cur_dir]
-           mov ecx,0x1000/4
+           mov esi,[esi+APPDATA.cur_dir]
-           mov edi,eax
+           mov ecx,0x1000/4
-           mov [ebx+APPDATA.cur_dir],eax
+           mov [ebx+APPDATA.cur_dir],edi
            rep movsd
            mov    eax,[Screen_Max_X]
            mov    [ecx+8],eax
            mov    eax,[Screen_Max_Y]
            mov    [ecx+12],eax
-           mov ebx, [ex_pg_dir]
-           add ebx, OS_BASE+8192-16
            mov ebx, [pl0_stack]
-           mov [ebx],  dword _sys_app_entry
+           mov eax,   [raw]
+           lea ecx, [ebx+REG_EDI]
+           mov edx,   [ex_stack]
-           mov eax,   [raw]
+           mov [ebx+REG_ENTRY],   dword  _sys_app_entry
+           mov [ebx+REG_RESTART], dword _pe_restart
-           mov edx,   [ex_stack_page]
+           mov [ebx+REG_RAW], eax
+           mov [ebx+REG_CSTACK], ecx
+           mov [ebx+REG_USTACK], edx
            mov [ebx+8], eax
-           mov [ebx+12], edx
+           lea ebx, [ebx+REG_ENTRY]
-           mov ecx, [slot]
-           shl ecx, 5
+           mov ecx, [slot]
-           mov [ecx*8+SLOT_BASE+APPDATA.saved_esp], ebx
+           shl ecx, 5
-           xor  ebx, ebx    ; process state - running
+           mov [ecx*8+SLOT_BASE+APPDATA.saved_esp], ebx
-           mov  [CURRENT_TASK+ecx+TASKDATA.state], bl
+           mov  [CURRENT_TASK+ecx+TASKDATA.state], 0
-       ;    DEBUGF 1,"%s",new_process_running
+           DEBUGF 1,"%s",new_process_running
            pop ebx
 	   ret
+endp
+align 4
+_pe_restart:
+           xchg bx, bx
+           add esp, 12
+           popad
-endp
+           iretd
 align 4
 @@:
            xor eax, eax
            ret
 endp
 ;addr_t __fastcall pe_app_space(size_t size);
 align 4
+@pe_app_space@4:
+           sub esp, 16
+           mov [esp+4],  ebx
+           mov [esp+8],  esi
+           mov [esp+12], edi
+           lea ebx, [ecx+0x3FFFFF]
-_new_app_space:
-           mov ecx, 2
+           xor ecx, ecx
            call @core_alloc@4
+           test eax, eax
-           test eax, eax
+           mov [esp], eax
-           jz .fail
-           push esi
-           push edi
            jz .fail
            mov edx, eax
            mov ecx, 512
            lea edi, [eax + OS_BASE]
            xor eax, eax
            cld
            rep stosd
+           mov ecx, 512
+           mov esi, _sys_pdbr+(HEAP_BASE shr 20)
+           rep movsd
+           mov esi, [esp]
+           shr ebx, 22
+.new_ptab:
+           xor ecx, ecx
-           mov ecx, 512
+           call @core_alloc@4
+           test eax, eax
-           mov esi, _sys_pdbr+(HEAP_BASE shr 20)
+           jz .fail
-           rep movsd
+           lea edi, [eax+OS_BASE]
+           or eax, PG_UW
+           mov [esi+OS_BASE], eax
+           mov ecx, 1024
+           xor eax, eax
+           rep stosd
+           add esi, 4
+           dec ebx
+           jnz .new_ptab
-           lea eax, [edx+PG_SW]
+           xor ecx, ecx
+           call @core_alloc@4
+           test eax, eax
+           jz .fail
+           lea edi, [eax+OS_BASE]
+           or eax, PG_UW
-           mov [edx+OS_BASE+(page_tabs shr 20)], eax
            mov ebx, [esp]
-           add eax, 4096
+           lea edx, [ebx+PG_SW]
-           mov [edx+OS_BASE+0x7FC], eax
+           mov [ebx+OS_BASE+(0x7FC00000 shr 20)], eax
            mov [ebx+OS_BASE+(page_tabs shr 20)], edx
+           mov ecx, 1024
-           lea edi, [edx+OS_BASE+8192]
+           xor eax, eax
+           rep stosd
-           mov ecx, 2048
-           xor eax, eax
+           mov eax, ebx
-           rep stosd
+.fail:
            mov ebx, [esp+4]

Subversion Repositories Kolibri OS

(root)/kernel/branches/kolibri_pe/core/taskman.inc – Rev 897 → 908