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

-gdte:
 gdte:
 idtreg:
-     dw   8*0x41-1
-     dd   idts+8
-label idts at 0xB100-8
-;idte = idts + 8 + 0x60
-;  ; old code below:
-;align 32
-;idts:
-;      dw  idte-$-1
+     dw   8*0x41-1
-;      dd  idts+8
+     dd   idts+8
 ;      dw  0
 label idts at 0xB100-8
         mov    esi,boot_sched_3_3
         call   boot_log
         mov    edi,0
         mov    edx,tss0i
-      setidtl2:
+     @@:
         mov    [edi+idts+ 8 +0], word 0
         mov    [edi+idts+ 8 +2], dx
-        mov    [edi+idts+ 8 +4], word 10000101b*256 ; task gate DPL=0
-;        cmp    edi,0x40*8
-;        jne    no_sw_int
-;        mov    [edi+idts+ 8 +4], word 11100101b*256 ; task gate DPL=3
-;      no_sw_int:
+        mov    [edi+idts+ 8 +4], word 10000101b*256 ; task gate DPL=0
         mov    [edi+idts+ 8 +6], word 0
         add    edx,8
         add    edi,8
-        cmp    edi,8*0x40 ;0x60
-        jbe    setidtl2 ;jb
-;
-; THIS CODE WON'T WORK ;-(
+        cmp    edi,8*0x40
-; because each process's 0-level stack points to the same area
-; and if task switch occurs and another process is being interrupted
-; a stack overflow happens
-; The only way to solve that problem is to disable interrupts
+        jb     @b
-; while 0x40-handler is working
-; Then we have to make all entries in the IDT INTERRUPT gates, not TASK
+    ; Exceptions
-;        mov    edi, idts+8
+        mov    edi, idts+8
-;        mov    esi, sys_int
+        mov    esi, sys_int
-;        mov    ecx, 32
+        mov    ecx, 32
-;     @@:
+     @@:
-;        mov    eax, [esi]
+        mov    eax, [esi]
-;        mov    [edi],   ax           ; lower part of offset
+        mov    [edi],   ax           ; lower part of offset
-;        mov    [edi+2], word os_code ; segment selector
+        mov    [edi+2], word os_code ; segment selector
-;        shr    eax, 16
+        shr    eax, 16
-;        mov    [edi+4], word 10001110b shl 8 ; interrupt descriptor
+        mov    [edi+4], word 10001110b shl 8 ; interrupt descriptor
-;        mov    [edi+6], ax
+        mov    [edi+6], ax
-;        add    esi, 4
+        add    esi, 4
-;        add    edi, 8
-;        dec    ecx
+        add    edi, 8
-;        jnz    @b
+        dec    ecx
         mov    [edi + 6], word (i40 shr 16)
-        ret
-align 4
-i38:
-        ; load data selectors
-        pushfd
-        push    ds es
-        push    eax
-        mov     ax, os_data
-        mov     ds, ax
-        mov     es, ax
-        pop     eax
-        pushad
-        push    edi
-        mov     edi, eax
-        mov     eax, ebx
-        mov     ebx, ecx
-        mov     ecx, edx
-        mov     esi, [esp]
-        and     edi, 0xFF
-        call    dword [servetable+edi*4]
-        add     esp, 4
-        popad
-        pop     es ds
-        popfd
+        ret
 iret
   l.trap   dw 0
   l.io     dw 0
 endg
+s0:
+        mov   ax, os_data
-s0:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   [error_interrupt],0x0
         jmp   change_task
+s1:
         mov   ax, os_data
-s1:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   [edx+0xa],byte 4
         jmp   change_task
+s2:
+        mov   ax, os_data
-s2:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   [edx+0xa],byte 4
         jmp   change_task
+s3:
+        mov   ax, os_data
-s3:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   [edx+0xa],byte 4
         jmp   change_task
+s4:
+        mov   ax, os_data
-s4:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   [edx+0xa],byte 4
         jmp   change_task
+s5:
+        mov   ax, os_data
-s5:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   [edx+0xa],byte 4
         jmp   change_task
+s6:
+        mov   ax, os_data
-s6:
+        mov   ds, ax
-        cli
+        mov   es, ax
 ;; FPU ERROR HANDLER ;;
 ;;;;;;;;;;;;;;;;;;;;;;;
 align 4
