sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Kernel: minor cleanup

Browse Source 
git-svn-id: svn://kolibrios.org@5788 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2015-09-03 14:52:02 +00:00
parent 530a133818
commit a1e19e9f62
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/trunk/core/memory.inc
View File

@ -1171,8 +1171,6 @@ endp
align 4 align 4
sysfn_meminfo: sysfn_meminfo:
; add ecx, new_app_base
cmp ecx, OS_BASE cmp ecx, OS_BASE
jae .fail jae .fail

15
kernel/trunk/core/sched.inc
View File

@ -16,7 +16,8 @@ $Revision$
align 32 align 32
irq0: irq0:
pushad pushad
Mov ds, ax, app_data mov ax, app_data
mov ds, ax
mov es, ax mov es, ax
inc [timer_ticks] inc [timer_ticks]
mov eax, [timer_ticks] mov eax, [timer_ticks]
@ -101,8 +102,10 @@ do_change_task:
mov [esi+APPDATA.saved_esp], esp mov [esi+APPDATA.saved_esp], esp
mov esp, [ebx+APPDATA.saved_esp] mov esp, [ebx+APPDATA.saved_esp]
; set new thread io-map ; set new thread io-map
Mov dword [page_tabs+((tss._io_map_0 and -4096) shr 10)],eax,[ebx+APPDATA.io_map] mov eax, [ebx+APPDATA.io_map]
Mov dword [page_tabs+((tss._io_map_1 and -4096) shr 10)],eax,[ebx+APPDATA.io_map+4] 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 ; set new thread memory-map
mov eax, [ebx+APPDATA.process] mov eax, [ebx+APPDATA.process]
cmp eax, [current_process] cmp eax, [current_process]
@ -113,7 +116,8 @@ do_change_task:
@@: @@:
; set tss.esp0 ; 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] mov edx, [ebx+APPDATA.tls_base]
@ -126,7 +130,8 @@ do_change_task:
mov fs, dx mov fs, dx
; set gs selector unconditionally ; set gs selector unconditionally
Mov gs,ax,graph_data Mov ax, graph_data
Mov gs, ax
; set CR0.TS ; set CR0.TS
cmp bh, byte[fpu_owner] ;bh == incoming task (new) cmp bh, byte[fpu_owner] ;bh == incoming task (new)
clts ;clear a task switch flag clts ;clear a task switch flag

6
kernel/trunk/gui/event.inc
View File

@ -104,7 +104,8 @@ align 4
mov [eax+EVENT.state], ecx mov [eax+EVENT.state], ecx
mov [eax+EVENT.pid], edx mov [eax+EVENT.pid], edx
inc [event_uid] inc [event_uid]
Mov [eax+EVENT.id],edx,[event_uid] mov edx, [event_uid]
mov [eax+EVENT.id], edx
or esi, esi or esi, esi
jz RemoveEventTo jz RemoveEventTo
lea edi, [eax+EVENT.code] lea edi, [eax+EVENT.code]
@ -277,7 +278,8 @@ Wait_events_ex:
jnz @f ;RET jnz @f ;RET
mov [esi+APPDATA.wait_test], edx mov [esi+APPDATA.wait_test], edx
mov [esi+APPDATA.wait_timeout], ebx 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, [TASK_BASE]
mov [eax+TASKDATA.state], 5 mov [eax+TASKDATA.state], 5
call change_task call change_task

5
kernel/trunk/macros.inc
View File

@ -83,11 +83,6 @@ end if
} }
; \end{diamond}[29.09.2006] ; \end{diamond}[29.09.2006]
macro Mov op1,op2,op3 ; op1 = op2 = op3
{
mov op2, op3
mov op1, op2
}
macro list_init head macro list_init head
{ {