WebSVN – Kolibri OS – Diff – /programs/other/calc/trunk/calc.asm

 ;;   Calc 1.1
 ;;           1) changed design
 ;;           2) new procedure of draw window (10 decimal digits, 23 binary, "+" not displayed now)
 ;;           3) window with skin
 ;;   Calc 1.2
-;;           1)added some useful functions, such as arcsin, arccos, arctg, 1/x, x^2
+;;           1) added some useful functions, such as arcsin, arccos, arctg, 1/x, x^2
 ;;   Calc 1.31
-;;           1)optimised program
+;;           1) optimised program
-;;           2)new type of window (you need kernel 114 revision or higher)
+;;           2) new type of window (you need kernel 114 revision or higher)
 ;;   Calc 1.32
-;;           1)fixed arccos
+;;           1) fixed arccos
+;;   Calc 1.33
+;;           1) align button captions in proper way, finally!
-appname equ 'Calc '
 version    equ '1.32'
 use32
-               org    0x0
+        org     0x0
-               db    'MENUET01'            ; 8 byte id
+        db      'MENUET01'      ; 8 byte id
-               dd     0x01                      ; header version
+        dd      0x01            ; header version
-               dd     START                    ; start of code
+        dd      START           ; start of code
-               dd     I_END                    ; size of image
+        dd      I_END           ; size of image
-               dd     0x1000                  ; memory for app
+        dd      E_END           ; memory for app
-               dd     0x1000                  ; esp
+        dd      E_END           ; esp
-               dd     0x0,0x0                 ; I_Param , I_Icon
+        dd      0x0,0x0         ; I_Param , I_Icon
-include '..\..\..\macros.inc'
+include '../../../macros.inc'
-START:
- red:
-    call draw_window
+START:
- still:
+red:
-    push 10
+        call    draw_window
-    pop eax
+still:
-    mcall
+        mcall   10
-    dec eax
+        dec     eax
-    jz red
+        jz      red
-    dec eax
+        dec     eax
-    jz key
+        jz      key
-  button:
-    mov  al,17      ; ¯®«ãç¨âì ¨¤¥â¨ä¨ª â®à  ¦ â®© ª®¯ª¨
+button:
-    mcall
+        mcall   17      ; get button id
-    shr  eax,8
+        shr     eax, 8
-    jmp  testbut
+        jmp     testbut
-  key:
-    mov  al,2       ; ¯®«ãç¨âì ASCII-ª®¤  ¦ â®© ª« ¢¨è¨
+key:
-    mcall
+        mcall   2       ; get ASCII key code
-    shr  eax,8
+        shr     eax, 8
-    mov  edi,asci   ; ¯¥à¥¢®¤ ASCII ¢ ¨¤¥â¨ä¨ª â®à ª®¯ª¨
+        mov     edi, asci       ; convert ASCII into button id
-    mov  ecx,18
+        mov     ecx, 18
-    cld
+        cld
-    repne scasb
+        repne   scasb
-    jne  still
+        jne     still
-    sub  edi,asci
+        sub     edi, asci
-    dec  edi
+        dec     edi
-    mov  esi,butid
+        mov     esi, butid
-    add  esi,edi
+        add     esi, edi
-    lodsb
+        lodsb
-  testbut:
-  show_result:
+show_result:
-    call   ftoa
+        call    ftoa
-    call   print_display
+        call    print_display
-    jmp    still
+        jmp     still
 error:
-    jmp  still
+        jmp     still
 calculate:
