sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

added release_pages, heap_mutex

Browse Source 
git-svn-id: svn://kolibrios.org@279 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2007-01-18 07:31:56 +00:00
parent f825a71d89
commit 14256358ea
2 changed files with 71 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
kernel/trunk/core/heap.inc
View File

@ -138,6 +138,7 @@ proc init_kernel_heap
mov [mem_used_list], eax mov [mem_used_list], eax
mov [mem_block_list+63*4], ebx mov [mem_block_list+63*4], ebx
mov byte [mem_block_map], 0xFC mov byte [mem_block_map], 0xFC
and [heap_mutex], 0
mov [heap_blocks], 4095 mov [heap_blocks], 4095
mov [free_blocks], 4095 mov [free_blocks], 4095
ret ret
@ -196,8 +197,6 @@ endp
align 4 align 4
proc alloc_mem_block proc alloc_mem_block
pushfd
cli
mov ebx, [mem_block_start] mov ebx, [mem_block_start]
mov ecx, [mem_block_end] mov ecx, [mem_block_end]
.l1: .l1:
@ -206,7 +205,6 @@ proc alloc_mem_block
add ebx,4 add ebx,4
cmp ebx, ecx cmp ebx, ecx
jb .l1 jb .l1
popfd
xor eax,eax xor eax,eax
ret ret
@ -218,13 +216,10 @@ found:
shl eax, 5 shl eax, 5
add eax, [mem_block_arr] add eax, [mem_block_arr]
dec [free_blocks] dec [free_blocks]
popfd
ret ret
endp endp
proc free_mem_block proc free_mem_block
pushfd
cli
sub eax, [mem_block_arr] sub eax, [mem_block_arr]
shr eax, 5 shr eax, 5
@ -236,15 +231,12 @@ proc free_mem_block
add eax, ebx add eax, ebx
cmp [mem_block_start], eax cmp [mem_block_start], eax
ja @f ja @f
popfd
ret ret
@@: @@:
mov [mem_block_start], eax mov [mem_block_start], eax
popfd
ret ret
.err: .err:
xor eax, eax xor eax, eax
popfd
ret ret
endp endp
@ -252,13 +244,14 @@ align 4
proc alloc_kernel_space stdcall, size:dword proc alloc_kernel_space stdcall, size:dword
local block_ind:DWORD local block_ind:DWORD
pushfd
cli
mov eax, [size] mov eax, [size]
add eax, 4095 add eax, 4095
and eax, not 4095 and eax, not 4095
mov [size], eax mov [size], eax
mov ebx, heap_mutex
call wait_mutex ;ebx
cmp eax, [heap_free] cmp eax, [heap_free]
ja .error ja .error
@ -268,7 +261,7 @@ proc alloc_kernel_space stdcall, size:dword
mov [block_ind], eax mov [block_ind], eax
stdcall get_block, eax stdcall get_block, eax
and eax, eax test eax, eax
jz .error jz .error
mov edi, eax ;edi - pBlock mov edi, eax ;edi - pBlock
@ -344,9 +337,8 @@ proc alloc_kernel_space stdcall, size:dword
mov eax, [esi+block_base] mov eax, [esi+block_base]
mov ebx, [size] mov ebx, [size]
sub [heap_free], ebx sub [heap_free], ebx
popfd and [heap_mutex], 0
ret ret
.m_eq_size: .m_eq_size:
remove_from_list edi remove_from_list edi
mov [mem_block_list+ebx*4], edx mov [mem_block_list+ebx*4], edx
@ -365,17 +357,20 @@ proc alloc_kernel_space stdcall, size:dword
mov eax, [edi+block_base] mov eax, [edi+block_base]
mov ebx, [size] mov ebx, [size]
sub [heap_free], ebx sub [heap_free], ebx
popfd and [heap_mutex], 0
ret ret
.error: .error:
xor eax, eax xor eax, eax
popfd mov [heap_mutex], eax
ret ret
endp endp
align 4 align 4
proc free_kernel_space stdcall, base:dword proc free_kernel_space stdcall, base:dword
mov ebx, heap_mutex
call wait_mutex ;ebx
mov eax, [base] mov eax, [base]
mov esi, [mem_used_list] mov esi, [mem_used_list]
@@: @@:
@ -465,6 +460,7 @@ proc free_kernel_space stdcall, base:dword
bts [mem_block_mask], eax bts [mem_block_mask], eax
.m_eq: .m_eq:
xor eax, eax xor eax, eax
mov [heap_mutex], eax
not eax not eax
ret ret
.insert: .insert:
@ -483,10 +479,12 @@ proc free_kernel_space stdcall, base:dword
bts [mem_block_mask], eax bts [mem_block_mask], eax
mov [esi+block_flags],FREE_BLOCK mov [esi+block_flags],FREE_BLOCK
xor eax, eax xor eax, eax
mov [heap_mutex], eax
not eax not eax
ret ret
.fail: .fail:
xor eax, eax xor eax, eax
mov [heap_mutex], eax
ret ret
endp endp
@ -552,7 +550,6 @@ proc kernel_alloc stdcall, size:dword
.end: .end:
mov eax, [lin_addr] mov eax, [lin_addr]
ret ret
.error: .error:
xor eax, eax xor eax, eax
ret ret
@ -560,9 +557,9 @@ endp
align 4 align 4
proc kernel_free stdcall, base:dword proc kernel_free stdcall, base:dword
locals
size dd ? mov ebx, heap_mutex
endl call wait_mutex ;ebx
mov eax, [base] mov eax, [base]
mov esi, [mem_used_list] mov esi, [mem_used_list]
@ -578,35 +575,15 @@ proc kernel_free stdcall, base:dword
cmp [esi+block_flags], USED_BLOCK cmp [esi+block_flags], USED_BLOCK
jne .fail jne .fail
and [heap_mutex], 0
mov ecx, [esi+block_size]; mov ecx, [esi+block_size];
mov [size], ecx
call release_pages ;eax, ecx
stdcall free_kernel_space, [base] stdcall free_kernel_space, [base]
test eax, eax ret
jz .fail
mov ecx, [size]
mov edi, [base]
shr ecx, 12
mov esi, edi
shr edi, 10
add edi, pages_tab
xor edx, edx
.release:
mov eax, [edi]
test eax, 1
jz .next
call free_page
mov [edi],edx
.next:
invlpg [esi]
add esi, 0x1000
add edi, 4
dec ecx
jnz .release
.fail: .fail:
and [heap_mutex], 0
ret ret
endp endp

