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

-;;   Calculator for MenuetOS
+;;   Calculator for MenuetOS (original version)
 ;;  (c)Ville Turjanmaa
 ;;   Compile with FASM for Menuet
 ;;
-;;    «ìªã«ïâ®à 1.1 alpha
+;;What's new:
-;;  (c)Pavel Rymovski aka Heavyiron
+;;   Calc 1.1
-;;What's new:1)changed design
+;;           1)changed design
 ;;           2)new procedure of draw window (10 decimal digits, 23 binary, "+" not displayed now)
 ;;           3)window with skin
 ;;           4)I had used macroses
-;;   Calc 1.2 alpha
+;;   Calc 1.2
 ;;           1)added some useful functions, such as arcsin, arccos, arctg, 1/x, x^2
-;;   Calc 1.3
+;;   Calc 1.31
 ;;           1)optimised program
+;;           2)new type of window (you need kernel 114 revision or higher)
+;;  Pavel Rymovski (Heavyiron)
-use32
+appname equ 'Calc '
+version equ '1.31'
-							 org    0x0
+use32
                org    0x0
                db    'MENUET01'               ; 8 byte id
                dd     0x01                    ; header version
                dd     START                   ; start of code
                dd     I_END                   ; size of image
                dd     0x1000                  ; memory for app
                dd     0x1000                  ; esp
-               dd     0x0 , 0x0               ; I_Param , I_Icon
+               dd     0x0,0x0                 ; I_Param , I_Icon
 include 'macros.inc'
 START:
 red:
     call draw_window
 still:
     push 10
     pop eax
     int 40h
     dec eax
+    jz red
-    jz red
+    dec eax
-    dec eax
+    jz key
-    jz key
+button:
-button:
+    mov  al,17      ; ¯®«ãç¨âì ¨¤¥â¨ä¨ª â®à  ¦ â®© ª®¯ª¨
+    int  0x40
-    mcall 17 	  ; ¯®«ãç¨âì ¨¤¥â¨ä¨ª â®à  ¦ â®© ª®¯ª¨
+    shr  eax,8
-    shr  eax,8
+    jmp  testbut
     jmp  testbut
 key:
- key:
+    mov  al,2       ; ¯®«ãç¨âì ASCII-ª®¤  ¦ â®© ª« ¢¨è¨
-    mcall 2         ; ¯®«ãç¨âì ASCII-ª®¤  ¦ â®© ª« ¢¨è¨
+    int  0x40
     shr  eax,8
     mov  esi,butid
     add  esi,edi
     lodsb
   testbut:
-  	cmp  eax,1	  ; ª®¯ª  1 - § ªàëâ¨¥ ¯à®£à ¬¬ë
+    cmp  eax,1      ; ª®¯ª  1 - § ªàëâ¨¥ ¯à®£à ¬¬ë
     jne  noclose
+    or   eax,-1
-    mcall -1
+    int  0x40
   noclose:
     cmp  eax,2
     jne  no_reset
     call clear_all
     jmp  still
   no_reset:
     finit
-    mov    ebx,muuta1	 ; ¥à¥¢®¤ ¢ ä®à¬ â FPU
+    mov  ebx,muuta1  ; ¥à¥¢®¤ ¢ ä®à¬ â FPU
-    mov    esi,18
+    mov  esi,18
-    call   atof
+    call atof
-    fstp   [trans1]
+    fstp [trans1]
-    mov    ebx,muuta2
+    mov  ebx,muuta2
-    mov    esi,18
+    mov  esi,18
-    call   atof
+    call atof
-    fst    [trans2]
+    fst  [trans2]
     cmp  eax,33
     jne  no_sign
     mov  eax,[display_type]
     mov  eax,[multipl+eax*4]
     mov  [entry_multiplier],eax
     call print_display
     jmp  still
-  multipl:  dd	10,16,2
+  multipl:  dd 10,16,2
   no_display_change:
     cmp  eax,6