-    pusha
+        pusha
-    cmp  [calc],' '
+        cmp     [calc], ' '
-    je   no_calculation
+        je      no_calculation
-    cmp  [calc],'/'
+        cmp     [calc], '/'
-    jne  no_cdiv
+        jne     no_cdiv
-    fdiv [trans1]
+        fdiv    [trans1]
-  no_cdiv:
+no_cdiv:
-    cmp  [calc],'*'
+        cmp     [calc], '*'
-    jne  no_cmul
+        jne     no_cmul
-    fmul [trans1]
+        fmul    [trans1]
-  no_cmul:
+no_cmul:
-    cmp  [calc],'+'
+        cmp     [calc], '+'
-    jne  no_cadd
+        jne     no_cadd
-    fadd [trans1]
+        fadd    [trans1]
-  no_cadd:
+no_cadd:
-    cmp  [calc],'-'
+        cmp     [calc], '-'
-    jne  no_cdec
+        jne     no_cdec
-    fsub [trans1]
+        fsub    [trans1]
-  no_cdec:
+no_cdec:
-    call   ftoa
+        call    ftoa
-  no_calculation:
+no_calculation:
-    call   print_display
+        call    print_display
-    popa
+        popa
-    ret
+        ret
 number_entry:
-    pusha
+        pusha
-    cmp  eax,[entry_multiplier]
+        cmp     eax, [entry_multiplier]
-    jge  no_entry
+        jge     no_entry
-    cmp  [id],1
+        cmp     [id], 1
-    je   decimal_entry
+        je      decimal_entry
-    mov  ebx,[integer]
+        mov     ebx, [integer]
-    test ebx,0xF0000000
+        test    ebx, 0xf0000000
-    jnz  no_entry
+        jnz     no_entry
-    mov  ebx,eax
+        mov     ebx, eax
-    mov  eax,[integer]
+        mov     eax, [integer]
-    mov  ecx,[entry_multiplier]
+        mov     ecx, [entry_multiplier]
-    mul  ecx
+        mul     ecx
-    add  eax,ebx
+        add     eax, ebx
-    mov  [integer],eax
+        mov     [integer], eax
-    call print_display
+        call    print_display
-    call to_muuta
+        call    to_muuta
-    popa
+        popa
-    ret
+        ret
-  decimal_entry:
+decimal_entry:
-    imul eax,[new_dec]
+        imul    eax, [new_dec]
-    add  [decimal],eax
+        add     [decimal], eax
-    mov  eax,[new_dec]
+        mov     eax, [new_dec]
-    xor  edx,edx
+        xor     edx, edx
-    mov  ebx,[entry_multiplier]
+        mov     ebx, [entry_multiplier]
-    div  ebx
+        div     ebx
-    mov  [new_dec],eax
+        mov     [new_dec], eax
-    call print_display
+        call    print_display
-    call to_muuta
+        call    to_muuta
-    popa
+        popa
-    ret
+        ret
-  no_entry:
+no_entry:
-    call print_display
+        call    print_display
-    call to_muuta
+        call    to_muuta
-    popa
+        popa
-    ret
+        ret
- to_muuta:
+to_muuta:
-    pusha
+        pusha
-    mov  al,[dsign]
+        mov     al, [dsign]
-    mov  esi,muuta0
+        mov     esi, muuta0
-    mov  edi,muuta1
+        mov     edi, muuta1
-    mov  ecx,18
+        mov     ecx, 18
-    cld
+        cld
-    rep  movsb
+        rep     movsb
-    mov  [muuta1],al
+        mov     [muuta1], al
-    mov  edi,muuta1+10     ; æ¥«®¥
+        mov     edi, muuta1+10     ; []
-    mov  eax,[integer]
+        mov     eax, [integer]
-  new_to_muuta1:
+new_to_muuta1:
-    mov  ebx,10
+        mov     ebx, 10
-    xor  edx,edx
+        xor     edx, edx
-    div  ebx
+        div     ebx
-    mov  [edi],dl
+        mov     [edi], dl
-    add  [edi],byte 48
+        add     [edi], byte 48
-    dec  edi
+        dec     edi
-    cmp  edi,muuta1+1
+        cmp     edi, muuta1+1
-    jge  new_to_muuta1
+        jge     new_to_muuta1
-    mov  edi,muuta1+17     ; ¤à®¡®¥
+        mov     edi, muuta1+17     ; {}
-    mov  eax,[decimal]
+        mov     eax, [decimal]
-  new_to_muuta2:
+new_to_muuta2:
-    mov  ebx,10
+        mov     ebx, 10
-    xor  edx,edx
+        xor     edx, edx
-    div  ebx
+        div     ebx
-    mov  [edi],dl
+        mov     [edi], dl
-    add  [edi],byte 48
+        add     [edi], byte 48
-    dec  edi
+        dec     edi
-    cmp  edi,muuta1+12
+        cmp     edi, muuta1+12
-    jge  new_to_muuta2
+        jge     new_to_muuta2
-    popa
+        popa
-    ret
+        ret
 new_entry:
