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

     times 16 dd unknown_interrupt
     dd   i40
+endg
+macro save_ring3_context
+{
+	push	ds es
+	pushad
+}
+macro restore_ring3_context
+{
+	popad
+	pop	es ds
 endg
 ; simply return control to interrupted process
 unknown_interrupt:
      iret
 macro exc_wo_code [num]
+{
   forward
-  forward
+  e#num :
-  e#num :
+      save_ring3_context
       mov bl, num
       jmp exc_c
+}
 macro exc_w_code [num]
+{
   forward
-  forward
+  e#num :
-  e#num :
+      add esp, 4
-      add esp, 4
+      save_ring3_context
 exc_c:
         mov   ax, os_data
         mov   ds, ax
         mov   es, ax
+; test if debugging
+        cli
+        mov   eax, [0x3000]
+        shl   eax, 8
+        mov   eax, [0x80000+eax+0xAC]
+        test  eax, eax
+        jnz   .debug
+        sti
+; not debuggee => say error and terminate
         add   esp, 28h
         movzx eax, bl
         mov   [error_interrupt], eax
         call  show_error_parameters
         mov   edx, [0x3010]
+        mov   [edx + 0xA], byte 4
+        jmp   change_task
+.debug:
+; we are debugged process, notify debugger and suspend ourself
+; eax=debugger PID
+        movzx ecx, bl
+        push  ecx
+        mov   ecx, [0x3010]
+        push  dword [ecx+4]	; PID of current process
+        push  12
+        pop   ecx
+        push  1		; 1=exception
+        call  debugger_notify
+        pop   ecx
+        pop   ecx
+        pop   ecx
+        mov   edx, [0x3010]
-        mov   [edx + 0xA], byte 4
+        mov   byte [edx+0xA], 1		; suspended
         call  change_task
-        jmp   change_task
+        restore_ring3_context
         iretd
+;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;
+;; FPU ERROR HANDLER ;;
-;; FPU ERROR HANDLER ;;
-;;;;;;;;;;;;;;;;;;;;;;;
-align 4
-e7:
+;;;;;;;;;;;;;;;;;;;;;;;
         clts
 align 4
-        push  eax
+e7:
         cmp   [eax + 0x7f], byte 0
         je    @f
         frstor [eax+0x10]
      @@:
         mov   [eax + 0x7f], byte 1
-        pop   es ds
-        pop   eax
+        restore_ring3_context
         iret
 iglobal
   prev_user_of_fpu dd 1
 macro irqh [num]
+{
   forward
   p_irq#num :
-     pushad
+     save_ring3_context
      mov   edi, num
      jmp   irq_c
+}
-irqh 2,5,7,8,9,10,11,14,15
 irqh 2,5,7,8,9,10,11,14,15
  irq_c:
-     push  ds es
+ irq_c:
      mov   ax, os_data
      mov   ds, ax
-     mov   es, ax
-     call  irqhandler
+     mov   es, ax
-     pop   es ds
+     call  irqhandler
-     popad
-     iret
+     restore_ring3_context
      iret
 p_irq6:
-     pushad
+p_irq6:
-     push  ds es
+     save_ring3_context
      mov   ax, os_data
      mov   ds, ax
-     mov   es, ax
-     call  fdc_irq
+     mov   es, ax
-     call  ready_for_next_irq
+     call  fdc_irq
-     pop   es ds
-     popad
+     call  ready_for_next_irq
-     iret
+     restore_ring3_context
      iret
 p_irq3:
-     pushad
+p_irq3:
-     push  ds es
+     save_ring3_context
-     mov   ax, os_data
-     mov   ds, ax
+     mov   ax, os_data
-     mov   es, ax
+     mov   ds, ax
-     call  check_mouse_data_com2
-     pop   es ds
+     mov   es, ax
-     popad
+     call  check_mouse_data_com2
-     iret
+     restore_ring3_context
      iret
 p_irq4:
-     pushad
+p_irq4:
-     push  ds es
-     mov   ax, os_data
+     save_ring3_context
-     mov   ds, ax
+     mov   ax, os_data
-     mov   es, ax
-     call  check_mouse_data_com1
+     mov   ds, ax
-     pop   es ds
+     mov   es, ax
-     popad
+     call  check_mouse_data_com1
-     iret
+     restore_ring3_context
      iret
-p_irq12:
-     pushad
-     push  ds es
+p_irq12:
-     mov   ax, os_data
+     save_ring3_context
-     mov   ds, ax
+     mov   ax, os_data
-     mov   es, ax
+     mov   ds, ax
      out    0xa0,al
      out   0x20, al
      ret
-irqD:
-     pushad
+irqD:
-     push  ds es
+     save_ring3_context
      mov   ax, os_data
      mov   ds, ax
      mov   es, ax
      mov   al,0x20
      out   dx,al
      mov   dx,0x20
      out   dx,al
-     pop   es ds
+     restore_ring3_context
      popad
      iret
     push   esi
     mov    esi,process_terminating
     call   sys_msg_board_str
     pop    esi
 @@:
     cli
     cmp   [application_table_status],0
     je    term9
     sti
     call  change_task
-    jmp   terminate
+    jmp   @b
   term9:
     xor   eax, eax
   ;  cld
     rep   stosd
     popa
+; debuggee test
+    pushad
+    mov  edi, esi
+    shl  edi, 5
+    mov  eax, [0x80000+edi*8+0xAC]
+    test eax, eax
+    jz   .nodebug
+    push 8
+    pop  ecx
+    push dword [0x3000+edi+0x4]   ; PID
+    push 2
+    call debugger_notify
+    pop  ecx
+    pop  ecx
+.nodebug:
+    popad
     pusha         ; at 0x80000+
     mov   edi,esi
     shl   edi,8
     add   edi,0x80000
     popa
     mov  edi,esi         ; do not run this process slot
     shl  edi, 5
+    mov  [edi+0x300A],byte 9
+; debugger test - terminate all debuggees
+    mov  eax, 2
+    mov  ecx, 0x80000+2*0x100+0xAC
+.xd0:
+    cmp  eax, [0x3004]
+    ja   .xd1
+    cmp  dword [ecx], esi
+    jnz  @f
+    and  dword [ecx], 0
+    pushad
+    xchg eax, ebx
+    mov  eax, 2
+    call sys_system
+    popad
+@@:
+    inc  eax
+    add  ecx, 0x100
+    jmp  .xd0
-    mov  [edi+0x300A],byte 9
+.xd1:
 ;    call  systest
     sti  ; .. and life goes on

Subversion Repositories Kolibri OS

(root)/kernel/trunk/core/sys32.inc – Rev 33 → 40