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

  → /kernel/branches/kolibri-process @ 4430

  → /kernel/branches/kolibri-process @ 4432

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 4430 → Rev 4432

/kernel/branches/kolibri-process/core/heap.inc
565,8 → 565,7
align 4
proc init_heap
mov ebx, [current_slot]
mov ebx, [ebx+APPDATA.process]
mov ebx, [current_process]
mov eax, [ebx+PROC.heap_top]
test eax, eax
jz @F
602,8 → 601,7
add ecx, (4095+PAGE_SIZE)
and ecx, not 4095
mov ebx, [current_slot]
mov ebx, [ebx+APPDATA.process]
mov ebx, [current_process]
mov esi, dword [ebx+PROC.heap_base] ; heap_base
mov edi, dword [ebx+PROC.heap_top] ; heap_top
.scan:
639,9 → 637,7
jnz @B
.no:
mov edx, [current_slot]
mov edx, [edx+APPDATA.process]
mov edx, [current_process]
mov ebx, [alloc_size]
add ebx, 0xFFF
and ebx, not 0xFFF
676,8 → 672,7
push esi
push edi
mov ebx, [current_slot]
mov ebx, [ebx+APPDATA.process]
mov ebx, [current_process]
mov edx, [address]
and edx, not 0xFFF
753,9 → 748,7
mov [page_tabs+ebx*4], ecx
.nothird:
mov edx, [current_slot]
mov edx, [edx+APPDATA.process]
mov edx, [current_process]
mov ebx, [alloc_size]
add ebx, 0xFFF
and ebx, not 0xFFF
815,8 → 808,7
.released:
push edi
mov edx, [current_slot]
mov edx, [edx+APPDATA.process]
mov edx, [current_process]
mov esi, dword [edx+PROC.heap_base]
mov edi, dword [edx+PROC.heap_top]
sub ebx, [edx+PROC.mem_used]
1004,8 → 996,7
jnz .nofreeall
mov eax, [page_tabs+ecx*4]
and eax, not 0xFFF
mov edx, [current_slot]
mov edx, [edx+APPDATA.process]
mov edx, [current_process]
mov ebx, [edx+PROC.mem_used]
sub ebx, eax
add ebx, 0x1000
1026,8 → 1017,7
shr ebx, 12
sub ebx, edx
push ebx ecx edx
mov edx, [current_slot]
mov edx, [edx+APPDATA.process]
mov edx, [current_process]
shl ebx, 12
sub ebx, [edx+PROC.mem_used]
neg ebx
1041,8 → 1031,7
shl ebx, 12
jz .ret
push esi
mov esi, [current_slot]
mov esi, [esi+APPDATA.process]
mov esi, [current_process]
mov esi, [esi+PROC.heap_top]
shr esi, 12
@@:
1066,8 → 1055,7
ret
.realloc_add:
; get some additional memory
mov eax, [current_slot]
mov eax, [eax+APPDATA.process]
mov eax, [current_process]
mov eax, [eax+PROC.heap_top]
shr eax, 12
cmp edx, eax
1100,8 → 1088,7
cld
rep stosd
pop edi
mov edx, [current_slot]
mov edx, [edx+APPDATA.process]
mov edx, [current_process]
shl ebx, 12
add [edx+PROC.mem_used], ebx
pop eax edx ecx
1108,8 → 1095,7
ret
.cant_inplace:
push esi edi
mov eax, [current_slot]
mov eax, [eax+APPDATA.process]
mov eax, [current_process]
mov esi, [eax+PROC.heap_base]
mov edi, [eax+PROC.heap_top]
shr esi, 12
1174,8 → 1160,7
jnz @b
.no:
push ebx
mov edx, [current_slot]
mov edx, [eax+APPDATA.process]
mov edx, [current_process]
shl ebx, 12
add [edx+PROC.mem_used], ebx
pop ebx

/kernel/branches/kolibri-process/core/sched.inc
121,10 → 121,10
Mov dword [page_tabs+((tss._io_map_0 and -4096) shr 10)],eax,[ebx+APPDATA.io_map]
Mov dword [page_tabs+((tss._io_map_1 and -4096) shr 10)],eax,[ebx+APPDATA.io_map+4]
; set new thread memory-map
mov ecx, APPDATA.process
mov eax, [ebx+ecx] ;offset>0x7F
cmp eax, [esi+ecx] ;offset>0x7F
mov eax, [ebx+APPDATA.process]
cmp eax, [current_process]
je @f
mov [current_process], eax
mov eax, [eax+PROC.pdt_0_phys]
mov cr3, eax
@@:

/kernel/branches/kolibri-process/core/taskman.inc
248,8 → 248,7
loop .copy_process_name_loop
.copy_process_name_done:
mov ebx, [current_slot]
mov ebx, [ebx+APPDATA.process]
mov ebx, [current_process]
mov [save_proc], ebx
stdcall create_process, [hdr_mem], [file_base], [file_size]
431,8 → 430,6
mov ecx, pg_data.mutex
call mutex_lock
xchg bx, bx
xor eax, eax
mov [process], eax
565,11 → 562,14
align 4
set_cr3:
pushfd
cli
mov ebx, [current_slot]
mov [current_process], eax
mov [ebx+APPDATA.process], eax
mov eax, [eax+PROC.pdt_0_phys]
mov cr3, eax
popfd
ret
align 4

/kernel/branches/kolibri-process/data32.inc
446,8 → 446,10
LFBSize rd 1
current_slot rd 1
current_process rd 1
current_slot rd 1 ; i.e. cureent thread
; status
hd1_status rd 1 ; 0 - free : other - pid
application_table_owner rd 1 ; 0 - free : other - pid

/kernel/branches/kolibri-process/kernel.asm
730,6 → 730,8
stosd
stosd
mov [current_process], sys_proc
mov edx, SLOT_BASE+256*1
mov ebx, [os_stack_seg]
add ebx, 0x2000