WebSVN – Kolibri OS – Diff – /kernel/trunk/kernel.asm

 format binary as "mnt"
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 9910 $
+$Revision: 9911 $
         cmp     al, 129
         jne     .bll1
 end if
-        mov     [timer_ticks_enable], 1         ; for cd driver
         mov     [timer_ticks_enable], 1         ; for cd driver
         sti
-        call    mtrr_validate
-        jmp     osloop
+        call    mtrr_validate
         jmp     osloop
         ; Fly :)
 ; All other parts of the kernel do not expect multi-CPU.
 ; Also, APs don't even have a stack here.
 ; Beware. Don't do anything here. Anything at all.
 idle_loop:
         cmp     [use_mwait_for_idle], 0
-        jnz     idle_loop_mwait
+        jnz     .mwait
-idle_loop_hlt:
+.hlt:
         hlt
-        jmp     idle_loop_hlt
+        jmp     .hlt
-idle_loop_mwait:
+.mwait:
         mov     eax, idle_addr
         xor     ecx, ecx
         xor     edx, edx
         monitor
         xor     ecx, ecx
         mov     eax, 20h        ; or 10h
         mwait
-        jmp     idle_loop_mwait
+        jmp     .mwait
 endg
 set_variables:
         mov     ecx, 0x16                    ; flush port 0x60
-.fl60:
+@@:
         in      al, 0x60
-        loop    .fl60
+        loop    @b
         push    eax
 display_number_force:
         push    eax
         and     eax, 0x3fffffff
         cmp     eax, 0xffff     ; length > 0 ?
         pop     eax
-        jge     cont_displ
+        jge     .cont_displ
         ret
-   cont_displ:
+   .cont_displ:
         push    eax
         and     eax, 0x3fffffff
         cmp     eax, 61*0x10000  ; length <= 60 ?
         pop     eax
-        jb      cont_displ2
+        jb      .cont_displ2
         ret
-   cont_displ2:
+   .cont_displ2:
         pushad
         cmp     al, 1            ; ecx is a pointer ?
-        jne     displnl1
+        jne     @f
         mov     ebp, ebx
         add     ebp, 4
-        mov     ebp, [ebp + std_application_base_address]
+        mov     ebp, [ebp] ;[ebp + std_application_base_address]
-        mov     ebx, [ebx + std_application_base_address]
+        mov     ebx, [ebx] ;[ebx + std_application_base_address]
- displnl1:
+@@:
         sub     esp, 64
         test    ah, ah            ; DECIMAL
-        test    ah, ah            ; DECIMAL
+        jnz     .no_display_desnum
         jnz     no_display_desnum
         shr     eax, 16
         and     eax, 0xC03f
 ;     and   eax,0x3f
         push    eax
         and     eax, 0x3f
         mov     edi, esp
         add     edi, 4+64-1
         mov     ecx, eax
         mov     eax, ebx
         mov     ebx, 10
- d_desnum:
+@@:
         xor     edx, edx
         call    division_64_bits
         div     ebx
         add     dl, 48
+        mov     [edi], dl
-        mov     [edi], dl
+        dec     edi
-        dec     edi
+        loop    @b
         loop    d_desnum
         pop     eax
         call    normalize_number
         call    draw_num_text
         add     esp, 64
         popad
         ret
+.no_display_desnum:
    no_display_desnum:
         cmp     ah, 0x01         ; HEXADECIMAL
-        cmp     ah, 0x01         ; HEXADECIMAL
+        jne     .no_display_hexnum
         jne     no_display_hexnum
         shr     eax, 16
         and     eax, 0xC03f
 ;     and   eax,0x3f
         push    eax
         and     eax, 0x3f
         mov     edi, esp
         add     edi, 4+64-1
         mov     ecx, eax
         mov     eax, ebx
         mov     ebx, 16
-   d_hexnum:
+@@:
         xor     edx, edx
         call    division_64_bits
         div     ebx
