WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-acpi/core/sys32.inc

 ;;  Distributed under GPL. See file COPYING for details.        ;;
 ;;  Copyright 2003 Ville Turjanmaa                              ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 3500 $
+$Revision: 3555 $
 align 4 ;3A08
 build_interrupt_table:
         dw      i40 and 0xFFFF, os_code, 11101111b shl 8, i40 shr 16
   idtreg: ; data for LIDT instruction (!!! must be immediately below sys_int data)
         dw      2*($-sys_int-4)-1
         dd      idts ;0x8000B100
-        dw      0    ;ïðîñòî âûðàâíèâàíèå
+        dw      0    ;просто выравнивание
   msg_fault_sel dd  msg_exc_8,msg_exc_u,msg_exc_a,msg_exc_b
 uglobal
   pf_err_code   dd ?
 endg
-page_fault_exc:                 ; äóðàêîóñòî÷èâîñòü: ñåëåêòîðû èñïîð÷åíû...
+page_fault_exc:                 ; дуракоусточивость: селекторы испорчены...
-        pop     [ss:pf_err_code]; äåéñòâèòåëüíî äî ñëåäóþùåãî #PF
+        pop     [ss:pf_err_code]; действительно до следующего #PF
         save_ring3_context
         mov     bl, 14
-exc_c:                          ; èñêëþ÷åíèÿ (âñå, êðîìå 7-ãî - #NM)
+exc_c:                          ; исключения (все, кроме 7-го - #NM)
-; Ôðýéì ñòåêà ïðè èñêëþ÷åíèè/ïðåðûâàíèè èç 3-ãî êîëüöà + pushad (ò.å., èìåííî çäåñü)
+; Фрэйм стека при исключении/прерывании из 3-го кольца + pushad (т.е., именно здесь)
   reg_ss        equ esp+0x30
   reg_esp3      equ esp+0x2C
   reg_eflags    equ esp+0x28
   reg_cs3       equ esp+0x24
   reg_eip       equ esp+0x20
- ; ýòî ôðýéì îò pushad
+ ; это фрэйм от pushad
   reg_eax       equ esp+0x1C
   reg_ecx       equ esp+0x18
   reg_edx       equ esp+0x14
   reg_ebx       equ esp+0x10
   reg_esp0      equ esp+0x0C
   reg_ebp       equ esp+0x08
   reg_esi       equ esp+0x04
   reg_edi       equ esp+0x00
-        mov     ax, app_data        ;èñêëþ÷åíèå
+        mov     ax, app_data        ;исключение
-        mov     ds, ax                  ;çàãðóçèì ïðàâèëüíûå çíà÷åíèÿ
+        mov     ds, ax                  ;загрузим правильные значения
-        mov     es, ax                  ;â ðåãèñòðû
+        mov     es, ax                  ;в регистры
-        cld                     ; è ïðèâîäèì DF ê ñòàíäàðòó
+        cld                     ; и приводим DF к стандарту
         movzx   ebx, bl
         sti
 ; not debuggee => say error and terminate
         call    show_error_parameters ;; only ONE using, inline ???
        ;mov     edx, [TASK_BASE]
         mov     [edx + TASKDATA.state], byte 4 ; terminate
+        call    wakeup_osloop
         jmp     change_task     ; stack - here it does not matter at all, SEE: core/shed.inc
 .debug:
 ; we are debugged process, notify debugger and suspend ourself
 ; eax=debugger PID
         mov     ecx, 1          ; debug_message code=other_exception
   restore  reg_esi
   restore  reg_edi
 align 4
+lock_application_table:
+        push    eax ecx edx
-set_application_table_status:
+        mov     ecx, application_table_mutex
-        push    eax
+        call    mutex_lock
         mov     eax, [CURRENT_TASK]
         shl     eax, 5
         add     eax, CURRENT_TASK+TASKDATA.pid
         mov     eax, [eax]
-        mov     [application_table_status], eax
+        mov     [application_table_owner], eax
-        pop     eax
+        pop     edx ecx eax
-        ret
-align 4
-clear_application_table_status:
-        push    eax
+        ret
-        mov     eax, [CURRENT_TASK]
-        shl     eax, 5
-        add     eax, CURRENT_TASK+TASKDATA.pid
-        mov     eax, [eax]
+align 4
+unlock_application_table:
-        cmp     eax, [application_table_status]
+        push    eax ecx edx
-        jne     apptsl1
-        xor     eax, eax
+        mov     [application_table_owner], 0
-        mov     [application_table_status], eax
+        mov     ecx, application_table_mutex
-      apptsl1:
+        call    mutex_unlock
-        pop     eax
+        pop     edx ecx eax
         ret
         pop     esi
         shl     esi, 5
         mov     [CURRENT_TASK+esi+TASKDATA.state], 9
         ret
 @@:
+        lea     edx, [SLOT_BASE+esi]
+        call    scheduler_remove_thread
            ;mov    esi,process_terminating
            ;call   sys_msg_board_str
-@@:
-        cli
-        cmp     [application_table_status], 0
-        je      term9
-        sti
-        call    change_task
-        jmp     @b
-term9:
-        call    set_application_table_status
+        call    lock_application_table
 ; if the process is in V86 mode...
         mov     eax, [.slot]
         shl     eax, 8
         mov     eax, [.slot]
         shl     eax, 8
         stdcall destroy_app_space, [SLOT_BASE+eax+APPDATA.dir_table], [SLOT_BASE+eax+APPDATA.dlls_list_ptr]
         mov     esi, [.slot]
-        cmp     [fpu_owner], esi ; if user fpu last -> fpu user = 1
+        cmp     [fpu_owner], esi ; if user fpu last -> fpu user = 2
         jne     @F
-        mov     [fpu_owner], 1
+        mov     [fpu_owner], 2
-        mov     eax, [256+SLOT_BASE+APPDATA.fpu_state]
+        mov     eax, [256*2+SLOT_BASE+APPDATA.fpu_state]
         clts
         bt      [cpu_caps], CAPS_SSE
         jnc     .no_SSE
         call    calculatescreen
         xor     eax, eax
         xor     esi, esi
         call    redrawscreen
-        mov     [MOUSE_BACKGROUND], byte 0; no mouse background
-        mov     [DONT_DRAW_MOUSE], byte 0; draw mouse
-        and     [application_table_status], 0
+        call    unlock_application_table
     ;mov   esi,process_terminated
     ;call  sys_msg_board_str
         add     esp, 4
         ret
-restore .slot
-;iglobal
-;if lang eq ru
-;  boot_sched_1    db   '®§¤ ¨¥ GDT TSS ãª § â¥«ï',0
-;  boot_sched_2    db   '®§¤ ¨¥ IDT â ¡«¨æë',0
-;else
-;  boot_sched_1    db   'Building gdt tss pointer',0
-;  boot_sched_2    db   'Building IDT table',0
-;end if
-;endg
 restore .slot
 ;build_scheduler:
 ;        mov     esi, boot_sched_1

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/core/sys32.inc – Rev 3500 → 3555