48
kernel/trunk/core/memory.inc
View File

@ -264,6 +264,52 @@ proc free_page
ret ret
endp endp
; param
; ecx= size
; eax= base
align 4
release_pages:
mov ebx, pg_data.pg_mutex
call wait_mutex ;ebx
shr ecx, 12
mov esi, eax
mov edi, eax
shr esi, 10
add esi, pages_tab
mov ebx, [page_start]
mov edx, sys_pgmap
@@:
xor eax, eax
xchg eax, [esi]
invlpg [edi]
test eax, 1
jz .next
shr eax, 12
bts [edx], eax
inc [pg_data.pages_free]
shr eax, 3
and eax, -4
add eax, edx
cmp eax, ebx
jae .next
mov ebx, eax
.next:
add edi, 0x1000
add esi, 4
dec ecx
jnz @B
and [pg_data.pg_mutex],0
ret
align 4 align 4
proc map_page_table stdcall, lin_addr:dword, phis_addr:dword proc map_page_table stdcall, lin_addr:dword, phis_addr:dword
mov ebx, [lin_addr] mov ebx, [lin_addr]
@ -1317,6 +1363,8 @@ align 16
mem_block_arr rd 1 mem_block_arr rd 1
mem_block_start rd 1 mem_block_start rd 1
mem_block_end rd 1 mem_block_end rd 1
heap_mutex rd 1
heap_size rd 1 heap_size rd 1
heap_free rd 1 heap_free rd 1
heap_blocks rd 1 heap_blocks rd 1