WebSVN – Kolibri OS – Diff – /kernel/trunk/core/sys32.inc

 ;; Copyright (C) KolibriOS team 2004-2021. All rights reserved. ;;
 ;;  Distributed under terms of the GNU General Public License.  ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 9692 $
+$Revision: 9709 $
 align 4 ;3A08
 build_interrupt_table:
         cli
         mov     eax, [esi+APPDATA.debugger_slot]
         test    eax, eax
         jnz     .debug
 ; not debuggee => say error and terminate
-        call    show_error_parameters
+        call    show_error_parameters  ; this function output in edx = current_slot
         sti
-        mov     [edx + TASKDATA.state], TSTATE_TERMINATING
+        mov     [edx + APPDATA.state], TSTATE_TERMINATING
         call    wakeup_osloop
         call    change_task
 ; If we're here, then the main OS thread has crashed before initializing IDLE thread.
 ; Or they both have crashed. Anyway, things are hopelessly broken.
         hlt
         push    [ebx + APPDATA.tid] ; PID
         push    ecx             ; debug_message code ((here: ecx==1/3))
         mov     cl, 12          ; debug_message size
         call    debugger_notify ;; only ONE using, inline ??? SEE: core/debug.inc
         add     esp, 12
-        mov     edx, [TASK_BASE]
+        mov     edx, [current_slot]
-        mov     [edx+TASKDATA.state], TSTATE_RUN_SUSPENDED
+        mov     [edx + APPDATA.state], TSTATE_RUN_SUSPENDED
         call    change_task     ; SEE: core/shed.inc
         restore_ring3_context
         iretd
         add     ebx, 4
         call    .check_ESP
         test    eax, eax
         jnz     .error_ESP
         DEBUGF  1, " [ESP+32]: %x\n",[ebx]
+;for input instruction
+        mov     ebx, [reg_eip+4]
+        call    .check_ESP
+        test    eax, eax
+        jnz     .error_ESP
+        DEBUGF  1, "K : [EIP]: %x",[ebx]
+        add     ebx, 4
+        call    .check_ESP
+        test    eax, eax
+        jnz     .error_ESP
+        DEBUGF  1, " [EIP+4]: %x",[ebx]
+        add     ebx, 4
+        call    .check_ESP
+        test    eax, eax
+        jnz     .error_ESP
+        DEBUGF  1, " [EIP+8]: %x\n",[ebx]
+        add     ebx, 4
+        call    .check_ESP
+        test    eax, eax
+        jnz     .error_ESP
+        DEBUGF  1, "K : [EIP+12]: %x\n",[ebx]
         pop     edx ecx ebx eax
         ret
 .error_ESP:
         pop     edx ecx ebx eax
         DEBUGF  1, "\n"
         .process  equ esp               ;ptr to parent process
         push    esi        ;save .slot
-        shl     esi, 8
+        shl     esi, BSF sizeof.APPDATA
+        mov     edx, [SLOT_BASE+esi+APPDATA.process]
-        mov     edx, [SLOT_BASE+esi+APPDATA.process]
+        test    edx, edx
-        test    edx, edx
-        jnz     @F
-        pop     esi
+        jnz     @F
-        shl     esi, BSF sizeof.TASKDATA
+        mov     [SLOT_BASE + esi + APPDATA.state], TSTATE_FREE
-        mov     [TASK_TABLE+esi+TASKDATA.state], TSTATE_FREE
+        pop     esi
         ret
 @@:
         push    edx                     ;save .process
         lea     edx, [SLOT_BASE+esi]
         call    scheduler_remove_thread
         call    lock_application_table
 ; if the process is in V86 mode...
         mov     eax, [.slot]
-        shl     eax, 8
+        shl     eax, BSF sizeof.APPDATA
         mov     esi, [eax+SLOT_BASE+APPDATA.pl0_stack]
         mov     ecx, [esi+8]
         mov     [eax+SLOT_BASE+APPDATA.io_map+4], ecx
 .nov86:
 ; destroy per-thread kernel objects
         mov     esi, [.slot]
-        shl     esi, 8
+        shl     esi, BSF sizeof.APPDATA
         add     esi, SLOT_BASE+APP_OBJ_OFFSET
 @@:
         mov     eax, [esi+APPOBJ.fd]
         test    eax, eax
         jz      @F
         pop     ecx
 .nodebug:
         popad
         mov     ebx, [.slot]
-        shl     ebx, 8
+        shl     ebx, BSF sizeof.APPDATA
         push    ebx
         mov     ebx, [SLOT_BASE+ebx+APPDATA.pl0_stack]
         stdcall kernel_free, ebx
         pop     ebx
         mov     ebx, [SLOT_BASE+ebx+APPDATA.cur_dir]
         stdcall kernel_free, ebx
         mov     edi, [.slot]
-        shl     edi, 8
+        shl     edi, BSF sizeof.APPDATA
         dec     eax
         cmp     eax, 1
         jbe     .nothing_to_activate
         lea     esi, [WIN_POS+eax*2]
         movzx   edi, word [esi]              ; edi = process
-        shl     edi, BSF sizeof.TASKDATA
+        shl     edi, BSF sizeof.APPDATA
-        cmp     [TASK_TABLE + edi + TASKDATA.state], TSTATE_FREE ; skip free slots
+        cmp     [SLOT_BASE + edi + APPDATA.state], TSTATE_FREE ; skip free slots
         je      .check_next_window
+        shr     edi, 3
         add     edi, window_data
 ; \begin{diamond}[19.09.2006]
 ; skip minimized windows
         test    [edi + WDATA.fl_wstate], WSTATE_MINIMIZED
         jnz     .check_next_window
   rmpr9:
         popa
         mov     edi, esi ; do not run this process slot
-        shl     edi, BSF sizeof.TASKDATA
+        shl     edi, BSF sizeof.APPDATA
-        mov     [edi+TASK_TABLE + TASKDATA.state], TSTATE_FREE
+        mov     [edi + SLOT_BASE + APPDATA.state], TSTATE_FREE
 ; debugger test - terminate all debuggees
         mov     eax, 2
         mov     ecx, SLOT_BASE+2*sizeof.APPDATA + APPDATA.debugger_slot

Subversion Repositories Kolibri OS

(root)/kernel/trunk/core/sys32.inc – Rev 9692 → 9709