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

         dw     0x0000
         db     0x00
         dw     11011111b *256 +10010010b
         db     0x00
-graph_data_l:
-        dw     0x3ff
-        dw     0x0000
-        db     0x00
-        dw     11010000b *256 +11110010b
-        db     0x00
-tss0_l:
-      times (max_processes+10) dd 0,0
-tss0i_l:
-      times 0x41 dq 0 ;(256+10) dd 0,0
 app_code_l:
       dw ((0x80000000-std_application_base_address) shr 12) and 0xffff
       dw 0
       db 0
       dw 0
       db 0
       dw 11010000b*256+11110010b+256*((0x80000000-std_application_base_address) shr 28)
       db std_application_base_address shr 24
+graph_data_l:
+        dw     0x3ff
+        dw     0x0000
+        db     0x00
+        dw     11010000b *256 +11110010b
+        db     0x00
+tss0_l:
       times (max_processes+10) dd 0,0
 gdte:
-idtreg:
+idtreg:
+     dw   8*0x41-1
+     dd   idts+8
+label idts at 0xB100-8
+uglobal
+ tss_sceleton:
+  l.back   dw 0,0
+  l.esp0   dd 0
+  l.ss0    dw 0,0
+  l.esp1   dd 0
+  l.ss1    dw 0,0
+  l.esp2   dd 0
+  l.ss2    dw 0,0
+  l.cr3    dd 0
+  l.eip    dd 0
+  l.eflags dd 0
+  l.eax    dd 0
+  l.ecx    dd 0
+  l.edx    dd 0
+  l.ebx    dd 0
+  l.esp    dd 0
+  l.ebp    dd 0
+  l.esi    dd 0
+  l.edi    dd 0
+  l.es     dw 0,0
+  l.cs     dw 0,0
+  l.ss     dw 0,0
+  l.ds     dw 0,0
-     dw   8*0x41-1
+  l.fs     dw 0,0
-     dd   idts+8
+  l.gs     dw 0,0
   l.ldt    dw 0,0
-label idts at 0xB100-8
+  l.trap   dw 0
         ret
-build_interrupt_table:
-        mov  [l.eflags],dword 0x11002
-        mov  [l.ss0], int_data
-        ;mov  [l.ss1], ring1_data
-        ;mov  [l.ss2], ring2_data
-        mov  [l.esp0], 0x52000
-        mov  [l.esp1], 0x53000
-        mov  [l.esp2], 0x54000
-        mov  eax,cr3
-        mov  [l.cr3],eax
-        mov  [l.cs],int_code
-        mov  [l.ss],int_data
-        mov  [l.ds],int_data
-        mov  [l.es],int_data
-        mov  [l.fs],int_data
-        mov  [l.gs],int_data
-        mov  eax,sys_int
-        mov  [l.esp],0x720000
-        mov  edi,0x290000
-     newint:
-        push edi
-        mov  ebx,[eax]
-        mov  [l.eip],ebx
-        mov  esi,tss_sceleton
-        mov  ecx,120/4
-        cld
-        rep  movsd
-        pop  edi
-        add  edi,128
-        add  [l.esp],1024
-        add  eax,4
-        cmp  eax,sys_int+4*0x40 ;0x60
-        jbe  newint  ;jb
-;;
-        mov    esi,boot_sched_3_2
-        call   boot_log
-        mov    ecx,0x290000
-        mov    edi,0
-      setgdtl2i:
-        mov    [edi+gdts+ tss0i +0], word 128
-        mov    [edi+gdts+ tss0i +2], cx
-        mov    eax,ecx
-        shr    eax,16
-        mov    [edi+gdts+ tss0i +4], al
-        mov    [edi+gdts+ tss0i +7], ah
-        mov    [edi+gdts+ tss0i +5], word 01010000b *256 +11101001b
-        add    ecx,128
-        add    edi,8
-        cmp    edi,8*0x40 ;0x60
-        jbe    setgdtl2i
-;;
-        mov    esi,boot_sched_3_3
-        call   boot_log
-        mov    edi,0
-        mov    edx,tss0i
-     @@:
-        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
-        mov    [edi+idts+ 8 +6], word 0
-        add    edx,8
-        add    edi,8
-        cmp    edi,8*0x40
         jb     @b
 build_interrupt_table:
-    ; Exceptions
         mov    edi, idts+8
         mov    esi, sys_int
