WebSVN – Kolibri OS – Diff – /kernel/trunk/kernel.asm

 format binary as "mnt"
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 9932 $
+$Revision: 9941 $
         pop     edx
         ret
 ;-----------------------------------------------------------------------------
-sys_end:
-        cmp     [_display.select_cursor], 0
-        je      @f
+sys_end:
 ; restore default cursor before killing
         pusha
         mov     ecx, [current_slot]
         mov     ecx, [ecx + APPDATA.window]
         call    restore_default_cursor_before_killing
-        popa
-@@:
+        popa
 ;--------------------------------------
 ; kill all sockets this process owns
         pusha
         mov     edx, [current_slot]
         mov     esi, [window_data + edx + WDATA.cursor]
         cmp     esi, [current_cursor]
+        je      @f
-        je      @f
+        cmp     [_display.select_cursor], 0
+        jz      @f
         push    esi
-        call    [_display.select_cursor]
+        stdcall [_display.select_cursor], esi
         mov     [current_cursor], esi
 @@:
         mov     [redrawmouse_unconditional], 1
         pusha
         mov     eax, edx     ;TODO: check function
         call    socket_process_end
         popa
 ;--------------------------------------
-        cmp     [_display.select_cursor], 0
-        je      .restore_end
 ; restore default cursor before killing
         pusha
         mov     ecx, [esp+32]
         shl     ecx, BSF sizeof.WDATA
         add     ecx, window_data
         cmp     [ecx + WDATA.cursor], eax
         je      @f
         call    restore_default_cursor_before_killing
 @@:
         popa
-.restore_end:
 ;--------------------------------------
      ;call MEM_Heap_Lock      ;guarantee that process isn't working with heap
         mov     [ecx + APPDATA.state], TSTATE_ZOMBIE; clear possible i40's
         call    wakeup_osloop
      ;call MEM_Heap_UnLock
 .os_mem:
         stosd
         lea     eax, [edx-1]
         stosd
-        mov     edx, ecx
-        shr     edx, (BSF sizeof.APPDATA - BSF sizeof.WDATA)
+        mov     edx, [SLOT_BASE + ecx + APPDATA.window]
 ; +30: PID/TID
         mov     eax, [SLOT_BASE + ecx + APPDATA.tid]
         stosd
     ; window position and size
         push    esi
-        lea     esi, [window_data + edx + WDATA.box]
+        lea     esi, [edx + WDATA.box]
         movsd
         movsd
         movsd
         movsd
     ; Process state (+50)
         movzx   eax, byte [SLOT_BASE + ecx + APPDATA.state]
         stosd
     ; Window client area box
-        lea     esi, [window_data + edx + WDATA.clientbox]
+        lea     esi, [edx + WDATA.clientbox]
         movsd
         movsd
         movsd
         movsd
         mov     cr0, eax
         ret
 is_cache_enabled:
-        mov     eax, cr0
-        mov     ebx, eax
+        mov     eax, cr0
-        and     eax, 01100000_00000000_00000000_00000000b
-        jz      cache_disabled
+        and     eax, 01100000_00000000_00000000_00000000b
-        mov     [esp + SYSCALL_STACK.eax], ebx
-cache_disabled:
-        mov     dword [esp + SYSCALL_STACK.eax], eax;0
+        mov     [esp + SYSCALL_STACK.eax], eax
         ret
 modify_pce:
 ;        DEBUGF  1, "K : drawbackground\n"
 ;        DEBUGF  1, "K : backg x %x\n",[BG_Rect_X_left_right]
 ;        DEBUGF  1, "K : backg y %x\n",[BG_Rect_Y_top_bottom]
 ;--------- set event 5 start ----------
         push    ecx edi
-        xor     edi, edi
+        mov     edi, window_data
         mov     ecx, [thread_count]
 ;--------------------------------------
 align 4
 set_bgr_event:
         add     edi, sizeof.WDATA
         mov     eax, [BG_Rect_X_left_right]
         mov     edx, [BG_Rect_Y_top_bottom]
-        cmp     [window_data + edi + WDATA.draw_bgr_x], 0
+        cmp     [edi + WDATA.draw_bgr_x], 0
         jz      .set
 .join:
-        cmp     word [window_data + edi + WDATA.draw_bgr_x], ax
+        cmp     word [edi + WDATA.draw_bgr_x], ax
         jae     @f
-        mov     word [window_data + edi + WDATA.draw_bgr_x], ax
+        mov     word [edi + WDATA.draw_bgr_x], ax
 @@:
         shr     eax, 16
-        cmp     word [window_data + edi + WDATA.draw_bgr_x + 2], ax
+        cmp     word [edi + WDATA.draw_bgr_x + 2], ax
         jbe     @f
-        mov     word [window_data + edi + WDATA.draw_bgr_x + 2], ax
+        mov     word [edi + WDATA.draw_bgr_x + 2], ax
 @@:
-        cmp     word [window_data + edi + WDATA.draw_bgr_y], dx
+        cmp     word [edi + WDATA.draw_bgr_y], dx
         jae     @f
-        mov     word [window_data + edi + WDATA.draw_bgr_y], dx
+        mov     word [edi + WDATA.draw_bgr_y], dx
 @@:
         shr     edx, 16