-    jb	 no_a_f
+    jb   no_a_f
     cmp  eax,11
-    jg	 no_a_f
+    jg   no_a_f
     add  eax,4
     call number_entry
     jmp  still
    no_a_f:
     cmp  eax,12
-    jb	 no_13
+    jb   no_13
     cmp  eax,14
-    jg	 no_13
+    jg   no_13
     sub  eax,11
     call number_entry
     jmp  still
    no_13:
     cmp  eax,19
-    jb	 no_46
+    jb   no_46
     cmp  eax,21
-    jg	 no_46
+    jg   no_46
     sub  eax,15
     call number_entry
     jmp  still
    no_46:
     cmp  eax,26
-    jb	 no_79
+    jb   no_79
     cmp  eax,28
-    jg	 no_79
+    jg   no_79
     sub  eax,19
     call number_entry
     jmp  still
    no_79:
     cmp  eax,34
     jne  no_0
     jmp  still
 calculate:
     pusha
     cmp  [calc],' '
-    je	 no_calculation
+    je   no_calculation
     cmp  [calc],'/'
     jne  no_cdiv
     fdiv [trans1]
     pusha
     cmp  eax,[entry_multiplier]
     jge  no_entry
     cmp  [id],1
-    je	 decimal_entry
+    je   decimal_entry
     mov  ebx,[integer]
     test ebx,0xc0000000
     jnz  no_entry
     mov  ebx,eax
     mov  edi,muuta1
     mov  ecx,18
     cld
     rep  movsb
     mov  [muuta1],al
-    mov  edi,muuta1+10	    ; æ¥«®¥
+    mov  edi,muuta1+10     ; æ¥«®¥
     mov  eax,[integer]
   new_to_muuta1:
     mov  [edi],dl
     add  [edi],byte 48
     dec  edi
     cmp  edi,muuta1+1
     jge  new_to_muuta1
-    mov  edi,muuta1+17	    ; ¤à®¡®¥
+    mov  edi,muuta1+17     ; ¤à®¡®¥
     mov  eax,[decimal]
   new_to_muuta2:
     mov  [new_dec],100000
     mov  [sign],byte '+'
     popa
     ret
-ten	   dd	 10.0,0
+ten          dd  10.0,0
-tmp	   dw	    1,0
+tmp          dw  1,0
-sign	   db	    1,0
+sign         db  1,0
-tmp2	   dq	  0x0,0
+tmp2         dq  0x0,0
-exp	   dd	  0x0,0
+exp          dd  0x0,0
-new_dec    dd  100000,0
+new_dec      dd  100000,0
-id	   db	  0x0,0
+id           db  0x0,0
-res	dd   0
+res          dd  0
-trans1	dq   0
+trans1       dq  0
-trans2	dq   0
+trans2       dq  0
-controlWord dw 1
+controlWord  dw  1
 ftoa:                         ; fpu st0 -> [integer],[decimal]
     pusha
     fst    [tmp2]
     fstcw  [controlWord]      ; set truncate integer mode
     mov    ax,[controlWord]
     mov    [tmp], ax
-    or	   [tmp], word 0x0c00
+    or     [tmp], word 0x0c00
     fldcw  [tmp]
     ftst                      ; test if st0 is negative
     fstsw  ax
   no_neg:
     fistp  [integer]
     fld    [tmp2]
     fisub  [integer]
     fldcw  [controlWord]
-    cmp  byte [sign], 0     ; change fraction to positive
+    cmp    byte [sign], 0     ; change fraction to positive
-    je	 no_neg2
+    je     no_neg2
     fchs
   no_neg2:
-    mov    [res],0	    ; convert 6 decimal numbers
+    mov    [res],0     ; convert 6 decimal numbers
     mov    edi,6
    newd:
     fisub  [decimal]
     ftst
     fstsw  ax
     dec    edi