-   hexletters = __fdo_hexdigits
+   ;hexletters = __fdo_hexdigits
-        add     edx, hexletters
+        add     edx, __fdo_hexdigits ;hexletters
+        mov     dl, [edx]
-        mov     dl, [edx]
+        mov     [edi], dl
-        mov     [edi], dl
+        dec     edi
-        dec     edi
+        loop    @b
         loop    d_hexnum
         pop     eax
         call    normalize_number
         call    draw_num_text
         add     esp, 64
         popad
+        ret
-        ret
+.no_display_hexnum:
    no_display_hexnum:
         cmp     ah, 0x02         ; BINARY
-        cmp     ah, 0x02         ; BINARY
+        jne     .no_display_binnum
         jne     no_display_binnum
         shr     eax, 16
         and     eax, 0xC03f
 ;     and   eax,0x3f
         push    eax
         and     eax, 0x3f
         mov     edi, esp
         add     edi, 4+64-1
         mov     ecx, eax
         mov     eax, ebx
         mov     ebx, 2
-   d_binnum:
+@@:
         xor     edx, edx
         call    division_64_bits
+        div     ebx
-        div     ebx
+        add     dl, 48
-        add     dl, 48
+        mov     [edi], dl
-        mov     [edi], dl
+        dec     edi
-        dec     edi
+        loop    @b
         loop    d_binnum
         pop     eax
         call    normalize_number
         call    draw_num_text
         add     esp, 64
         popad
         jnc     @f
         mov     edi, eax
 @@:
         jmp     dtext
 ;-----------------------------------------------------------------------------
-iglobal
-midi_base dw 0
-endg
-;-----------------------------------------------------------------------------
 align 4
 sys_setup:
 ;  1 = roland mpu midi base , base io address
 ;  2 = keyboard   1, base kaybap 2, shift keymap, 9 country 1eng 2fi 3ger 4rus
 ;  3 = not used
 ;-----------------------------------------------------------------------------
 get_timer_ticks:
         mov     eax, [timer_ticks]
         ret
 ;-----------------------------------------------------------------------------
+iglobal
+midi_base dw 0
+endg
+align 4
+sys_midi:
+        cmp     word [mididp], 0
+        jnz     @f
+        mov     [esp + SYSCALL_STACK.eax], 1
+        ret
+@@:
+        and     [esp + SYSCALL_STACK.eax], 0
+        dec     ebx
+        jnz     .smn1
+ ;    call setuart
+@@:
+        call    .is_output
+        test    al, al
+        jnz     @b
+        mov     dx, word [midisp]
+        mov     al, 0xff
+        out     dx, al
+@@:
+        mov     dx, word [midisp]
+        mov     al, 0xff
+        out     dx, al
+        call    .is_input
+        test    al, al
+        jnz     @b
+        call    .get_mpu_in
+        cmp     al, 0xfe
+        jnz     @b
+@@:
+        call    .is_output
+        test    al, al
+        jnz     @b
+        mov     dx, word [midisp]
+        mov     al, 0x3f
+        out     dx, al
+        ret
+.smn1:
+        dec     ebx
+        jnz     .ret
+@@:
+        call    .get_mpu_in
+        call    .is_output
+        test    al, al
+        jnz     @b
+        mov     al, bl
+        call    .put_mpu_out
+.ret:
+        ret
-is_input:
+.is_input:
         push    edx
         mov     dx, word [midisp]
         in      al, dx
         and     al, 0x80
         pop     edx
         ret
-is_output:
+.is_output:
         push    edx
         mov     dx, word [midisp]
         in      al, dx
         and     al, 0x40
         pop     edx
         ret
-get_mpu_in:
+.get_mpu_in:
         push    edx
         mov     dx, word [mididp]
         in      al, dx
         pop     edx
         ret
-put_mpu_out:
+.put_mpu_out:
         push    edx
