WebSVN – Kolibri OS – Diff – /kernel/branches/gfx_kernel/kernel.asm

 ;;
 ;;
 ;;   Compile with last version FASM
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+include "proc32.inc"
 include "kglobals.inc"
 include "lang.inc"
+include "const.inc"
-WinMapAddress           equ     0x460000
+;WinMapAddress      equ     0x460000
-display_data       = 0x460000
+;display_data       = 0x460000
 max_processes      equ   255
 window_data        equ   0x0000
-tss_data           equ   0xD20000
+;window_data        equ   0x0000
-;tss_step           equ   (128+2048) ; tss & i/o - 16384 ports, * 256=557056
+;tss_data           equ   0xD20000
-tss_step           equ   (128+8192) ; tss & i/o - 65535 ports, * 256=557056*4
-draw_data          equ   0xC00000
+tss_step           equ   (128+8192) ; tss & i/o - 65535 ports, * 256=557056*4
-sysint_stack_data  equ   0xC03000
+;draw_data          equ   0xC00000
 ;sysint_stack_data  equ   0xC03000
-twdw               equ   (0x3000-window_data)
+;twdw               equ   (0x3000-window_data)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 use16
                   org   0x0
+                  jmp   start_of_code
                   jmp   start_of_code
 ; mike.dld {
         org $+0x10000
 db 0
 dd servetable-0x10000
 drawbackground   dd __sys_drawbackground
 calculatescreen  dd __sys_calculatescreen
 setscreen        dd __sys_setscreen
 ; } mike.dld
-version           db    'Kolibri OS  version 0.5.8.1      ',13,10,13,10,0
+version           db    'Kolibri OS  version 0.6.5.0      ',13,10,13,10,0
                   ;dd    endofcode-0x10000
                   ;db   'Boot02'
-; CR0 Flags - Protected mode and Paging
-        mov     ecx,0x00000001
-        ;and     ebx,65535
-        ;cmp     ebx,00100000000000000b ; lfb -> paging
-        ;jb      no_paging
-        ;mov     ax,0x0000
-        ;mov     es,ax
-        ;mov     al,[es:0x901E]
         ;cmp     al,1
-        ;je      no_paging
+; CR0 Flags - Protected mode and Paging
    l.6: in      al, 0x64
         test    al, 2
         jnz     l.6
         mov     al, 0xDF
         out     0x60, al
+   l.7: in      al, 0x64
+        test    al, 2
+        jnz     l.7
+        mov     al, 0xFF
+        out     0x64, al
         lgdt    [cs:gdts-0x10000]       ; Load GDT
         mov     eax, cr0                ; Turn on paging // protected mode
         or      eax, ecx
         and     eax, 10011111b *65536*256 + 0xffffff ; caching enabled
         mov     cr0, eax
         mov     gs,ax
         mov     ss,ax
         mov     esp,0x3ec00             ; Set stack
         jmp     pword os_code:B32       ; jmp to enable 32 bit mode
+if gdte >= $
+error 'GDT overlaps with used code!'
+end if
+use32
+include 'unpacker.inc'
+__DEBUG__ fix 1
+__DEBUG_LEVEL__ fix 1
-use32
+include 'fdo.inc'
 iglobal
   boot_memdetect    db   'Determining amount of memory',0
   boot_fonts        db   'Fonts loaded',0
 .bll2:   popad
-         ret
-uglobal
-  cpuid_0    dd  0,0,0,0
-  cpuid_1    dd  0,0,0,0
-  cpuid_2    dd  0,0,0,0
   cpuid_3    dd  0,0,0,0
-endg
+         ret
 iglobal
   firstapp   db  '/rd/1/LAUNCHER',0
-  char       db  'CHAR    MT '
+  char       db  'FONTS/CHAR.MT',0
-  char2      db  'CHAR2   MT '
+  char2      db  'FONTS/CHAR2.MT',0
   bootpath   db  '/KOLIBRI    '
   bootpath2  db  0
-  vmode      db  'VMODE   MDR'
+  vmode      db  'drivers/VMODE.MDR',0
-  cur_file   db  'ARROW   CUR'
+  cur_file   db  'ARROW.CUR',0
         mov   ecx,(0x100000*0xF-0x280000) / 4
         cld
         rep   stosd
 ; CLEAR 0x80000-0x90000
 ;       xor   eax,eax
         mov   edi,0x80000
         mov   ecx,(0x90000-0x80000)/4
 ;       cld
         rep   stosd
         mov   ecx,0x10000 / 4
         cld
         rep   stosd
+; SAVE REAL MODE VARIABLES
+        mov     ax, [0x2f0000 + 0x9031]
-; SAVE REAL MODE VARIABLES
+        mov     [IDEContrRegsBaseAddr], ax
 ; --------------- APM ---------------------
     mov    eax, [0x2f0000 + 0x9040]    ; entry point
     mov    dword[apm_entry], eax
     mov    word [apm_entry + 4], apm_code_32 - gdts
     mov    eax, [0x2f0000 + 0x9044]    ; version & flags
     mov    [apm_vf], eax
 ; -----------------------------------------
+;        movzx eax,byte [0x2f0000+0x9010]  ; mouse port
+;        mov   [0xF604],byte 1  ;al
-;        movzx eax,byte [0x2f0000+0x9010]  ; mouse port
+        mov     al, [0x2F0000+0x901F]   ; DMA writing
-;        mov   [0xF604],byte 1  ;al
+        mov     [allow_dma_write], al
         mov   al,[0x2f0000+0x9000]        ; bpp
-        mov   [0xFBF1],al
+        mov   [ScreenBPP],al
         movzx eax,word [0x2f0000+0x900A]  ; X max
 ;       dec   eax
-        mov   [0xfe00],eax
+        mov   [ScreenWidth],eax
         mov   [screen_workarea.right],eax
         movzx eax,word [0x2f0000+0x900C]  ; Y max
 ;       dec   eax
-        mov   [0xfe04],eax
+        mov   [ScreenHeight],eax
         mov   [screen_workarea.bottom],eax
         movzx eax,word [0x2f0000+0x9008]  ; screen mode
-        mov   [0xFE0C],eax
+        mov   [SCR_MODE],eax
         mov   eax,[0x2f0000+0x9014]       ; Vesa 1.2 bnk sw add
-        mov   [0xE030],eax
+        mov   [BANK_SWITCH],eax
-        mov   [0xfe08],word 640*4         ; Bytes PerScanLine
+        mov   [BytesPerScanLine],word 640*4         ; Bytes PerScanLine
-        cmp   [0xFE0C],word 0x13          ; 320x200
+        cmp   [SCR_MODE],word 0x13          ; 320x200
         je    @f
-        cmp   [0xFE0C],word 0x12          ; VGA 640x480
+        cmp   [SCR_MODE],word 0x12          ; VGA 640x480
         je    @f
         mov   ax,[0x2f0000+0x9001]        ; for other modes
-        mov   [0xfe08],ax
+        mov   [BytesPerScanLine],ax
         mov   al,[0x2F0000+0x9034]        ; vesa major version number (ascii)
-        mov   [0xE034],al
+        mov   [VESA_VER_MAJOR],al
         mov   al,[0x2F0000+0x9035]        ; card vendor (intel=1, s3=2, other=3)
-        mov   [0xE035],al
+        mov   [GFX_CARD_VENDOR],al
       @@:
         ;cmp     [0x2f0000+0x901e],byte 1
         ;jne     no_d_lfb
         mov     byte [0x2f0000+0x901e],0x0
         mov     eax,[0x2f0000+0x9018]
       ;no_d_lfb:
-        mov     [0xfe80],eax
+        mov     [LFBAddress],eax
-        cmp     [0xfe0c],word 0100000000000000b
+        cmp     [SCR_MODE],word 0100000000000000b
         jge     setvesa20
-        cmp     [0xfe0c],word 0x13
+        cmp     [SCR_MODE],word 0x13
         je      v20ga32
-        mov     [0xe020],dword Vesa12_putpixel24  ; Vesa 1.2
+        mov     [PUTPIXEL],dword Vesa12_putpixel24  ; Vesa 1.2
         mov     [0xe024],dword Vesa12_getpixel24
-        cmp     [0xfbf1],byte 24
+        cmp     [ScreenBPP],byte 24
         jz      ga24
-        mov     [0xe020],dword Vesa12_putpixel32
+        mov     [PUTPIXEL],dword Vesa12_putpixel32
         mov     [0xe024],dword Vesa12_getpixel32
       ga24:
         jmp     v20ga24
       setvesa20:
-        mov     [0xe020],dword Vesa20_putpixel24  ; Vesa 2.0
+        mov     [PUTPIXEL],dword Vesa20_putpixel24  ; Vesa 2.0
         mov     [0xe024],dword Vesa20_getpixel24
-        cmp     [0xfbf1],byte 24
+        cmp     [ScreenBPP],byte 24
         jz      v20ga24
       v20ga32:
-        mov     [0xe020],dword Vesa20_putpixel32
+        mov     [PUTPIXEL],dword Vesa20_putpixel32
         mov     [0xe024],dword Vesa20_getpixel32
       v20ga24:
-        cmp     [0xfe0c],word 0x12                ; 16 C VGA 640x480
+        cmp     [SCR_MODE],word 0x12                ; 16 C VGA 640x480
         jne     no_mode_0x12
-        mov     [0xe020],dword VGA_putpixel
+        mov     [PUTPIXEL],dword VGA_putpixel
         mov     [0xe024],dword Vesa20_getpixel32
