Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3126 → Rev 3069

/kernel/trunk/core/malloc.inc
341,9 → 341,10
; insert_chunk(p,psize);
 
mov eax, esi
pop esi
mov ecx, edi
call insert_chunk
jmp .fail2
pop edi
jmp insert_chunk
.unl_large:
 
; unlink_large_chunk((tchunkptr)next);
363,9 → 364,10
; insert_chunk(p,psize);
 
mov eax, esi
pop esi
mov ecx, edi
call insert_chunk
jmp .fail2
pop edi
jmp insert_chunk
.fix_next:
 
; (p+psize)->prev_foot = psize;
384,9 → 386,10
; insert_chunk(p,psize);
 
mov eax, esi
pop esi
mov ecx, edi
call insert_chunk
jmp .fail2
pop edi
jmp insert_chunk
 
; param
; ecx = chunk
415,11 → 418,15
mov [esi+8], edx ;P->fd = F
mov [esi+12], eax ;P->bk = B
pop esi
mov ecx, mst.mutex
call mutex_unlock
ret
.large:
mov ebx, eax
call insert_large_chunk
pop esi
mov ecx, mst.mutex
call mutex_unlock
ret
 
 
/kernel/trunk/core/test_malloc.asm
50,12 → 50,12
ret
 
run_test3:
; 1024 times run random operation.
; 1024000 times run random operation.
; Randomly select malloc(random size from 1 to 1023)
; or free(random of previously allocated areas)
mov edi, 0x12345678
xor esi, esi ; 0 areas allocated
mov ebx, 1024
mov ebx, 1024000
.loop:
imul edi, 1103515245
add edi, 12345
78,11 → 78,7
push eax
; mov ecx, [saved_state_num]
; mov [saved_state+ecx*8], eax
push edi
call malloc_with_test
pop ecx
cmp ecx, edi
jnz edi_destroyed
; mov ecx, [saved_state_num]
; mov [saved_state+ecx*8+4], eax
; inc [saved_state_num]
117,11 → 113,7
jnz memory_destroyed
pop eax edi
push ebx edx
push edi
call free
pop ecx
cmp ecx, edi
jnz edi_destroyed
pop edx ebx
dec esi
pop eax ecx
158,15 → 150,9
ret
 
; Stubs for kernel procedures used by heap code
mutex_init:
and dword [ecx], 0
wait_mutex:
inc dword [ebx]
ret
mutex_lock:
inc dword [ecx]
ret
mutex_unlock:
dec dword [ecx]
ret
 
kernel_alloc:
cmp dword [esp+4], bufsize
188,7 → 174,7
jmp error_with_code
 
check_mutex:
cmp dword [mst.mutex], 0
cmp [mst.mutex], 0
jnz @f
ret
@@:
209,10 → 195,6
mov eax, 5
jmp error_with_code
 
edi_destroyed:
mov eax, 6
jmp error_with_code
 
error_with_code:
mov edx, saved_state_num
; eax = error code
226,7 → 208,6
 
; Include main heap code
include '../proc32.inc'
include '../struct.inc'
include '../const.inc'
include 'malloc.inc'