-        mov     dx, word [mididp]
-        out     dx, al
-        pop     edx
-        ret
-align 4
-sys_midi:
-        cmp     [mididp], 0
+        mov     dx, word [mididp]
-        jnz     sm0
-        mov     [esp+36], dword 1
-        ret
-sm0:
-        and     [esp+36], dword 0
-        dec     ebx
-        jnz     smn1
- ;    call setuart
-su1:
-        call    is_output
-        test    al, al
-        jnz     su1
-        mov     dx, word [midisp]
-        mov     al, 0xff
-        out     dx, al
-su2:
-        mov     dx, word [midisp]
-        mov     al, 0xff
-        out     dx, al
-        call    is_input
-        test    al, al
-        jnz     su2
-        call    get_mpu_in
-        cmp     al, 0xfe
-        jnz     su2
-su3:
-        call    is_output
-        test    al, al
-        jnz     su3
-        mov     dx, word [midisp]
-        mov     al, 0x3f
-        out     dx, al
-        ret
-smn1:
-        dec     ebx
-        jnz     smn2
-sm10:
-        call    get_mpu_in
-        call    is_output
-        test    al, al
-        jnz     sm10
-        mov     al, bl
+        out     dx, al
-        call    put_mpu_out
-        smn2:
+        pop     edx
         ret
-sys_end:
+;-----------------------------------------------------------------------------
-;--------------------------------------
+sys_end:
         cmp     ecx, edx
         ja      .noprocessterminate
         mov     eax, [thread_count]
         shl     ecx, BSF sizeof.APPDATA
         add     ecx, SLOT_BASE
         mov     edx, [ecx + APPDATA.tid]
         cmp     byte [ecx + APPDATA.state], TSTATE_FREE
         jz      .noprocessterminate
         push    eax
         mov     eax, ecx
         cmp     [_display.select_cursor], 0
         je      .restore_end
 ; restore default cursor before killing
         pusha
         mov     ecx, [esp+32]
-        shl     ecx, 8
+        shl     ecx, BSF sizeof.APPDATA
         add     ecx, SLOT_BASE
         mov     eax, [def_cursor]
         cmp     [ecx + APPDATA.cursor], eax
         je      @f
         call    restore_default_cursor_before_killing
 .noprocessterminate:
         add     esp, 4
         ret
 ;------------------------------------------------------------------------------
 sysfn_terminate2:
-;lock application_table_status mutex
-.table_status:
         call    lock_application_table
         mov     eax, ecx
         call    pid_to_slot
         test    eax, eax
         jz      .not_found
         ret
 ;------------------------------------------------------------------------------
 sysfn_sound_flag:       ; 18.8 = get/set sound_flag
 ;     cmp  ecx,1
         dec     ecx
-        jnz     nogetsoundflag
+        jnz     .set_flag
         movzx   eax, byte [sound_flag]; get sound_flag
         mov     [esp + SYSCALL_STACK.eax], eax
         ret
- nogetsoundflag:
+.set_flag:
 ;     cmp  ecx,2
         dec     ecx
-        jnz     nosoundflag
+        jnz     .err
         xor     byte [sound_flag], 1
- nosoundflag:
+.err:
         ret
 ;------------------------------------------------------------------------------
 sysfn_minimize:         ; 18.10 = minimize window
         mov     [window_minimize], 1
         call    wakeup_osloop
         mov     dword [esp + SYSCALL_STACK.eax], -1
         ret
 ;------------------------------------------------------------------------------
 sysfn_waitretrace:     ; 18.14 = sys wait retrace
-     ;wait retrace functions
+        ;wait retrace functions
- sys_wait_retrace:
         mov     edx, 0x3da
- WaitRetrace_loop:
+.loop:
         in      al, dx
         test    al, 1000b
