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

 ;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 5057 $
+$Revision: 5130 $
         shr     edi, 10
         bt      [cpu_caps], CAPS_PSE
         jnc     .map_page_tables
         or      esi, PG_LARGE+PG_UW
-        mov     edx, sys_pgdir+(LFB_BASE shr 20)
+        mov     edx, sys_proc+PROC.pdt_0+(LFB_BASE shr 20)
 @@:
         mov     [edx], esi
         add     edx, 4
         add     esi, 0x00400000
         dec     edi
         jnz     @B
         bt      [cpu_caps], CAPS_PGE
         jnc     @F
-        or      dword [sys_pgdir+(LFB_BASE shr 20)], PG_GLOBAL
+        or      dword [sys_proc+PROC.pdt_0+(LFB_BASE shr 20)], PG_GLOBAL
 @@:
         mov     dword [LFBAddress], LFB_BASE
         mov     eax, cr3      ;flush TLB
         push    ebx
         push    esi
         push    edi
+        mov     edx, [current_slot]
+        mov     ebx, [edx+APPDATA.process]
-        mov     edx, [current_slot]
-        cmp     [edx+APPDATA.heap_base], 0
+        cmp     [ebx+PROC.heap_base], 0
         jne     .exit
         mov     edi, [new_size]
         add     edi, 4095
         and     edi, not 4095
         mov     [new_size], edi
-        mov     esi, [edx+APPDATA.mem_size]
+        mov     esi, [ebx+PROC.mem_used]
         add     esi, 4095
         call    mutex_unlock
 .update_size:
         mov     edx, [current_slot]
+        mov     ebx, [new_size]
-        mov     ebx, [new_size]
+        mov     edx, [edx+APPDATA.process]
-        call    update_mem_size
+        mov     [edx+PROC.mem_used], ebx
 .exit:
         pop     edi
         pop     esi
         pop     ebx
         inc     eax
         ret
 endp
-align 4
-update_mem_size:
-; in: edx = slot base
-;     ebx = new memory size
-; destroys eax,ecx,edx
-        mov     [APPDATA.mem_size+edx], ebx
-;search threads and update
-;application memory size infomation
-        mov     ecx, [APPDATA.dir_table+edx]
-        mov     eax, 2
-.search_threads:
-;eax = current slot
-;ebx = new memory size
-;ecx = page directory
-        cmp     eax, [TASK_COUNT]
-        jg      .search_threads_end
-        mov     edx, eax
-        shl     edx, 5
-        cmp     word [CURRENT_TASK+edx+TASKDATA.state], 9  ;if slot empty?
-        jz      .search_threads_next
-        shl     edx, 3
-        cmp     [SLOT_BASE+edx+APPDATA.dir_table], ecx      ;if it is our thread?
-        jnz     .search_threads_next
-        mov     [SLOT_BASE+edx+APPDATA.mem_size], ebx      ;update memory size
-.search_threads_next:
-        inc     eax
-        jmp     .search_threads
-.search_threads_end:
         ret
 ; param
 ;  eax= linear address
