BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /kernel/trunk/core/ @ 6

  → /kernel/trunk/core/ @ 5

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 6 → Rev 5

/kernel/trunk/core/sys32.inc
68,6 → 68,7
; <IP 05.02.2005>
idtreg:
dw 8*0x41-1
dd idts+8
75,8 → 76,20
label idts at 0xB100-8
;idte = idts + 8 + 0x60
; </IP> ; old code below:
;align 32
;idts:
; dw idte-$-1
; dd idts+8
; dw 0
; times 0x62 dd 0,0
;idte:
build_process_gdt_tss_pointer:
mov ecx,tss_data
164,32 → 177,44
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 +6], word 0
add edx,8
add edi,8
cmp edi,8*0x40
jb @b
cmp edi,8*0x40 ;0x60
jbe setidtl2 ;jb
; Exceptions
mov edi, idts+8
mov esi, sys_int
mov ecx, 32
@@:
mov eax, [esi]
mov [edi], ax ; lower part of offset
mov [edi+2], word os_code ; segment selector
shr eax, 16
mov [edi+4], word 10001110b shl 8 ; interrupt descriptor
mov [edi+6], ax
add esi, 4
add edi, 8
dec ecx
jnz @b
; <Ivan Poddubny 06.02.2005>
; THIS CODE WON'T WORK ;-(
; 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
; while 0x40-handler is working
; Then we have to make all entries in the IDT INTERRUPT gates, not TASK
; mov edi, idts+8
; mov esi, sys_int
; mov ecx, 32
; @@:
; mov eax, [esi]
; mov [edi], ax ; lower part of offset
; mov [edi+2], word os_code ; segment selector
; shr eax, 16
; mov [edi+4], word 10001110b shl 8 ; interrupt descriptor
; mov [edi+6], ax
; add esi, 4
; add edi, 8
; dec ecx
; jnz @b
; </Ivan Poddubny>
ret
205,7 → 230,33
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
iret
iglobal
sys_int:
dd s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,sa,sb,sc,sd,se,sf
260,9 → 311,7
endg
s0:
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0x0
mov [error_interrupt_entry],dword s0
276,9 → 325,7
s1:
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0x1
mov [error_interrupt_entry],dword s1
291,9 → 338,7
jmp change_task
s2:
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0x2
mov [error_interrupt_entry],dword s2
306,9 → 351,7
jmp change_task
s3:
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0x3
mov [error_interrupt_entry],dword s3
321,9 → 364,7
jmp change_task
s4:
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0x4
mov [error_interrupt_entry],dword s4
336,9 → 377,7
jmp change_task
s5:
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0x5
mov [error_interrupt_entry],dword s5
351,9 → 390,7
jmp change_task
s6:
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0x6
mov [error_interrupt_entry],dword s6
372,45 → 409,54
align 4
s7:
clts
; <IP 05.02.2004>
cli
; </IP>
mov edi, 7*8
mov [edi+gdts+ tss0i +5], word 01010000b *256 +11101001b
push eax
push ds es
mov edi,[0x3000]
shl edi, 3
mov [edi+gdts+ tss0 +5], word 01010000b *256 +11101001b
mov ax, os_data
mov ds, ax
mov es, ax
mov eax, [prev_user_of_fpu]
shl eax, 8
add eax, 0x80000 + 0x10
fsave [eax]
; 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
cld
rep movsd
mov eax, [0x3000]
mov [prev_user_of_fpu], eax
shl eax, 8
add eax, 0x80000
cmp [eax + 0x7f], byte 0
je @f
frstor [eax+0x10]
@@:
mov [eax + 0x7f], byte 1
; get base address of our TSS and...
mov esi,[0x3000]
imul esi,tss_step
add esi,tss_data
pop es ds
pop eax
; ...init segments, stack, eip, flags
mov word [esi+l.cs-tss_sceleton],int_code
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
mov dword [esi+l.esp-tss_sceleton],fpu_stack+4*8
mov dword [esi+l.eip-tss_sceleton],fpu_handler
mov dword [esi+l.eflags-tss_sceleton],0x11002
iret
; then execute this task
mov ebx, [0x3000]
shl ebx,3
add ebx, tss0 ;t
mov [0xB004], bx
iglobal
prev_user_of_fpu dd 1
endg
jmp pword [0xB000]
jmp s7
s8:
add esp, 4 ; zero on the stack!
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0x8
mov [error_interrupt_entry],dword s8
423,9 → 469,7
jmp change_task
s9:
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0x9
mov [error_interrupt_entry],dword s9
437,12 → 481,8
jmp change_task
; Invalid TSS
sa:
add esp, 4 ; error code
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0xa
mov [error_interrupt_entry],dword sa
454,12 → 494,8
jmp change_task
; Segment not present
sb:
add esp, 4
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0xb
mov [error_interrupt_entry],dword sb
471,12 → 507,8
jmp change_task
; Stack fault exception
sc:
add esp, 4
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0xc
mov [error_interrupt_entry],dword sc
488,12 → 520,8
jmp change_task
; General Protection Fault
sd:
add esp, 4
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0xd
mov [error_interrupt_entry],dword sd
505,12 → 533,8
jmp change_task
; Page-Fault Exception
se:
add esp, 4
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0xe
mov [error_interrupt_entry],dword se
522,11 → 546,8
jmp change_task
; ??
sf:
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0xf
mov [error_interrupt_entry],dword sf
538,11 → 559,8
jmp change_task
; x87 FPU Floating-Point Error
s10:
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0x10
mov [error_interrupt_entry],dword s10
554,12 → 572,8
jmp change_task
; Alignment Check Exception
s11:
add esp, 4
mov ax, os_data
mov ds, ax
mov es, ax
cli
mov [error_interrupt],0x11
mov [error_interrupt_entry],dword s11
571,9 → 585,6
jmp change_task
writehex:
pusha
668,10 → 679,47
jmp .out_eip
irq5:
call restore_caller
; irq1 -> hid/keyboard.inc
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
jmp irqD
p_irq2:
call restore_caller
795,24 → 843,17
jmp p_irq12
irqD:
p_irq13:
call restore_caller
mov dx,0xf0
mov al,0
out dx,al
mov edi,13
call irqhandler
mov dx,0xa0
mov al,0x20
out dx,al
mov dx,0x20
out dx,al
call return_to_caller
jmp irqD
jmp p_irq13
p_irq14:
call restore_caller
936,9 → 977,11
ret
; simply return control to interrupted process
; this code should never get control!
; applications can use only 0x40 interrupt
unknown_interrupt:
iret
@@: call change_task
jmp @b
977,8 → 1020,23
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
endg
sys_resize_app_memory:
; eax = 1 - resize
; ebx = new amount of memory
1063,7 → 1121,10
jmp new_start_application_hd
uglobal
;threadstring dd 0x0
new_process_place dd 0x0
;check_processes dd 0x0
;dec3004 db 0x0
app_start dd 0x0
app_i_end dd 0x0
app_mem dd 0x0
1071,6 → 1132,8
app_i_param dd 0x0
app_i_icon dd 0x0
app_mem_pos dd 0x0
;thread_create dd 0x0
;gdt_place dd 0x0
appl_path dd 0x0
appl_path_size dd 0x0
endg
1123,6 → 1186,8
mov eax,esi
call dispose_app_cr3_table
mov [first_gdt_search],0x2 ; start gdt search from beginning
cmp [prev_user_of_fpu],esi ; if user fpu last -> fpu user = 1
jne fpu_ok_1
mov [prev_user_of_fpu],1
1131,7 → 1196,19
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 [usedi40+eax],byte 0
mov ecx,esi ; remove buttons
bnewba2:
mov edi,[0xfe88]
1321,7 → 1398,8
popa
mov edi,esi ; do not run this process slot
shl edi, 5
shl edi, 5 ;imul edi,0x20
; add edi,0x3000
mov [edi+0x300A],byte 9
; call systest
sti ; .. and life goes on
1365,6 → 1443,12
build_scheduler:
; { Ivan 06.03.2005
mov edi, usedi40
mov ecx, 256/4
xor eax, eax
rep stosd
; } Ivan 06.03.2005
mov esi,boot_sched_1
call boot_log

