Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 205 → Rev 206

/kernel/trunk/const.inc
403,6 → 403,7
.NumLinenum dw ?
.Characteristics dd ?
}
COFF_SECTION_SIZE equ 40
 
struc COFF_RELOC
{ .VirtualAddress dd ?
/kernel/trunk/core/dll.inc
523,6 → 523,8
test eax, eax
jnz .fail
 
mov eax, [file_size]
 
stdcall kernel_alloc, [file_size]
mov [file], eax
 
674,7 → 676,7
dec ecx
jnz .next_reloc
.next:
add [sec], 40
add [sec], COFF_SECTION_SIZE
dec [n_sec]
jnz .fix_sec
.exit:
709,7 → 711,7
add ebx, [edx+CFS.SizeOfRawData]
add ebx, 15
and ebx, not 15
add edx, 18
add edx, COFF_SECTION_SIZE
dec ecx
jnz @B
mov [img_size], ebx
747,7 → 749,7
.next:
add edi, 15
and edi, not 15
add eax, 40
add eax, COFF_SECTION_SIZE
dec ebx
jnz @B
 
835,7 → 837,7
add ebx, [edx+CFS.SizeOfRawData]
add ebx, 15
and ebx, not 15
add edx, 18
add edx, COFF_SECTION_SIZE
dec ecx
jnz @B
mov [img_size], ebx
867,7 → 869,7
.next:
add edi, 15-new_app_base
and edi, not 15
add eax, 40
add eax, COFF_SECTION_SIZE
dec ebx
jnz @B
 
894,7 → 896,7
lea eax, [edx+20]
@@:
add [eax+CFS.VirtualAddress], edi ;patch user space offset
add eax, 40
add eax, COFF_SECTION_SIZE
dec ebx
jnz @B
 
/kernel/trunk/core/heap.inc
257,8 → 257,8
cli
 
mov eax, [size]
add eax, 0xFFF
and eax, 0xFFFFF000;
add eax, 4095
and eax, not 4095
mov [size], eax
cmp eax, [heap_free]
ja .error
499,8 → 499,8
endl
 
mov eax, [size]
add eax, 0xFFF
and eax, 0xFFFFF000;
add eax, 4095
and eax, not 4095;
mov [size], eax
and eax, eax
jz .error