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

-$Revision: 437 $
+$Revision: 465 $
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
 ;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
   .stack_top   dd ?    ;+24
   .i_param     dd ?    ;+28
   .i_icon      dd ?    ;+32
+}
-struc TSS
-{
-  ._back   rw 2
-  ._esp0   rd 1
-  ._ss0    rw 2
-  ._esp1   rd 1
-  ._ss1    rw 2
-  ._esp2   rd 1
-  ._ss2    rw 2
-  ._cr3    rd 1
-  ._eip    rd 1
-  ._eflags rd 1
-  ._eax    rd 1
-  ._ecx    rd 1
-  ._edx    rd 1
-  ._ebx    rd 1
-  ._esp    rd 1
-  ._ebp    rd 1
-  ._esi    rd 1
-  ._edi    rd 1
-  ._es     rw 2
-  ._cs     rw 2
-  ._ss     rw 2
-  ._ds     rw 2
-  ._fs     rw 2
-  ._gs     rw 2
-  ._ldt    rw 2
-  ._trap   rw 1
-  ._io     rw 1
-}
-virtual at 0
-  TSS  TSS
 end virtual
 struc APP_PARAMS
 { .app_cmdline   ;0x00
            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
            and edi, not 4095
            sub ecx, edi
            jna @F
            xor eax, eax
-           add edi, new_app_base
+      ;     add edi, new_app_base
            cld
            rep stosb
 @@:
            test eax, eax
            jz .fail
            mov [dir_addr], eax
            stdcall map_page,[tmp_task_pdir],eax,dword PG_SW
            mov esi, sys_pgdir
            mov edi, [tmp_task_pdir]
+           mov ecx, (OS_BASE shr 20)/4
-           mov ecx, (page_tabs shr 20)/4
+           xor eax, eax
+           cld
+           rep stosd
+           mov ecx, (OS_BASE shr 20)/4
-           cld
+           mov esi, sys_pgdir+(OS_BASE shr 20)
            rep movsd
            mov eax, [dir_addr]
-           or eax, PG_SW
-           stosd                 ; [(page_tabs shr 20)]= eax
+           or eax, PG_SW
-           mov ecx, 0x800/4
-           xor eax, eax
-           rep stosd
+           mov [edi-4096+(page_tabs shr 20)], eax
-           mov eax, [dir_addr]
+           and eax, -4096
            call set_cr3
            ret
 endp
 align 4
+set_cr3:
-set_cr3:
-           mov esi, [CURRENT_TASK]
-           mov ebx, esi
-           shl esi,8
-           mov [SLOT_BASE+esi+0xB8],eax
-           imul   ebx,tss_step
-           add    ebx,tss_data
+           mov ebx, [current_slot]
-           mov [ebx+28], eax
+           mov [ebx+APPDATA.dir_table], eax
            mov cr3, eax
            ret
            mov eax, [pg_dir]
            and eax, not 0xFFF
            stdcall map_page,[tmp_task_pdir],eax,dword PG_SW
-           mov esi, [tmp_task_pdir]
-           add esi, 0x800
+           mov esi, [tmp_task_pdir]
-           mov edi, 0x800/4
+           mov edi, (OS_BASE shr 20)/4
 .destroy:
            mov eax, [esi]
            test eax, 1
            jz .next
            mov ecx, 0x8000
 @@:
            mov eax, [slot]
            shl  eax,8
            mov ebx, [offset]
-           add ebx, new_app_base
+     ;      add ebx, new_app_base
            push ecx
            stdcall map_memEx, [proc_mem_map],\
                               [SLOT_BASE+eax+0xB8],\
                               ebx, ecx
            pop ecx
            mov ecx, 0x8000
 @@:
            mov eax, [slot]
            shl  eax,8
            mov ebx, [offset]
-           add ebx, new_app_base
+      ;     add ebx, new_app_base
            push ecx
            stdcall map_memEx, [proc_mem_map],\
                               [SLOT_BASE+eax+0xB8],\
                               ebx, ecx
            pop ecx
            test eax, eax
            jz .failed
            mov [slot], eax
-           mov    esi,[CURRENT_TASK]
            shl    esi,8
-           add    esi,SLOT_BASE
+           mov    esi,[current_slot]
            mov    ebx,esi             ;ebx=esi - pointer to extended information about current thread
            jnz .do_wait
            pop ebx
            pop eax
            ret
+EFL_IF      equ 0x0200
+EFL_IOPL1   equ 0x1000
+EFL_IOPL2   equ 0x2000
+EFL_IOPL3   equ 0x3000
 align 4
 proc set_app_params stdcall,slot:dword, params:dword,\
                         cmd_line:dword, app_path:dword, flags:dword
            shl eax, 8
            mov [eax+SLOT_BASE+APPDATA.fpu_state], edi
            mov [eax+SLOT_BASE+APPDATA.fpu_handler], 0
            mov [eax+SLOT_BASE+APPDATA.sse_handler], 0
+;set default io permission map
+           mov [eax+SLOT_BASE+APPDATA.io_map],\
+                  (tss._io_map_0-OS_BASE+PG_MAP)
+           mov [eax+SLOT_BASE+APPDATA.io_map+4],\
+                  (tss._io_map_1-OS_BASE+PG_MAP)
            mov esi, fpu_data
-           mov ecx, 512/4
-           cld
+           mov ecx, 512/4
            rep movsd
            cmp    ebx,[TASK_COUNT]
            jc      @f
            cmp     eax, [SLOT_BASE+APPDATA.mem_size+ebx*8]
-           ja      @f
            ja      @f
            add edx, new_app_base
            stdcall k_strncpy, edx, [cmd_line], 256
 @@:
            mov edx,[params]
-        mov     eax, edx
+           mov     eax, edx
-        add     eax, 1024
+           add     eax, 1024
-        jc      @f
+           jc      @f
-        cmp     eax, [SLOT_BASE+APPDATA.mem_size+ebx*8]
+           cmp     eax, [SLOT_BASE+APPDATA.mem_size+ebx*8]
-        ja      @f
+           ja      @f
-           add edx, new_app_base
            stdcall k_strncpy, edx, [app_path], 1024
 @@:
            mov    ebx,[slot]
            mov    eax,ebx
            shl    ebx,5
+           lea    ecx,[draw_data+ebx]  ;ecx - pointer to draw data
 ; set window state to 'normal' (non-minimized/maximized/rolled-up) state
            mov     [ebx+window_data+WDATA.fl_wstate], WSTATE_NORMAL
            mov     [ebx+window_data+WDATA.fl_redraw], 1
            add    ebx,CURRENT_TASK            ;ebx - pointer to information about process
            mov    [ebx+TASKDATA.wnd_number],al;set window number on screen = process slot
            inc    dword [process_number]
            mov    eax,[process_number]
-           mov    [ebx+4],eax           ;set PID
-           mov    ecx,ebx
+           mov    [ebx+4],eax           ;set PID
            add    ecx,(draw_data-CURRENT_TASK)  ;ecx - pointer to draw data
 ;set draw data to full screen
            mov    [ecx+0],dword 0
            mov    [ecx+4],dword 0
            mov    eax,[ScreenWidth]
            mov    [ecx+8],eax
            mov    eax,[ScreenHeight]
-           mov    [ecx+12],eax
+           mov    [ecx+12],eax
            mov edi,[slot]
-           imul edi,tss_step
-           add edi,tss_data
-           mov ecx,128/4
-           xor eax, eax
-           cld
-           rep stosd
-;Add IO access table - bit array of permitted ports
-           not eax
-           mov ecx,2048
-           rep stosd                 ; access to 4096*8=65536 ports
-           sub edi, tss_step
-;set cr3 register in TSS of application
+           mov ebx, [pl0_stack]
+           mov esi,[params]
+           lea ecx, [ebx+REG_EIP]
-           mov ecx, [slot]
+           xor eax, eax
+           mov [ebx+REG_RET], dword irq0.return
+           mov [ebx+REG_EDI], eax
+           mov [ebx+REG_ESI], eax
+           mov [ebx+REG_EBP], eax
+           mov [ebx+REG_ESP], ecx   ;ebx+REG_EIP
-           shl ecx, 8
+           mov [ebx+REG_EBX], eax
-           mov eax,[SLOT_BASE+ecx+APPDATA.dir_table]
+           mov [ebx+REG_EDX], eax
-           mov [edi+TSS._cr3],eax
+           mov [ebx+REG_ECX], eax
-           mov esi,[params]
+           mov [ebx+REG_EAX], eax
-           mov eax, [esi+0x08]       ;app_eip
-           mov [edi+TSS._eip],eax    ;set eip in TSS
-           mov eax, [esi+0x0C]       ;app_esp
+           mov eax, [esi+0x08]       ;app_eip
-           mov [edi+TSS._esp],eax    ;set stack in TSS
+           mov [ebx+REG_EIP],  eax   ;app_entry
-           mov [edi+TSS._eflags],dword 0x1202
-           mov [edi+TSS._cs],app_code  ;selector of code segment
-           mov [edi+TSS._ss],app_data
-           mov [edi+TSS._ds],app_data
-           mov [edi+TSS._es],app_data
-           mov [edi+TSS._fs],app_data
-           mov [edi+TSS._gs],graph_data ;selector of graphic segment
+           mov [ebx+REG_CS], dword app_code
-           mov [edi+TSS._io],word 128
+           mov [ebx+REG_EFLAGS], dword EFL_IOPL1+EFL_IF
-           mov [edi+TSS._ss0], os_data
-           mov ebx, [pl0_stack]
-           add ebx, RING0_STACK_SIZE
-           mov [edi+TSS._esp0],ebx
-           mov ecx, edi    ;ecx - address of application TSS
-           mov ebx,[slot]
+           mov eax, [esi+0x0C]       ;app_esp
-           shl ebx,3
-;set TSS descriptor
+           mov [ebx+REG_APP_ESP], eax    ;app_stack
-           mov [ebx+gdts+tss0+0],word tss_step ;limit (size)
+           mov [ebx+REG_SS], dword app_data
            mov [ebx+gdts+tss0+2],cx  ;part of offset
            mov    esi,new_process_running
            call   sys_msg_board_str     ;output information about succefull startup
            ret
 endp
-include "debug.inc"
-iglobal
-    new_process_loading db 'K : New Process - loading',13,10,0
-    new_process_running db 'K : New Process - done',13,10,0
-    start_not_enough_memory db 'K : New Process - not enough memory',13,10,0

Subversion Repositories Kolibri OS

(root)/kernel/trunk/core/taskman.inc – Rev 437 → 465