-        jz      WaitRetrace_loop
+        jz      .loop
         and     [esp + SYSCALL_STACK.eax], dword 0
         ret
 ;------------------------------------------------------------------------------
 align 4
 sysfn_centermouse:      ; 18.15 = mouse centered
         ret
 .no_floppy_save:
         mov     [esp + SYSCALL_STACK.eax], dword 1
         ret
 ;------------------------------------------------------------------------------
-align 4
-sys_getkey:
-        mov     [esp + SYSCALL_STACK.eax], dword 1
-        ; test main buffer
-        mov     ebx, [current_slot_idx]                          ; TOP OF WINDOW STACK
-        movzx   ecx, word [WIN_STACK + ebx * 2]
-        mov     edx, [thread_count]
-        cmp     ecx, edx
-        jne     .finish
-        cmp     [KEY_COUNT], byte 0
-        je      .finish
-        movzx   ax, byte [KEY_BUFF + 120 + 2]
-        shl     eax, 8
-        mov     al, byte [KEY_BUFF]
-        shl     eax, 8
-        push    eax
-        dec     byte [KEY_COUNT]
-        and     byte [KEY_COUNT], 127
-        movzx   ecx, byte [KEY_COUNT]
-        add     ecx, 2
-        mov     eax, KEY_BUFF + 1
-        mov     ebx, KEY_BUFF
-        call    memmove
-        add     eax, 120 + 2
-        add     ebx, 120 + 2
-        call    memmove
-        pop     eax
-;--------------------------------------
-align 4
-.ret_eax:
-        mov     [esp + SYSCALL_STACK.eax], eax
-        ret
-;--------------------------------------
-align 4
-.finish:
-; test hotkeys buffer
-        mov     ecx, hotkey_buffer
-;--------------------------------------
-align 4
-@@:
-        cmp     [ecx], ebx
-        jz      .found
-        add     ecx, 8
-        cmp     ecx, hotkey_buffer + 120 * 8
-        jb      @b
-        ret
-;--------------------------------------
-align 4
-.found:
-        mov     ax, [ecx + 6]
-        shl     eax, 16
-        mov     ah, [ecx + 4]
-        mov     al, 2
-        and     dword [ecx + 4], 0
-        and     dword [ecx], 0
-        jmp     .ret_eax
-;------------------------------------------------------------------------------
-align 4
-sys_getbutton:
-        mov     ebx, [current_slot_idx]                         ; TOP OF WINDOW STACK
-        mov     [esp + SYSCALL_STACK.eax], dword 1
-        movzx   ecx, word [WIN_STACK + ebx * 2]
-        mov     edx, [thread_count] ; less than 256 processes
-        cmp     ecx, edx
-        jne     .exit
-        movzx   eax, byte [BTN_COUNT]
-        test    eax, eax
-        jz      .exit
-        mov     eax, [BTN_BUFF]
-        and     al, 0xFE                                    ; delete left button bit
-        mov     [BTN_COUNT], byte 0
-        mov     [esp + SYSCALL_STACK.eax], eax
-;--------------------------------------
-align 4
-.exit:
-        ret
-;------------------------------------------------------------------------------
 align 4
 sys_cpuusage:
 ;  RETURN:
         mov     edi, [_display.win_map]              ; set os to use all pixels
         mov     eax, 0x01010101
         mov     ecx, [_display.win_map_size]
         shr     ecx, 2
         rep stosd
-        mov     byte[window_data + 32 + WDATA.z_modif], ZPOS_DESKTOP
+        mov     byte[window_data + sizeof.WDATA + WDATA.z_modif], ZPOS_DESKTOP
         mov     [REDRAW_BACKGROUND], 0
         ret
 ;-----------------------------------------------------------------------------
 uglobal
   imax    dd 0x0
 ;.forced:
 ;        call    vesa20_drawbar
 ;        call    [draw_pointer]
 ;        ret
 ;-----------------------------------------------------------------------------