-    pusha
+        pusha
-    mov  esi,muuta1
+        mov     esi, muuta1
-    mov  edi,muuta2
+        mov     edi, muuta2
-    mov  ecx,18
+        mov     ecx, 18
-    cld
+        cld
-    rep  movsb
+        rep     movsb
-    mov  esi,muuta0
+        mov     esi, muuta0
-    mov  edi,muuta1
+        mov     edi, muuta1
-    mov  ecx,18
+        mov     ecx, 18
-    cld
+        cld
-    rep  movsb
+        rep     movsb
-    mov  [integer],0
+        mov     [integer], 0
-    mov  [decimal],0
+        mov     [decimal], 0
-    mov  [id],0
+        mov     [id], 0
-    mov  [new_dec],100000
+        mov     [new_dec], 100000
-    mov  [sign],byte '+'
+        mov     [sign], byte '+'
-    popa
+        popa
-    ret
+        ret
 ftoa:                         ; fpu st0 -> [integer],[decimal]
-    pusha
+        pusha
-    fst    [tmp2]
+        fst     [tmp2]
-    fstcw  [controlWord]      ; set truncate integer mode
+        fstcw   [controlWord]      ; set truncate integer mode
-    mov    ax,[controlWord]
+        mov     ax, [controlWord]
-    mov    [tmp], ax
+        mov     [tmp], ax
-    or     [tmp], word 0x0c00
+        or      [tmp], word 0x0c00
-    fldcw  [tmp]
+        fldcw   [tmp]
-    ftst                      ; test if st0 is negative
+        ftst                      ; test if st0 is negative
-    fstsw  ax
+        fstsw   ax
-    and    ax, 0x4500
+        and     ax, 0x4500
-    mov    [sign], 0
+        mov     [sign], 0
-    cmp    ax, 0x0100
+        cmp     ax, 0x0100
-    jne    no_neg
+        jne     no_neg
-    mov    [sign],1
+        mov     [sign], 1
-  no_neg:
+no_neg:
-    fld    [tmp2]
+        fld     [tmp2]
-    cmp    byte [sign], 0     ; change fraction to positive
+        cmp     byte [sign], 0     ; change fraction to positive
-    je     no_neg2
+        je      no_neg2
-    fchs
+        fchs
-  no_neg2:
+no_neg2:
-    fadd   [smallValueForRounding]
+        fadd    [smallValueForRounding]
-    fist   [integer]
+        fist    [integer]
-    fisub  [integer]
+        fisub   [integer]
-    mov    [res],0     ; convert 6 decimal numbers
+        mov     [res], 0     ; convert 6 decimal numbers
-    mov    edi,6
+        mov     edi, 6
-   newd:
+newd:
-    fimul  [kymppi]
+        fimul   [kymppi]
-    fist   [decimal]
+        fist    [decimal]
-    mov    ebx,[res]
+        mov     ebx, [res]
-    imul   ebx,10
+        imul    ebx, 10
-    mov    [res],ebx
+        mov     [res], ebx
-    mov    eax,[decimal]
+        mov     eax, [decimal]
-    add    [res],eax
+        add     [res], eax
-    fisub  [decimal]
+        fisub   [decimal]
-    fst    [tmp2]
+        fst     [tmp2]
-    ftst
+        ftst
-    fstsw  ax
+        fstsw   ax
-    test   ax,1
+        test    ax, 1
-    jnz    real_done
+        jnz     real_done
-    fld    [tmp2]
+        fld     [tmp2]
-    dec    edi
+        dec     edi
-    jz	   real_done
+        jz      real_done
-    jmp    newd
+        jmp     newd
-  real_done:
+real_done:
-    fldcw  [controlWord]
+        fldcw   [controlWord]
-    mov    eax,[res]
+        mov     eax, [res]
-    mov    [decimal],eax
+        mov     [decimal], eax
-    cmp    [integer],0x80000000
+        cmp     [integer], 0x80000000
-    jne    no_error
+        jne     no_error
-    call   clear_all
+        call    clear_all
-    mov    [calc],'E'
+        mov     [calc], 'E'
-  no_error:
+no_error:
-    mov    [dsign],byte '+'
+        mov     [dsign], byte '+'
-    cmp    [sign],byte 0      ; convert negative result
+        cmp     [sign], byte 0      ; convert negative result
-    je     no_negative
+        je      no_negative
-;    mov    eax,[integer]
+;       mov     eax, [integer]
-;    not    eax
+;       not     eax
-;    inc    eax
+;       inc     eax
-;    mov    [integer],eax
+;       mov     [integer], eax
-    mov    [dsign],byte '-'
+        mov     [dsign], byte '-'
-  no_negative:
+no_negative:
-    call   to_muuta
+        call    to_muuta
-    popa
+        popa
-    ret
+        ret
 atof:
