change functionality of f68:15, f68:18 (discussion on forum topic 1253)

git-svn-id: svn://kolibrios.org@1074 a494cfbc-eb01-0410-851d-a64ba20cac60

kernel/trunk/const.inc

@@ -468,7 +468,7 @@ struc EVENT
    .id          dd ?   ;event uid
    .state       dd ?   ;internal flags
    .code        dd ?
-                rd 6
+                rd 5
    .size     =  $ - .magic
    .codesize =  $ - .code
 }

kernel/trunk/core/fpu.inc

@@ -181,110 +181,3 @@ except_7:                  ;#NM exception handler
 iglobal
   fpu_owner dd 0
 endg
-
-reg_eip       equ ebp+4
-reg_cs        equ ebp+8
-reg_eflags    equ ebp+12
-reg_esp       equ ebp+16
-reg_ss        equ ebp+20
-
-align 4    ;not used now
-proc except_16       ;fpu native exceptions handler
-        test    byte [esp+8+2], 2
-        jnz     v86_except_16
-           push ebp
-           mov ebp, esp
-
-           push eax
-           push ebx
-           push ecx
-           push edx
-
-           mov ebx, [CURRENT_TASK]
-           shl ebx, 8
-
-           mov eax, [ebx+SLOT_BASE+APPDATA.fpu_handler]
-           test eax, eax
-           jz .default
-
-           mov ecx, [reg_eip]
-           mov edx, [reg_esp]
-           sub edx, 4
-           mov [edx], ecx
-           mov [reg_esp], edx
-           mov dword [reg_eip], eax
-
-           pop edx
-           pop ecx
-           pop ebx
-           pop eax
-
-           leave
-           iretd
-
-.default:
-           pop edx
-           pop ecx
-           pop ebx
-           pop eax
-           leave
-
-           save_ring3_context     ;debugger support
-
-           mov bl, 16
-           jmp exc_c
-endp
-
-align 4    ;not used now
-proc except_19      ;sse exceptions handler
-        test    byte [esp+8+2], 2
-        jnz     v86_except_19
-           push ebp
-           mov ebp, esp
-
-           push eax
-           push ebx
-           push ecx
-           push edx
-
-           mov ebx, [current_slot]
-
-           mov eax, [ebx+APPDATA.sse_handler]
-           test eax, eax
-           jz .default
-
-           mov ecx, [reg_eip]
-           mov edx, [reg_esp]
-           sub edx, 4
-           mov [edx], ecx
-           mov [reg_esp], edx
-           mov dword [reg_eip], eax
-
-           pop edx
-           pop ecx
-           pop ebx
-           pop eax
-
-           leave
-           iretd
-
-.default:
-           pop edx
-           pop ecx
-           pop ebx
-           pop eax
-           leave
-
-           save_ring3_context     ;debugger support
-
-           mov bl, 19
-           jmp exc_c
-endp
-
-restore reg_eip
-restore reg_cs
-restore reg_eflags
-restore reg_esp
-restore reg_ss
-
-

kernel/trunk/core/memory.inc

@@ -1033,10 +1033,11 @@ f68:
            mov [esp+36], eax
            ret
 .15:
-           mov ecx, [current_slot]
+           mov  eax, [current_slot]
-           mov eax, [ecx+APPDATA.fpu_handler]
+           xchg ebx, [eax+APPDATA.exc_handler]
-           mov [ecx+APPDATA.fpu_handler], ebx
+           xchg ecx, [eax+APPDATA.except_mask]
-           mov [esp+36], eax
+           mov  [esp+36], ebx ; reg_eax+8
+           mov  [esp+24], ecx ; reg_ebx+8
            ret
 .16:
            test ebx, ebx
@@ -1051,11 +1052,12 @@ f68:
            mov [esp+36], eax
            ret
 .18:
-           mov ecx, [current_slot]
+           mov  eax, [current_slot]
-           mov eax, [ecx+APPDATA.sse_handler]
+           btr  [eax+APPDATA.except_mask],ebx
-           mov [ecx+APPDATA.sse_handler], ebx
+           setc byte[esp+36]
-           mov [esp+36], eax
+           jecxz @f
-           ret
+           bts  [eax+APPDATA.except_mask],ebx
+     @@:   ret
 .19:
            cmp ebx, OS_BASE
            jae .fail

kernel/trunk/core/sys32.inc

@@ -124,22 +124,20 @@ exc_c:                         ;
         Mov     ds,ax,app_data  ; çàãðóçèì ïðàâèëüíûå çíà÷åíèÿ
         mov     es,ax           ; â ñåãìåíòíûå ðåãèñòðû
         cld                     ; è ïðèâîäèì DF ê ñòàíäàðòó