-s7:
-        ;
+s7:
-        cli
-        ;
-        mov    edi, 7*8
-        mov    [edi+gdts+ tss0i +5], word 01010000b *256 +11101001b
+        clts
-        mov    edi,[0x3000]
+        push  eax
+        push  ds es
-        shl    edi, 3
-        mov    [edi+gdts+ tss0 +5], word 01010000b *256 +11101001b
+        mov   ax, os_data
+        mov   ds, ax
+        mov   es, ax
-        ; save a copy of current task's TSS to fpu_tss
-        mov    esi,[0x3000]
-        imul   esi,tss_step
-        add    esi,tss_data
-        mov    edi,fpu_tss
-        mov    ecx,120/4
+        mov   eax, [prev_user_of_fpu]
-        cld
+        shl   eax, 8
-        rep    movsd
+        add   eax, 0x80000 + 0x10
-        ; get base address of our TSS and...
+        fsave [eax]
-        mov    esi,[0x3000]
-        imul   esi,tss_step
-        add    esi,tss_data
+        mov   eax, [0x3000]
+        mov   [prev_user_of_fpu], eax
-        ; ...init segments, stack, eip, flags
+        shl   eax, 8
-        mov    word [esi+l.cs-tss_sceleton],int_code
+        add   eax, 0x80000
-        mov    word [esi+l.ss-tss_sceleton],int_data
-        mov    word [esi+l.ds-tss_sceleton],int_data
-        mov    word [esi+l.es-tss_sceleton],int_data
-        mov    word [esi+l.fs-tss_sceleton],int_data
-        mov    word [esi+l.gs-tss_sceleton],int_data
+        cmp   [eax + 0x7f], byte 0
-        mov    dword [esi+l.esp-tss_sceleton],fpu_stack+4*8
+        je    @f
-        mov    dword [esi+l.eip-tss_sceleton],fpu_handler
-        mov    dword [esi+l.eflags-tss_sceleton],0x11002
+        frstor [eax+0x10]
+     @@:
+        mov   [eax + 0x7f], byte 1
+        pop   es ds
-        ; then execute this task
-        mov    ebx, [0x3000]
+        pop   eax
+        iret
-        shl    ebx,3
+iglobal
-        add    ebx, tss0 ;t
+  prev_user_of_fpu dd 1
-        mov    [0xB004], bx
+endg
         mov   [edx+0xa],byte 4
         jmp   change_task
+s9:
+        mov   ax, os_data
-s9:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   edx,[0x3010]
         mov   [edx+0xa],byte 4
+        jmp   change_task
         jmp   change_task
+; Invalid TSS
+sa:
+        add   esp, 4 ; error code
+        mov   ax, os_data
-sa:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   edx,[0x3010]
         mov   [edx+0xa],byte 4
+        jmp   change_task
         jmp   change_task
+; Segment not present
+sb:
+	add   esp, 4
+        mov   ax, os_data
-sb:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   edx,[0x3010]
         mov   [edx+0xa],byte 4
+        jmp   change_task
         jmp   change_task
+; Stack fault exception
+sc:
+	add   esp, 4
+        mov   ax, os_data
-sc:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   edx,[0x3010]
         mov   [edx+0xa],byte 4
+        jmp   change_task
         jmp   change_task
+; General Protection Fault
+sd:
+	add   esp, 4
+        mov   ax, os_data
-sd:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   edx,[0x3010]
         mov   [edx+0xa],byte 4
+        jmp   change_task
         jmp   change_task
+; Page-Fault Exception
+se:
+	add   esp, 4
+        mov   ax, os_data
-se:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   edx,[0x3010]
         mov   [edx+0xa],byte 4
+        jmp   change_task
         jmp   change_task
+; ??
+sf:
+        mov   ax, os_data
-sf:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   edx,[0x3010]
         mov   [edx+0xa],byte 4
+        jmp   change_task
         jmp   change_task
+; x87 FPU Floating-Point Error
+s10:
+        mov   ax, os_data
-s10:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   edx,[0x3010]
         mov   [edx+0xa],byte 4
+        jmp   change_task
         jmp   change_task
+; Alignment Check Exception
+s11:
+	add   esp, 4
+        mov   ax, os_data
-s11:
+        mov   ds, ax
-        cli
+        mov   es, ax
         mov   edx,[0x3010]
         mov   [edx+0xa],byte 4
+        jmp   change_task
         jmp   change_task
 writehex:
         shl    eax,7
         mov    eax,[eax+0x298000+l.eip-tss_sceleton]
         jmp    .out_eip