-    push ax
+        push    ax
-    push di
+        push    di
-    fldz
+        fldz
-    mov di, 0
+        mov     di, 0
-    cmp si, 0
+        cmp     si, 0
-    je .error            ; Jump if string has 0 length.
+        je      .error            ; Jump if string has 0 length.
-    mov byte [sign], 0
+        mov     byte [sign], 0
-    cmp byte [bx], '+'   ; Take care of leading '+' or '-'.
+        cmp     byte [bx], '+'   ; Take care of leading '+' or '-'.
-    jne .noPlus
+        jne     .noPlus
-    inc di
+        inc     di
-    jmp .noMinus
+        jmp     .noMinus
   .noPlus:
-    cmp byte [bx], '-'
+        cmp     byte [bx], '-'
-    jne .noMinus
+        jne     .noMinus
-    mov byte [sign], 1   ; Number is negative.
+        mov     byte [sign], 1   ; Number is negative.
-    inc di
+        inc     di
   .noMinus:
-    cmp si, di
+        cmp     si, di
-    je .error
+        je      .error
-    call atof_convertWholePart
+        call    atof_convertWholePart
-    jc .error
+        jc      .error
-    call atof_convertFractionalPart
+        call    atof_convertFractionalPart
-    jc .error
+        jc      .error
-    cmp byte [sign], 0
+        cmp     byte [sign], 0
-    je .dontNegate
+        je      .dontNegate
-    fchs    ; Negate value
+        fchs    ; Negate value
   .dontNegate:
-    mov bh, 0    ; Set bh to indicate the string is a valid number.
+        mov     bh, 0    ; Set bh to indicate the string is a valid number.
-    jmp .exit
+        jmp     .exit
   .error:
-    mov bh, 1    ; Set error code.
+        mov     bh, 1    ; Set error code.
-   ; fstp st0    ; Pop top of fpu stack.
+;       fstp    st0    ; Pop top of fpu stack.
   .exit:
-    pop di
+        pop     di
-    pop ax
+        pop     ax
-    ret
+        ret
 atof_convertWholePart:
     ; Convert the whole number part (the part preceding the decimal
     ; point) by reading a digit at a time, multiplying the current
     ; value by 10, and adding the digit.
-.mainLoop:
+  .mainLoop:
-    mov al, [bx + di]
+        mov     al, [bx + di]
-    cmp al, '.'
+        cmp     al, '.'
-    je .exit
+        je      .exit
-    cmp al, '0'       ; Make sure character is a digit.
+        cmp     al, '0'       ; Make sure character is a digit.
-    jb .error
+        jb      .error
-    cmp al, '9'
+        cmp     al, '9'
-    ja .error
+        ja      .error
     ; Convert single character to digit and save to memory for
     ; transfer to the FPU.
-    sub al, '0'
+        sub     al, '0'
-    mov ah, 0
+        mov     ah, 0
-    mov [tmp], ax
+        mov     [tmp], ax
     ; Multiply current value by 10 and add in digit.