+        movzx   ebx,bl
 ; redirect to V86 manager? (EFLAGS & 0x20000) != 0?
         test    byte[reg_eflags+2],2
         jnz     v86_exc_c
         cmp     bl,14           ; #PF
-        jne     .l0
+        jne     @f
         call    page_fault_handler
-  .l0:  mov     esi, [current_slot]
+  @@:   mov     esi, [current_slot]
-        mov     eax,[esi+APPDATA.fpu_handler]
+        btr     [esi+APPDATA.except_mask], ebx
-        cmp     bl,16           ; #MF
+        jnc     @f
-        je      .l1
+        mov     eax,[esi+APPDATA.exc_handler]
-        cmp     bl,19           ; #XF
+        test    eax, eax
-        jne     .l2
-        mov     eax,[esi+APPDATA.sse_handler]
-  .l1:  test    eax, eax
         jnz     IRetToUserHook
-  .l2:  cli
+  @@:   cli
         mov     eax, [esi+APPDATA.debugger_slot]
         test    eax, eax
         jnz     .debug
@@ -154,15 +152,16 @@ exc_c:                         ;
 ; eax=debugger PID
         cmp     bl,1            ; #DB
         je      debug_ex
-        movzx   edx, bl         ; debug_message data=Number_Of_Exception
+        mov     edx, ebx        ; debug_message data=Number_Of_Exception
         mov     ecx,1           ; debug_message code=other_exception
         jmp     debug_ex.notify ; notify debugger and suspend ourself
 
 IRetToUserHook:
         xchg    eax, [reg_eip]
-        sub     dword[reg_esp3], 4
+        sub     dword[reg_esp3], 8
         mov     edi, [reg_esp3]
         stosd
+        mov     [edi], ebx
         restore_ring3_context
 unknown_interrupt:
         iretd
@@ -176,8 +175,7 @@ show_error_parameters:
         cmp     bl, 0x0e
         jbe     .l1
   .l0:  mov     bl, 0x09
-  .l1:  movzx   eax,bl
+  .l1:  mov     eax,[msg_fault_sel+ebx*4 - 0x08*4]
-        mov     eax,[msg_fault_sel+eax*4 - 0x08*4]
         DEBUGF  1, "K : %s\n", eax
         mov     eax, [reg_cs3+4]
         mov     edi, msg_sel_app

kernel/trunk/core/taskman.inc

@@ -955,8 +955,8 @@ proc set_app_params stdcall,slot:dword, params:dword,\
 
        shl eax, 8
        mov [eax+SLOT_BASE+APPDATA.fpu_state], edi
-	   mov [eax+SLOT_BASE+APPDATA.fpu_handler], 0
+       mov [eax+SLOT_BASE+APPDATA.exc_handler], 0
-	   mov [eax+SLOT_BASE+APPDATA.sse_handler], 0
+       mov [eax+SLOT_BASE+APPDATA.except_mask], 0
 
 ;set default io permission map
        mov [eax+SLOT_BASE+APPDATA.io_map],\

kernel/trunk/docs/sysfuncr.txt

@@ -3641,30 +3641,49 @@ Architecture Software Developer's Manual, Volume 3, Appendix B);
     ¨«¨ ¯®¤ä㭪樥© 20.
 
 ======================================================================
-===== ”ã­ªæ¨ï 68, ¯®¤äã­ªæ¨ï 14 - ®¦¨¤ âì ¨§¢¥é¥­¨ï ®â ¤à ©¢¥à . =====
+==================== ”ã­ªæ¨ï 68, ¯®¤äã­ªæ¨ï 14 =======================
+===== Ž¦¨¤ âì ¯®«ã祭¨ï ᨣ­ « , ®â ¤àã£¨å ¯à¨«®¦¥­¨©/¤à ©¢¥à®¢. =====
 ======================================================================
 <EFBFBD> à ¬¥âàë:
   * eax = 68 - ­®¬¥à ä㭪樨
   * ebx = 14 - ­®¬¥à ¯®¤ä㭪樨
-  * ecx = 㪠§ â¥«ì ­  ¡ãä¥à ¤«ï ¨­ä®à¬ æ¨¨ (8 ¡ ©â)
+  * ecx = 㪠§ â¥«ì ­  ¡ãä¥à ¤«ï ¨­ä®à¬ æ¨¨ (24 ¡ ©â )
 ‚®§¢à é ¥¬®¥ §­ ç¥­¨¥:
   * ¡ãä¥à, ­  ª®â®àë© ãª §ë¢ ¥â ecx, ᮤ¥à¦¨â á«¥¤ãîéãî ¨­ä®à¬ æ¨î:
