BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → / @ 1212

  → / @ 1213

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 1212 → Rev 1213

/kernel/trunk/core/heap.inc
1218,10 → 1218,10
and eax, SHM_OPEN_MASK
mov [action], eax
mov eax, [name]
test eax, eax
mov ebx, [name]
test ebx, ebx
mov edx, E_PARAM
jz .exit
jz .fail
mov esi, [shmem_list.fd]
align 4
1230,7 → 1230,7
je .not_found
lea edx, [esi+SMEM.name] ; link , base, size
stdcall strncmp, edx, eax, 32
stdcall strncmp, edx, ebx, 32
test eax, eax
je .found
1242,7 → 1242,7
cmp eax, SHM_OPEN
mov edx, E_NOTFOUND
je .exit
je .fail
cmp eax, SHM_CREATE
mov edx, E_PARAM
1249,13 → 1249,13
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
1266,7 → 1266,7
test eax, eax
mov esi, eax
mov edx, E_NOMEM
jz .exit
jz .fail
stdcall kernel_alloc, [size]
test eax, eax
1309,7 → 1309,7
je .create_map
cmp eax, SHM_OPEN_ALWAYS
jne .exit
jne .fail
.create_map:
1318,7 → 1318,7
cmp eax, [esi+SMEM.access]
mov [access], eax
mov edx, E_ACCESS
ja .exit
ja .fail
mov ebx, [CURRENT_TASK]
shl ebx, 5
1329,12 → 1329,14
test eax, eax
mov edi, eax
mov edx, E_NOMEM
jz .exit
jz .fail
inc [esi+SMEM.refcount]
mov [edi+SMAP.magic], 'SMAP'
mov [edi+SMAP.destroy], destroy_smap
mov [edi+SMAP.parent], esi
mov [edi+SMAP.base], 0
mov [edi+SMAP.parent], 0
stdcall user_alloc, [esi+SMEM.size]
test eax, eax
1342,9 → 1344,7
mov edx, E_NOMEM
jz .cleanup2
lock inc [esi+SMEM.refcount]
mov [edi+SMAP.base], eax
mov [edi+SMAP.parent], esi
mov ecx, [esi+SMEM.size]
mov [size], ecx
1371,10 → 1371,10
xor edx, edx
cmp [owner_access], 0
jne .exit
jne .fail
.exit:
mov edx, [size]
.exit:
.fail:
mov eax, [mapped]
popfd
1382,13 → 1382,14
pop esi
pop ebx
ret
.cleanup:
mov [size], edx
mov eax, esi
call free
jmp .exit
.cleanup2:
mov [size], edx
mov eax, edi
call destroy_smap
jmp .exit

/kernel/trunk/docs/sysfuncs.txt
3666,7 → 3666,11
* +16 = +0x10: dword: pointer to output data
* +20 = +0x14: dword: size of output data
Returned value:
* eax = determined by driver
* eax = error code
0 - successful call
-1 - any error.
-2, -3, -4, etc. reserved for kernel error codes
1, 2, 3, etc driver specific error codes
Remarks:
* Function codes and the structure of input/output data
are defined by driver.