-    jz	   real_done
+    jz     real_done
     jmp    newd
   real_done:
     call   clear_all
     mov    [calc],'E'
   no_error:
     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]
     not    eax
     inc    eax
     mov    [integer],eax
     push ax
     push di
     fldz
     mov di, 0
     cmp si, 0
-    je .error				; Jump if string has 0 length.
+    je .error            ; Jump if string has 0 length.
     mov byte [sign], 0
-    cmp byte [bx], '+'	 		; Take care of leading '+' or '-'.
+    cmp byte [bx], '+'   ; Take care of leading '+' or '-'.
     jne .noPlus
     inc di
     jmp .noMinus
   .noPlus:
     cmp byte [bx], '-'
     jne .noMinus
-    mov byte [sign], 1	            ; Number is negative.
+    mov byte [sign], 1   ; Number is negative.
     inc di
   .noMinus:
     cmp si, di
     je .error
     call atof_convertWholePart
     jc .error
     call atof_convertFractionalPart
     jc .error
     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
   .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.
 .mainLoop:
     mov al, [bx + di]
     cmp al, '.'
     je .exit
-    cmp al, '0'    ; Make sure character is a digit.
+    cmp al, '0'       ; Make sure character is a digit.
     jb .error
     cmp al, '9'
     ja .error
     ; Multiply current value by 10 and add in digit.
     fmul dword [ten]
     fiadd word [tmp]
     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
     jmp .mainLoop
   .error:
-    stc 	   ; Set error (carry) flag.
+    stc                ; Set error (carry) flag.
     ret
   .exit:
-    clc 	   ; Clear error (carry) flag.
+    clc                ; Clear error (carry) flag.
     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
-    inc di	       ; Move past the decimal point.
+    inc di             ; Move past the decimal point.
-    cmp si, di	   ; Jump if end of string has been reached.
+    cmp si, di         ; Jump if end of string has been reached.
     je .exit
     mov al, [bx + di]
-    cmp al, '0'    ; Make sure character is a digit.
+    cmp al, '0'        ; Make sure character is a digit.
     jb .error
     cmp al, '9'
     fmul  st0, st1
     faddp st2, st0
     jmp .mainLoop
   .error:
-    stc 	       ; Set error (carry) flag.
+    stc           ; Set error (carry) flag.
-    fstp st0	   ; Pop top of fpu stack.
+    fstp st0    ; Pop top of fpu stack.
     ret
   .exit:
-    clc 	   		 ; Clear error (carry) flag.
+    clc              ; Clear error (carry) flag.
-    fstp st0	   ; Pop top of fpu stack.
+    fstp st0    ; Pop top of fpu stack.
     ret
 ;   *********************************************
+;   ******* WINDOW DEFINITIONS AND DRAW *********
+;   *********************************************
+draw_window:
+    mov  eax,48
+    mov  ebx,3
-;   *******     ********
+    mov  ecx,sc
+    mov  edx,sizeof.system_colors
+    int  0x40
+    mov  eax,12
-;   *********************************************
+    mov  ebx,1
+    int  0x40
+    mov  eax,0
+    mov  ebx,200*65536+255
+    mov  ecx,200*65536+180
-draw_window:
+    mov  edx,[sc.work]
+    or   edx,0x33000000
-    mcall 12,1
+    mov  edi,header
-    mcall 0,200*65536+255,200*65536+180,0x03ddeeff   ; äãªæ¨ï 0: ®¯à¥¤¥«¨âì ¨ ®âà¨á®¢ âì ®ª®
+    int  0x40
     mcall 4,8*65536+8,0x10000000,labelt,label_len    ;
     mov  eax,8
-    mov  ebx,24*65536+28
+    mov  ebx,19*65536+28
-    mov  ecx,70*65536+18
+    mov  ecx,49*65536+18
     mov  edx,6
-    mov  esi,0x0066ee
+    mov  esi,[sc.work_button]
     mov  edi,7
   newbutton:
     dec  edi
     jnz  no_new_row
     mov  edi,7
-    mov  ebx,24*65536+25+3
+    mov  ebx,19*65536+28
     add  ecx,20*65536