+;
 .fail:  ;simply return to caller
         mov     esp, ebp
         pop     ebx               ;restore exception number (#PF)
         ret
-;        xchg bx, bx
-;        add     esp,12 ;clear in stack: locals(.err_addr) + #PF + ret_to_caller
-;        restore_ring3_context
-;        iretd
 .user_space:
         test    eax, PG_MAP
         jnz     .err_access       ;Страница присутствует
 .err_access:
 ; access denied? this may be a result of copy-on-write protection for DLL
 ; check list of HDLLs
         and     ebx, not 0xFFF
-        mov     eax, [CURRENT_TASK]
-        shl     eax, 8
+        mov     eax, [current_process]
-        mov     eax, [SLOT_BASE+eax+APPDATA.dlls_list_ptr]
+        mov     eax, [eax+PROC.dlls_list_ptr]
         test    eax, eax
         jz      .fail
         mov     esi, [eax+HDLL.fd]
 .scan_hdll:
         rep movsd
         jmp     .exit
 endp
 ; returns number of mapped bytes
-proc map_mem stdcall, lin_addr:dword,slot:dword,\
+proc map_mem_ipc stdcall, lin_addr:dword,slot:dword,\
+                      ofs:dword,buf_size:dword,req_access:dword
-                      ofs:dword,buf_size:dword,req_access:dword
+        locals
+             count   dd ?
+             process dd ?
+        endl
         push    0 ; initialize number of mapped bytes
         mov     [count], 0
         cmp     [buf_size], 0
         jz      .exit
         mov     eax, [slot]
+        shl     eax, 8
-        shl     eax, 8
+        mov     eax, [SLOT_BASE+eax+APPDATA.process]
-        mov     eax, [SLOT_BASE+eax+APPDATA.dir_table]
+        test    eax, eax
-        and     eax, 0xFFFFF000
+        jz      .exit
-        stdcall map_page, [ipc_pdir], eax, PG_UW
+        mov     [process], eax
-        mov     ebx, [ofs]
-        shr     ebx, 22
+        mov     ebx, [ofs]
-        mov     esi, [ipc_pdir]
+        shr     ebx, 22
-        mov     edi, [ipc_ptab]
+        mov     eax, [eax+PROC.pdt_0+ebx*4]                 ;get page table
-        mov     eax, [esi+ebx*4]
-        and     eax, 0xFFFFF000
-        jz      .exit
-        stdcall map_page, edi, eax, PG_UW
-;           inc ebx
-;           add edi, 0x1000
-;           mov eax, [esi+ebx*4]
-;           test eax, eax
-;           jz @f
+        mov     esi, [ipc_ptab]
-;          and eax, 0xFFFFF000
+        and     eax, 0xFFFFF000
-;           stdcall map_page, edi, eax
+        jz      .exit
         stdcall map_page, esi, eax, PG_SW
 @@:
         mov     edi, [lin_addr]
         and     edi, 0xFFFFF000
         mov     ecx, [buf_size]
         add     ecx, 4095
         shr     ecx, 12
-        inc     ecx
-        mov     edx, [ofs]
+        inc     ecx                  ; ???????????
         shr     edx, 12
-        and     edx, 0x3FF
+        mov     edx, [ofs]
-        mov     esi, [ipc_ptab]
+        shr     edx, 12
+        and     edx, 0x3FF
 .map:
         stdcall safe_map_page, [slot], [req_access], [ofs]
+        jnc     .exit
-        jnc     .exit
+        add     [count], PAGE_SIZE
-        add     dword [ebp-4], 4096
+        add     [ofs], PAGE_SIZE
-        add     [ofs], 4096
+        dec     ecx
-        dec     ecx
+        jz      .exit
-        jz      .exit
+        add     edi, PAGE_SIZE
-        add     edi, 0x1000
+        inc     edx
-        inc     edx
+        cmp     edx, 1024
-        cmp     edx, 0x400
+        jnz     .map
         jnz     .map
+        inc     ebx
-        inc     ebx
+        mov     eax, [process]
-        mov     eax, [ipc_pdir]
+        mov     eax, [eax+PROC.pdt_0+ebx*4]
-        mov     eax, [eax+ebx*4]
+        and     eax, 0xFFFFF000
-        and     eax, 0xFFFFF000
         jz      .exit
-        stdcall map_page, esi, eax, PG_UW
-        xor     edx, edx
+        stdcall map_page, esi, eax, PG_SW
-        jmp     .map
+        xor     edx, edx
         jmp     .map
 .exit:
+        mov     eax, [count]
-        pop     eax
+        ret
+endp
+proc map_memEx stdcall, lin_addr:dword,slot:dword,\
-        ret
+                        ofs:dword,buf_size:dword,req_access:dword
-endp
+        locals
              count   dd ?
-proc map_memEx stdcall, lin_addr:dword,slot:dword,\
+             process dd ?
-                        ofs:dword,buf_size:dword,req_access:dword
+        endl
-        push    0 ; initialize number of mapped bytes
+        mov     [count], 0
+        cmp     [buf_size], 0
-        cmp     [buf_size], 0
+        jz      .exit
         jz      .exit
+        mov     eax, [slot]
-        mov     eax, [slot]
+        shl     eax, 8
-        shl     eax, 8
-        mov     eax, [SLOT_BASE+eax+APPDATA.dir_table]
+        mov     eax, [SLOT_BASE+eax+APPDATA.process]
-        and     eax, 0xFFFFF000
         test    eax, eax
-        stdcall map_page, [proc_mem_pdir], eax, PG_UW
+        jz      .exit
-        mov     ebx, [ofs]
         shr     ebx, 22
-        mov     esi, [proc_mem_pdir]
+        mov     [process], eax
-        mov     edi, [proc_mem_tab]
+        mov     ebx, [ofs]
-        mov     eax, [esi+ebx*4]
+        shr     ebx, 22
-        and     eax, 0xFFFFF000
+        mov     eax, [eax+PROC.pdt_0+ebx*4]                 ;get page table
-        test    eax, eax
+        mov     esi, [proc_mem_tab]
-        jz      .exit
+        and     eax, 0xFFFFF000
-        stdcall map_page, edi, eax, PG_UW
+        jz      .exit
         stdcall map_page, esi, eax, PG_SW
 @@:
-        mov     edi, [lin_addr]
-        and     edi, 0xFFFFF000
-        mov     ecx, [buf_size]
+        mov     edi, [lin_addr]
-        add     ecx, 4095
+        and     edi, 0xFFFFF000
-        shr     ecx, 12
+        mov     ecx, [buf_size]
-        inc     ecx
+        add     ecx, 4095
-        mov     edx, [ofs]
+        shr     ecx, 12
-        shr     edx, 12
-        and     edx, 0x3FF
+        inc     ecx                  ; ???????????
+        mov     edx, [ofs]
+        shr     edx, 12
+        and     edx, 0x3FF
+.map:
-        mov     esi, [proc_mem_tab]
+        stdcall safe_map_page, [slot], [req_access], [ofs]
+        jnc     .exit
+        add     [count], PAGE_SIZE
+        add     [ofs], PAGE_SIZE
+        dec     ecx
+        jz      .exit
+        add     edi, PAGE_SIZE
+        inc     edx
+        cmp     edx, 1024
+        jnz     .map
-.map:
+        inc     ebx
-        stdcall safe_map_page, [slot], [req_access], [ofs]
+        mov     eax, [process]
-        jnc     .exit
+        mov     eax, [eax+PROC.pdt_0+ebx*4]
-        add     dword [ebp-4], 0x1000
+        and     eax, 0xFFFFF000
-        add     edi, 0x1000
+        jz      .exit
         cli
         cld
         push    ebx ecx
         mov     eax, [slot]
         shl     eax, 8
-        mov     eax, [SLOT_BASE+eax+APPDATA.dlls_list_ptr]
+        mov     eax, [SLOT_BASE+eax+APPDATA.process]
+        mov     eax, [eax+PROC.dlls_list_ptr]
         test    eax, eax
         jz      .no_hdll
         mov     ecx, [eax+HDLL.fd]
 .scan_hdll:
         cmp     ecx, eax
 @@:
         or      eax, -1
         mov     [esp+32], eax
         ret
-;align 4
-;proc set_ipc_buff
-;           mov  eax,[current_slot]
-;           pushf
-;           cli
-;           mov  [eax+APPDATA.ipc_start],ebx     ;set fields in extended information area
-;           mov  [eax+APPDATA.ipc_size],ecx
-;
-;           add ecx, ebx
-;           add ecx, 4095
-;           and ecx, not 4095
-;
-;.touch:    mov eax, [ebx]
-;           add ebx, 0x1000
-;           cmp ebx, ecx
-;           jb  .touch
-;
-;           popf
-;           xor eax, eax
-;           ret
-;endp
 proc sys_ipc_send stdcall, PID:dword, msg_addr:dword, msg_size:dword
            locals
              dst_slot   dd ?
              dst_offset dd ?
         test    eax, eax
         jz      .no_pid
         mov     [dst_slot], eax
         shl     eax, 8
-        mov     edi, [eax+SLOT_BASE+0xa0] ;is ipc area defined?
+        mov     edi, [eax+SLOT_BASE+APPDATA.ipc_start] ;is ipc area defined?
         test    edi, edi
         jz      .no_ipc_area
         mov     ebx, edi
         and     ebx, 0xFFF
         mov     [dst_offset], ebx
-        mov     esi, [eax+SLOT_BASE+0xa4]
+        mov     esi, [eax+SLOT_BASE+APPDATA.ipc_size]
         mov     [buf_size], esi
         stdcall alloc_kernel_space, esi
         mov     ecx, eax
         pop     edi esi
 @@:
         mov     [used_buf], ecx
-        stdcall map_mem, ecx, [dst_slot], \
+        stdcall map_mem_ipc, ecx, [dst_slot], \
                 edi, esi, PG_SW
         mov     edi, [dst_offset]
         add     edi, [used_buf]
 .buffer_overflow:
         push    3
 .ret:
         mov     eax, [used_buf]
         cmp     eax, [ipc_tmp]
-        jz      @f
+        je      @f
         stdcall free_kernel_space, eax
 @@:
         pop     eax
         popf
         ret

Subversion Repositories Kolibri OS

(root)/kernel/trunk/core/memory.inc – Rev 5057 → 5130