Burer/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

More correct build_ru.bat and build_en.bat

Browse Source 
Now kernel uses interrupt gates for i40 handler instead of task gates. 
So i40 handler TSS can be removed.

git-svn-id: svn://kolibrios.org@3 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Andrey Halyavin (halyavin) 2005-10-10 16:57:18 +00:00
parent d5c0fed779
commit b37db20eb6
7 changed files with 72 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/trunk/build_en.bat
View File

@ -1,4 +1,4 @@
@if not exist lang.inc ( @erase lang.inc
@echo lang fix en >lang.inc @echo lang fix en >lang.inc
)
@fasm kernel.asm kernel.mnt @fasm kernel.asm kernel.mnt
@pause

4
kernel/trunk/build_ru.bat
View File

@ -1,4 +1,4 @@
@if not exist lang.inc ( @erase lang.inc
@echo lang fix ru >lang.inc @echo lang fix ru >lang.inc
)
@fasm kernel.asm kernel.mnt @fasm kernel.asm kernel.mnt
@pause

4
kernel/trunk/core/newproce.inc
View File

@ -455,7 +455,9 @@ new_start_application_fl:
mov [l.io],word 128 mov [l.io],word 128
mov [l.eflags],dword 0x11202 mov [l.eflags],dword 0x11202
mov [l.ss0],os_data mov [l.ss0],os_data
mov [l.esp0],0x55000 shl ebx,9
add ebx,sysint_stack_data
mov [l.esp0],ebx
; mov [l.esp1],0x56000 ; mov [l.esp1],0x56000
; mov [l.esp2],0x57000 ; mov [l.esp2],0x57000

2
kernel/trunk/core/sched.inc
View File

@ -93,7 +93,7 @@ irq0:
mov edx,[0x3000] mov edx,[0x3000]
lea edx,[tss0sys+8*edx] lea edx,[tss0sys+8*edx]
;mov [8*0x40+idts+8+0], word 0 ;mov [8*0x40+idts+8+0], word 0
mov [8*0x40+idts+8+2],dx ;mov [8*0x40+idts+8+2],dx
;mov [8*0x40+idts+8+4],word 11100101b*256 ;mov [8*0x40+idts+8+4],word 11100101b*256
;mov [8*0x40+idts+8+6], word 0 ;mov [8*0x40+idts+8+6], word 0

8
kernel/trunk/core/sys32.inc
View File

@ -288,10 +288,10 @@ build_syscall_interrupt_table:
;mov dx,tss0sys ;mov dx,tss0sys
mov edi,8*0x40+idts+8 mov edi,8*0x40+idts+8
mov [edi + 0], word 0 mov [edi + 0], word (i40 and ((1 shl 16)-1))
mov [edi + 2], word tss0sys ;dx mov [edi + 2], word os_code
mov [edi + 4], word 11100101b*256 mov [edi + 4], word 11101110b*256
mov [edi + 6], word 0 mov [edi + 6], word (i40 shr 16)
mov edi,8*0x38+idts+8 mov edi,8*0x38+idts+8
mov eax, i38 mov eax, i38

94
kernel/trunk/core/syscall.inc
View File

