Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6261 → Rev 6260

/kernel/branches/Kolibri-acpi/core/taskman.inc
75,7 → 75,7
slot_base dd ?
file_base dd ?
file_size dd ?
; handle dd ? ;temp. for default cursor handle for curr. thread
handle dd ? ;temp. for default cursor handle for curr. thread
;app header data
hdr_cmdline dd ? ;0x00
hdr_path dd ? ;0x04
87,15 → 87,15
 
pushad
 
; cmp [SCR_MODE], word 0x13
; jbe @f
; pushad
; stdcall set_cursor, [def_cursor_clock]
; mov [handle], eax
; mov [redrawmouse_unconditional], 1
; call wakeup_osloop
; popad
;@@:
cmp [SCR_MODE], word 0x13
jbe @f
pushad
stdcall set_cursor, [def_cursor_clock]
mov [handle], eax
mov [redrawmouse_unconditional], 1
call wakeup_osloop
popad
@@:
mov [flags], edx
 
; [ebp] pointer to filename
256,9 → 256,6
test eax, eax
jz .failed
 
mov ebx, [sys_proc+LHEAD.prev]
__list_add eax, ebx, sys_proc
 
mov ebx, [hdr_mem]
mov [eax+PROC.mem_used], ebx
 
277,6 → 274,8
@@:
mov [ebx+APPDATA.tls_base], edx
 
if GREEDY_KERNEL
else
mov ecx, [hdr_mem]
mov edi, [file_size]
add edi, 4095
288,6 → 287,7
cld
rep stosb
@@:
end if
 
; release only virtual space, not phisical memory
 
315,14 → 315,14
call unlock_application_table
mov eax, esi
.final:
; cmp [SCR_MODE], word 0x13
; jbe @f
; pushad
; stdcall set_cursor, [handle]
; mov [redrawmouse_unconditional], 1
; call wakeup_osloop
; popad
;@@:
cmp [SCR_MODE], word 0x13
jbe @f
pushad
stdcall set_cursor, [handle]
mov [redrawmouse_unconditional], 1
call wakeup_osloop
popad
@@:
ret
endp
 
632,12 → 632,12
.internal:
push ecx
 
mov esi, ecx
list_del esi
 
mov esi, [esi+PROC.dlls_list_ptr]
mov esi, [ecx+PROC.dlls_list_ptr]
call destroy_all_hdlls
 
; mov ecx, pg_data.mutex
; call mutex_lock
 
mov esi, [esp]
add esi, PROC.pdt_0
mov edi, (0x80000000 shr 20)/4
657,6 → 657,9
 
call kernel_free ;ecx still in stack
stdcall map_page, [tmp_task_ptab], 0, PG_UNMAP
; mov ecx, pg_data.mutex
; call mutex_unlock
 
.exit:
ret
 
/kernel/branches/Kolibri-acpi/kernel.asm
1100,9 → 1100,6
 
first_app_found:
 
mov ecx, bios_fb
call set_framebuffer
 
; START MULTITASKING
 
; A 'All set - press ESC to start' messages if need
/kernel/branches/Kolibri-acpi/video/framebuffer.inc
125,7 → 125,6
mov esi, [LFBAddress]
bt [cpu_caps], CAPS_PSE
jnc .create_page_tables
 
mov edx, 0x00400000
or esi, PG_GLOBAL+PDE_LARGE+PAT_WC+PG_UWR
and esi, [pte_valid_mask]
209,17 → 208,18
lea esi, [ecx+FRB.pde]
mov eax, sys_proc
 
cld
pushfd
cli
mov [_display.current_lfb], ecx
 
.patch_pde:
lea edi, [eax+PROC.pdt_0+4096-32] ;last 8 pd entries up to 32Mb framebuffer
mov ecx, 4
mov ecx, 8
rep movsd ;patch pde
sub esi, 16
mov eax, [eax+PROC.list.next] ;next process/address space
cmp eax, sys_proc
sub esi, 32
mov edi, [eax+PROC.list.next] ;next process/address space
xchg eax, edi
cmp eax, edi
jne .patch_pde
 
bt [cpu_caps], CAPS_PGE