-    * +0: dword: ª®­áâ ­â  EV_INTR = 1
+    * +0: dword: ¨¤¥­â¨ä¨ª â®à ¯®á«¥¤ãîé¨å ¤ ­­ëå ᨣ­ « 
-    * +4: dword: ¤ ­­ë¥ ¤à ©¢¥à 
+    * +4: ¤ ­­ë¥ ¯à¨­ï⮣® ᨣ­ «  (20 ¡ ©â), ä®à¬ â ª®â®àëå
-‡ ¬¥ç ­¨ï:
+          ®¯à¥¤¥«ï¥âáï ¯¥à¢ë¬ dword-®¬
-  * ’¥ªãé ï ॠ«¨§ æ¨ï ¢® ¢à¥¬ï ®¦¨¤ ­¨ï âॡã¥â ¤®¢®«ì­® "âï¦ñ«ëå"
-    ®¯¥à æ¨© ¯¥à¥ª«î祭¨ï ª®­â¥ªáâ .
 
 ======================================================================
-== ”ã­ªæ¨ï 68, ¯®¤äã­ªæ¨ï 15 - ãáâ ­®¢¨âì ®¡à ¡®â稪 ¨áª«î祭¨© FPU. =
+==== ”ã­ªæ¨ï 68, ¯®¤äã­ªæ¨ï 15 - ãáâ ­®¢¨âì ®¡à ¡®â稪 ¨áª«î祭¨©  ===
 ======================================================================
 <EFBFBD> à ¬¥âàë:
   * eax = 68 - ­®¬¥à ä㭪樨
   * ebx = 15 - ­®¬¥à ¯®¤ä㭪樨
   * ecx =  ¤à¥á ­®¢®£® ®¡à ¡®â稪  ¨áª«î祭¨©
+  * edx = ¬ áª  ®¡à ¡ â뢠¥¬ëå ¨áª«î祭¨©
 ‚®§¢à é ¥¬®¥ §­ ç¥­¨¥:
   * eax =  ¤à¥á áâ à®£® ®¡à ¡®â稪  ¨áª«î祭¨©
     (0, ¥á«¨ ®­ ­¥ ¡ë« ãáâ ­®¢«¥­)