@ -3,9 +3,19 @@
;; SYSTEM CALL ENTRY ;; ;; SYSTEM CALL ENTRY ;;
;; ;; ;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
uglobal
task_tss rd 1
endg
align 32 align 32
i40: i40:
pushad
push ds
mov ax,word os_data
mov ds,ax
mov es,ax
mov [task_tss],esp
add dword [task_tss],4
cli cli
mov edi,[0x3000] mov edi,[0x3000]
@ -15,15 +25,15 @@ i40:
mov [edi+gdts+ tss0 +5], word 01010000b *256 +11101001b mov [edi+gdts+ tss0 +5], word 01010000b *256 +11101001b
;save GDT TSS entry ;save GDT TSS entry
mov edx,[edi+tss0_l] ; mov edx,[edi+tss0_l]
mov [reg1+eax*4],edx ; mov [reg1+eax*4],edx
mov edx,[edi+tss0_l+4] ; mov edx,[edi+tss0_l+4]
mov [reg2+eax*4],edx ; mov [reg2+eax*4],edx
;and then write there i40's descriptor ;and then write there i40's descriptor
mov edx,[tss0sys_l+edi] ; mov edx,[tss0sys_l+edi]
mov [edi+tss0_l],edx ; mov [edi+tss0_l],edx
mov edx,[tss0sys_l+edi+4] ; mov edx,[tss0sys_l+edi+4]
mov [edi+tss0_l+4],edx ; mov [edi+tss0_l+4],edx
shl edi,5 shl edi,5
@ -32,26 +42,28 @@ i40:
; for syscall trace function ; for syscall trace function
call save_registers call save_registers
mov esi, [0x3000] ; mov esi, [0x3000]
imul esi, tss_step ; imul esi, tss_step
add esi, tss_data ; add esi, tss_data
mov esi,[task_tss]
; sub esi,0x28
; esi holds address of TSS of interupted program ; esi holds address of TSS of interupted program
; load first 3 registers ; load first 3 registers
mov eax,[esi+l.eax-tss_sceleton] mov eax,[esi+28];+l.eax-tss_sceleton]
mov ebx,[esi+l.ebx-tss_sceleton] mov ebx,[esi+16];l.ebx-tss_sceleton]
mov ecx,[esi+l.ecx-tss_sceleton] mov ecx,[esi+24];l.ecx-tss_sceleton]
; save current registers ; save current registers
; stack may be modified by a system function to return some value to caller! ; stack may be modified by a system function to return some value to caller!
pushad pushad
; load all registers from TSS of the application, in crossed order (why?) ; load all registers from TSS of the application, in crossed order (why?)
mov edi,[esi+l.eax-tss_sceleton] mov edi,[esi+28];l.eax-tss_sceleton]
mov eax,[esi+l.ebx-tss_sceleton] mov eax,[esi+16];l.ebx-tss_sceleton]
mov ebx,[esi+l.ecx-tss_sceleton] mov ebx,[esi+24];l.ecx-tss_sceleton]
mov ecx,[esi+l.edx-tss_sceleton] mov ecx,[esi+20];l.edx-tss_sceleton]
mov edx,[esi+l.esi-tss_sceleton] mov edx,[esi+4];l.esi-tss_sceleton]
mov esi,[esi+l.edi-tss_sceleton] mov esi,[esi+0];l.edi-tss_sceleton]
; enable interupts - a task switch or an IRQ _CAN_ interrupt i40 handler ; enable interupts - a task switch or an IRQ _CAN_ interrupt i40 handler
sti sti
@ -72,22 +84,22 @@ i40:
; </Ivan 05.03.2005> ; </Ivan 05.03.2005>
; modify 3 program's registers (in its TSS) ; modify 3 program's registers (in its TSS)
mov [esi+l.eax-tss_sceleton], eax mov [esi+28],eax;[esi+l.eax-tss_sceleton], eax
mov [esi+l.ebx-tss_sceleton], ebx mov [esi+16],ebx;[esi+l.ebx-tss_sceleton], ebx
mov [esi+l.ecx-tss_sceleton], ecx mov [esi+24],ecx;[esi+l.ecx-tss_sceleton], ecx
; calculate app's TSS address ; calculate app's TSS address
mov ebx, [0x3000] ; mov ebx, [0x3000]
shl ebx, 3 ; shl ebx, 3
add ebx, tss0_l ; add ebx, tss0_l
mov ecx, [0x3000] ; mov ecx, [0x3000]
; restore saved TSS descriptor ; restore saved TSS descriptor
mov eax, [reg1+ecx*4] ; mov eax, [reg1+ecx*4]
mov [ebx], eax ; mov [ebx], eax
mov eax, [reg2+ecx*4] ; mov eax, [reg2+ecx*4]
mov [ebx+4], eax ; mov [ebx+4], eax
xor eax, eax xor eax, eax
mov edi, [0x3000] ; no syscall interrupt in use anymore mov edi, [0x3000] ; no syscall interrupt in use anymore
@ -95,14 +107,20 @@ i40:
mov [edi+0x80000+0xB0],eax mov [edi+0x80000+0xB0],eax
; clear busy flag in TSS of this handler ; clear busy flag in TSS of this handler
mov edi, [0x3000] ; mov edi, [0x3000]
shl edi, 3 ; shl edi, 3
mov [edi+tss0sys_l +5], word 01010000b *256 +11101001b ; mov [edi+tss0sys_l +5], word 01010000b *256 +11101001b
add edi,tss0 ; add edi,tss0
mov [0xB004], di ; mov [0xB004], di
jmp pword [0xB000] ; jmp pword [0xB000]
pop eax
mov ds,ax
mov es,ax
popad
iretd
jmp i40 jmp i40

4
kernel/trunk/kernel.asm
View File

@ -112,8 +112,8 @@ include "KERNEL16.INC"
;; ;; ;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
os_data equ os_data_l-gdts ; GDTs os_data = os_data_l-gdts ; GDTs
os_code equ os_code_l-gdts os_code = os_code_l-gdts
int_code equ int_code_l-gdts int_code equ int_code_l-gdts
int_data equ int_data_l-gdts int_data equ int_data_l-gdts
tss0sys equ tss0sys_l-gdts tss0sys equ tss0sys_l-gdts