-irq5:
-     call   restore_caller
-     mov    dx,word [sb16]
-     add    dx,0xe
-     in     al,dx
-;     mov    byte [SB16_Status],0
-     mov    [check_idle_semaphore],5
-     mov    al,0x20
-     out    0x20,al
-     call  return_to_caller
-     jmp   irq5
-irqD:
-     call   restore_caller
-     mov   dx,0xf0
-     mov   al,0
-     out   dx,al
-     mov   dx,0xa0
-     mov   al,0x20
-     out   dx,al
-     mov   dx,0x20
-     out   dx,al
-     mov   ds,cx
-     mov   es,cx
-     mov   fs,cx
      call  return_to_caller
       call  return_to_caller
-      jmp   p_irq12
       jmp   p_irq12
-p_irq13:
+irqD:
+     call   restore_caller
+     mov   dx,0xf0
+     mov   al,0
+     out   dx,al
+     mov   dx,0xa0
-     call  restore_caller
+     mov   al,0x20
+     out   dx,al
+     mov   dx,0x20
-     mov   edi,13
+     out   dx,al
      call  irqhandler
    noa0:
-     ret
+     ret
-; this code should never get control!
-; applications can use only 0x40 interrupt
-unknown_interrupt:
+; simply return control to interrupted process
         pop  eax
-        ret
-uglobal
-  old_code_0 dd 0x0
-  old_code_1 dd 0x0
-  ;
-  new_code_0 dd 0x0
-  new_code_1 dd 0x0
-  new_data_0 dd 0x0
-  new_data_1 dd 0x0
   new_pos    dd 0x0
-  new_amount dd 0x0
+        ret
 endg
 start_application_hd:
     jmp   new_start_application_hd
 uglobal
-  ;threadstring       dd  0x0
-  new_process_place  dd  0x0
-  ;check_processes    dd  0x0
+uglobal
-  ;dec3004            db  0x0
+  new_process_place  dd  0x0
   app_start    dd  0x0
   app_i_end    dd  0x0
   app_mem      dd  0x0
   app_esp      dd  0x0
   app_i_param  dd  0x0
-  app_i_icon   dd  0x0
-  app_mem_pos  dd  0x0
-  ;thread_create    dd 0x0
+  app_i_icon   dd  0x0
-  ;gdt_place        dd 0x0
+  app_mem_pos  dd  0x0
   appl_path        dd 0x0
   appl_path_size   dd 0x0
     call  set_application_table_status
     mov    eax,esi
-    call   dispose_app_cr3_table
-    mov   [first_gdt_search],0x2   ; start gdt search from beginning
+    call   dispose_app_cr3_table
     cmp   [prev_user_of_fpu],esi   ; if user fpu last -> fpu user = 1
     jne   fpu_ok_1
     mov   [prev_user_of_fpu],1
   fpu_ok_1:
-    mov   [0xf400],byte 0           ; empty keyboard buffer
-    mov   [0xf500],byte 0           ; empty button buffer
-;    mov   ecx,esi                               ; clear memory reserv.
-;    shl   ecx,3
-;    mov   [ecx+gdts+ app_code-3 +0],dword 0
-;    mov   [ecx+gdts+ app_code-3 +4],dword 0
-;    mov   [ecx+gdts+ app_data-3 +0],dword 0
-;    mov   [ecx+gdts+ app_data-3 +4],dword 0
-    mov   edi, esi
     mov   [0xf400],byte 0           ; empty keyboard buffer
-    mov   [usedi40+eax],byte 0
+    mov   [0xf500],byte 0           ; empty button buffer
   rmpr9:
-    popa
-    mov  edi,esi         ; do not run this process slot
+    popa
-    shl  edi, 5 ;imul edi,0x20
+    mov  edi,esi         ; do not run this process slot
-;    add  edi,0x3000
+    shl  edi, 5
     mov  [edi+0x300A],byte 9
 ;    call  systest
   boot_sched_4    db   'Building syscall interrupt table',0
 endg
-build_scheduler:
-      ; { Ivan 06.03.2005
-        mov    edi, usedi40
-        mov    ecx, 256/4
-        xor    eax, eax
         rep    stosd
-      ; } Ivan 06.03.2005
+build_scheduler:

Subversion Repositories Kolibri OS

(root)/kernel/trunk/core/sys32.inc – Rev 5 → 6