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

 ;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1130 $
+$Revision: 1213 $
            mov eax, [access]
            and eax, SHM_OPEN_MASK
            mov [action], eax
-           mov eax, [name]
+           mov ebx, [name]
-           test eax, eax
+           test ebx, ebx
            mov edx, E_PARAM
-           jz .exit
+           jz .fail
            mov esi, [shmem_list.fd]
 align 4
 @@:
            cmp esi, shmem_list
            je .not_found
            lea edx, [esi+SMEM.name] ; link , base, size
-           stdcall strncmp, edx, eax, 32
+           stdcall strncmp, edx, ebx, 32
 .not_found:
            mov eax, [action]
            cmp eax, SHM_OPEN
            mov edx, E_NOTFOUND
-           je .exit
+           je .fail
            cmp eax, SHM_CREATE
            mov edx, E_PARAM
            je .create_shm
            cmp eax, SHM_OPEN_ALWAYS
-           jne .exit
+           jne .fail
 .create_shm:
            mov ecx, [size]
            test ecx, ecx
-           jz .exit
+           jz .fail
            add ecx, 4095
            and ecx, -4096
            mov [size], ecx
            mov eax, SMEM.sizeof
            call malloc
            test eax, eax
            cmp eax, SHM_OPEN
            mov edx, E_PARAM
            je .create_map
            cmp eax, SHM_OPEN_ALWAYS
-           jne .exit
+           jne .fail
 .create_map:
            mov eax, [access]
            and eax, SHM_ACCESS_MASK
            cmp eax, [esi+SMEM.access]
            mov [access], eax
            mov edx, E_ACCESS
-           ja .exit
+           ja .fail
            mov ebx, [CURRENT_TASK]
            shl ebx, 5
            mov ebx, [CURRENT_TASK+ebx+4]
            mov eax, SMAP.sizeof
+           call create_kernel_object
+           test eax, eax
-           call create_kernel_object
+           mov edi, eax
-           test eax, eax
+           mov edx, E_NOMEM
+           jz .fail
            mov edi, eax
-           mov edx, E_NOMEM
-           jz .exit
+           inc [esi+SMEM.refcount]
            mov [edi+SMAP.magic], 'SMAP'
            mov [edi+SMAP.destroy], destroy_smap
-           mov [edi+SMAP.base], 0
+           mov [edi+SMAP.parent], esi
-           mov [edi+SMAP.parent], 0
            mov [edi+SMAP.base], 0
-           stdcall user_alloc, [esi+SMEM.size]
            test eax, eax
-           mov [mapped], eax
+           stdcall user_alloc, [esi+SMEM.size]
-           mov edx, E_NOMEM
+           test eax, eax
            loop @B
            xor edx, edx
-           cmp [owner_access], 0
-           jne .exit
            cmp [owner_access], 0
+           jne .fail
+.exit:
            mov edx, [size]
-.exit:
+.fail:
            mov eax, [mapped]
            popfd
            pop edi
-           pop esi
-           pop ebx
+           pop esi
+           pop ebx
            ret
 .cleanup:
-.cleanup:
+           mov [size], edx
            mov eax, esi
+           call free
-           call free
+           jmp .exit
            jmp .exit
 .cleanup2:
-.cleanup2:
+           mov [size], edx

Subversion Repositories Kolibri OS

(root)/kernel/trunk/core/heap.inc – Rev 1130 → 1213