Burer/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

calc 1.32 - fixed arccos

Browse Source 
git-svn-id: svn://kolibrios.org@382 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
heavyiron 2007-03-01 22:28:51 +00:00
parent 1ced1382c9
commit 743dc85bed
1 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
programs/other/calc/trunk/calc.asm
View File

@ -1,22 +1,25 @@
;; Calculator for MenuetOS (original version) ;; Calculator for MenuetOS (c) Ville Turjanmaa
;; (c)Ville Turjanmaa ;;
;; Compile with FASM for Menuet ;; Compile with FASM for Menuet
;; ;;
;;What's new: ;; Pavel Rymovski (Heavyiron) - kolibri version
;; What's new:
;; Calc 1.1 ;; Calc 1.1
;; 1)changed design ;; 1) changed design
;; 2)new procedure of draw window (10 decimal digits, 23 binary, "+" not displayed now) ;; 2) new procedure of draw window (10 decimal digits, 23 binary, "+" not displayed now)
;; 3)window with skin ;; 3) window with skin
;; 4)I had used macroses ;; 4) used macroses
;; Calc 1.2 ;; 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 ;; 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)
;; Pavel Rymovski (Heavyiron) ;; Calc 1.32
;; 1)fixed arccos
appname equ 'Calc ' appname equ 'Calc '
version equ '1.31' version equ '1.32'
use32 use32
org 0x0 org 0x0
@ -32,6 +35,12 @@ include 'macros.inc'
START: START:
mov eax,48
mov ebx,3
mov ecx,sc
mov edx,sizeof.system_colors
int 0x40
red: red:
call draw_window call draw_window
@ -115,7 +124,6 @@ key:
mov [entry_multiplier],eax mov [entry_multiplier],eax
call print_display call print_display
jmp still jmp still
multipl: dd 10,16,2
no_display_change: no_display_change:
cmp eax,6 cmp eax,6
@ -212,14 +220,13 @@ key:
cmp eax,25 cmp eax,25
jne no_acos jne no_acos
fld [trans1] fld [trans1]
fld st0
fmul st,st1
fld1 fld1
fsub st,st1 fsubrp st1,st0
fsqrt
fld1
fadd st,st2
fsqrt fsqrt
fxch st1
fpatan fpatan
fadd st,st0
jmp show_result jmp show_result
no_acos: no_acos:
@ -441,17 +448,6 @@ new_entry:
popa popa
ret ret
ten dd 10.0,0
tmp dw 1,0
sign db 1,0
tmp2 dq 0x0,0
exp dd 0x0,0
new_dec dd 100000,0
id db 0x0,0
res dd 0
trans1 dq 0
trans2 dq 0
controlWord dw 1
ftoa: ; fpu st0 -> [integer],[decimal] ftoa: ; fpu st0 -> [integer],[decimal]
pusha pusha
@ -471,8 +467,7 @@ ftoa: ; fpu st0 -> [integer],[decimal]
no_neg: no_neg:
fld [tmp2] fld [tmp2]
fistp [integer] fist [integer]
fld [tmp2]
fisub [integer] fisub [integer]
fldcw [controlWord] fldcw [controlWord]
cmp byte [sign], 0 ; change fraction to positive cmp byte [sign], 0 ; change fraction to positive
@ -562,7 +557,7 @@ atof:
.error: .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: .exit:
pop di pop di
@ -652,12 +647,6 @@ atof_convertFractionalPart:
draw_window: draw_window:
mov eax,48
mov ebx,3
mov ecx,sc
mov edx,sizeof.system_colors
int 0x40
mov eax,12 mov eax,12
mov ebx,1 mov ebx,1
int 0x40 int 0x40
@ -865,6 +854,18 @@ calc db ' '
integer dd 0 integer dd 0
decimal dd 0 decimal dd 0
kymppi dd 10 kymppi dd 10
ten dd 10.0,0
tmp dw 1,0
sign db 1,0
tmp2 dq 0x0,0
exp dd 0x0,0
new_dec dd 100000,0
id db 0x0,0
res dd 0
trans1 dq 0
trans2 dq 0
controlWord dw 1
multipl: dd 10,16,2
dsign: dsign:
muuta1 db '+0000000000.000000' muuta1 db '+0000000000.000000'