-        mov    ecx, 32
+        mov    ecx, 0x40
      @@:
         mov    eax, [esi]
         mov    [edi+6], ax
         add    esi, 4
         add    edi, 8
         dec    ecx
         jnz    @b
-        ret
-build_syscall_interrupt_table:
-        ;mov    dx,tss0sys
-        mov    edi,8*0x40+idts+8
+        ;mov    edi,8*0x40+idts+8
         mov    [edi + 0], word (i40 and ((1 shl 16)-1))
         mov    [edi + 2], word os_code
         mov    [edi + 4], word 11101110b*256
         mov    [edi + 6], word (i40 shr 16)
         ret
-iglobal
-  sys_int:
-    dd   s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,sa,sb,sc,sd,se,sf
-    dd   s10        ,s11      ;  ,i_unknown12,i_unknown13
+iglobal
-;    dd   i_unknown14,i_unknown15,i_unknown16,i_unknown17
+  sys_int:
-;    dd   i_unknown18,i_unknown19,i_unknown1a,i_unknown1b
+    dd   e0,e1,e2,e3,e4,e5,e6,e7,e8,e9,e10,e11,e12,e13,e14,e15
-;    dd   i_unknown1c,i_unknown1d,i_unknown1e,i_unknown1f
-    times 14 dd unknown_interrupt
-    dd   irq0  ,irq1  ,p_irq2 ,p_irq3 ,p_irq4 ,p_irq5,p_irq6 ,p_irq7
-    dd   p_irq8,p_irq9,p_irq10,p_irq11,p_irq12,irqD  ,p_irq14,p_irq15
+    dd   e16,e17
     times 14 dd unknown_interrupt
     ;dd   i_unknown30,i_unknown31,i_unknown32,i_unknown33
-    ;dd   i_unknown34,i_unknown35,i_unknown36,i_unknown37
-    ;dd   i_unknown38,i_unknown39,i_unknown3a,i_unknown3b
-    ;dd   i_unknown3c,i_unknown3d,i_unknown3e,i_unknown3f
-    times 16 dd unknown_interrupt
-    dd   i40
-endg
-uglobal
- tss_sceleton:
-  l.back   dw 0,0
-  l.esp0   dd 0
-  l.ss0    dw 0,0
-  l.esp1   dd 0
-  l.ss1    dw 0,0
-  l.esp2   dd 0
-  l.ss2    dw 0,0
-  l.cr3    dd 0
-  l.eip    dd 0
-  l.eflags dd 0
-  l.eax    dd 0
-  l.ecx    dd 0
-  l.edx    dd 0
-  l.ebx    dd 0
-  l.esp    dd 0
-  l.ebp    dd 0
-  l.esi    dd 0
-  l.edi    dd 0
-  l.es     dw 0,0
-  l.cs     dw 0,0
-  l.ss     dw 0,0
-  l.ds     dw 0,0
-  l.fs     dw 0,0
-  l.gs     dw 0,0
-  l.ldt    dw 0,0
-  l.trap   dw 0
-  l.io     dw 0
-endg
-s0:
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0x0
-        mov   [error_interrupt_entry],dword s0
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
-        jmp   change_task
-s1:
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0x1
-        mov   [error_interrupt_entry],dword s1
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
-        jmp   change_task
-s2:
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0x2
-        mov   [error_interrupt_entry],dword s2
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
-        jmp   change_task
+    dd   irq0  ,irq1  ,p_irq2 ,p_irq3 ,p_irq4 ,p_irq5,p_irq6 ,p_irq7
-s3:
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0x3
-        mov   [error_interrupt_entry],dword s3
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
+    dd   p_irq8,p_irq9,p_irq10,p_irq11,p_irq12,irqD  ,p_irq14,p_irq15
-        jmp   change_task
-s4:
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0x4
-        mov   [error_interrupt_entry],dword s4
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
-        jmp   change_task
-s5:
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
+    times 16 dd unknown_interrupt
+    dd   i40
+endg
+; simply return control to interrupted process
+unknown_interrupt:
+     iret
-        mov   [error_interrupt],0x5
-        mov   [error_interrupt_entry],dword s5
+macro exceptions [num]
+{
-        call  show_error_parameters
+  forward
+  e#num :
-        mov   edx,[0x3010]
+  	mov bl, num
-        mov   [edx+0xa],byte 4
   	jmp exc_c
-        jmp   change_task
+}
-s6:
+exceptions 0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
-        mov   ax, os_data
+exc_c:
-        mov   ds, ax
+        mov   ax, os_data
-        mov   es, ax
+        mov   ds, ax
         mov   es, ax
         mov   [error_interrupt],0x6