-  no_new_row:
-    mcall 8
-    add  ebx,30*65536
-    inc  edx
-    cmp  edx,39
-    jbe  newbutton
-    mcall 8,225*65536+8,28*65536+8,3                    ; 'dec-bin-hex'
+  no_new_row:
+    int  0x40
+    add  ebx,30*65536
+    inc  edx
+    cmp  edx,39
+    jbe  newbutton
+    mcall  ,199*65536+28,49*65536+18,2                  ; 'C'
-    mcall 8,204*65536+28,70*65536+18,2,0xcc0000         ; 'C'
+    mcall  ,220*65536+8,7*65536+8,3                     ; 'dec-bin-hex'
-    mov  ebx,25*65536+75                                ; à®à¨á®¢ª  ¯®¤¯¨á¥© ª®¯®ª
+    mov  eax,4
-    mov  ecx,0xffffff
+    mov  ebx,27*65536+54
-    mov  edx,text
+    mov  ecx,[sc.work_button_text]
-    mov  esi,34
+    mov  edx,text
+    mov  esi,33
   newline:
+    int  0x40
+    add  ebx,20
-  newline:
+    add  edx,33
+    cmp  [edx],byte 'x'
+    jne  newline
     mcall 4
-    add  ebx,20
+    call print_display
     add  edx,34
-    cmp  [edx],byte 'x'
-    jne  newline
+    mov  eax,12
-    call print_display
+    mov  ebx,2
-    mcall 12,2
+    int  0x40
-    ret
+    ret
+print_display:
+    pusha
+    mcall 13,18*65536+210,19*65536+13,0xffffff
+    mov  eax,4
+    mov  ebx,135*65536+7
-print_display:
+    mov  ecx,[sc.work_text]
-    pusha
+    or   ecx,0x40000000
-    mcall 13,100*65536+120,25*65536+13,0x00ddeeff
+    mov  edx,calc
-    mcall 13,23*65536+210,40*65536+13,0xffffff
+    mov  esi,1
+    mov  edi,[sc.work]
-    mcall 4,140*65536+28,0,calc,1
+    int  0x40
-    mov  eax,4
-    mov  ebx,203*65536+29
+    mov  ebx,198*65536+8
-    mov  ecx,0
+    mov  edx,[display_type]
-    mov  edx,[display_type]
+    shl  edx,2
+    add  edx,display_type_text
+    mov  esi,3
+    mov  edi,[sc.work]
+    int  0x40
-    shl  edx,2
-    add  edx,display_type_text
+    cmp  [dsign],byte '+'
-    mov  esi,3
+    je   positive
-    int  0x40
+    mov  ebx,23*65536+22
     mov  ecx,0x0
-    cmp  [dsign],byte '+'
+    mov  edx,dsign
+    mov  esi,1
-    je  positive
+    int  0x40
+positive:
+    cmp  [display_type],0
+    jne  no_display_decimal
+    cmp  [decimal],0
+    je   whole
+    mov  ebx,180*65536+22
-    mcall 4,28*65536+43,0x0,dsign,1
+    mov  ecx,0x0
+    mov  edx,dot
+    mov  esi,1
+    int  0x40
+    mov  eax,47
+    mov  ebx,10*65536
+    mov  ecx,[integer]
+    mov  edx,120*65536+22
+    mov  esi,0x0
-positive:
+    int  0x40
     cmp  [display_type],0                            ; ¤¥áïâ¨ç ï á¨áâ¥¬  áç¨á«¥¨ï
-    jne  no_display_decimal
+    mov  ebx,6*65536
+    mov  ecx,[decimal]
+    mov  edx,187*65536+22
+    mov  esi,0x0
+    int  0x40
+    popa
-    cmp  [decimal],0
+    ret
     je   whole
