Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5787 → Rev 5788

/kernel/trunk/core/memory.inc
1171,8 → 1171,6
 
align 4
sysfn_meminfo:
 
; add ecx, new_app_base
cmp ecx, OS_BASE
jae .fail
 
/kernel/trunk/core/sched.inc
16,7 → 16,8
align 32
irq0:
pushad
Mov ds, ax, app_data
mov ax, app_data
mov ds, ax
mov es, ax
inc [timer_ticks]
mov eax, [timer_ticks]
101,8 → 102,10
mov [esi+APPDATA.saved_esp], esp
mov esp, [ebx+APPDATA.saved_esp]
; set new thread io-map
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]
mov eax, [ebx+APPDATA.io_map]
mov dword [page_tabs+((tss._io_map_0 and -4096) shr 10)], eax
mov eax, [ebx+APPDATA.io_map+4]
mov dword [page_tabs+((tss._io_map_1 and -4096) shr 10)], eax
; set new thread memory-map
mov eax, [ebx+APPDATA.process]
cmp eax, [current_process]
113,7 → 116,8
@@:
; set tss.esp0
 
Mov [tss._esp0],eax,[ebx+APPDATA.saved_esp0]
mov eax, [ebx+APPDATA.saved_esp0]
mov [tss._esp0], eax
 
mov edx, [ebx+APPDATA.tls_base]
 
126,7 → 130,8
mov fs, dx
 
; set gs selector unconditionally
Mov gs,ax,graph_data
Mov ax, graph_data
Mov gs, ax
; set CR0.TS
cmp bh, byte[fpu_owner] ;bh == incoming task (new)
clts ;clear a task switch flag
/kernel/trunk/gui/event.inc
104,7 → 104,8
mov [eax+EVENT.state], ecx
mov [eax+EVENT.pid], edx
inc [event_uid]
Mov [eax+EVENT.id],edx,[event_uid]
mov edx, [event_uid]
mov [eax+EVENT.id], edx
or esi, esi
jz RemoveEventTo
lea edi, [eax+EVENT.code]
277,7 → 278,8
jnz @f ;RET
mov [esi+APPDATA.wait_test], edx
mov [esi+APPDATA.wait_timeout], ebx
Mov [esi+APPDATA.wait_begin],eax,[timer_ticks]
mov eax, [timer_ticks]
mov [esi+APPDATA.wait_begin], eax
mov eax, [TASK_BASE]
mov [eax+TASKDATA.state], 5
call change_task
/kernel/trunk/macros.inc
83,11 → 83,6
}
; \end{diamond}[29.09.2006]
 
macro Mov op1,op2,op3 ; op1 = op2 = op3
{
mov op2, op3
mov op1, op2
}
 
macro list_init head
{