-    fmul dword [ten]
+        fmul    dword [ten]
-    fiadd word [tmp]
+        fiadd   word [tmp]
-    inc di
+        inc     di
-    cmp si, di         ; Jump if end of string has been reached.
+        cmp     si, di         ; Jump if end of string has been reached.
-    je .exit
+        je      .exit
-    jmp .mainLoop
+        jmp     .mainLoop
   .error:
-    stc                ; Set error (carry) flag.
+        stc                ; Set error (carry) flag.
-    ret
+        ret
   .exit:
-    clc                ; Clear error (carry) flag.
+        clc                ; Clear error (carry) flag.
-    ret
+        ret
 atof_convertFractionalPart:
-    fld1               ; Load 1 to TOS.  This will be the value of the decimal place.
+        fld1               ; Load 1 to TOS.  This will be the value of the decimal place.
   .mainLoop:
-    cmp si, di         ; Jump if end of string has been reached.
+        cmp     si, di         ; Jump if end of string has been reached.
-    je .exit
+        je      .exit
-    inc di             ; Move past the decimal point.
-    cmp si, di         ; Jump if end of string has been reached.
-    je .exit
+        inc     di             ; Move past the decimal point.
-    mov al, [bx + di]
-    cmp al, '0'        ; Make sure character is a digit.
+        cmp     si, di         ; Jump if end of string has been reached.
-    jb .error
-    cmp al, '9'
-    ja .error
-    fdiv dword [ten]   ; Next decimal place
+        je      .exit
-    sub al, '0'
-    mov ah, 0
+        mov     al, [bx + di]
-    mov [tmp], ax
+        cmp     al, '0'        ; Make sure character is a digit.
-    ; Load digit, multiply by value for appropriate decimal place,
+        jb      .error
-    ; and add to current total.
+        cmp     al, '9'
+        ja      .error
-    fild  word [tmp]
+        fdiv    dword [ten]   ; Next decimal place
-    fmul  st0, st1
+        sub     al, '0'
-    faddp st2, st0
+        mov     ah, 0
-    jmp .mainLoop
+        mov     [tmp], ax
-  .error:
+    ; Load digit, multiply by value for appropriate decimal place,
-    stc           ; Set error (carry) flag.
+    ; and add to current total.
-    fstp st0    ; Pop top of fpu stack.
-    ret
+        fild    word [tmp]
+        fmul    st0, st1
-  .exit:
+        faddp   st2, st0
-    clc              ; Clear error (carry) flag.
+        jmp     .mainLoop
-    fstp st0    ; Pop top of fpu stack.
-    ret
+  .error:
+        stc           ; Set error (carry) flag.
-;   *********************************************
+        fstp    st0    ; Pop top of fpu stack.
-;   ******* WINDOW DEFINITIONS AND DRAW *********
+        ret
-;   *********************************************
+  .exit:
-draw_window:
+        clc              ; Clear error (carry) flag.
+        fstp    st0    ; Pop top of fpu stack.
-    mov  eax,12
+        ret
-    mov  ebx,1
-    mcall
+;   *********************************************
+;   ******* WINDOW DEFINITIONS AND DRAW *********
-    mov  eax,48
+;   *********************************************
-    mov  ebx,3
-    mov  ecx,sc
+draw_window:
+        mcall   12, 1
+        mcall   48, 3, sc, sizeof.system_colors
+        mcall   48, 4
+        mov     ecx, eax
+        xor     eax, eax
+        mov     ebx, 200 shl 16 + 256
+        add     ecx, 200 shl 16 + 158
+        mov     edx, [sc.work]
+        or      edx, 0x34000000
+        mov     edi, title
+        mcall
+        mov     eax, 8
+        mov     ebx, 19 shl 16 + 28
+        mov     ecx, 49 shl 16 + 18
+        mov     edx, 6
+        mov     esi, [sc.work_button]
+        mov     edi, 7
+newbutton:
+        dec     edi
+        jnz     no_new_row
+        mov     edi, 7
+        mov     ebx, 19 shl 16 + 28
-    mov  edx,sizeof.system_colors
-    mcall
-    mov  eax,48
-    mov  ebx,4
-    int  0x40
-    mov  ecx, eax
-    xor  eax,eax
-    mov  ebx,200 shl 16+256
-    add  ecx,200 shl 16+158
-    mov  edx,[sc.work]
-    or   edx,0x34000000
-    mov  edi,title
+        add     ecx, 20 shl 16
-    mcall
-    mov  eax,8
-    mov  ebx,19 shl 16+28
+no_new_row:
-    mov  ecx,49 shl 16+18
+        mcall
-    mov  edx,6
+        add     ebx, 30 shl 16
-    mov  esi,[sc.work_button]
+        inc     edx
-    mov  edi,7
+        cmp     edx, 39
+        jbe     newbutton
+        mcall   , <199, 28>, <49, 18>, 2        ; 'C'
+        mcall   , <220,  8>, < 7,  8>, 3        ; 'dec-bin-hex'
+        mov     ecx, [sc.work_button_text]
+        mov     edx, text
+        mov     edi, 55 - 20
+next_line:
+        inc     edx
+        and     edi, 0x0000ffff
+        add     edi, 20 SHL 16 + 20
+next_button:
+        movzx   esi, byte[edx - 1]
+        imul    eax, esi, 6
+        neg     eax
+        add     eax, 29
+        shr     eax, 1
+        shl     eax, 16
+        mov     ebx, edi
-  newbutton:
-    dec  edi
-    jnz  no_new_row
-    mov  edi,7
-    mov  ebx,19 shl 16+28
-    add  ecx,20 shl 16
-  no_new_row:
-    mcall
-    add  ebx,30 shl 16
-    inc  edx
-    cmp  edx,39
-    jbe  newbutton
-    mcall  ,199 shl 16+28,49 shl 16+18,2               ; 'C'
-    mcall  ,220 shl 16+8,7 shl 16+8,3                     ; 'dec-bin-hex'
-    mov  eax,4
-    mov  ebx,27 shl 16+55
-    mov  ecx,[sc.work_button_text]
-    mov  edx,text
-    mov  esi,33
-  newline:
-    mcall
-    add  ebx,20
-    add  edx,33
-    cmp  [edx],byte 'x'
+        add     ebx, eax
-    jne  newline
+        mcall   4
+        add     edx, esi
-    call print_display
+        inc     edx
+        add     edi, 30 SHL 16
-    mov  eax,12
+        cmp     [edx - 1], byte 0
-    mov  ebx,2
+        jne     next_button
-    mcall
-    ret
-print_display:
-    pusha
-    mcall 13,18 shl 16+210,19 shl 16+13,0xffffff
+        cmp     [edx], byte 'x'
-    mov  eax,4
-    mov  ebx,135 shl 16+7
-    mov  ecx,[sc.work_text]
-    or   ecx,0x40000000
-    mov  edx,calc
-    mov  esi,1
+        jne     next_line
-    mov  edi,[sc.work]
-    mcall
-    mov  ebx,198 shl 16+8
-    mov  edx,[display_type]
-    shl  edx,2
-    add  edx,display_type_text
-    mov  esi,3
-    mov  edi,[sc.work]
-    mcall
-    cmp  [dsign],byte '+'
-    je   positive
-    mov  ebx,23 shl 16+22
-    mov  ecx,0x0
-    mov  edx,dsign
-    mov  esi,1
-    mcall
-positive:
-    cmp  [display_type],0
-    jne  no_display_decimal
-    cmp  [decimal],0
-    je   whole
-    mov  ebx,180 shl 16+22
-    mov  ecx,0x0
-    mov  edx,dot
-    mov  esi,1
-    mcall
-    mov  eax,47
-    mov  ebx,10 shl 16
-    mov  ecx,[integer]
-    mov  edx,120 shl 16+22
-    mov  esi,0x0
-    mcall
-    mov  ebx,6 shl 16
-    mov  ecx,[decimal]
-    mov  edx,187 shl 16+22
+        call    print_display
-    mov  esi,0x0
-    mcall
-    popa
-    ret
-whole:
-    mov  ebx,220 shl 16+22
-    mov  ecx,0x0
-    mov  edx,dot
-    mov  esi,1
-    mcall
-    cmp  [integer],0
-    je  null
-    mov  eax,47
-    mov  ebx,10 shl 16
-    mov  ecx,[integer]
+        mcall   12, 2
-    mov  edx,160 shl 16+22
-    mov  esi,0x0
+        ret
+print_display:
-    mcall
+        pusha
+        mcall   13, <19, 209>, <19, 13>, 0xffffff
+        mov     eax, 4
+        mov     ebx, 135 shl 16 + 7
+        mov     ecx, [sc.work_text]
+        or      ecx, 0x40000000
+        mov     edx, calc
+        mov     esi, 1
+        mov     edi, [sc.work]
+        mcall
+        mov     ebx, 198 shl 16 + 8
+        mov     edx, [display_type]
+        shl     edx, 2
+        add     edx, display_type_text
+        mov     esi, 3
+        mov     edi, [sc.work]
+        mcall
+        cmp     [dsign], byte '+'
+        je      positive
+        mcall   , <23, 22>, 0, dsign, 1
     popa