+whole:
+    mov  ebx,220*65536+22
+    mov  ecx,0x0
-    mcall 47,10*65536,[integer],125*65536+43,0x0     ; ®â®¡à ¦ âì 10 æ¨äà
+    mov  edx,dot
-    mcall 4,185*65536+43,0x0,dot,1
+    mov  esi,1
+    int  0x40
+    cmp  [integer],0
-    mcall 47,6*65536,[decimal],192*65536+43,0x0      ; ®â®¡à ¦ âì 6 æ¨äà ¯®á«¥ § ¯ïâ®©
+    je  null
     popa
-    ret
+    mov  eax,47
     mov  ebx,10*65536
-whole:
-    cmp  [integer],0
-    je  null
+    mov  ecx,[integer]
-    mcall 47,10*65536,[integer],165*65536+43,0x0
+    mov  edx,160*65536+22
+    mov  esi,0x0
+    int  0x40
+    popa
+    ret
-    mcall 4,225*65536+43,0x0,dot,1
+  no_display_decimal:
+    cmp  [display_type],1
+    jne  no_display_hexadecimal
+    cmp  [integer],0
-    popa
+    je  null
     ret
     mov  eax,47
-  no_display_decimal:
+    mov  ebx,256+8*65536
-    cmp  [integer],0
+    mov  ecx,[integer]
+    mov  edx,173*65536+22
+    mov  esi,0x0
+    int  0x40
-    je  null
+    popa
+    ret
-    cmp  [display_type],1
-    jne  no_display_hexadecimal
+  no_display_hexadecimal:
-    mcall 47,1*256+8*65536,[integer],178*65536+43,0x0    ; ®â®¡à ¦ âì 8 è¥áâ ¤æ â¨à¨çëå æ¨äà
+    cmp  [integer],0
-    popa
+    je  null
     ret
+    mov  eax,47
-  no_display_hexadecimal:
+    mov  ebx,2*256+32*65536
-    cmp  [integer],0
+    mov  ecx,[integer]
-    je  null
+    mov  edx,32*65536+22
+    mov  esi,0x0
+    int  0x40
-    cmp  [display_type],2
-    jne  null
-    mcall 47,2*256+32*65536,[integer],37*65536+43,0x0    ; ®â®¡à ¦ âì 32 ¤¢®¨çë¥ æ¨äàë
+    popa
-    popa
+    ret
     ret
   null:
     call print_display
     popa
     ret
+;data
-;¡« áâì ¤ ëå
+header db appname,version,0
-display_type       dd  0    ; 0 = decimal, 1 = hexadecimal, 2= binary
 entry_multiplier   dd  10
+display_type       dd  0    ; 0 = decimal, 1 = hexadecimal, 2= binary
-display_start_y    dd  0x0
+entry_multiplier   dd  10
 display_type_text  db  'dec hex bin'
-dot	db  '.'
+dot     db  '.'
-calc	db  ' '
+calc    db  ' '
 integer dd    0
 decimal dd    0
 kymppi  dd   10
 dsign:
-muuta1	db   '+0000000000.000000'
+muuta1  db   '+0000000000.000000'
-muuta2	db   '+0000000000.000000'
+muuta2  db   '+0000000000.000000'
-muuta0	db   '+0000000000.000000'
+muuta0  db   '+0000000000.000000'
 text:
-    db '  A    B    C    D    E    F    C '
+    db ' A    B    C    D    E    F    C '
-    db '  1    2    3    +   Int  Sin Asin'
+    db ' 1    2    3    +   Int  Sin Asin'
-    db '  4    5    6    -   1/x  Cos Acos'
-    db '  7    8    9    /   x^2  Tan Atan'
-    db ' +/-   0    .    *   Sqr  Pi    = '
-    db 'x'
     db ' 4    5    6    -   1/x  Cos Acos'
+    db ' 7    8    9    /   x^2  Tan Atan'
+    db '+/-   0    .    *   Sqr  Pi    = '
+    db 'x'

Subversion Repositories Kolibri OS

(root)/programs/other/calc/trunk/calc.asm – Rev 109 → 153