-align 4
-kb_write_wait_ack:
-        push    ecx edx
-        mov     dl, al
-        mov     ecx, 0x1ffff; last 0xffff, new value in view of fast CPU's
-.wait_output_ready:
-        in      al, 0x64
-        test    al, 2
-        jz      @f
-        loop    .wait_output_ready
-        mov     ah, 1
-        jmp     .nothing
-@@:
-        mov     al, dl
-        out     0x60, al
-        mov     ecx, 0xfffff; last 0xffff, new value in view of fast CPU's
-.wait_ack:
-        in      al, 0x64
-        test    al, 1
-        jnz     @f
-        loop    .wait_ack
-        mov     ah, 1
-        jmp     .nothing
-@@:
-        in      al, 0x60
-        xor     ah, ah
-.nothing:
-        pop     edx ecx
-        ret
-;-----------------------------------------------------------------------------
 if used _rdtsc
 _rdtsc:
         bt      [cpu_caps], CAPS_TSC
         jnc     .ret_rdtsc
         rdtsc
         mov     [esp + SYSCALL_STACK.eax], edx
         mov     [esp + SYSCALL_STACK.ebx], 1
         ret
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; 66 sys function.                                                ;;
-;; in eax=66,ebx in [0..5],ecx,edx                                 ;;
-;; out eax                                                         ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-iglobal
-align 4
-f66call:
-           dd sys_process_def.1   ; 1 = set keyboard mode
-           dd sys_process_def.2   ; 2 = get keyboard mode
-           dd sys_process_def.3   ; 3 = get keyboard ctrl, alt, shift
-           dd sys_process_def.4   ; 4 = set system-wide hotkey
-           dd sys_process_def.5   ; 5 = delete installed hotkey
-           dd sys_process_def.6   ; 6 = disable input, work only hotkeys
-           dd sys_process_def.7   ; 7 = enable input, opposition to f.66.6
-endg
-;-----------------------------------------------------------------------------
-align 4
-sys_process_def:
-        dec     ebx
-        cmp     ebx, 7
-        jae     .not_support    ;if >=8 then or eax,-1
-        mov     edi, [current_slot]
-        jmp     dword [f66call + ebx*4]
-.not_support:
-        or      [esp + SYSCALL_STACK.eax], -1
-        ret
-;-----------------------------------------------------------------------------
-align 4
-.1:
-        mov     [edi + APPDATA.keyboard_mode], cl
-        ret
-;-----------------------------------------------------------------------------
-align 4
-.2:                             ; 2 = get keyboard mode
-        movzx   eax, byte [edi + APPDATA.keyboard_mode]
-        mov     [esp + SYSCALL_STACK.eax], eax
-        ret
-;-----------------------------------------------------------------------------
-align 4
-.3:                             ;3 = get keyboard ctrl, alt, shift
-        mov     eax, [kb_state]
-        mov     [esp + SYSCALL_STACK.eax], eax
-        ret
-;-----------------------------------------------------------------------------
-align 4
-.4:
-        mov     edi, [current_slot_idx]
-        mov     eax, hotkey_list
-@@:
-        cmp     dword [eax + 8], 0
-        jz      .found_free
-        add     eax, 16
-        cmp     eax, hotkey_list+16*256
-        jb      @b
-        mov     dword [esp + SYSCALL_STACK.eax], 1
-        ret
-.found_free:
-        mov     [eax + 8], edi
-        mov     [eax + 4], edx
-        movzx   ecx, cl
-        lea     ecx, [hotkey_scancodes+ecx*4]
-        mov     edx, [ecx]
-        mov     [eax], edx
-        mov     [ecx], eax
-        mov     [eax + 12], ecx
-        test    edx, edx
-        jz      @f
-        mov     [edx + 12], eax
-@@:
-        and     dword [esp + SYSCALL_STACK.eax], 0
-        ret
-;-----------------------------------------------------------------------------
-align 4
-.5:
-        mov     edi, [current_slot_idx]
-        movzx   ebx, cl
-        lea     ebx, [hotkey_scancodes+ebx*4]
-        mov     eax, [ebx]
-.scan:
-        test    eax, eax
-        jz      .notfound
-        cmp     [eax + 8], edi
-        jnz     .next
-        cmp     [eax + 4], edx
-        jz      .found
-.next:
-        mov     eax, [eax]
-        jmp     .scan
-.notfound:
-        mov     dword [esp + SYSCALL_STACK.eax], 1
-        ret
-.found:
-        mov     ecx, [eax]
-        jecxz   @f
-        mov     edx, [eax + 12]
-        mov     [ecx + 12], edx
-@@:
-        mov     ecx, [eax + 12]
-        mov     edx, [eax]
-        mov     [ecx], edx
-        xor     edx, edx
-        mov     [eax + 4], edx
-        mov     [eax + 8], edx
-        mov     [eax + 12], edx
-        mov     [eax], edx
-        mov     [esp + SYSCALL_STACK.eax], edx
-        ret
-;-----------------------------------------------------------------------------
-align 4
-.6:
-        pushfd
-        cli
-        mov     eax, [PID_lock_input]
-        test    eax, eax
-        jnz     @f
-; get current PID
-        mov     eax, [current_slot]
-        mov     eax, [eax + APPDATA.tid]
-; set current PID for lock input
-        mov     [PID_lock_input], eax
-@@:
-        popfd
-        ret
-;-----------------------------------------------------------------------------
-align 4
-.7:
-        mov     eax, [PID_lock_input]
-        test    eax, eax
-        jz      @f
-; get current PID
-        mov     ebx, [current_slot]
-        mov     ebx, [ebx + APPDATA.tid]
-; compare current lock input with current PID
-        cmp     ebx, eax
-        jne     @f
-        xor     eax, eax
-        mov     [PID_lock_input], eax
-@@:
-        ret
-;-----------------------------------------------------------------------------
-uglobal
-  PID_lock_input dd 0x0
-endg
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; 61 sys function.                                                ;;
 ;; in eax=61,ebx in [1..3]                                         ;;
 ;; out eax                                                         ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
         cmp     word [apm_vf], ax       ; Check APM BIOS enable
         jne     @f
         inc     eax
         or      dword [esp + 44], eax   ; error
         add     eax, 7