-    ret
+positive:
+        cmp     [display_type], 0
-  no_display_decimal:
+        jne     no_display_decimal
-    cmp  [display_type],1
+        cmp     [decimal], 0
-    jne  no_display_hexadecimal
+        je      whole
-    cmp  [integer],0
-    je  null
+        mcall   , <180, 22>, 0, dot, 1
+        mcall   47, <10, 0>, [integer], <120, 22>, 0
-    mov  eax,47
+        mcall   , <6, 0>, [decimal], <187, 22>, 0
-    mov  ebx,256+8 shl 16
-    mov  ecx,[integer]
+        popa
-    mov  edx,173 shl 16+22
+        ret
-    mov  esi,0x0
-    mcall
+whole:
+        mcall   , <220, 22>, 0, dot, 1
-    popa
-    ret
+        cmp     [integer], 0
+        je      null
-  no_display_hexadecimal:
+        mcall   47, <10, 0>, [integer], <160, 22>, 0
-    cmp  [integer],0
+        popa
-    je  null
+        ret
-    mov  eax,47
+no_display_decimal:
-    mov  ebx,2*256+32 shl 16
+        cmp     [display_type], 1
-    mov  ecx,[integer]
+        jne     no_display_hexadecimal
-    mov  edx,32 shl 16+22
+        cmp     [integer], 0
-    mov  esi,0x0
+        je      null
-    mcall
+        mcall   47, <8, 256>, [integer], <173, 22>, 0
+        popa
-    popa
+        ret
-    ret
+no_display_hexadecimal:
-  null:
+        cmp     [integer], 0
-    mov  eax,47
+        je      null
-    mov  ebx,1 shl 16
+        mcall   47, <32, 2*256>, [integer], <32, 22>, 0
-    mov  ecx,0
+        popa
-    mov  edx,214 shl 16+22
+        ret
-    mov  esi,0x0
-    mcall
+null:
+        mcall   47, <1, 0>, 0, <214, 22>, 0
-    popa
+        popa
-    ret
+        ret
 clear_all:
-    pusha
+        pusha
-    mov  [calc],' '
+        mov     [calc], ' '
-    mov  [integer],0
+        mov     [integer], 0
-    mov  [decimal],0
+        mov     [decimal], 0
-    mov  [id],0
+        mov     [id], 0
-    mov  [dsign],byte '+'
+        mov     [dsign], byte '+'
-    mov  esi,muuta0
+        mov     esi, muuta0
-    mov  edi,muuta1
+        mov     edi, muuta1
-    mov  ecx,18
+        mov     ecx, 18
-    cld
+        cld
-    rep  movsb
+        rep     movsb
-    mov  esi,muuta0
+        mov     esi, muuta0
-    mov  edi,muuta2
+        mov     edi, muuta2
-    mov  ecx,18
+        mov     ecx, 18
+        cld
+        rep     movsb

Subversion Repositories Kolibri OS

(root)/programs/other/calc/trunk/calc.asm – Rev 2745 → 3625