+  * ebx = ¬ áª  áâ à®£® ®¡à ¡®â稪  ¨áª«î祭¨©
+‡ ¬¥ç ­¨ï:
+  * <20>®¬¥à ¡¨â  ¢ ¬ áª¥ ¨áª«î祭¨© ᮮ⢥âáâ¢ãîâ ­®¬¥à㠨᪫î祭¨ï ¯®
+    ᯥæ¨ä¨ª æ¨¨ ­  ¯à®æ¥áá®à (Intel-PC). ’ ª ­ ¯à¨¬¥à, ¨áª«î祭¨ï FPU
+    ¨¬¥îâ ­®¬¥à 16 (#MF),   SSE - 19 (#XF).
+  * ‚ ¤ ­­®© ॠ«¨§ æ¨¨ ¨£­®à¨àã¥âáï § ¯à®á ­  ¯¥à¥å¢ â ¨áª«î祭¨ï 7
+    - á¨á⥬  ®¡à ¡ â뢠¥â #NM á ¬®áâ®ï⥫쭮.
+  * <20>®«ì§®¢ â¥«ì᪨© ®¡à ¡®â稪 ¯®«ã砥⠭®¬¥à ¨áª«î祭¨ï ¯ à ¬¥â஬
+    ¢ á⥪¥. <20>®í⮬㠯ࠢ¨«ì­ë© ¢ë室 ¨§ ®¡à ¡®â稪 : RET 4. ‚®§¢à â
+    ¯à¨ í⮬ ¯à®¨§¢®¤¨âáï ­  ª®¬ ­¤ã, ¢ë§¢ ¢èãî ¨áª«î祭¨¥.
+  * <20>ਠ¯¥à¥¤ ç¥ ã¯à ¢«¥­¨ï ®¡à ¡®â稪㠨᪫î祭¨©, á¡à á뢠¥âáï
+    ᮮ⢥âáâ¢ãî騩 ¡¨â ¢ ¬ áª¥ ¨áª«î祭¨©. ‚®§­¨ª­®¢¥­¨¥ í⮣® ¦¥
+    ¨áª«î祭¨ï ¢ ¯®á«¥¤á⢨¨ - ¯à¨¢¥¤¥â ª default-®¡à ¡®âª¥ â ª®¢®£®.
+    € ¨¬¥­­®: ª § ¢¥à襭¨î à ¡®âë ¯à¨«®¦¥­¨ï, ¨«¨ ¯à¨®áâ ­®¢ª¥ á
+    ­®â¨ä¨ª æ¨¥© ®â« ¦¨¢ î饬㠯ਫ®¦¥­¨î.
+  * <20>®á«¥ § ¢¥à襭¨ï ªà¨â¨ç¥áª¨å ¤¥©á⢨© ¢ ®¡à ¡®â稪¥ ¯®«ì§®¢ â¥«ï,
+    ¢®ááâ ­®¢«¥­¨¥ ¡¨â  ¬ áª¨ ¤ ­­®£® ¨áª«î祭¨ï ¬®¦­® ᤥ« âì
+    ¯®¤ä㭪樥© 18. ‘¡à®á ä« £®¢ ¨áª«î祭¨© ¢ ¬®¤ã«ïå FPU ¨ XMM -
+    â ª¦¥ ¢®§« £ ¥âáï ­  ®¡à ¡®â稪 ¯®«ì§®¢ â¥«ï.
 
 ======================================================================
 =========== ”ã­ªæ¨ï 68, ¯®¤äã­ªæ¨ï 16 - § £à㧨âì ¤à ©¢¥à. ===========
@@ -3705,15 +3724,19 @@ Architecture Software Developer's Manual, Volume 3, Appendix B);
   * <20>।¢ à¨â¥«ì­® ¤®«¦¥­ ¡ëâì ¯®«ã祭 åí­¤« ¤à ©¢¥à  ¯®¤ä㭪樥© 16.
 
 ======================================================================
-== ”ã­ªæ¨ï 68, ¯®¤äã­ªæ¨ï 18 - ãáâ ­®¢¨âì ®¡à ¡®â稪 ¨áª«î祭¨© SSE. =
+= ”ã­ªæ¨ï 68, ¯®¤äã­ªæ¨ï 18 - ¨§¬¥­¥­¨¥ á®áâ®ï­¨ï  ªâ¨¢­®á⨠ᨣ­ «  =
 ======================================================================
 <EFBFBD> à ¬¥âàë:
   * eax = 68 - ­®¬¥à ä㭪樨
   * ebx = 18 - ­®¬¥à ¯®¤ä㭪樨
-  * ecx =  ¤à¥á ­®¢®£® ®¡à ¡®â稪  ¨áª«î祭¨©
+  * ecx = ­®¬¥à ᨣ­ « 
+  * edx = §­ ç¥­¨¥ ãáâ ­ ¢«¨¢ ¥¬®©  ªâ¨¢­®á⨠(0/1)
 ‚®§¢à é ¥¬®¥ §­ ç¥­¨¥:
-  * eax =  ¤à¥á áâ à®£® ®¡à ¡®â稪  ¨áª«î祭¨©
+  * eax = áâ à®¥ §­ ç¥­¨¥  ªâ¨¢­®á⨠ᨣ­ «  (0/1)
-    (0, ¥á«¨ ®­ ­¥ ¡ë« ãáâ ­®¢«¥­)
+‡ ¬¥ç ­¨ï:
+  * ‚ ⥪ã饩 ॠ«¨§ æ¨¨ ¨§¬¥­ï¥âáï ⮫쪮 ¬ áª  ¯®«ì§®¢ â¥«ì᪮£®
+    ®¡à ¡®â稪  ¨áª«î祭¨©, ãáâ ­®¢«¥­­®£® ¯®¤ä㭪樥© 15. <20>ਠí⮬
+    ­®¬¥à ᨣ­ «  ᮮ⢥âáâ¢ã¥â ­®¬¥à㠨᪫î祭¨ï.
 
 ======================================================================
 ============= ”ã­ªæ¨ï 68, ¯®¤äã­ªæ¨ï 19 - § £à㧨âì DLL. =============

kernel/trunk/docs/sysfuncs.txt

@@ -3613,29 +3613,47 @@ Remarks:
     or subfunction 20.
 
 ======================================================================
-======== Function 68, subfunction 14 - wait for driver notify. =======
+===================== Function 68, subfunction 14 ====================
+====== Waiting delivering of signal from another program/driver ======
 ======================================================================
 Parameters:
   * eax = 68 - function number
   * ebx = 14 - subfunction number
-  * ecx = pointer to the buffer for information (8 bytes)
+  * ecx = pointer to the buffer for information (24 bytes)
 Returned value:
   * buffer pointed to by ecx contains the following information:
-    * +0: dword: constant EV_INTR = 1
+    * +0: dword: identifier for underlying data of signal
-    * +4: dword: driver data
+    * +4: data of signal (20 bytes), format of which is defining by
-Remarks:
+          first dword
-  * The current implementation at wait time uses "heavy" operations
-    of task switch.
 
 ======================================================================
-====== Function 68, subfunction 15 - set FPU exception handler. ======
+====== Function 68, subfunction 15 - set new exceptions handler ======
 ======================================================================
 Parameters:
   * eax = 68 - function number
   * ebx = 15 - subfunction number
   * ecx = address of the new exception handler
+  * edx = the mask of processing exceptions
 Returned value:
   * eax = address of the old exception handler (0, if it was not set)
+  * ebx = the old mask of exception handler
+Remarks:
+  * Bit number in mask of exceptions is correspond to exception number
+    by CPU-specification (Intel-PC). For example, FPU-exception have
+    number 16 (#MF), and SSE-exception - 19 (#XF)
+  * The current implementation ignore the inquiry for hook of 7
+    exception - system process #NM by one's own.
+  * User handler get exception number in stack parameter. So, correct
+    exit from handler is: RET 4. Return from handler is to the same
+    instruction, that was cause the exception
+  * When control is transfering to user handler, corresponding bit in
+    exception mask is clearing. Rising this exception in consequence
+    - reduce to default-handling. Exactly: terminating the application,
+    or suspending with debug-notify to owner.
+  * After completion of critical operations in user handler, it may be
+    rising corresponding bit in exception mask by using subfunction 18
+    Clearing exceptions flags in FPU and/or XMM modules - is
+    responsibility of user handler too.
 
 ======================================================================
 ============= Function 68, subfunction 16 - load driver. =============
@@ -3676,14 +3694,19 @@ Remarks:
   * Previously one must obtain driver handle by subfunction 16.
 
 ======================================================================
-====== Function 68, subfunction 18 - set SSE exception handler. ======
+==== Function 68, subfunction 18 - change state of signal activity ===
 ======================================================================
 Parameters:
   * eax = 68 - function number
   * ebx = 15 - subfunction number
-  * ecx = address of the new exception handler
+  * ecx = signal number
+  * edx = value of activity (0/1)
 Returned value:
-  * eax = address of the old exception handler (0, if it was not set)
+  * eax = value of old activity for this signal (0/1)
+Remarks:
+  * In current implementation, it is changed only exception mask for
+    user exception handler, wich was previously set by subfunction 15.
+    At that, number of signal correspond to exception number.
 
 ======================================================================
 =============== Function 68, subfunction 19 - load DLL. ==============

kernel/trunk/kernel.asm

@@ -675,8 +675,8 @@ no_lib_load:
 
         xor  eax, eax
         mov  dword [SLOT_BASE+APPDATA.fpu_state], fpu_data
-        mov  dword [SLOT_BASE+APPDATA.fpu_handler], eax
+        mov  dword [SLOT_BASE+APPDATA.exc_handler], eax
-        mov  dword [SLOT_BASE+APPDATA.sse_handler], eax
+        mov  dword [SLOT_BASE+APPDATA.except_mask], eax
 
         ; name for OS/IDLE process
 
@@ -697,8 +697,8 @@ no_lib_load:
         cld
         rep movsd
 
-        mov dword [SLOT_BASE+256+APPDATA.fpu_handler], eax
+        mov dword [SLOT_BASE+256+APPDATA.exc_handler], eax
-        mov dword [SLOT_BASE+256+APPDATA.sse_handler], eax
+        mov dword [SLOT_BASE+256+APPDATA.except_mask], eax
 
         mov ebx, SLOT_BASE+256+APP_OBJ_OFFSET
         mov  dword [SLOT_BASE+256+APPDATA.fd_obj], ebx

kernel/trunk/kernel32.inc

@@ -122,8 +122,8 @@ struc APPDATA
 
   .fpu_state       dd ?            ;+16
   .ev_count_       dd ? ;unused    ;+20
-  .fpu_handler     dd ?            ;+24
+  .exc_handler     dd ?            ;+24
-  .sse_handler     dd ?            ;+28
+  .except_mask     dd ?            ;+28
   .pl0_stack       dd ? ;unused    ;+32
   .heap_base       dd ?            ;+36
   .heap_top        dd ?            ;+40