+      no_mode_0x12:
+           call test_cpu
+;           btr [cpu_caps], CAPS_SSE    ;test: dont't use sse code
+;           btr [cpu_caps], CAPS_SSE2   ;test: don't use sse2
+;           btr [cpu_caps], CAPS_FXSR   ;test: disable sse support
+                                        ;all sse commands rise #UD exption
+;           btr [cpu_caps], CAPS_PSE    ;test: don't use large pages
+;           btr [cpu_caps], CAPS_PGE    ;test: don't use global pages
+;           btr [cpu_caps], CAPS_MTRR   ;test: don't use MTRR
+           bts [cpu_caps], CAPS_TSC     ;force use rdtsc
+; -------- Fast System Call init ----------
+; Intel SYSENTER/SYSEXIT (AMD CPU support it too)
+           bt [cpu_caps], CAPS_SEP
+           jnc .SEnP   ; SysEnter not Present
+           xor edx, edx
+           mov ecx, MSR_SYSENTER_CS
+           mov eax, os_code
+           wrmsr
+           mov ecx, MSR_SYSENTER_ESP
+           mov eax, sysenter_stack ; Check it
+           wrmsr
-      no_mode_0x12:
+           mov ecx, MSR_SYSENTER_EIP
+           mov eax, sysenter_entry
+           wrmsr
+.SEnP:
+; AMD SYSCALL/SYSRET
+           cmp byte[cpu_vendor], 'A'
+           jne .noSYSCALL
+           mov eax, 0x80000001
+           cpuid
+           test edx, 0x800  ; bit_11 - SYSCALL/SYSRET support
+           jz .noSYSCALL
+           mov ecx, MSR_AMD_EFER
+           rdmsr
-; MEMORY MODEL
+           or eax, 1   ; bit_0 - System Call Extension (SCE)
+           wrmsr
-;        mov     [0xfe84],dword 0x100000*16        ; apps mem base address
-;        movzx   ecx,byte [0x2f0000+0x9030]
-;        dec     ecx
+	; !!!! It`s dirty hack, fix it !!!
-;        mov     eax,16*0x100000 ; memory-16
-;        shl     eax,cl
-;        mov     [0xfe8c],eax      ; memory for use
+	; Bits of EDX :
-;        cmp     eax,16*0x100000
-;        jne     no16mb
-;        mov     [0xfe84],dword 0xD80000 ; !!! 10 !!!
-;      no16mb:
+	; Bit 3116 During the SYSRET instruction, this field is copied into the CS register
-; init:
-;  1) 0xFE84 - applications base
-;  2) 0xFE8C - total amount of memory
-        xor     edi, edi
-  m_GMS_loop:
-        add     edi, 0x400000
-        mov     eax, dword [edi]
-        mov     dword [edi], 'TEST'
-        wbinvd
-        cmp     dword [edi], 'TEST'
-        jne     m_GMS_exit
-        cmp     dword [0], 'TEST'
-        je      m_GMS_exit
-        mov     dword [es:edi], eax
+	;  and the contents of this field, plus 8, are copied into the SS register.
-        jmp     m_GMS_loop
-  m_GMS_exit:
+	; Bit 150 During the SYSCALL instruction, this field is copied into the CS register
-        mov     [edi], eax
-        ; now edi contains the EXACT amount of memory
+	;  and the contents of this field, plus 8, are copied into the SS register.
-        mov     eax, 0x100000*16
-        cmp     edi, eax ;0x100000*16
+	; mov	edx, (os_code + 16) * 65536 + os_code
-        jb      $                 ; less than 16 Mb
+           mov edx, 0x1B0013
-        mov     dword [0xFE84], eax ;0x100000*16
-        cmp     edi, eax ;0x100000*16
-        jne     @f
-        mov     dword [0xFE84], 0xD80000 ; =0x100000*13.5
+           mov eax, syscall_entry
-      @@:
+           mov ecx, MSR_AMD_STAR
+           wrmsr
+.noSYSCALL:
+; -----------------------------------------
         mov     dword [0xFE8C], edi
+; MEMORY MODEL
+           call mem_test
+           call init_mtrr
            call init_mem
-;!!!!!!!!!!!!!!!!!!!!!!!!!!
+           call init_page_map
 include 'detect/disks.inc'
-;!!!!!!!!!!!!!!!!!!!!!!!!!!
+; ENABLE PAGING
-; CHECK EXTRA REGION
+           mov eax, sys_pgdir
-; ENABLE PAGING
+           mov cr3, eax
-        mov     eax,cr0
+           mov eax,cr0
-        or      eax,0x80000000
+           or eax,CR0_PG
-        mov     cr0,eax
-        jmp     $+2
+           mov cr0,eax
-        call    MEM_Init
+           call init_kernel_heap
-;add 0x800000-0xc00000 area
+           stdcall kernel_alloc, 0x2000
-        cmp     word [0xfe0c],0x13
+           mov [os_stack], eax
-        jle     .less_memory
-        mov     eax,0x800000      ;linear address
-        mov     ebx,0x400000 shr 12 ;size in pages (4Mb)
-        mov     ecx,0x800000        ;physical address
+           call init_LFB
-        jmp     .end_first_block
+           call init_fpu
-.less_memory:
-        mov     eax,0x980000      ;linear address
+           call init_malloc
-        mov     ebx,0x280000 shr 12 ;size in pages (2.5Mb)
-        mov     ecx,0x980000        ;physical address
+           stdcall alloc_kernel_space, 0x4F000
+           mov [ipc_tmp], eax
-.end_first_block:
+           mov ebx, 0x1000
-        call    MEM_Add_Heap        ;nobody can lock mutex yet
+           add eax, 0x40000
+           mov [proc_mem_map], eax
-        call    create_general_page_table
+           add eax, 0x8000
-;add 0x1000000(0xd80000)-end_of_memory area
+           mov [proc_mem_pdir], eax
-        mov     eax,second_base_address
+           add eax, ebx
+           mov [proc_mem_tab], eax
+           add eax, ebx
+           mov [tmp_task_pdir], eax
+           add eax, ebx
+           mov [tmp_task_ptab], eax
-        mov     ebx,[0xfe8c]
+           add eax, ebx
+           mov [ipc_pdir], eax
+           add eax, ebx
+           mov [ipc_ptab], eax
+           call init_events
         mov     ecx,[0xfe84]
-        sub     ebx,ecx
+           mov eax, srv.fd-SRV_FD_OFFSET
-        shr     ebx,12
+           mov [srv.fd], eax
-        add     eax,ecx
+           mov [srv.bk], eax
         call    MEM_Add_Heap
-;init physical memory manager.
+           mov edi, irq_tab
+           xor eax, eax
+           mov ecx, 16
+           rep stosd
-        call    Init_Physical_Memory_Manager
+;Set base of graphic segment to linear address of LFB
         mov     eax,[LFBAddress]          ; set for gs
-        mov     dword [0xfe80],0x80000000 ;0x800000
+        mov     [graph_data_l+2],ax
         shr     eax,16
 ;!!!!!!!!!!!!!!!!!!!!!!!
 ; LOAD FONTS I and II
-        mov   [0x3000],dword 1
+        mov   [CURRENT_TASK],dword 1
-        mov   [0x3004],dword 1
-        mov   [0x3010],dword 0x3020
+        mov   [TASK_COUNT],dword 1
         mov   [TASK_BASE],dword TASK_DATA
-        mov   eax,char
-        mov   esi,12
+        mov   esi,char
         xor   ebx,ebx
-        mov   ecx,2560;26000
-        mov   edx,0x3F600;0x37000
+        mov   ecx,2560;26000
-        call  fileread
+        mov   edx,FONT_I
+        call  fs_RamdiskRead
-        mov   eax,char2
-        mov   esi,12
+        mov   esi,char2
         xor   ebx,ebx
         mov   ecx,2560;26000
         movzx   ecx, word [boot_y]
         or      ecx, (10+29*6) shl 16 ; "Determining amount of memory"
         sub     ecx, 10
         mov     edx, 0xFFFFFF
-        mov     ebx, [0xFE8C]
+        mov     ebx, [MEM_AMOUNT]
         shr     ebx, 20
         mov     edi, 1
         mov     eax, 0x00040000
-        call    display_number
-; CHECK EXTENDED REGION
-;        mov     dword [0x80000000],0x12345678
-;        cmp     dword [0x80000000],0x12345678
-;        jz      extended_region_found
-;        mov     esi,boot_ext_region
-;        call    boot_log
-;        jmp     $
-;extended_region_found:
         call    display_number_force
 ; REDIRECT ALL IRQ'S TO INT'S 0x20-0x2f
         call   build_scheduler ; sys32.inc
-; LOAD IDT
-        lidt   [cs:idtreg]
-; READ CPUID RESULT
-        mov     esi,boot_cpuid
-        call    boot_log
-        pushfd                  ; get current flags
-        pop     eax
-        mov     ecx,eax
-        xor     eax,0x00200000  ; attempt to toggle ID bit
-        push    eax
-        popfd
-        pushfd                  ; get new EFLAGS
-        pop     eax
-        push    ecx             ; restore original flags
-        popfd
-        and     eax,0x00200000  ; if we couldn't toggle ID,
-        and     ecx,0x00200000  ; then this is i486
-        cmp     eax,ecx
-        jz      nopentium
-        ; It's Pentium or later. Use CPUID
-        mov     edi,cpuid_0
-        mov     esi,0
-      cpuid_new_read:
+; LOAD IDT
-        mov     eax,esi
-        cpuid
-        call    cpuid_save
-        add     edi,4*4
-        cmp     esi,3
-        jge     cpuid_done
-        cmp     esi,[cpuid_0]
-        jge     cpuid_done
-        inc     esi
-        jmp     cpuid_new_read
-      cpuid_save:
-        mov     [edi+00],eax
-        mov     [edi+04],ebx
-        mov     [edi+8],ecx
-        mov     [edi+12],edx
-        ret
-      cpuid_done:
-      nopentium:
-; CR4 flags - enable fxsave / fxrstore
-;
-;        finit
-;        mov     eax,1
-;        cpuid
-;        test    edx,1000000h
-;        jz      fail_fpu
-;        mov     eax,cr4
-;        or      eax,200h        ; Enable fxsave/fxstor
-;        mov     cr4,eax
-;     fail_fpu:
-;The CPU to this moment should be already in PM,
-;and bit MP of the register cr0 should be installed in 1.
-finit ;reset of the FPU (finit, instead of fninit)
-fsetpm ;enable PM of the FPU
-finit ;reset the registers, contents which are still equal RM
-;Now FPU too in PM
+        lidt   [cs:idtreg]
-; DETECT DEVICES
+        cli
         mov   al,0x2e              ; msb
         out   0x40,al
 ; SET MOUSE
-        mov   eax,cur_file
-        mov   esi,12
+        mov   esi,cur_file
-        mov   ebx,0
+        xor   ebx,ebx
         mov   ecx,26000
         mov   edx,mousepointer
-        call  fileread
+        call  fs_RamdiskRead
         mov   esi,mousepointer+62+32*31*4
         mov   esi,boot_setmouse
         call  boot_log
+        call  setmouse
-        call  setmouse
+        mov  [pci_access_enabled],1
 ; SET PRELIMINARY WINDOW STACK AND POSITIONS
 ; SET UP OS TASK
+        mov  esi,boot_setostask
+        call boot_log
+        mov eax, fpu_data
+        mov  dword [SLOT_BASE+APPDATA.fpu_state], eax
+        mov  dword [SLOT_BASE+APPDATA.fpu_handler], 0
-        mov  esi,boot_setostask
+        mov  dword [SLOT_BASE+APPDATA.sse_handler], 0
-        call boot_log
+        ; name for OS/IDLE process
-        ; name for OS/IDLE process
-        mov  dword [0x80000+256+APPDATA.app_name],   dword 'OS/I'
+        mov dword [SLOT_BASE+256+APPDATA.app_name],   dword 'OS/I'
-        mov  dword [0x80000+256+APPDATA.app_name+4], dword 'DLE '
+        mov dword [SLOT_BASE+256+APPDATA.app_name+4], dword 'DLE '
-        ; task list
+        mov edi, [os_stack]
-        mov  [0x3020+TASKDATA.wnd_number], 1 ; on screen number
+        mov dword [SLOT_BASE+256+APPDATA.pl0_stack], edi
-        mov  [0x3020+TASKDATA.pid], 1        ; process id number
+        add edi, 0x2000-512
-        mov  [0x3020+TASKDATA.mem_start], 0  ; process base address
+        mov dword [SLOT_BASE+256+APPDATA.fpu_state], edi
 ;----------------------
-mov eax,[0xfe00]
+mov eax,[ScreenWidth]
-mov ebx,[0xfe04]
+mov ebx,[ScreenHeight]
 xor ecx,ecx
 mov [0],ecx
 mov [4],ecx
 mov [8],eax
 mov [12],ebx
 mov [256+0],ecx
 mov [256+4],ecx
-mov [256+8],eax
-mov [256+12],ebx
-;----------------------
-        ; set default flags & stacks
-        mov  [l.eflags],dword 0x11202 ; sti and resume
-        mov  [l.ss0], os_data
-        ; osloop - TSS
-        mov  eax,cr3
-        mov  [l.cr3],eax
-        mov  [l.eip],osloop
-        mov  [l.esp],sysint_stack_data + 4096*2 ; uses slot 1 stack
+mov [256+8],eax
+mov [256+12],ebx
-        mov  [l.cs],os_code
+;----------------------
-        mov  [l.ss],os_data
-        mov  [l.ds],os_data
-        mov  [l.es],os_data
-        mov  [l.fs],os_data
-        mov  [l.gs],os_data
-        ; move tss to tss_data+tss_step
         mov  esi,tss_sceleton
-        mov  edi,tss_data+tss_step
+        mov esi, fpu_data
+        mov ecx, 512/4
+        cld
+        rep movsd
+        mov dword [SLOT_BASE+256+APPDATA.fpu_handler], 0
+        mov dword [SLOT_BASE+256+APPDATA.sse_handler], 0
+        mov ebx, [def_cursor]
+        mov dword [SLOT_BASE+256+APPDATA.cursor], ebx
+        mov ebx, SLOT_BASE+256+APP_OBJ_OFFSET
+        mov  dword [SLOT_BASE+256+APPDATA.fd_obj], ebx
+        mov  dword [SLOT_BASE+256+APPDATA.bk_obj], ebx
+        ; task list
+        mov  [TASK_DATA+TASKDATA.wnd_number], 1 ; on screen number
+        mov  [TASK_DATA+TASKDATA.pid], 1        ; process id number
+        mov  [TASK_DATA+TASKDATA.mem_start], 0  ; process base address
+        mov  edi,tss_data+tss_step
+        mov ecx, (tss_step)/4
+        xor eax, eax
+        cld
+        rep stosd
+        mov  edi,tss_data+tss_step
+        mov  [edi+TSS._ss0], os_data
+        mov  eax,cr3
+        mov  [edi+TSS._cr3],eax
+        mov  [edi+TSS._eip],osloop
+        mov  [edi+TSS._eflags],dword 0x11202 ; sti and resume
+        mov eax, [os_stack]
+        add eax, 0x2000-512
+        mov  [edi+TSS._esp], eax
+        mov  [edi+TSS._cs],os_code
+        mov  [edi+TSS._ss],os_data
+        mov  [edi+TSS._ds],os_data
-        mov  ecx,120/4
+        mov  [edi+TSS._es],os_data
-        cld
+        mov  [edi+TSS._fs],os_data
+        mov  [edi+TSS._gs],os_data
-        rep  movsd
+        mov  ax,tss0
         ltr  ax
         mov  ax,tss0
         mov   esi,250               ; wait 1/4 a second
         call  delay_ms
         call  _rdtsc
         sub   eax,ecx
         shl   eax,2
-        mov   [0xf600],eax          ; save tsc / sec
+        mov   [CPU_FREQ],eax          ; save tsc / sec
+        mov ebx, 1000000
+        div ebx
+        mov [stall_mcs], eax
 ; SET VARIABLES
         call  stack_init
         call  fdc_init
 ; PALETTE FOR 320x200 and 640x480 16 col
-        cmp   [0xfe0c],word 0x12
+        cmp   [SCR_MODE],word 0x12
         jne   no_pal_vga
         mov   esi,boot_pal_vga
         call  boot_log
         call  paletteVGA
       no_pal_vga:
-        cmp   [0xfe0c],word 0x13
+        cmp   [SCR_MODE],word 0x13
         jne   no_pal_ega
         mov   esi,boot_pal_ega
         movsd
         movsd
         movsd
         call    load_skin
-; MTRR'S
-        call  enable_mtrr
 ; LOAD FIRST APPLICATION
-        mov   [0x3000],dword 1
+        mov   [CURRENT_TASK],dword 1
-        mov   [0x3004],dword 1
+        mov   [TASK_COUNT],dword 1
         cli
         cmp   byte [0x2f0000+0x9030],1
+        jne   no_load_vrr_m
         jne   no_load_vrr_m
-        mov   ebp,vrr_m
-        lea   esi,[ebp+6]       ; skip '/RD/1/'
+        mov ebp, vrr_m
-        xor   ebx,ebx                   ; no parameters
+        xor ebx, ebx
-        xor   edx,edx                   ; no flags
+        xor edx, edx
-        call  fs_RamdiskExecute.flags
+        call fs_execute
         cmp   eax,2                  ; if vrr_m app found (PID=2)
         je    first_app_found
-    no_load_vrr_m:
+no_load_vrr_m:
-        mov   ebp,firstapp
-        lea   esi,[ebp+6]
+        mov ebp, firstapp
-        xor   ebx,ebx                   ; no parameters
+        xor ebx, ebx
-        xor   edx,edx                   ; no flags
-        call  fs_RamdiskExecute.flags
+        xor edx, edx
         call fs_execute
         cmp   eax,2                  ; continue if a process has been loaded
         je    first_app_found
         mov   eax, 0xDEADBEEF        ; otherwise halt
         hlt
-      first_app_found:
+first_app_found:
         cli
-        ;mov   [0x3004],dword 2
+        ;mov   [TASK_COUNT],dword 2
-        mov   [0x3000],dword 1       ; set OS task fisrt
+        mov   [CURRENT_TASK],dword 1       ; set OS task fisrt
 ; SET KEYBOARD PARAMETERS
         mov   al, 0xf6         ; reset keyboard, scan enabled
         call  kb_write
-        ; wait until 8042 is ready
-;        xor ecx,ecx
+        ; wait until 8042 is ready
-;      @@:
+        xor ecx,ecx
-;        in     al,64h
+      @@:
-;        and    al,00000010b
+        in     al,64h
-;        loopnz @b
+        and    al,00000010b
-        call  Wait8042BufferEmpty
+        loopnz @b
        ; mov   al, 0xED       ; svetodiody - only for testing!
        ; call  kb_write
        ; call  kb_read
        ; mov   al, 111b
        ; call  kb_write
        ; call  kb_read
         mov   al, 0xF3       ; set repeat rate & delay
         call  kb_write
-        call  kb_read
+;        call  kb_read
         mov   al, 0 ; 30 250 ;00100010b ; 24 500  ;00100100b  ; 20 500
         call  kb_write
-        call  kb_read
+;        call  kb_read
      ;// mike.dld [
         call  set_lights
         out   0x20,al
         out   0xa0,al
+        loop  ready_for_irqs         ; flush the queue
-        loop  ready_for_irqs         ; flush the queue
+        stdcall attach_int_handler, dword 1, irq1
+;        mov    [dma_hdd],1
         cmp     [IDEContrRegsBaseAddr], 0
-;        mov    [dma_hdd],1
+        setnz   [dma_hdd]
 ;                    MAIN OS LOOP START                              ;
 ;                                                                    ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 align 32
 osloop:
         call   [draw_pointer]
         call   checkbuttons
         call   checkwindows
 ;       call   check_window_move_request
         call   checkmisc
 ;                                                                      ;
 ;                       KERNEL FUNCTIONS                               ;
 ;                                                                      ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-enable_mtrr:
-        pushad
-        cmp    [0x2f0000+0x901c],byte 2
-        je     no_mtrr
-        mov    eax,[0xFE0C]                ; if no LFB then no MTRR
-        test   eax,0100000000000000b
-        jz     no_mtrr
-        mov    edx,[cpuid_1+3*4]           ; edx - MTRR's supported ?
-        test   edx,1000000000000b
-        jz     no_mtrr
-        call   find_empty_mtrr
-        cmp    ecx,0
-        jz     no_mtrr
-        mov    esi,boot_mtrr               ; 'setting mtrr'
-        call   boot_log
-        mov    edx,0x0                     ; LFB , +8 M , write combine
-        mov    eax,[0x2f9018]
-        or     eax,1
-        wrmsr
-        inc    ecx
-        mov    edx,0xf
-        mov    eax,0xff800800
-        wrmsr
-        mov    ecx,0x2ff                   ; enable mtrr's
-        rdmsr
-        or     eax,100000000000b           ; set
-        wrmsr
-     no_mtrr:
-        popad
-        ret
-find_empty_mtrr:  ; 8 pairs checked
-        mov    ecx,0x201-2
-      mtrr_find:
-        add    ecx,2
-        cmp    ecx,0x200+8*2
-        jge    no_free_mtrr
-        rdmsr
-        test   eax,0x0800
-        jnz    mtrr_find
-        dec    ecx
-        ret
-      no_free_mtrr:
-        mov    ecx,0
-        ret
 reserve_irqs_ports:
 ;        shl   eax,2
 ;        mov   [irq_owner+eax],byte 1
                                        ; RESERVE PORTS
-        mov   edi,1                    ; 0x00-0xff
+        mov   edi,1                    ; 0x00-0x2d
-        mov   [0x2d0000],edi
+        mov   [RESERVED_PORTS],edi
         shl   edi,4
+        mov   [RESERVED_PORTS+edi+0],dword 1
+        mov   [RESERVED_PORTS+edi+4],dword 0x0
+        mov   [RESERVED_PORTS+edi+8],dword 0x2d
+        inc   dword [RESERVED_PORTS]          ; 0x30-0x4d
+        mov   edi,[RESERVED_PORTS]
+        shl   edi,4
+        mov   [RESERVED_PORTS+edi+0],dword 1
+        mov   [RESERVED_PORTS+edi+4],dword 0x30
+        mov   [RESERVED_PORTS+edi+8],dword 0x4d
+        inc   dword [RESERVED_PORTS]          ; 0x50-0xdf
+        mov   edi,[RESERVED_PORTS]
+        shl   edi,4
+        mov   [RESERVED_PORTS+edi+0],dword 1
+        mov   [RESERVED_PORTS+edi+4],dword 0x50
+        mov   [RESERVED_PORTS+edi+8],dword 0xdf
+        inc   dword [RESERVED_PORTS]          ; 0xe5-0xff
+        mov   edi,[RESERVED_PORTS]
+        shl   edi,4
-        mov   [0x2d0000+edi+0],dword 1
+        mov   [RESERVED_PORTS+edi+0],dword 1
+        mov   [RESERVED_PORTS+edi+4],dword 0xe5
+        mov   [RESERVED_PORTS+edi+8],dword 0xff
         mov   [0x2d0000+edi+4],dword 0x0
         mov   [0x2d0000+edi+8],dword 0xff
 ;        cmp   [0xf604],byte 2          ; com1 mouse -> 0x3f0-0x3ff
 ;        jne   ripl1
 ;        inc   dword [0x2d0000]
 set_variables:
         mov   ecx,0x100                       ; flush port 0x60
 .fl60:  in    al,0x60
         loop  .fl60
-        mov   [0xfcff],byte 0                 ; mouse buffer
+        mov   [MOUSE_BUFF_COUNT],byte 0                 ; mouse buffer
-        mov   [0xf400],byte 0                 ; keyboard buffer
+        mov   [KEY_COUNT],byte 0                 ; keyboard buffer
-        mov   [0xf500],byte 0                 ; button buffer
+        mov   [BTN_COUNT],byte 0                 ; button buffer
-;        mov   [0xfb0a],dword 100*65536+100    ; mouse x/y
+;        mov   [MOUSE_X],dword 100*65536+100    ; mouse x/y
         push  eax
         mov   ax,[0x2f0000+0x900c]
         shr   ax,1
         shl   eax,16
         mov   ax,[0x2f0000+0x900A]
         shr   ax,1
-        mov   [0xfb0a],eax
+        mov   [MOUSE_X],eax
         pop   eax
         mov   byte [SB16_Status],0            ; Minazzi Paolo
         mov   [display_data-12],dword 1       ; tiled background
-        mov   [0xfe88],dword 0x2C0000         ; address of button list
+        mov   [BTN_ADDR],dword BUTTON_INFO    ; address of button list
      ;!! IP 04.02.2005:
         mov   [next_usage_update], 100
         mov   byte [0xFFFF], 0 ; change task if possible
         ret
 ;* mouse centered - start code- Mario79
 mouse_centered:
         push  eax
-        mov   eax,[0xFE00]
+        mov   eax,[ScreenWidth]
         shr   eax,1
-        mov   [0xFB0A],ax
+        mov   [MOUSE_X],ax
-        mov   eax,[0xFE04]
+        mov   eax,[ScreenHeight]
 sys_outport:
     mov   edi,ebx          ; separate flag for read / write
     and   ebx,65535
-    mov   ecx,[0x2d0000]
+    mov   ecx,[RESERVED_PORTS]
     test  ecx,ecx
     jne   sopl8
     mov   [esp+36],dword 1
     ret
   sopl8:
-    mov   edx,[0x3010]
+    mov   edx,[TASK_BASE]
     mov   edx,[edx+0x4]
     and   ebx,65535
     cld
   sopl1:
     mov   esi,ecx
     shl   esi,4
-    add   esi,0x2d0000
+    add   esi,RESERVED_PORTS
     cmp   edx,[esi+0]
      mov  [esp+36],dword 2
-     ret
-align 4
-sys_wss:
-     cmp  word [wss],word 0
-     jnz  wssl1
-     mov  [esp+36],dword 1
-     ret
-   wssl1:
-     cmp  eax,1    ; set volume - main
-     jnz  wssl2
-     mov  [esp+36],dword 0
-     ret
-   wssl2:
-     cmp  eax,2    ; set volume - cd
-     jnz  wssl3
-     ; L
-     mov  dx,word [wss]
-     add  dx,4
-     mov  al,0x2
-     out  dx,al
-     mov  esi,1
-     call delay_ms
-     mov  eax,ebx
-     inc  edx
-     out  dx,al
-     ; R
-     mov  dx,word [wss]
-     add  dx,4
-     mov  al,0x3
-     out  dx,al
-     mov  esi,1
-     call delay_ms
-     mov  eax,ebx
-     inc  edx
-     out  dx,al
-     mov  [esp+36],dword 0
-     ret
-   wssl3:
-     mov   [esp+36],dword 2
+     ret
      ret
 display_number:
 ;                   eax bits 22-31 = reserved
+;
 ; ebx = number or pointer
 ; ecx = x shl 16 + y
 ; edx = color
+        xor     edi, edi
+display_number_force:
      cmp   eax,0xffff            ; length > 0 ?
      jge   cont_displ
      ret
      jne   no_display_desnum
      shr   eax,16
      and   eax,0x3f
      push  eax
      mov   edi,esp
-     add   edi,4+64
+     add   edi,4+64-1
      mov   ecx,eax
      mov   eax,ebx
      mov   ebx,10
    d_desnum:
      xor   edx,edx
      jne   no_display_hexnum
      shr   eax,16
      and   eax,0x3f
      push  eax
      mov   edi,esp
-     add   edi,4+64
+     add   edi,4+64-1
      mov   ecx,eax
      mov   eax,ebx
      mov   ebx,16
    d_hexnum:
      xor   edx,edx
      jne   no_display_binnum
      shr   eax,16
      and   eax,0x3f
      push  eax
      mov   edi,esp
-     add   edi,4+64
+     add   edi,4+64-1
      mov   ecx,eax
      mov   eax,ebx
      mov   ebx,2
    d_binnum:
      xor   edx,edx
      ; ebx color
      ; ecx start of text
      ; edx length
      ; edi 1 force
+;        mov     edi,[CURRENT_TASK]
+;        shl     edi,8
+;        add     ax,word[edi+SLOT_BASE+APPDATA.wnd_clientbox.top]
+;        rol     eax,16
+;        add     ax,word[edi+SLOT_BASE+APPDATA.wnd_clientbox.left]
+;        rol     eax,16
      mov   edx,eax
-     mov   ecx,65
+     mov   ecx,64+4
      sub   ecx,eax
-     add   ecx,esp
-     add   ecx,4
+     add   ecx,esp
      mov   eax,[esp+64+32-8+4]
      push  edx                       ; add window start x & y
-     mov   edx,[0x3010]
+     mov   edx,[TASK_BASE]
+     mov   ebx,[edx-twdw+WDATA.box.left]
-     mov   ebx,[edx-twdw+WDATA.box.left]
+     add   ebx, [(edx-CURRENT_TASK)*8+SLOT_BASE+APPDATA.wnd_clientbox.left]
      shl   ebx,16
+     add   ebx,[edx-twdw+WDATA.box.top]
-     add   ebx,[edx-twdw+WDATA.box.top]
+     add   ebx, [(edx-CURRENT_TASK)*8+SLOT_BASE+APPDATA.wnd_clientbox.top]
      add   eax,ebx
      pop   edx
      mov   ebx,[esp+64+32-12+4]
         and     ebx, not 0x80000000     ; force counted string
         mov     esi, [esp+64+4+4]
-     xor   edi,edi
+        mov     edi, [esp+64+4]
      jmp   dtext
 ; 1=roland mpu midi base , base io address
 ; 2=keyboard   1, base kaybap 2, shift keymap, 9 country 1eng 2fi 3ger 4rus
 ; 3=cd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
 ; 4=sb16 base , base io address
 ; 5=system language, 1eng 2fi 3ger 4rus
-; 6=wss base , base io address
 ; 7=hd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
 ; 8=fat32 partition in hd
 ; 9
 ; 10 = sound dma channel
 ; 11 = enable lba read
      mov  word [mididp],bx
      inc  bx
      mov  word [midisp],bx
      ret
 iglobal
+midi_base dw 0
-midi_base dw 0
+endg
    nsyse1:
      cmp  eax,2                      ; KEYBOARD
      jnz  nsyse2
      cmp  ebx,1
      jnz  kbnobase
-     mov  edi,[0x3010]
+     mov  edi,[TASK_BASE]
      add  ecx,[edi+TASKDATA.mem_start]
      mov  eax,ecx
      mov  ebx,keymap
      mov  ecx,128
      call memmove
      ret
    kbnobase:
      cmp  ebx,2
      jnz  kbnoshift
-     mov  edi,[0x3010]
+     mov  edi,[TASK_BASE]
      add  ecx,[edi+TASKDATA.mem_start]
      mov  eax,ecx
      mov  ebx,keymap_shift
      mov  ecx,128
      call memmove
      ret
    kbnoshift:
      cmp  ebx,3
      jne  kbnoalt
-     mov  edi,[0x3010]
+     mov  edi,[TASK_BASE]
      add  ecx,[edi+TASKDATA.mem_start]
      mov  eax,ecx
      jnz  nsyse5
      mov  [syslang],ebx
      ret
    nsyse5:
-     cmp  eax,6                      ; WSS
-     jnz  nsyse6
-     cmp  ebx,0x100
-     jb   nsyse6
-     mov  [wss],ebx
-     ret
-wss_temp dd 0
-   nsyse6:
      cmp  eax,7                      ; HD BASE
      jne  nsyse7
      test ebx,ebx
      jz   nosethd
      mov  [hdbase],0x170
      mov  [hdid],0x10
      mov  [hdpos],4
 ;     call set_FAT32_variables
    noseslhd:
-     mov   [0xfe10],dword 0
     call  reserve_hd1
+    call  reserve_hd_channel
-    call  clear_hd_cache
+    call  free_hd_channel
     mov   [hd1_status],0        ; free
    nosethd:
      ret
 iglobal
+hd_base db 0
-hd_base db 0
+endg
    nsyse7:
      cmp  eax,8                      ; HD PARTITION
      jne  nsyse8
+     mov  [fat32part],ebx
-     mov  [fat32part],ebx
+;     call set_FAT32_variables
-;     call set_FAT32_variables
+    call  reserve_hd1
-    call  reserve_hd1
+    call  reserve_hd_channel
-    call  clear_hd_cache
+    call  free_hd_channel
      pusha
      call  choice_necessity_partition_1
 ; 1=roland mpu midi base , base io address
 ; 2=keyboard   1, base kaybap 2, shift keymap, 9 country 1eng 2fi 3ger 4rus
 ; 3=cd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
 ; 4=sb16 base , base io address
 ; 5=system language, 1eng 2fi 3ger 4rus
-; 6=wss base
 ; 7=hd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
 ; 8=fat32 partition in hd
 ; 9=get hs timer tic
      cmp  eax,2
      jne  ngsyse2
      cmp  ebx,1
      jnz  kbnobaseret
-     mov  edi,[0x3010]
+     mov  edi,[TASK_BASE]
      add  ecx,[edi+TASKDATA.mem_start]
      mov  ebx,ecx
      mov  eax,keymap
      mov  ecx,128
      call memmove
      ret
    kbnobaseret:
      cmp  ebx,2
      jnz  kbnoshiftret
-     mov  edi,[0x3010]
+     mov  edi,[TASK_BASE]
      add  ecx,[edi+TASKDATA.mem_start]
      mov  ebx,ecx
      mov  eax,keymap_shift
      mov  ecx,128
      call memmove
      ret
    kbnoshiftret:
      cmp  ebx,3
      jne  kbnoaltret
-     mov  edi,[0x3010]
+     mov  edi,[TASK_BASE]
      add  ecx,[edi+TASKDATA.mem_start]
      mov  ebx,ecx
      mov  eax,keymap_alt
      mov  ecx,128
      jnz  ngsyse5
      mov  eax,[syslang]
      mov  [esp+36],eax
      ret
    ngsyse5:
-     cmp  eax,6
-     jnz  ngsyse6
-     mov  eax,[wss]
-     mov  [esp+36],eax
-     ret
-   ngsyse6:
      cmp  eax,7
      jnz  ngsyse7
      movzx eax,[hd_base]
      mov  [esp+36],eax
      ret
      ret
    ngsyse12:
      mov  [esp+36],dword 1
      ret
 iglobal
+align 4
+mousefn dd msscreen, mswin, msbutton, msset
+        dd app_load_cursor
+        dd app_set_cursor
+        dd app_delete_cursor
-align 4
+endg
 readmousepos:
+; eax=0 screen relative
+; eax=1 window relative
+; eax=2 buttons pressed
+; eax=3 set mouse pos   ; reserved
-; eax=0 screen relative
+; eax=4 load cursor
-; eax=1 window relative
+; eax=5 set cursor
+; eax=6 delete cursor   ; reserved
-; eax=2 buttons pressed
+           cmp eax, 6
            ja msset
-    test eax,eax
+           jmp [mousefn+eax*4]
-    jnz  nosr
+msscreen:
-    mov  eax,[0xfb0a]
+           mov  eax,[MOUSE_X]
-    shl  eax,16
+           shl  eax,16
-    mov  ax,[0xfb0c]
-    mov  [esp+36],eax
-    ret
-  nosr:
+           mov  ax,[MOUSE_Y]
            mov  [esp+36],eax
-    cmp  eax,1
+           ret
-    jnz  nowr
+mswin:
-    mov  eax,[0xfb0a]
+           mov  eax,[MOUSE_X]
-    shl  eax,16
+           shl  eax,16
-    mov  ax,[0xfb0c]
+           mov  ax,[MOUSE_Y]
-    mov  esi,[0x3010]
+           mov  esi,[TASK_BASE]
+           mov  bx, word [esi-twdw+WDATA.box.left]
+           shl  ebx,16
+           mov  bx, word [esi-twdw+WDATA.box.top]
+           sub  eax,ebx
+           mov  edi,[CURRENT_TASK]
+           shl  edi,8
-    mov  bx, word [esi-twdw+WDATA.box.left]
+           sub  ax,word[edi+SLOT_BASE+APPDATA.wnd_clientbox.top]
-    shl  ebx,16
+           rol  eax,16
+           sub  ax,word[edi+SLOT_BASE+APPDATA.wnd_clientbox.left]
+           rol  eax,16
+           mov  [esp+36],eax
+           ret
-    mov  bx, word [esi-twdw+WDATA.box.top]
+msbutton:
+           movzx eax,byte [BTN_DOWN]
-    sub  eax,ebx
+           mov  [esp+36],eax
-    mov  [esp+36],eax
+           ret
-    ret
+msset:
-  nowr:
+           ret
 app_load_cursor:
+           add ebx, new_app_base
+           cmp ebx, new_app_base
+           jb msset
+           stdcall load_cursor, ebx, ecx
+           mov [esp+36], eax
+           ret
+app_set_cursor:
+           stdcall set_cursor, ebx
-    cmp   eax,2
+           mov [esp+36], eax
-    jnz   nomb
+           ret
     movzx eax,byte [0xfb40]
    in   al,dx
    and  al,0x80
    pop  edx
    ret
 is_output:
    push edx
     ret
 sys_end:
-     mov   eax,[0x3010]
+     mov   eax,[TASK_BASE]
      mov   [eax+TASKDATA.state], 3  ; terminate this program
     waitterm:            ; wait here for termination
+     mov   eax,5
-     mov   eax,5
+     call  delay_hs
-     call  delay_hs
+     jmp   waitterm
      jmp   waitterm
 iglobal
-iglobal
+align 4
         dd      sysfn_getfreemem        ; 16 = get free memory size
         dd      sysfn_getallmem         ; 17 = get total memory size
         dd      sysfn_terminate2        ; 18 = terminate thread using PID
                                         ;                 instead of slot
         dd      sysfn_mouse_acceleration; 19 = set/get mouse acceleration
+        dd      sysfn_meminfo           ; 20 = get extended memory info
 sysfn_num = ($ - sys_system_table)/4
 endg
 sys_system:
         ret
 sysfn_shutdown:         ; 18.1 = BOOT
      mov  [0x2f0000+0x9030],byte 0
+  for_shutdown_parameter:
-  for_shutdown_parameter:
-     mov  eax,[0x3004]
+     mov  eax,[TASK_COUNT]
      add  eax,2
      mov  [shutdown_processes],eax
-     mov  [0xFF00],al
+     mov  [SYS_SHUTDOWN],al
      and  dword [esp+36], 0
      ret
   uglobal
    shutdown_processes: dd 0x0
   endg
 sysfn_terminate:        ; 18.2 = TERMINATE
      cmp  ebx,2
      jb   noprocessterminate
-     mov  edx,[0x3004]
+     mov  edx,[TASK_COUNT]
      cmp  ebx,edx
      ja   noprocessterminate
-     mov  eax,[0x3004]
+     mov  eax,[TASK_COUNT]
      shl  ebx,5
-     mov  edx,[ebx+0x3000+TASKDATA.pid]
+     mov  edx,[ebx+CURRENT_TASK+TASKDATA.pid]
-     add  ebx,0x3000+TASKDATA.state
+     add  ebx,CURRENT_TASK+TASKDATA.state
      cmp  byte [ebx], 9
      jz   noprocessterminate
     ret
 sysfn_activate:         ; 18.3 = ACTIVATE WINDOW
      cmp  ebx,2
      jb   .nowindowactivate
-     cmp  ebx,[0x3004]
+     cmp  ebx,[TASK_COUNT]
      ja   .nowindowactivate
      mov   [window_minimize], 2   ; restore window if minimized
-     movzx esi, word [0xC000 + ebx*2]
+     movzx esi, word [WIN_STACK + ebx*2]
-     cmp   esi, [0x3004]
+     cmp   esi, [TASK_COUNT]
      je    .nowindowactivate ; already active
      mov   edi, ebx
      shl   edi, 5
      add   edi, window_data
-     movzx esi, word [0xC000 + ebx * 2]
+     movzx esi, word [WIN_STACK + ebx * 2]
-     lea   esi, [0xC400 + esi * 2]
+     lea   esi, [WIN_POS + esi * 2]
      call  waredraw
 .nowindowactivate:
      ret
 sysfn_getidletime:              ; 18.4 = GET IDLETIME
      mov  eax,[idleusesec]
      mov  [esp+36], eax
      ret
 sysfn_getcpuclock:              ; 18.5 = GET TSC/SEC
-     mov  eax,[0xf600]
+     mov  eax,[CPU_FREQ]
      mov  [esp+36], eax
      ret
 ;  SAVE ramdisk to /hd/1/menuet.img
 ;!!!!!!!!!!!!!!!!!!!!!!!!
    include 'blkdev/rdsave.inc'
 ;!!!!!!!!!!!!!!!!!!!!!!!!
      mov ecx,10
      cld
      rep movsb
      ret
    for_all_tables:
-     mov edi,[0x3010]
+     mov edi,[TASK_BASE]
      mov edi,[edi+TASKDATA.mem_start]
      add edi,ecx
-     mov esi,0x40000
+     mov esi,DRIVE_DATA
      ret
   full_table:
      cmp  ebx,2
      jnz  exit_for_anyone
      call for_all_tables
 sysfn_lastkey:          ; 18.12 = return 0 (backward compatibility)
         and     dword [esp+36], 0
         ret
 sysfn_getversion:       ; 18.13 = get kernel ID and version
-     mov edi,[0x3010]
+     mov edi,[TASK_BASE]
      mov edi,[edi+TASKDATA.mem_start]
      add edi,ebx
      mov esi,version_inf
      mov ecx,version_end-version_inf
      mov  [mouse_delay],ecx
      ret
  .set_pointer_position:
      cmp  ebx,4  ; set mouse pointer position
      jnz  .end
-     mov   [0xFB0C],cx    ;y
+     mov   [MOUSE_Y],cx    ;y
      ror   ecx,16
-     mov   [0xFB0A],cx    ;x
+     mov   [MOUSE_X],cx    ;x
      rol   ecx,16
  .end:
      ret
 sysfn_getfreemem:
-     mov  eax,[MEM_FreeSpace]
+     mov eax, [pg_data.pages_free]
-     shl  eax,2
+     shl eax, 2
-     mov  [esp+36],eax
+     mov [esp+36],eax
      ret
 sysfn_getallmem:
-     mov  eax,[0xFE8C]
-     shr  eax,10
-;     mov  eax,[MEM_AllSpace]
+     mov  eax,[MEM_AMOUNT]
-;     shl  eax,2
+     shr eax, 10
      mov  [esp+36],eax
      ret
 sound_flag      db 0
 endg
 iglobal
 version_inf:
-  db 0,5,8,1  ; version 0.5.8.1
+  db 0,6,5,0  ; version 0.6.5.0
   db UID_KOLIBRI
   db 'Kolibri',0
 version_end:
     jbe   nosb2
     mov   edx,[ebx]
     and   edx,0xFF000000 ;255*256*256*256
     and   ecx,0x00FFFFFF ;255*256*256+255*256+255
     add   edx,ecx
-    mov   [ebx+0x300000],edx
+    mov   [ebx+IMG_BACKGROUND],edx
 ;    mov   [bgrchanged],1
     ret
   nosb2:
 draw_background_temp:
 ;    cmp   [bgrchanged],1 ;0
 ;    je    nosb31
 ;draw_background_temp:
 ;    mov   [bgrchanged],1 ;0
-    mov   [0xfff0],byte 1
+    mov   [REDRAW_BACKGROUND],byte 1
     mov    [background_defined], 1
    nosb31:
     ret
   nosb3:
   nosb4:
     cmp   eax,5                            ; BLOCK MOVE TO BGR
     jnz   nosb5
   ; bughere
-    mov   edi, [0x3010]
+    mov   edi, [TASK_BASE]
     add   ebx, [edi+TASKDATA.mem_start]
  ;   mov   esi, ebx
  ;   mov   edi, ecx
     mov   eax, ebx
     mov   ebx, ecx
     add   ecx, edx
     cmp   ecx, 0x160000-16
     ja    .fin
  ;   add   edi, 0x300000
-    add   ebx, 0x300000
+    add   ebx, IMG_BACKGROUND
     mov   ecx, edx
     cmp   ecx, 0x160000-16
     ja    .fin
 ;    mov   [bgrchanged],1
     cmp   eax,2                                  ; PIXEL
     jnz   nogb2
     mov   edx,0x160000-16
     cmp   edx,ebx
     jbe   nogb2
-    mov   eax, [ebx+0x300000]
+    mov   eax, [ebx+IMG_BACKGROUND]
     and   eax, 0xFFFFFF
     mov   [esp+36],eax
     ret
   nogb2:
 align 4
 sys_getkey:
     mov   [esp+36],dword 1
 ; test main buffer
-    mov   ebx, [0x3000]                          ; TOP OF WINDOW STACK
+    mov   ebx, [CURRENT_TASK]                          ; TOP OF WINDOW STACK
-    movzx ecx,word [0xC000 + ebx * 2]
+    movzx ecx,word [WIN_STACK + ebx * 2]
-    mov   edx,[0x3004]
+    mov   edx,[TASK_COUNT]
     cmp   ecx,edx
     jne   .finish
-    cmp   [0xf400],byte 0
+    cmp   [KEY_COUNT],byte 0
     je    .finish
-    movzx eax,byte [0xf401]
+    movzx eax,byte [KEY_BUFF]
     shl   eax,8
     push  eax
-    dec   byte [0xf400]
+    dec   byte [KEY_COUNT]
-    and   byte [0xf400],127
+    and   byte [KEY_COUNT],127
-    movzx ecx,byte [0xf400]
+    movzx ecx,byte [KEY_COUNT]
     add   ecx,2
  ;   mov   esi,0xf402
  ;   mov   edi,0xf401
  ;   cld
  ;  rep   movsb
-    mov   eax, 0xF402
+    mov   eax, KEY_BUFF+1
-    mov   ebx, 0xF401
+    mov   ebx, KEY_BUFF
     call  memmove
     pop   eax
 .ret_eax:
     mov   [esp+36],eax
 align 4
 sys_getbutton:
-    mov   ebx, [0x3000]                         ; TOP OF WINDOW STACK
+    mov   ebx, [CURRENT_TASK]                         ; TOP OF WINDOW STACK
     mov   [esp+36],dword 1
-    movzx ecx, word [0xC000 + ebx * 2]
+    movzx ecx, word [WIN_STACK + ebx * 2]
-    mov   edx, [0x3004] ; less than 256 processes
+    mov   edx, [TASK_COUNT] ; less than 256 processes
     cmp   ecx,edx
     jne   .exit
-    movzx eax,byte [0xf500]
+    movzx eax,byte [BTN_COUNT]
     test  eax,eax
     jz    .exit
-    mov   eax,[0xf501]
+    mov   eax,[BTN_BUFF]
     shl   eax,8
-    mov   [0xf500],byte 0
+    mov   [BTN_COUNT],byte 0
 ;  +22 dword     start in mem
 ;  +26 dword     used mem
 ;  +30 dword     PID , process idenfification number
+;
-    mov  edi,[0x3010]   ; eax = return area
+    mov  edi,[TASK_BASE]   ; eax = return area
     add  eax,[edi + TASKDATA.mem_start]
     cmp  ebx,-1         ; who am I ?
     jne  no_who_am_i
-    mov  ebx,[0x3000]
+    mov  ebx,[CURRENT_TASK]
   no_who_am_i:
     ; return memory usage
     xor  edx,edx
     mov  eax,0x20
     mul  ebx
-    add  eax,0x3000+TASKDATA.cpu_usage
+    add  eax,CURRENT_TASK+TASKDATA.cpu_usage
     mov  ebx,eax
     pop  eax
     mov  ecx,[ebx]
     mov  [eax],ecx
     pop  ebx
-    mov  cx, [0xC000 + ebx * 2]
+    mov  cx, [WIN_STACK + ebx * 2]
     mov  [eax+4],cx
-    mov  cx, [0xC400 + ebx * 2]
+    mov  cx, [WIN_POS + ebx * 2]
     mov  [eax+6],cx
     push eax
     mov  eax,ebx
     shl  eax,8
-    add  eax,0x80000+APPDATA.app_name
+    add  eax,SLOT_BASE+APPDATA.app_name
     pop  ebx
     add  ebx,10
     mov  ecx,11
     mov    edx,0x100000*16
     pop    ecx                                   ; get gdt of tss
     cmp    ecx,1
     je     os_mem
     shl    ecx,8
-    mov    edx,[0x80000+ecx+APPDATA.mem_size] ;0x8c
+    mov    edx,[SLOT_BASE+ecx+APPDATA.mem_size] ;0x8c
     mov    eax,std_application_base_address
     ; eax run base -> edx used memory
   os_mem:
     dec    edx
     mov    [ebx+12],eax
     ; PID (+30)
     mov    eax,[esp]
     shl    eax,5
-    add    eax,0x3000+TASKDATA.pid
+    add    eax,CURRENT_TASK+TASKDATA.pid
     mov    eax,[eax]
     ; Process state (+50)
     mov    eax,[esp]
     shl    eax,5
-    add    eax,0x3000+TASKDATA.state
+    add    eax,CURRENT_TASK+TASKDATA.state
+    mov    eax,[eax]
+    mov    [ebx+40],ax
+    ; Window client area box
+    mov    esi,[esp]
+    shl    esi,8
+    add    esi,SLOT_BASE+APPDATA.wnd_clientbox
+    lea    edi,[ebx+44]
+    mov    ecx,4
+    rep    movsd
+    ; Window state
+    mov    esi,[esp]
+    shl    esi,5
-    mov    eax,[eax]
+    add    esi,window_data + WDATA.box
-    mov    [ebx+40],ax
+    mov    al,[esi+window_data+WDATA.fl_wstate]
     mov    [edi],al
     pop    ebx
     pop    eax
     cmp  eax,1
     jne  no_widgets_away
     ; buttons away
-    mov   ecx,[0x3000]
+    mov   ecx,[CURRENT_TASK]
   sys_newba2:
-    mov   edi,[0xfe88]
+    mov   edi,[BTN_ADDR]
   no_widgets_away:
     cmp   eax,2
     jnz   srl1
-    mov   edx,[0x3010]      ; return whole screen draw area for this app
+    mov   edx,[TASK_BASE]      ; return whole screen draw area for this app
-    add   edx,draw_data-0x3000
+    add   edx,draw_data-CURRENT_TASK
     mov   [edx+RECT.left], 0
     mov   [edx+RECT.top], 0
-    mov   eax,[0xfe00]
+    mov   eax,[ScreenWidth]
     mov   [edx+RECT.right],eax
-    mov   eax,[0xfe04]
+    mov   eax,[ScreenHeight]
     mov   [edx+RECT.bottom],eax
-    mov   edi,[0x3010]
+    mov   edi,[TASK_BASE]
     cmp   edi,3   ; type IV - skinned window
     jne   nosyswIV
     ; parameter for drawwindow_IV
     push  0
-    mov   edi, [0x3004]
+    mov   edi, [TASK_COUNT]
-    movzx edi, word [0xC400 + edi*2]
+    movzx edi, word [WIN_POS + edi*2]
-    cmp   edi, [0x3000]
+    cmp   edi, [CURRENT_TASK]
     jne   @f
     inc   dword [esp]
  @@:
 draw_window_caption:
         inc     [mouse_pause]
         call    [disable_mouse]
         xor     eax,eax
-        mov     edx,[0x3004]
+        mov     edx,[TASK_COUNT]
-        movzx   edx,word[0xC400+edx*2]
+        movzx   edx,word[WIN_POS+edx*2]
-        cmp     edx,[0x3000]
+        cmp     edx,[CURRENT_TASK]
         jne     @f
         inc     eax
-    @@: mov     edx,[0x3000]
+    @@: mov     edx,[CURRENT_TASK]
         shl     edx,5
         add     edx,window_data
         movzx   ebx,[edx+WDATA.fl_wstyle]
         and     bl,0x0F
         call    drawwindow_I_caption
 ;--------------------------------------------------------------
   .2:   ;jmp     @f
-        mov     edi,[0x3000]
+        mov     edi,[CURRENT_TASK]
         shl     edi,5
         test    [edi+window_data+WDATA.fl_wstyle],WSTYLE_HASCAPTION
         jz      @f
-        mov     ecx,[edi*8+0x80000+APPDATA.wnd_caption]
+        mov     ecx,[edi*8+SLOT_BASE+APPDATA.wnd_caption]
         or      ecx,ecx
         jz      @f
         jz      @f
         movzx   eax,[ecx+WDATA.fl_wstyle]
         and     eax,0x0F
         mov     eax,[eax*8+window_topleft+0]
-        mov     [edi+0x80000+APPDATA.wnd_clientbox.left],eax
+        mov     [edi+SLOT_BASE+APPDATA.wnd_clientbox.left],eax
         shl     eax,1
         neg     eax
         add     eax,[ecx+WDATA.box.width]
-        mov     [edi+0x80000+APPDATA.wnd_clientbox.width],eax
+        mov     [edi+SLOT_BASE+APPDATA.wnd_clientbox.width],eax
         movzx   eax,[ecx+WDATA.fl_wstyle]
         and     eax,0x0F
         push    [eax*8+window_topleft+0]
         mov     eax,[eax*8+window_topleft+4]
-        mov     [edi+0x80000+APPDATA.wnd_clientbox.top],eax
+        mov     [edi+SLOT_BASE+APPDATA.wnd_clientbox.top],eax
         neg     eax
         sub     eax,[esp]
         add     eax,[ecx+WDATA.box.height]
-        mov     [edi+0x80000+APPDATA.wnd_clientbox.height],eax
+        mov     [edi+SLOT_BASE+APPDATA.wnd_clientbox.height],eax
         add     esp,4
         pop     edi ecx eax
         ret
     @@:
         xor     eax,eax
-        mov     [edi+0x80000+APPDATA.wnd_clientbox.left],eax
+        mov     [edi+SLOT_BASE+APPDATA.wnd_clientbox.left],eax
-        mov     [edi+0x80000+APPDATA.wnd_clientbox.top],eax
+        mov     [edi+SLOT_BASE+APPDATA.wnd_clientbox.top],eax
         mov     eax,[ecx+WDATA.box.width]
-        mov     [edi+0x80000+APPDATA.wnd_clientbox.width],eax
+        mov     [edi+SLOT_BASE+APPDATA.wnd_clientbox.width],eax
         mov     eax,[ecx+WDATA.box.height]
-        mov     [edi+0x80000+APPDATA.wnd_clientbox.height],eax
+        mov     [edi+SLOT_BASE+APPDATA.wnd_clientbox.height],eax
         pop     edi ecx eax
         ret
 sys_set_window:
-    mov   edi,[0x3000]
+    mov   edi,[CURRENT_TASK]
-    shl   edi,5
-    add   edi,window_data
     shl   edi,5
-    ; colors
+    add   edi,window_data
-    mov   [edi+WDATA.cl_workarea],ecx
-    mov   [edi+WDATA.cl_titlebar],edx
+    ; colors
-    mov   [edi+WDATA.cl_frames],esi
+    mov   [edi+WDATA.cl_workarea],ecx
     mov   [edi+WDATA.cl_titlebar],edx
-        call    set_window_clientbox
+    mov   [edi+WDATA.cl_frames],esi
     sar   eax,16
     sar   ebx,16
     mov   word[edi+WDATA.box.left],ax
     mov   word[edi+WDATA.box.top],bx
+    call  check_window_position
     call  check_window_position
     call  set_window_clientbox
     push  ecx esi edi               ; save for window fullscreen/resize
     ;mov   esi,edi
         mov     cl,[edi+WDATA.fl_wstyle]
     sub   edi,window_data
     shl   edi,3
-    add   edi,0x80000
+    add   edi,SLOT_BASE
         and     cl,0x0F
         mov     [edi+APPDATA.wnd_caption],0
         cmp     cl,3
         jne     @f
+        mov     [edi+APPDATA.wnd_caption],esi
-        mov     [edi+APPDATA.wnd_caption],esi
+    @@: mov     esi,[esp+0]
     @@: mov     esi,[esp+0]
     add   edi, APPDATA.saved_box
-    add   edi, APPDATA.saved_box
+        movsd
     add   ecx, eax
     add   edx, ebx
         call    [calc_clipping_rects]
     pop   edx ecx ebx eax
-    mov   [0xf400],byte 0           ; empty keyboard buffer
+    mov   [KEY_COUNT],byte 0           ; empty keyboard buffer
-    mov   [0xf500],byte 0           ; empty button buffer
+    mov   [BTN_COUNT],byte 0           ; empty button buffer
   newd:
         jnz     .get_window_caption
         ; NOTE: only window owner thread can set its caption,
         ;       so there's no parameter for PID/TID
-        mov     edi,[0x3000]
+        mov     edi,[CURRENT_TASK]
         shl     edi,5
+        ; have to check if caption is within application memory limit
+        ; check is trivial, and if application resizes its memory,
-        ; have to check if caption is within application memory limit
+        ;   caption still can become over bounds
-        ; check is trivial, and if application resizes its memory,
+; diamond, 31.10.2006: check removed because with new memory manager
-        ;   caption still can become over bounds
+; there can be valid data after APPDATA.mem_size bound
-        mov     ecx,[edi*8+0x80000+APPDATA.mem_size]
+;        mov     ecx,[edi*8+SLOT_BASE+APPDATA.mem_size]
-        add     ecx,255 ; max caption length
+;        add     ecx,255 ; max caption length
-        cmp     ebx,ecx
+;        cmp     ebx,ecx
-        ja      .exit_fail
+;        ja      .exit_fail
         ret
 sys_window_move:
-        mov     edi,[0x3000]
+        mov     edi,[CURRENT_TASK]
         shl     edi,5
         je    .no_y_resizing
         mov     [edi + WDATA.box.height], edx
       .no_y_resizing:
+        call  check_window_position
-        call  check_window_position
+        call  set_window_clientbox
         pushad                       ; save for window fullscreen/resize
         mov   esi,edi
         sub   edi,window_data
         shr   edi,5
         shl   edi,8
-        add   edi, 0x80000 + APPDATA.saved_box
+        add   edi, SLOT_BASE + APPDATA.saved_box
         mov   ecx,4
         cld
         mov   ebx, [edi + WDATA.box.top]
         mov   ecx, [edi + WDATA.box.width]
         mov   edx, [edi + WDATA.box.height]
-        add   ecx, eax
+        add   ecx,eax
-        add   edx, ebx
+        add   edx,ebx
         call  [calculatescreen]
         popad
         pop   edx                   ; calculcate screen at old position
         mov   eax,edi               ; redraw screen at old position
         xor   esi,esi
         call  redrawscreen
-        mov   [0xfff5],byte 0 ; mouse pointer
+        mov   [DONT_DRAW_MOUSE],byte 0 ; mouse pointer
-        mov   [0xfff4],byte 0 ; no mouse under
+        mov   [MOUSE_BACKGROUND],byte 0 ; no mouse under
-        mov   [0xfb44],byte 0 ; react to mouse up/down
+        mov   [MOUSE_DOWN],byte 0 ; react to mouse up/down
         mov   ecx,10          ; wait 1/10 second
 ;    jz    temp_nobackgr
 ;    mov   [0xfff0],byte 2
 ;    call  change_task
 ;    mov   [draw_data+32+0],dword 0
 ;    mov   [draw_data+32+4],dword 0
-;    mov   eax,[0xfe00]
+;    mov   eax,[ScreenWidth
 ;    mov   ebx,[0xfe04]
 ;    mov   [draw_data+32+8],eax
 ;    mov   [draw_data+32+12],ebx
 ;    call  drawbackground
 ;    mov   [0xfff0],byte 0
-;    mov   [0xfff4],byte 0
+;    mov   [MOUSE_BACKGROUND],byte 0
 ;temp_nobackgr:
 ;    ret
 uglobal
 ; check if pixel is allowed to be drawn
 checkpixel:
         push eax edx
-        mov  edx,[0xfe00]     ; screen x size
+        mov  edx,[ScreenWidth]     ; screen x size
         inc  edx
         imul edx, ebx
         mov  dl, [eax+edx+display_data] ; lea eax, [...]
         xor  ecx, ecx
-        mov  eax, [0x3000]
+        mov  eax, [CURRENT_TASK]
         cmp  al, dl
   nocpustart:
     cmp   [mouse_active], 1
     jne   mouse_not_active
     mov   [mouse_active], 0
     xor   edi, edi
-    mov   ecx, [0x3004]
+    mov   ecx, [TASK_COUNT]
    set_mouse_event:
     add   edi, 256
-    or    [edi+0x80000+APPDATA.event_mask], dword 00100000b
+    or    [edi+SLOT_BASE+APPDATA.event_mask], dword 00100000b
     loop  set_mouse_event
   mouse_not_active:
-    cmp   [0xfff0],byte 0               ; background update ?
+    cmp   [REDRAW_BACKGROUND],byte 0               ; background update ?
     jz    nobackgr
     cmp    [background_defined], 0
     jz    nobackgr
-    mov   [0xfff0],byte 2
+    mov   [REDRAW_BACKGROUND],byte 2
     call  change_task
-    mov   [draw_data+32 + RECT.left],dword 0
+	mov   [draw_data+32 + RECT.left],dword 0
-    mov   [draw_data+32 + RECT.top],dword 0
+	mov   [draw_data+32 + RECT.top],dword 0
-    mov   eax,[0xfe00]
+    mov   eax,[ScreenWidth]
-    mov   ebx,[0xfe04]
+    mov   ebx,[ScreenHeight]
-    mov   [draw_data+32 + RECT.right],eax
+	mov   [draw_data+32 + RECT.right],eax
-    mov   [draw_data+32 + RECT.bottom],ebx
+	mov   [draw_data+32 + RECT.bottom],ebx
     call  [drawbackground]
-    mov   [0xfff0],byte 0
+    mov   [REDRAW_BACKGROUND],byte 0
-    mov   [0xfff4],byte 0
+    mov   [MOUSE_BACKGROUND],byte 0
   nobackgr:
     ; system shutdown request
-    cmp  [0xFF00],byte 0
+    cmp  [SYS_SHUTDOWN],byte 0
     je   noshutdown
     mov  edx,[shutdown_processes]
     sub  dl,2
-    cmp  [0xff00],dl
+    cmp  [SYS_SHUTDOWN],dl
     jne  no_mark_system_shutdown
     mov   edx,0x3040
-    movzx ecx,byte [0xff00]
+    movzx ecx,byte [SYS_SHUTDOWN]
     add   ecx,5
   markz:
     mov   [edx+TASKDATA.state],byte 3
     add   edx,0x20
     loop  markz
   no_mark_system_shutdown:
        not_this_task:
          pop   ecx
-         cmp   ecx,[0x3004]
+         cmp   ecx,[TASK_COUNT]
         ; all black
         mov   [display_data-8],dword 4      ; size x
         mov   [display_data-4],dword 2      ; size y
-        mov   edi, 0x300000                 ; set background to black
+        mov   edi, IMG_BACKGROUND                 ; set background to black
         xor   eax, eax
         mov   ecx, 0x0fff00 / 4
         cld
         rep   stosd
         mov   edi,display_data              ; set os to use all pixels
         mov   eax,0x01010101
-        mov   ecx,0x1fff00 / 4
+        mov   ecx,0x15ff00 / 4
         rep   stosd
 set_app_param:
         push edi
-        mov  edi,[0x3010]
+        mov  edi,[TASK_BASE]
 ;;       3 unknown FS
 ;;       4 partition not defined at hd
 ;;       5 file not found
 ;; ebx = size of file
+;
-;     mov   edi,[0x3010]
+;     mov   edi,[TASK_BASE]
 ;     add   edi,0x10
 ;     add   esi,[edi]
 ;     add   eax,[edi]
+;
 ;     pushad
 align 4
 sys_programirq:
-    mov   edi,[0x3010]
+    mov   edi,[TASK_BASE]
     add   eax,[edi+TASKDATA.mem_start]
     cmp   ebx,16
     jae   .not_owner
-    mov   edi,[0x3010]
+    mov   edi,[TASK_BASE]
     mov   edi,[edi+TASKDATA.pid]
      jae   .not_owner
      mov   edx,eax           ; check for correct owner
      shl   edx,2
      add   edx,irq_owner
      mov   edx,[edx]
-     mov   edi,[0x3010]
+     mov   edi,[TASK_BASE]
      mov   edi,[edi+TASKDATA.pid]
      cmp   edx,edi
      je    gidril1
 .not_owner:
      mov   [esp+32],dword 2     ; ecx=2
   gidril1:
      mov   ebx,eax
      shl   ebx,12
-     add   ebx,0x2e0000
+     add   ebx,IRQ_SAVE
      mov   eax,[ebx]
      mov   ecx,1
 set_io_access_rights:
      pushad
-     mov   edi,[0x3000]
+     mov   edi,[CURRENT_TASK]
      imul  edi,tss_step
      popad
-     ret
      ret
 r_f_port_area:
      cmp   ebx,ecx            ; beginning > end ?
      ja    rpal1
      cmp   ecx,65536
      jae   rpal1
-     mov   esi,[0x2d0000]
+     mov   esi,[RESERVED_PORTS]
      test  esi,esi            ; no reserved areas ?
      je    rpal2
      cmp   esi,255            ; max reserved
      jae   rpal1
    rpal3:
      mov   edi,esi
      shl   edi,4
-     add   edi,0x2d0000
+     add   edi,RESERVED_PORTS
      cmp   ebx,[edi+8]
      ja    rpal4
      cmp   ecx,[edi+4]
      jae   rpal1
    no_unmask_io:
      popad                         ; end enable io map
      sti
-     mov   edi,[0x2d0000]
+     mov   edi,[RESERVED_PORTS]
      add   edi,1
-     mov   [0x2d0000],edi
+     mov   [RESERVED_PORTS],edi
      shl   edi,4
-     add   edi,0x2d0000
+     add   edi,RESERVED_PORTS
-     mov   esi,[0x3010]
+     mov   esi,[TASK_BASE]
      mov   esi,[esi+TASKDATA.pid]
      mov   [edi],esi
      mov   [edi+4],ebx
      mov   [edi+8],ecx
-     xor   eax, eax
-     ret
      xor   eax, eax
+     ret
 free_port_area:
      pushad
-     mov   esi,[0x2d0000]     ; no reserved areas ?
+     mov   esi,[RESERVED_PORTS]     ; no reserved areas ?
      test  esi,esi
      je    frpal2
-     mov   edx,[0x3010]
+     mov   edx,[TASK_BASE]
      mov   edx,[edx+TASKDATA.pid]
    frpal3:
      mov   edi,esi
      shl   edi,4
      mov   esi,edi
      add   esi,16
      cld
      rep   movsb
-     dec   dword [0x2d0000]
+     dec   dword [RESERVED_PORTS]
      test  eax,eax
      jz    reserve_irq
      lea   edi,[irq_owner+ebx*4]
      mov   edx,[edi]
-     mov   eax,[0x3010]
+     mov   eax,[TASK_BASE]
      cmp   edx,[eax+TASKDATA.pid]
      jne   fril1
      dec   ecx
      mov   [edi],ecx
      lea   edi,[irq_owner+ebx*4]
      cmp   dword [edi], 0
      jnz   ril1
-     mov   edx,[0x3010]
+     mov   edx,[TASK_BASE]
      mov   edx,[edx+TASKDATA.pid]
      mov   [edi],edx
      dec   ecx
    ril1:
-     mov   [esp+36],ecx ; return in eax
-     ret
      mov   [esp+36],ecx ; return in eax
      ret
 __sys_drawbackground:
        inc   [mouse_pause]
-       cmp   [0xfe0c],word 0x12
+       cmp   [SCR_MODE],word 0x12
        je   dbrv20
      dbrv12:
-       cmp  [0xfe0c],word 0100000000000000b
+       cmp  [SCR_MODE],word 0100000000000000b
        jge  dbrv20
-       cmp  [0xfe0c],word 0x13
+       cmp  [SCR_MODE],word 0x13
        je   dbrv20
        call  vesa12_drawbackground
      test  ecx,0xFFFF0000
      jnz   @f
   .exit:
      ret
  @@:
-        mov     edi,[0x3000]
+        mov     edi,[CURRENT_TASK]
         shl     edi,8
-        add     dx,word[edi+0x80000+APPDATA.wnd_clientbox.top]
+        add     dx,word[edi+SLOT_BASE+APPDATA.wnd_clientbox.top]
         rol     edx,16
-        add     dx,word[edi+0x80000+APPDATA.wnd_clientbox.left]
+        add     dx,word[edi+SLOT_BASE+APPDATA.wnd_clientbox.left]
         rol     edx,16
   .forced:
+        push    ebp esi 0
+        mov     ebp, putimage_get24bpp
+        mov     esi, putimage_init24bpp
+sys_putimage_bpp:
+;        call    [disable_mouse] ; this will be done in xxx_putimage
 ;        mov     eax, vga_putimage
-        cmp     [0xfe0c], word 0x12
+        cmp     [SCR_MODE], word 0x12
         jz      @f   ;.doit
         mov     eax, vesa12_putimage
-        cmp     [0xfe0c], word 0100000000000000b
+        cmp     [SCR_MODE], word 0100000000000000b
         jae     @f
-        cmp     [0xfe0c], word 0x13
+        cmp     [SCR_MODE], word 0x13
         jnz     .doit
 @@:
         mov     eax, vesa20_putimage
 .doit:
         inc     [mouse_pause]
         call    eax
         dec     [mouse_pause]
+        pop     ebp esi ebp
         jmp     [draw_pointer]
+syscall_putimage_palette:
+        lea     edi, [esi+std_application_base_address]
+        mov     esi, edx
+        mov     edx, ecx
+        mov     ecx, ebx
+        lea     ebx, [eax+std_application_base_address]
+sys_putimage_palette:
+; ebx = pointer to image
+; ecx = [xsize]*65536 + [ysize]
+; edx = [xstart]*65536 + [ystart]
+; esi = number of bits per pixel, must be 8, 24 or 32
+; edi = pointer to palette
+; ebp = row delta
+        mov     eax, [CURRENT_TASK]
+        shl     eax, 8
+        add     dx, word [eax+SLOT_BASE+APPDATA.wnd_clientbox.top]
+        rol     edx, 16
+        add     dx, word [eax+SLOT_BASE+APPDATA.wnd_clientbox.left]
+        rol     edx, 16
+.forced:
+        push    ebp esi ebp
+        cmp     esi, 8
+        jnz     @f
+        mov     ebp, putimage_get8bpp
+        mov     esi, putimage_init8bpp
+        jmp     sys_putimage_bpp
+@@:
+        cmp     esi, 24
+        jnz     @f
+        mov     ebp, putimage_get24bpp
+        mov     esi, putimage_init24bpp
+        jmp     sys_putimage_bpp
+@@:
+        cmp     esi, 32
+        jnz     @f
+        mov     ebp, putimage_get32bpp
+        mov     esi, putimage_init32bpp
+        jmp     sys_putimage_bpp
+@@:
+        pop     ebp esi
+        ret
+putimage_init24bpp:
+        lea     eax, [eax*3]
+putimage_init8bpp:
+        ret
+putimage_get24bpp:
+        mov     eax, [esi]
+        add     esi, 3
+        ret     4
+putimage_get8bpp:
+        movzx   eax, byte [esi]
+        push    edx
+        mov     edx, [esp+8]
+        mov     eax, [edx+eax*4]
+        pop     edx
+        inc     esi
+        ret     4
+putimage_init32bpp:
+        shl     eax, 2
+        ret
+putimage_get32bpp:
+        lodsd
+        ret     4
 ; eax x beginning
 ; ebx y beginning
 ; ecx x end
-; edx y end
+	; edx y end
 ; edi color
 __sys_drawbar:
-        mov     esi,[0x3000]
+        mov     esi,[CURRENT_TASK]
         shl     esi,8
-        add     eax,[esi+0x80000+APPDATA.wnd_clientbox.left]
+        add     eax,[esi+SLOT_BASE+APPDATA.wnd_clientbox.left]
-        add     ecx,[esi+0x80000+APPDATA.wnd_clientbox.left]
+        add     ecx,[esi+SLOT_BASE+APPDATA.wnd_clientbox.left]
-        add     ebx,[esi+0x80000+APPDATA.wnd_clientbox.top]
+        add     ebx,[esi+SLOT_BASE+APPDATA.wnd_clientbox.top]
-        add     edx,[esi+0x80000+APPDATA.wnd_clientbox.top]
+        add     edx,[esi+SLOT_BASE+APPDATA.wnd_clientbox.top]
+  .forced:
-  .forced:
+    inc   [mouse_pause]
-    inc   [mouse_pause]
+;        call    [disable_mouse]
-    cmp   [0xfe0c],word 0x12
+    cmp   [SCR_MODE],word 0x12
     je   dbv20
    sdbv20:
-    cmp  [0xfe0c],word 0100000000000000b
+    cmp  [SCR_MODE],word 0100000000000000b
     jge  dbv20
-    cmp  [0xfe0c],word 0x13
+    cmp  [SCR_MODE],word 0x13
     je   dbv20
     call vesa12_drawbar
     dec   [mouse_pause]
 kb_write:
         push    ecx edx
         mov     dl,al
-        mov     ecx,0x1ffff ; last 0xffff, new value in view of fast CPU's
+;        mov     ecx,0x1ffff ; last 0xffff, new value in view of fast CPU's
-      kw_loop1:
+;      kw_loop1:
-        in      al,0x64
+;        in      al,0x64
-        test    al,0x20
+;        test    al,0x20
-        jz      kw_ok1
+;        jz      kw_ok1
-        loop    kw_loop1
+;        loop    kw_loop1
-        mov     ah,1
+;        mov     ah,1
-        jmp     kw_exit
+;        jmp     kw_exit
-      kw_ok1:
+;      kw_ok1:
         in      al,0x60
         mov     ecx,0x1ffff ; last 0xffff, new value in view of fast CPU's
       kw_loop:
 setmouse:  ; set mousepicture -pointer
            ; ps2 mouse enable
-     mov     [0xf200],dword mousepointer+62+32*31*4
+     mov     [MOUSE_PICTURE],dword mousepointer+62+32*31*4
      ret
-_rdtsc:
-     mov   edx,[cpuid_1+3*4]
+_rdtsc:
-     test  edx,00010000b
+     bt [cpu_caps], CAPS_TSC
-     jz    ret_rdtsc
+     jnc ret_rdtsc
      rdtsc
      ret
    ret_rdtsc:
-     mov   edx,0xffffffff
-     mov   eax,0xffffffff
-     ret
+     mov   edx,0xffffffff
      mov   eax,0xffffffff
      ret
    @@:
      popad
      ret
 uglobal
-  msg_board_data: times 512 db 0
+  msg_board_data: times 4096 db 0
   msg_board_count dd 0x0
 endg
      jne  smbl1
      mov  [msg_board_data+ecx],bl
      inc  ecx
-     and  ecx, 511
+     and  ecx, 4095
      mov  [msg_board_count], ecx
      mov  [check_idle_semaphore], 5
    smbl2:
      ret
-sys_trace:
-     test eax, eax                  ; get event data
-     jnz  no_get_sys_events
-     mov  esi,save_syscall_data     ; data
-     mov  edi,[0x3010]
-     mov  edi,[edi+TASKDATA.mem_start]
-     add  edi,ebx
-     cld
-     rep  movsb
-     mov  [esp+24],dword 0
-     mov  eax,[save_syscall_count]  ; count
-     mov  [esp+36],eax
-     ret
-   no_get_sys_events:
      ret
 sys_process_def:
-        mov     edi, [0x3000]
+        mov     edi, [CURRENT_TASK]
         dec     eax             ; 1 = set keyboard mode
      jne   no_set_keyboard_setup
      shl   edi,8
-     mov   [edi+0x80000 + APPDATA.keyboard_mode],bl
+     mov   [edi+SLOT_BASE + APPDATA.keyboard_mode],bl
      ret
 no_del_keyboard_hotkey:
-     ret
-sys_ipc:
-     cmp  eax,1                      ; DEFINE IPC MEMORY
-     jne  no_ipc_def
-     mov  edi,[0x3000]
-     shl  edi,8
-     add  edi,0x80000
-     mov  [edi + APPDATA.ipc_start], ebx
-     mov  [edi + APPDATA.ipc_size], ecx
-     mov  [esp+36],dword 0
-     ret
-   no_ipc_def:
-     cmp  eax,2                      ; SEND IPC MESSAGE
-     jne  no_ipc_send
-     mov  esi,1
-     mov  edi,0x3020
-    ipcs1:
-     cmp  [edi+TASKDATA.pid], ebx
-     je   ipcs2
-     add  edi,0x20
-     inc  esi
-     cmp  esi,[0x3004]
-     jbe  ipcs1
-     mov  [esp+36],dword 4
-     ret
-    ipcs2:
-     cli
-     push esi
-     mov  eax,esi
-     shl  eax,8
-     mov  ebx,[eax+0x80000 + APPDATA.ipc_start]
-     test ebx,ebx                  ; ipc area not defined ?
-     je   ipc_err1
-     add  ebx,[eax+0x80000 + APPDATA.ipc_size]
-     mov  eax,esi
-     shl  eax,5
-     add  ebx,[eax+0x3000 + TASKDATA.mem_start]    ; ebx <- max data position
-     mov  eax,esi                  ; to
-     shl  esi,8
-     add  esi,0x80000
-     mov  edi,[esi+APPDATA.ipc_start]
-     shl  eax,5
-     add  eax,0x3000
-     add  edi,[eax+TASKDATA.mem_start]
-     cmp  [edi],byte 0             ; overrun ?
-     jne  ipc_err2
-     mov  ebp,edi
-     add  edi,[edi+4]
-     add  edi,8
-     mov  esi,ecx                  ; from
-     mov  eax,[0x3010]
-     mov  eax,[eax+TASKDATA.mem_start]
-     add  esi,eax
-     mov  ecx,edx                  ; size
-     mov  eax,edi
-     add  eax,ecx
-     cmp  eax,ebx
-     jg   ipc_err3                 ; not enough room ?
-     push ecx
-     mov  eax,[0x3010]
-     mov  eax,[eax+TASKDATA.pid]
-     mov  [edi-8],eax
-     mov  [edi-4],ecx
-     cld
-     rep  movsb
-     pop  ecx
-     add  ecx,8
-     mov  edi,ebp                  ; increase memory position
-     add  dword [edi+4],ecx
-     mov  edi,[esp]
-     shl  edi,8
-     or   dword [edi+0x80000+APPDATA.event_mask],dword 01000000b ; ipc message
-     cmp  [check_idle_semaphore],dword 20
-     jge  ipc_no_cis
-     mov  [check_idle_semaphore],5
-   ipc_no_cis:
-     xor  eax, eax
-    ipc_err:
-     add  esp,4
-     mov  [esp+36],eax
-     sti
-     ret
-    ipc_err1:
-     add  esp,4
-     mov  [esp+36],dword 1
-     sti
-     ret
-    ipc_err2:
-     add  esp,4
-     mov  [esp+36],dword 2
-     sti
-     ret
-    ipc_err3:
-     add  esp,4
-     mov  [esp+36],dword 3
-     sti
-     ret
-   no_ipc_send:
-     mov  [esp+36],dword -1
      ret
 align 4
 sys_gs:                         ; direct screen access
      cmp  eax,1                 ; resolution
      jne  no_gs1
-     mov  eax,[0xfe00]
+     mov  eax,[ScreenWidth]
      shl  eax,16
-     mov  ax,[0xfe04]
+     mov  ax,[ScreenHeight]
      add  eax,0x00010001
      mov  [esp+36],eax
      ret
    no_gs1:
      cmp   eax,2                ; bits per pixel
      jne   no_gs2
-     movzx eax,byte [0xfbf1]
+     movzx eax,byte [ScreenBPP]
      mov   [esp+36],eax
      ret
    no_gs2:
 align 4  ;  system functions
 syscall_setpixel:                       ; SetPixel
-     mov   edx,[0x3010]
+     mov   edx,[TASK_BASE]
      add   eax,[edx-twdw+WDATA.box.left]
      add   ebx,[edx-twdw+WDATA.box.top]
-        mov     edi,[0x3000]
+        mov     edi,[CURRENT_TASK]
         shl     edi,8
-        add     eax,[edi+0x80000+APPDATA.wnd_clientbox.left]
+        add     eax,[edi+SLOT_BASE+APPDATA.wnd_clientbox.left]
-        add     ebx,[edi+0x80000+APPDATA.wnd_clientbox.top]
+        add     ebx,[edi+SLOT_BASE+APPDATA.wnd_clientbox.top]
      xor   edi,edi ; no force
 ;     mov   edi,1
      call  [disable_mouse]
      jmp   [putpixel]
 align 4
 syscall_writetext:                      ; WriteText
-     mov   edi,[0x3010]
+     mov   edi,[TASK_BASE]
      mov   ebp,[edi-twdw+WDATA.box.left]
         push    esi
-        mov     esi,[0x3000]
+        mov     esi,[CURRENT_TASK]
         shl     esi,8
-        add     ebp,[esi+0x80000+APPDATA.wnd_clientbox.left]
+        add     ebp,[esi+SLOT_BASE+APPDATA.wnd_clientbox.left]
      shl   ebp,16
      add   ebp,[edi-twdw+WDATA.box.top]
 align 4
 syscall_openramdiskfile:                ; OpenRamdiskFile
-     mov   edi,[0x3010]
+     mov   edi,[TASK_BASE]
-     add   edi, TASKDATA.mem_start
+     add   edi,TASKDATA.mem_start
      add   eax,[edi]
      je    drectr
      movzx ecx,ax
      sar   eax,16
      movzx edx,bx
      sar   ebx,16
-        mov     esi,[0x3000]
+        mov     esi,[CURRENT_TASK]
         shl     esi,8
-        add     eax,[esi+0x80000+APPDATA.wnd_clientbox.left]
+        add     eax,[esi+SLOT_BASE+APPDATA.wnd_clientbox.left]
-        add     ebx,[esi+0x80000+APPDATA.wnd_clientbox.top]
+        add     ebx,[esi+SLOT_BASE+APPDATA.wnd_clientbox.top]
      add   ecx,eax
      add   edx,ebx
      jmp   [drawbar]
     drectr:
      ret
 align 4
 syscall_getscreensize:                  ; GetScreenSize
-     movzx eax,word[0xfe00]
-     shl   eax,16
-     mov   ax,[0xfe04]
-     mov   [esp+36],eax
-     ret
-align 4
-syscall_startapp:                       ; StartApp
-     mov   edi,[0x3010]
-     add   edi, TASKDATA.mem_start
-     add   eax,[edi]
-     test  ebx,ebx
-     jz    noapppar
-     add   ebx,[edi]
-   noapppar:
-;     call  start_application_fl
+     movzx eax,word[ScreenWidth]
-     xor   edx,edx      ; compatibility - flags=0
+     shl   eax,16
-     call   new_start_application_fl
-     mov   [esp+36],eax
+     mov   ax,[ScreenHeight]
-     ret
+     mov   [esp+36],eax
      ret
 align 4
-syscall_cdaudio:                        ; CD
-     call  sys_cd_audio
-     mov   [esp+36],eax
-     ret
-;  ReadHd and StartHdApp functions are obsolete. Use 58 or 70 functions instead.
-;align 4
-;
-;syscall_readhd:                         ; ReadHd
-;
-;     mov   edi,[0x3010]
-;     add   edi,0x10
-;     add   esi,[edi]
-;     add   eax,[edi]
-;     call  read_hd_file
-;     mov   [esp+36],eax
-;     mov   [esp+24],ebx
-;     ret
-;align 4
-;
-;syscall_starthdapp:                     ; StartHdApp
-;
-;     mov   edi,[0x3010]
-;     add   edi,0x10
-;     add   eax,[edi]
 ;     add   ecx,[edi]
-;     xor   ebp,ebp
+syscall_cdaudio:                        ; CD
-;     xor   edx,edx      ; compatibility - flags=0
-;     call  start_application_hd
+     call  sys_cd_audio
-;     mov   [esp+36],eax
+     mov   [esp+36],eax
-;     ret
+     ret
 align 4
 syscall_delramdiskfile:                 ; DelRamdiskFile
-     mov   edi,[0x3010]
+     mov   edi,[TASK_BASE]
-     add   edi, TASKDATA.mem_start
+     add   edi,TASKDATA.mem_start
      add   eax,[edi]
      call  filedelete
      mov   [esp+36],eax
      ret
 align 4
 syscall_writeramdiskfile:               ; WriteRamdiskFile
-     mov   edi,[0x3010]
+     mov   edi,[TASK_BASE]
-     add   edi, TASKDATA.mem_start
+     add   edi,TASKDATA.mem_start
      add   eax,[edi]
 align 4
 syscall_readstring:                     ; ReadString
-     mov   edi,[0x3010]
+     mov   edi,[TASK_BASE]
-     add   edi, TASKDATA.mem_start
+     add   edi,TASKDATA.mem_start
      add   eax,[edi]
      call  read_string
      mov   [esp+36],eax
      ret
 align 4
 syscall_drawline:                       ; DrawLine
-     mov   edi,[0x3010]
+     mov   edi,[TASK_BASE]
      mov   edx, [edi-twdw+WDATA.box.left]
-        mov     esi,[0x3000]
+        mov     esi,[CURRENT_TASK]
         shl     esi,8
-        add     edx, [esi+0x80000+APPDATA.wnd_clientbox.left]
+        add     edx,[esi+SLOT_BASE+APPDATA.wnd_clientbox.left]
      add   ax,dx
      rol   eax,16
      add   ax,dx
      rol   eax,16
      mov   edx, [edi-twdw+WDATA.box.top]
 align 4
 read_from_hd:                           ; Read from hd - fn not in use
-     mov   edi,[0x3010]
+     mov   edi,[TASK_BASE]
      add   edi,TASKDATA.mem_start
      add   eax,[edi]
      mov   [esp+36],eax
      mov   [esp+24],ebx
-     ret
      ret
-align 4
-write_to_hd:                            ; Write a file to hd
-     mov   edi,[0x3010]
-     add   edi,TASKDATA.mem_start
-     add   eax,[edi]
-     add   ecx,[edi]
-     add   edx,[edi]
+align 4
-     call  file_write
-     ret
-;  Sysfunction 57, delete_from_hd, is obsolete. Use 58 or 70 functions instead.
-;align 4
-;
-;delete_from_hd:                         ; Delete a file from hd
-;
-;     mov   edi,[0x3010]
-;     add   edi,0x10
-;     add   eax,[edi]
-;     add   ecx,[edi]
-;     call  file_delete
-;     ret
+paleholder:
 	ret
 ; --------------- APM ---------------------
 apm_entry    dp    0
 ;clear_busy_flag_at_caller:
 ;      push  edi
-;      mov   edi,[0x3000]    ; restore processes tss pointer in gdt, busyfl?
+;      mov   edi,[CURRENT_TASK]    ; restore processes tss pointer in gdt, busyfl?
 ;      imul  edi,8
-;      mov   [edi+gdts+ tss0 +5], word 01010000b *256 +11101001b
-;      pop   edi
+;      mov   [edi+gdts+ tss0 +5], word 01010000b *256 +11101001b
-;      ret
+;      pop   edi
 wraw_bacground_select db 0
   lba_read_enabled    dd   0x0  ; 0 = disabled , 1 = enabled
   pci_access_enabled  dd   0x0  ; 0 = disabled , 1 = enabled
-  sb16       dd 0x0
-  wss        dd 0x0
+  sb16       dd 0x0
+  buttontype         dd 0x0
+  windowtypechanged  dd 0x0
+align 4
+  cpu_caps    dd 4 dup(0)
-  buttontype         dd 0x0
+  pg_data  PG_DATA
-  windowtypechanged  dd 0x0
+  heap_test   dd ?
 endg
 iglobal
   keyboard   dd 0x1
+  sound_dma  dd 0x1
+  syslang    dd 0x1
+endg
-  sound_dma  dd 0x1
+if __DEBUG__ eq 1
-  syslang    dd 0x1
+  include_debug_strings
-endg
+end if
 IncludeIGlobals

Subversion Repositories Kolibri OS

(root)/kernel/branches/gfx_kernel/kernel.asm – Rev 143 → 384