WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-acpi/core/heap.inc

 ;; Copyright (C) KolibriOS team 2004-2009. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 2151 $
+$Revision: 2156 $
 HASH_IT  = 1
            jna @f
            mov op, 63
 @@:
+}
+align 4
+md:
+.add_to_used:
+           mov eax, [esi+block_base]
+           mov ebx, [esi+block_base]
+           shr ebx, 6
+           add eax, ebx
+           shr ebx, 6
+           add eax, ebx
+           shr eax, 12
+           and eax, 63
-macro remove_from_used op
+           inc [mem_hash_cnt+eax*4]
+           lea ecx, [mem_used_list+eax*8]
+           list_add esi, ecx
-{
+           mov [esi+block_flags], USED_BLOCK
+           mov eax, [esi+block_size]
+           sub [heap_free], eax
+           ret
+align 4
-           mov edx, [op+list_fd]
+.find_used:
-           mov ecx, [op+list_bk]
+           mov ecx, eax
+           mov ebx, eax
+           shr ebx, 6
+           add ecx, ebx
+           shr ebx, 6
+           add ecx, ebx
+           shr ecx, 12
+           and ecx, 63
-           mov [edx+list_bk], ecx
+           lea ebx, [mem_used_list+ecx*8]
+           mov esi, ebx
-           mov [ecx+list_fd], edx
+.next:
+           mov esi, [esi+list_fd]
+           cmp esi, ebx
+           je .fail
-           mov [op+list_fd], 0
+           cmp eax, [esi+block_base]
+           jne .next
+           ret
+.fail:
+           xor esi, esi
+           ret
+align 4
+.del_from_used:
+           call .find_used
+           test esi, esi
+           jz .done
+           cmp [esi+block_flags], USED_BLOCK
-           mov [op+list_bk], 0
+           jne .fatal
+           dec [mem_hash_cnt+ecx*4]
+           list_del esi
+.done:
+           ret
+.fatal:                            ;FIXME panic here
+           xor esi, esi
            ret
 ;Initial heap state
+;
             mov eax, edi
             stosd
             stosd
             loop @B
-            mov eax, mem_used.fd
+            mov ecx, 64
+            mov edi, mem_used_list
-            mov [mem_used.fd], eax
+@@:
+            mov eax, edi
+            stosd
+            stosd
-            mov [mem_used.bk], eax
+            loop @B
             stdcall alloc_pages, dword 32
             mov ecx, 32
             add eax, MEM_BLOCK.sizeof
             loop @B
-            mov [eax-MEM_BLOCK.sizeof], dword 0
             mov [eax-MEM_BLOCK.sizeof], dword 0
             mov ecx, heap_mutex
             call mutex_init
             mov [heap_blocks], 4094
            sub [edi+block_size], edx
            mov eax, [edi+block_size]
            calc_index eax
            cmp eax, [block_ind]
-           je .m_eq_ind
+           je .add_used
            list_del edi
            btr [mem_block_mask], ecx
 @@:
            bts [mem_block_mask], eax
            lea edx, [mem_block_list+eax*8]   ;edx= list head
            list_add edi, edx
-.m_eq_ind:
+.add_used:
-           mov ecx, mem_used.fd
-           mov edx, [ecx+list_fd]
-           mov [esi+list_fd], edx
-           mov [esi+list_bk], ecx
-           mov [ecx+list_fd], esi
-           mov [edx+list_bk], esi
-           mov [esi+block_flags], USED_BLOCK
-           mov ebx, [size]
-           sub [heap_free], ebx
-if HASH_IT
-           pushad
-           mov eax, [esi+block_base]
-           mov ebx, [esi+block_base]
-           shr ebx, 6
-           add eax, ebx
-           shr ebx, 6
-           add eax, ebx
-           shr eax, 12
-           and eax, 63
-           inc [mem_hash_cnt+eax*4]
-           popad
-end if
+           call md.add_to_used
            mov ecx, heap_mutex
            call mutex_unlock
            mov eax, [esi+block_base]
            pop edi
            pop esi
+           pop ebx
-           pop ebx
+           ret
            ret
 .m_eq_size:
            list_del edi
            lea edx, [mem_block_list+ebx*8]
            cmp edx, [edx]
            jnz @f
-           btr [mem_block_mask], ebx
-@@:
-           mov ecx, mem_used.fd
-           mov edx, [ecx+list_fd]
-           mov [edi+list_fd], edx
-           mov [edi+list_bk], ecx
-           mov [ecx+list_fd], edi
-           mov [edx+list_bk], edi
+           btr [mem_block_mask], ebx
-           mov [edi+block_flags], USED_BLOCK
-           mov ebx, [size]
-           sub [heap_free], ebx
-if HASH_IT
-           pushad
-           mov eax, [edi+block_base]
-           mov ebx, [edi+block_base]
-           shr ebx, 6
-           add eax, ebx
+@@:
-           shr ebx, 6
-           add eax, ebx
-           shr eax, 12
-           and eax, 63
-           inc [mem_hash_cnt+eax*4]
-           popad
-end if
-           mov ecx, heap_mutex
-           call mutex_unlock
-           mov eax, [edi+block_base]
-           pop edi
-           pop esi
-           pop ebx
+           mov esi, edi
-           ret
+           jmp .add_used
 .error_unlock:
            mov ecx, heap_mutex
            call mutex_lock
-           mov eax, [base]
-           mov esi, [mem_used.fd]
-@@:
-           cmp esi, mem_used.fd
-           je .fail
+           mov eax, [base]
-           cmp [esi+block_base], eax
-           je .found
-           mov esi, [esi+list_fd]
-           jmp @b
-.found:
-           cmp [esi+block_flags], USED_BLOCK
-           jne .fail
-if HASH_IT
-           pushad
-           mov eax, [esi+block_base]
-           mov ebx, [esi+block_base]
-           shr ebx, 6
-           add eax, ebx
-           shr ebx, 6
-           add eax, ebx
-           shr eax, 12
-           and eax, 63
+           call md.del_from_used
-           dec [mem_hash_cnt+eax*4]
+           test esi, esi
-           popad
+           jz .fail
 end if
 .prev:
            mov edi, [esi+block_prev]
            cmp [edi+block_flags], FREE_BLOCK
            jne .insert
-           remove_from_used esi
            mov edx, [esi+block_next]
            mov [edi+block_next], edx
            mov [edx+block_prev], edi
            call mutex_unlock
            xor eax, eax
            not eax
            ret
 .insert:
-           remove_from_used esi
            mov [esi+block_flags], FREE_BLOCK
            mov eax, [esi+block_size]
            calc_index eax
            mov edi, esi
            jmp .add_block
            ret
 endp
 align 4
+proc kernel_free stdcall, base:dword
 proc kernel_free stdcall, base:dword
            push ebx esi
            mov ecx, heap_mutex
-           call mutex_lock
-           mov eax, [base]
+           call mutex_lock
-           mov esi, [mem_used.fd]
-@@:
-           cmp esi, mem_used.fd
-           je .fail
-           cmp [esi+block_base], eax
-           je .found
+           mov eax, [base]
-           mov esi, [esi+list_fd]
+           call md.find_used
            jmp @b

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/core/heap.inc – Rev 2151 → 2156