-        mov     dword [esp + 32], eax   ; 32-bit protected-mode interface not supported
+        mov     dword [esp + SYSCALL_STACK.eax], eax   ; 32-bit protected-mode interface not supported
         ret
 @@:
 ;       xchg    eax, ecx
 ;       xchg    ebx, ecx
         cmp     dx, 3
         ja      @f
         and     [esp + 44], byte 0xfe    ; emulate func 0..3 as func 0
         mov     eax, [apm_vf]
-        mov     [esp + 32], eax
+        mov     [esp + SYSCALL_STACK.eax], eax
         shr     eax, 16
-        mov     [esp + 28], eax
+        mov     [esp + SYSCALL_STACK.ecx], eax
         ret
         mov     [master_tab], eax
         mov     eax, cr3
         mov     cr3, eax
         pop     eax
-        mov     [esp + 4 ], edi
+        mov     [esp + SYSCALL_STACK.edi], edi
-        mov     [esp + 8], esi
+        mov     [esp + SYSCALL_STACK.esi], esi
-        mov     [esp + 20], ebx
+        mov     [esp + SYSCALL_STACK.ebx], ebx
-        mov     [esp + 24], edx
+        mov     [esp + SYSCALL_STACK.edx], edx
-        mov     [esp + 28], ecx
+        mov     [esp + SYSCALL_STACK.ecx], ecx
-        mov     [esp + 32], eax
+        mov     [esp + SYSCALL_STACK.eax], eax
         setc    al
         and     [esp + 44], byte 0xfe
         or      [esp + 44], al
         ret

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm @ 5851 – Rev 9910 → 9911