-        mov   [error_interrupt_entry],dword s6
+        movzx eax, bl
+        mov   [error_interrupt], eax
         call  show_error_parameters
-        mov   edx,[0x3010]
+        mov   edx, [0x3010]
 iglobal
   prev_user_of_fpu dd 1
 endg
-s8:
-        add   esp, 4 ; zero on the stack!
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0x8
-        mov   [error_interrupt_entry],dword s8
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
-        jmp   change_task
-s9:
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0x9
-        mov   [error_interrupt_entry],dword s9
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
-        jmp   change_task
-; Invalid TSS
-sa:
-        add   esp, 4 ; error code
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0xa
-        mov   [error_interrupt_entry],dword sa
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
-        jmp   change_task
-; Segment not present
-sb:
-	add   esp, 4
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0xb
-        mov   [error_interrupt_entry],dword sb
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
-        jmp   change_task
-; Stack fault exception
-sc:
-	add   esp, 4
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0xc
-        mov   [error_interrupt_entry],dword sc
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
-        jmp   change_task
-; General Protection Fault
-sd:
-	add   esp, 4
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0xd
-        mov   [error_interrupt_entry],dword sd
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
-        jmp   change_task
-; Page-Fault Exception
-se:
-	add   esp, 4
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0xe
-        mov   [error_interrupt_entry],dword se
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
-        jmp   change_task
-; ??
-sf:
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0xf
-        mov   [error_interrupt_entry],dword sf
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
-        jmp   change_task
-; x87 FPU Floating-Point Error
-s10:
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0x10
-        mov   [error_interrupt_entry],dword s10
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
-        jmp   change_task
-; Alignment Check Exception
-s11:
-	add   esp, 4
-        mov   ax, os_data
-        mov   ds, ax
-        mov   es, ax
-        mov   [error_interrupt],0x11
-        mov   [error_interrupt_entry],dword s11
-        call  show_error_parameters
-        mov   edx,[0x3010]
-        mov   [edx+0xa],byte 4
         jmp   change_task
+writehex:
+      pusha
-writehex:
-      pusha
-      mov  ecx,eax
-      mov  ax,word [printerrorat]
-      shl  eax,16
-      mov  ax,[esp+32+4]
-      sub  ax,60
-      mov  edx,1
+      mov  edi, [write_error_to]
-      mov  esi,8
-      mov  ebx,0xffffff
-    whl1:
-      push ecx
-      and  ecx,0xf
+      mov  esi, 8
-      add  ecx,hexletters
+    @@:
-      mov  edi,1
+      mov  ecx, eax
-      mov  cl,[ecx]
-      mov  edi,[write_error_to]
+      and  ecx, 0xf
-      mov  [edi],cl
-      dec  [write_error_to]
+      mov  cl,[ecx+hexletters]
       mov  [edi],cl
-      pop  ecx
+      dec  edi
       shr  ecx,4
-      sub  eax,6*65536
+      shr  eax,4
-      dec  esi
-      jnz  whl1
-      popa
+      dec  esi
-      ret
+      jnz  @b
-iglobal
+      popa
         mov    eax,[error_interrupt]
         call   writehex
         mov    eax,[0x3000]
         shl    eax,8
-        cmp    [0x80000+eax+0xB0],dword 0
+        cmp    [0x80000+eax+0xB0],byte 0
         jnz    .system_error
         mov    eax,[0x3000]