-        cmp     word [window_data + edi + WDATA.draw_bgr_y+2], dx
+        cmp     word [edi + WDATA.draw_bgr_y+2], dx
         jbe     @f
-        mov     word [window_data + edi + WDATA.draw_bgr_y+2], dx
+        mov     word [edi + WDATA.draw_bgr_y+2], dx
 @@:
         jmp     .common
 .set:
-        mov     [window_data + edi + WDATA.draw_bgr_x], eax
+        mov     [edi + WDATA.draw_bgr_x], eax
-        mov     [window_data + edi + WDATA.draw_bgr_y], edx
+        mov     [edi + WDATA.draw_bgr_y], edx
 .common:
-        mov     eax, [window_data + edi + WDATA.thread]
+        mov     eax, [edi + WDATA.thread]
         test    eax, eax
         jz      @f
         or      [eax + APPDATA.occurred_events], EVENT_BACKGROUND
 @@:
-        sub     ecx, 1
-        jnz     set_bgr_event
-        ;loop    set_bgr_event
+        loop    set_bgr_event
         pop     edi ecx
 ;--------- set event 5 stop -----------
         dec     [REDRAW_BACKGROUND]     ; got new update request?
         jnz     backgr
         cmp     [SYS_SHUTDOWN], dl
         jne     noshutdown
         lea     ecx, [edx-1]
-        mov     edx, SLOT_BASE + sizeof.APPDATA ;OS_BASE+0x3040
+        mov     edx, SLOT_BASE + sizeof.APPDATA*2 ;OS_BASE+0x3040
         jecxz   no_mark_system_shutdown
 ;--------------------------------------
 align 4
         cmp     cl, TSTATE_TERMINATING
         jnz     .noterminate
 .terminate:
         pushad
-        mov     ecx, eax
+        push    esi
-        shl     ecx, BSF sizeof.WDATA
-        add     ecx, window_data
+        mov     ecx, dword[ebx - APPDATA.state + APPDATA.window]
-        call    restore_default_cursor_before_killing
-        popad
+        call    restore_default_cursor_before_killing
-        pushad
+        pop     esi
         call    terminate
         popad
         cmp     byte [SYS_SHUTDOWN], 0
         dec     eax
         jnz     newct
         ret
 ;-----------------------------------------------------------------------------
 align 4
+; eax - ptr to WDATA
 redrawscreen:
 ; eax , if process window_data base is eax, do not set flag/limits
         pushad
       @@:
         mov     eax, [edi + WDATA.box.left]
         mov     ebx, [edi + WDATA.box.top]
-        mov     ecx, [draw_limits.bottom] ; ecx = area y end     ebx = window y start
-        cmp     ecx, ebx
+        cmp     ebx, [draw_limits.bottom] ; ecx = area y end     ebx = window y start
-        jb      ricino
+        jae     ricino
         mov     ecx, [draw_limits.right] ; ecx = area x end     eax = window x start
-        cmp     ecx, eax
+        cmp     eax, [draw_limits.right] ; ecx = area x end     eax = window x start
-        jb      ricino
+        jae     ricino
         cmp     ecx, eax
         jb      ricino
 ;--------------------------------------
 align 4
 bgli:
-        cmp     dword[esp], 1
+        cmp     dword[esp], 1  ; check index in window_data array, 1 - idle
         jnz     .az
         cmp     [REDRAW_BACKGROUND], 0
         call    wakeup_osloop
         jmp     newdw8
 ;--------------------------------------
 align 4
 .az:
-        mov     eax, edi
         mov     ebx, [draw_limits.left]        ; set limits
-        mov     [eax + WDATA.draw_data.left], ebx
+        mov     [edi + WDATA.draw_data.left], ebx
         mov     ebx, [draw_limits.top]
-        mov     [eax + WDATA.draw_data.top], ebx
+        mov     [edi + WDATA.draw_data.top], ebx
         mov     ebx, [draw_limits.right]
-        mov     [eax + WDATA.draw_data.right], ebx
+        mov     [edi + WDATA.draw_data.right], ebx
         mov     ebx, [draw_limits.bottom]
-        mov     [eax + WDATA.draw_data.bottom], ebx
+        mov     [edi + WDATA.draw_data.bottom], ebx
-        cmp     dword [esp], 1
+        cmp     dword [esp], 1  ; check idle thread
         jne     nobgrd
         inc     [REDRAW_BACKGROUND]
         call    wakeup_osloop
 ;--------------------------------------
 align 4
 newdw8:
 nobgrd:
 ;--------------------------------------
-        push    eax  edi ebp
+        push    edi ebp
-        mov     edi, [esp+12]
+        mov     edi, [esp+8]
         cmp     edi, 1
         je      .found
         dec     edx
         jns     .start_y
 ;--------------------------------------
 align 4
 .not_found:
-        pop     ebp edi eax
+        pop     ebp edi
         jmp     ricino
 ;--------------------------------------
 align 4
 .found:
-        pop     ebp edi eax
+        pop     ebp edi
-        mov     [eax + WDATA.fl_redraw], WSTATE_REDRAW  ; mark as redraw
+        mov     [edi + WDATA.fl_redraw], WSTATE_REDRAW  ; mark as redraw
 ;--------------------------------------
 align 4
 ricino:
 not_this_task:

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm – Rev 9932 → 9941