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: 996 $
+$Revision: 1066 $
 EFL_IF      equ 0x0200
 EFL_IOPL1   equ 0x1000
            test eax, eax
            jz .failed
            mov   ebx,[slot_base]
-           mov   [ebx+APPDATA.dir_table],eax
-           mov   eax,[hdr_mem]
-           mov   [ebx+APPDATA.mem_size],eax
            mov   [ebx+APPDATA.dir_table],eax
+           mov   ecx,[hdr_mem]
+           mov   [ebx+APPDATA.mem_size],ecx
            mov ecx, [hdr_mem]
            mov edi, [file_size]
          ;  add edi, 4095
          ;  and edi, not 4095
            sub ecx, edi
            ;mov   eax,[hdr_mem]
            ;mov   [ebx+APPDATA.mem_size],eax
-           mov ecx, 1
+           mov ecx, 2
-           call @core_alloc@4
+           call @frame_alloc@4
            lea edi, [eax+OS_BASE]
            mov [ebx+APPDATA.bk_obj],edx
            mov ecx, [def_cursor]
-           mov [ebx+APPDATA.cursor],ecx
+           mov [ebx+APPDATA.cursor],ecx
            xor ecx, ecx
-           call @core_alloc@4
+           call _alloc_page
            lea edi, [eax+OS_BASE]         ; FIXME
            mov ecx, 512
            xor eax, eax
            cld
            rep stosd
+           mov esi, [img_base]
-           mov ecx, 512
+           mov ecx, 512                             ; FIX only core tabs
            mov esi, _sys_pdbr+(HEAP_BASE shr 20)
            rep movsd
            mov edi, [dir_addr]
            lea eax, [edi+PG_SW]
            mov [edi+OS_BASE+(page_tabs shr 20)], eax
+           mov eax, edi
+           call set_cr3
            mov eax, edi
-           call set_cr3
+           mov esi, [img_base]
-           mov edx, [app_tabs]
+           mov ebx, [app_tabs]
            mov edi, master_tab
 @@:
            call _alloc_page
            test eax, eax
            jz .fail
            or eax, PG_UW
            stosd
-           dec edx
+           dec ebx
            jnz @B
            mov edi, page_tabs
-           mov ecx, [app_tabs]
+           mov edi, page_tabs
-           shl ecx, 10
-           xor eax, eax
+           mov ecx, [app_tabs]
-           rep stosd
+           shl ecx, 10
            xor eax, eax
-           mov ecx, [app_pages]
+           rep stosd
            xor ebx, ebx
            mov [esp+8],  esi
            mov [esp+12], edi
-           lea ebx, [ecx+0x3FFFFF]
+           lea ebx, [ecx+0x3FFFFF]
            xor ecx, ecx
-           call @core_alloc@4
+           call _alloc_page
            test eax, eax
            mov [esp], eax
            jz .fail
            mov ecx, 512
            lea edi, [eax + OS_BASE]
            xor eax, eax
            cld
            rep stosd
-           mov ecx, 512
+           mov ecx, 512                              ; FIX only core tabs
            mov esi, _sys_pdbr+(HEAP_BASE shr 20)
-           rep movsd
+           rep movsd
            mov esi, [esp]
-           shr ebx, 22
+           mov esi, [esp]
-.new_ptab:
+           shr ebx, 22
-           xor ecx, ecx
+.new_ptab:
            add esi, 4
            dec ebx
-           jnz .new_ptab
+           jnz .new_ptab
            xor ecx, ecx
-           call @core_alloc@4
+           call _alloc_page
            test eax, eax
            jz .fail
            jz .next
            test ecx, 1 shl 9
            jnz .next                      ;skip shared pages
-           call @core_free@4
+           call @frame_free@4
 .next:
            add esi, 4
            dec ebx
            add eax, OS_BASE
            stdcall destroy_page_table, eax
            mov ecx, [esi]
-           call @core_free@4
+           call @frame_free@4
 .next:
            add esi, 4
            dec edi
            jnz .destroy
            mov ecx, [pg_dir]
-           call @core_free@4
+           call @frame_free@4
 .exit:
            locals
              pl0_stack dd ?
            endl
-           mov ecx, 1            ;(RING0_STACK_SIZE+512) shr 12
+           mov ecx, 2            ;(RING0_STACK_SIZE+512) shr 12
-           call @core_alloc@4
+           call @frame_alloc@4
            add eax, OS_BASE
            mov [SLOT_BASE+APPDATA.pl0_stack+ebx],eax
            add eax, RING0_STACK_SIZE
            mov [SLOT_BASE+APPDATA.saved_esp0+ebx], eax
            call _alloc_page
+           lea edi, [eax + OS_BASE]
-           add eax, OS_BASE
+           mov [ebx+SLOT_BASE+APPDATA.cur_dir], edi
            mov esi,[current_slot]
            mov esi,[esi+APPDATA.cur_dir]
-           mov ecx,0x1000/4
-           mov edi,eax
-           mov [ebx+SLOT_BASE+APPDATA.cur_dir],eax
+           mov ecx,0x1000/4
            rep movsd
            inc  ecx     ; process state - suspended
            mov  eax,[CURRENT_TASK]
            mov  [SLOT_BASE+ebx*8+APPDATA.debugger_slot],eax
 .no_debug:
            mov  [CURRENT_TASK+ebx+TASKDATA.state], cl
-           DEBUGF 1,"%s",new_process_running
+         ;  DEBUGF 1,"%s",new_process_running
            ret
 endp

Subversion Repositories Kolibri OS

(root)/kernel/branches/kolibri_pe/core/taskman.inc – Rev 996 → 1066