-; irq1  ->  hid/keyboard.inc
-p_irq2:
-     call  restore_caller
-     mov   edi,2               ; 1
-     call  irqhandler          ; 2/5
-     call  return_to_caller
-     jmp   p_irq2
-p_irq3:
-     call  restore_caller
-     mov   edi,3
-     call  irqhandler
+; irq1  ->  hid/keyboard.inc
-     call  return_to_caller
-     jmp   p_irq3
-p_irq4:
-     call  restore_caller
-     mov   edi,4
-     call  irqhandler
-     call  return_to_caller
-     jmp   p_irq4
-p_irq5:
-     call  restore_caller
-     mov   edi,5
-     call  irqhandler
-     call  return_to_caller
-     jmp   p_irq5
-p_irq6:
+macro irqhh [num]
-     call  restore_caller
-     call  fdc_irq
-     mov   edi,6
+{
-     call  irqhandler
-     call  return_to_caller
-     jmp   p_irq6
+  forward
-p_irq7:
+  p_irq#num :
-     call  restore_caller
+     pushad
-     mov   edi,7
-     call  irqhandler
+     mov   edi, num
+     jmp   irq_c
-     call  return_to_caller
-     jmp   p_irq7
+}
-p_irq8:
-     call  restore_caller
-     mov   edi,8
-     call  irqhandler
-     call  return_to_caller
-     jmp   p_irq8
+irqhh 2,3,4,5,6,7,8,9,10,11,12,14,15
-p_irq9:
-     call  restore_caller
-     mov   edi,9
-     call  irqhandler
-     call  return_to_caller
-     jmp   p_irq9
-p_irq10:
+ irq_c:
-     call  restore_caller
-     mov   edi,10
-     call  irqhandler
-     call  return_to_caller
-     jmp   p_irq10
+     push  ds es
-p_irq11:
-     call  restore_caller
-     mov   edi,11
-     call  irqhandler
-     call  return_to_caller
-     jmp   p_irq11
+     mov   ax, os_data
-p_irq12:
-      call  restore_caller
-      mov   edi,12
+     mov   ds, ax
-      call  irqhandler
+     mov   es, ax
      call  irqhandler
+     pop   es ds
+     popad
-      call  return_to_caller
+     iret
+irqD:
+     pushad
-      jmp   p_irq12
+     push  ds es
      mov   ax, os_data
-irqD:
+     mov   ds, ax
-     call   restore_caller
+     mov   es, ax
      mov   dx,0xf0
      mov   al,0
      out   dx,al
-     mov   dx,0xa0
-     mov   al,0x20
-     out   dx,al
-     mov   dx,0x20
-     out   dx,al
-     call  return_to_caller
-     jmp   irqD
-p_irq14:
-     call  restore_caller
-     mov   edi,14
-     call  irqhandler
-     call  return_to_caller
+     mov   dx,0xa0
-     jmp   p_irq14
-p_irq15:
-     call  restore_caller
-     mov   edi,15
-     call  irqhandler
-     call  return_to_caller
-     jmp   p_irq15
-align 4
+     mov   al,0x20
-restore_caller:
-      mov    edi,[0x3000]
-      shl    edi, 3
-      mov    [edi+gdts+ tss0 +5], word 01010000b *256 +11101001b
-      ret
-align 4
-return_to_caller:
-      mov   ebx,[0x3000]
-      shl   bx,3
+     out   dx,al
-      add   bx,tss0;t
+     mov   dx,0x20
-      mov   [tss_irq12],bx
+     out   dx,al
    noa0:
-     ret
-; simply return control to interrupted process
-unknown_interrupt:
-     iret
      ret
 set_application_table_status:
-        push eax
+set_application_table_status:
         push eax
         mov  eax,[0x3000]
 clear_application_table_status:
         push eax
         mov  eax,[0x3000]
-        ;imul eax,32
+        mov  eax,[0x3000]
         shl  eax, 5
         add  eax,0x3000+4
 ;draw_present db 0
 ;* end code - fix error redraw for terminate (2) - Mario79
 iglobal
   boot_sched_1    db   'Building gdt tss pointer',0
-  ;boot_sched_2    db   'Building gdt gate pointer',0
-  boot_sched_3    db   'Building interrupt table - TSS',0
-  boot_sched_3_2  db   'Building interrupt table - GDT',0
-  boot_sched_3_3  db   'Building interrupt table - IDT',0
-  boot_sched_4    db   'Building syscall interrupt table',0
+  boot_sched_2    db   'Building IDT table',0
 endg
 build_scheduler:
-        mov    esi,boot_sched_1
-        call   boot_log
-        call   build_process_gdt_tss_pointer
-;        mov    esi,boot_sched_2
+        mov    esi,boot_sched_1
-;        call   boot_log
+        call   boot_log
-;        call   build_process_gdt_gate_pointer
-        mov    esi,boot_sched_3
-        call   boot_log
-        call   build_interrupt_table
+        call   build_process_gdt_tss_pointer

Subversion Repositories Kolibri OS

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