/kernel/trunk/core/sched.inc
5,13 → 5,23
;; IRQ0 HANDLER (TIMER INTERRUPT) ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
align 32
irq0:
cmp [error_interrupt],-1
je no_error_in_previous_process
mov edi,[error_interrupt]
shl edi, 3
mov [edi+tss0i_l +5], word 01010000b *256 +11101001b
mov edi,[error_interrupt]
shl edi,7
add edi,0x290000
mov esi,[error_interrupt_entry]
mov [edi+l.eip-tss_sceleton],esi
mov [edi+l.eflags-tss_sceleton],dword 0x11002
mov [0xffff],byte 0
mov [error_interrupt],-1
75,6 → 85,13
do_not_change_task:
;mov edx,[0x3000]
;lea edx,[tss0sys+8*edx]
;mov [8*0x40+idts+8+0], word 0
;mov [8*0x40+idts+8+2],dx
;mov [8*0x40+idts+8+4],word 11100101b*256
;mov [8*0x40+idts+8+6], word 0
call _rdtsc
mov [edi+0x18],eax
96,7 → 113,6
.switch:
jmp pword [0xB000]
inc [context_counter] ;noname & halyavin
jmp irq0
iglobal

/kernel/trunk/core/syscall.inc
4,9 → 4,8
;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
uglobal
pushed_regs rd 1
task_tss rd 1
endg
align 32
i40:
pushad
15,24 → 14,33
mov ax,word os_data
mov ds,ax
mov es,ax
mov [pushed_regs],esp
add dword [pushed_regs],4
mov [task_tss],esp
add dword [task_tss],4
cli
mov eax, [0x3000]
mov edi, eax
shl edi, 8
mov edi,[0x3000]
mov eax,edi
shl edi, 3
;clear busy flag in application's TSS
mov [edi+gdts+ tss0 +5], word 01010000b *256 +11101001b
shl edi,5
mov [edi+0x80000+0xB0],eax ; used i40 handler
; for syscall trace function
call save_registers
mov esi,[pushed_regs]
; mov esi, [0x3000]
; imul esi, tss_step
; add esi, tss_data
mov esi,[task_tss]
; sub esi,0x28
; esi holds address of TSS of interupted program
; load first 3 registers
mov eax,[esi+28]
mov ebx,[esi+16]
mov ecx,[esi+24]
mov eax,[esi+28];+l.eax-tss_sceleton]
mov ebx,[esi+16];l.ebx-tss_sceleton]
mov ecx,[esi+24];l.ecx-tss_sceleton]
; save current registers
; stack may be modified by a system function to return some value to caller!
39,12 → 47,12
pushad
; load all registers from TSS of the application, in crossed order (why?)
mov edi,[esi+28]
mov eax,[esi+16]
mov ebx,[esi+24]
mov ecx,[esi+20]
mov edx,[esi+4]
mov esi,[esi+0]
mov edi,[esi+28];l.eax-tss_sceleton]
mov eax,[esi+16];l.ebx-tss_sceleton]
mov ebx,[esi+24];l.ecx-tss_sceleton]
mov ecx,[esi+20];l.edx-tss_sceleton]
mov edx,[esi+4];l.esi-tss_sceleton]
mov esi,[esi+0];l.edi-tss_sceleton]
; enable interupts - a task switch or an IRQ _CAN_ interrupt i40 handler
sti
58,10 → 66,16
; return saved and probably even changed regs
popad
; <Ivan 05.03.2005> esi already loaded - look above "pusha"
;mov esi,[0x3000]
;imul esi,tss_step
;add esi,tss_data
; </Ivan 05.03.2005>
; modify 3 program's registers (in its TSS)
mov [esi+28],eax
mov [esi+16],ebx
mov [esi+24],ecx
mov [esi+28],eax;[esi+l.eax-tss_sceleton], eax
mov [esi+16],ebx;[esi+l.ebx-tss_sceleton], ebx
mov [esi+24],ecx;[esi+l.ecx-tss_sceleton], ecx
xor eax, eax
mov edi, [0x3000] ; no syscall interrupt in use anymore
75,11 → 89,36
popad
iretd
jmp i40
label reg1 dword at 0x6000
label reg2 dword at 0x6400
label usedi40 byte at 0x6800
uglobal
schd dd 0x0
endg
align 4
save_registers:
mov esi,[0x3000]
imul esi,tss_step
add esi,tss_data
mov eax,[esi+l.eax-tss_sceleton]
mov ebx,[esi+l.ebx-tss_sceleton]
mov ecx,[esi+l.ecx-tss_sceleton]
mov edx,[esi+l.edx-tss_sceleton]
mov edi,[esi+l.edi-tss_sceleton]
mov ebp,[esi+l.ebp-tss_sceleton]
mov esi,[esi+l.esi-tss_sceleton]
push eax ecx esi edi
mov esi, [0x3010]
mov eax, [esi+0x4] ; load PID
mov esi, [pushed_regs]
mov eax,[esi+0x4]
mov esi,esp
inc [save_syscall_count]
mov edi,[save_syscall_count]
and edi,0xF
89,6 → 128,7
mov ecx,32 / 4
cld
rep movsd
pop edi esi ecx eax
ret
uglobal

/kernel/trunk/core/fpu.inc
0,0 → 1,62
iglobal
prev_user_of_fpu dd 0x1 ; set to OS
endg
label fpu_tss at 0xB080
label fpu_stack dword at 0xB060
align 4
fpu_handler:
; clear TS flag in CR0 -> for task switching
clts
; save FPU context of the previous task
mov eax,[prev_user_of_fpu]
shl eax,8
add eax,0x80000+0x10
fsave [eax]
; next task switch save our FPU context
; now restore context of current task (if exists)
mov eax,[0x3000]
mov [prev_user_of_fpu],eax
shl eax,8
add eax,0x80000
cmp [eax+0x7f],byte 0
je bs7_first_fpu
frstor [eax+0x10]
bs7_first_fpu:
mov [eax+0x7f],byte 1
; prepare structure in stack for proper IRET
movzx eax,word [fpu_tss+l.ss-tss_sceleton] ; push ss
push eax
mov eax,[fpu_tss+l.esp-tss_sceleton] ; push esp
push eax
mov eax,[fpu_tss+l.eflags-tss_sceleton] ; push eflags
push eax
movzx eax,word [fpu_tss+l.cs-tss_sceleton] ; push cs
push eax
mov eax,[fpu_tss+l.eip-tss_sceleton] ; push eip
push eax
; save eax
push dword [fpu_tss+l.eax-tss_sceleton]
; restore all segment registers
mov ax,[fpu_tss+l.es-tss_sceleton]
mov es,ax
mov ax,[fpu_tss+l.fs-tss_sceleton]
mov fs,ax
mov ax,[fpu_tss+l.gs-tss_sceleton]
mov gs,ax
mov ax,[fpu_tss+l.ds-tss_sceleton]
mov ds,ax
; restore eax
pop eax
iret