aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Veresov <aleksey@veresov.pro>2020-10-17 21:06:24 +0300
committerAleksey Veresov <aleksey@veresov.pro>2020-10-17 21:06:24 +0300
commitba1ce0c68a784947ac4d96675813f3b7c074895b (patch)
tree2d3d5bbc9d3e95ab70031d6c8fb185582a3cc25f
parent04c755e9f071425d637f8a1c3cd35b258e4e456e (diff)
parent44d2daf8f659a843cf7d39cbaec18c146bf59f28 (diff)
downloadcryptrobber-ba1ce0c68a784947ac4d96675813f3b7c074895b.tar
cryptrobber-ba1ce0c68a784947ac4d96675813f3b7c074895b.tar.xz
cryptrobber-ba1ce0c68a784947ac4d96675813f3b7c074895b.zip
Merge remote-tracking branch 'exegete/master' into master
-rw-r--r--ia32/float/control.sts19
-rw-r--r--ia32/float/float.sts50
-rw-r--r--ia32/float/math.sts32
-rw-r--r--ia32/float/stack.sts19
-rw-r--r--test.sts20
5 files changed, 76 insertions, 64 deletions
diff --git a/ia32/float/control.sts b/ia32/float/control.sts
new file mode 100644
index 0000000..3863f5f
--- /dev/null
+++ b/ia32/float/control.sts
@@ -0,0 +1,19 @@
+defasm float_init
+ # 9b ?' ; wait
+ # db ?' # e3 ?' ; fninit
+next
+
+defasm float_cload
+ # d9 ?' # 2c ?' # 24 ?' ; fldcw [esp]
+ # 58 ?' ; pop eax
+next
+
+defasm float_sstore
+ # 9b ?' # df ?' # e0 ?' ; fstsw ax
+ # 50 ?' ; push eax
+next
+
+defasm float_cstore
+ # 50 ?' ; push eax
+ # d9 ?' # 3c ?' # 24 ?' ; fstcw [esp]
+next
diff --git a/ia32/float/float.sts b/ia32/float/float.sts
index 9f3ba52..d6907ca 100644
--- a/ia32/float/float.sts
+++ b/ia32/float/float.sts
@@ -1,47 +1,3 @@
-defasm float_init
- # 9b ?' ; wait
- # db ?' # e3 ?' ; fninit
-next
-
-defasm float_cload
- # d9 ?' # 2c ?' # 24 ?' ; fldcw [esp]
- # 58 ?' ; pop eax
-next
-
-defasm float_sstore
- # 9b ?' # df ?' # e0 ?' ; fstsw ax
- # 50 ?' ; push eax
-next
-
-defasm float_cstore
- # 50 ?' ; push eax
- # d9 ?' # 3c ?' # 24 ?' ; fstcw [esp]
-next
-
-defasm float_fload
- # d9 ?' # 04 ?' # 24 ?' ; fld dword [esp]
- # 58 ?' ; pop eax
-next
-
-defasm float_iload
- # db ?' # 04 ?' # 24 ?' ; fild dword [esp]
- # 58 ?' ; pop eax
-next
-
-defasm float_fstore
- # 50 ?' ; push eax
- # d9 ?' # 1c ?' # 24 ?' ; fstp dword [esp]
-next
-
-defasm float_istore
- # 50 ?' ; push eax
- # db ?' # 1c ?' # 24 ?' ; fistp dword [esp]
-next
-
-defasm float_add
- # de ?' # c1 ?' ; faddp st1, st0
-next
-
-defasm float_div
- # de ?' # f9 ?' ; fdivp st1, st0
-next
+module ia32/float/control.sts
+module ia32/float/stack.sts
+module ia32/float/math.sts
diff --git a/ia32/float/math.sts b/ia32/float/math.sts
new file mode 100644
index 0000000..d02b491
--- /dev/null
+++ b/ia32/float/math.sts
@@ -0,0 +1,32 @@
+defasm float_add
+ # de ?' # c1 ?' ; faddp st1, st0
+next
+
+defasm float_sub
+ # de ?' # e9 ?' ; fsubp st1, st0
+next
+
+defasm float_mul
+ # de ?' # c9 ?' ; fmullp st1, st0
+next
+
+defasm float_div
+ # de ?' # f9 ?' ; fdivp st1, st0
+next
+
+defasm float_sqrt
+ # d9 ?' # fa ?' ; fsqrt
+next
+
+defasm float_more
+ # de ?' # d9 ?' ; fcompp
+ # 9b ?' # df ?' # e0 ?' ; fstsw ax
+ # 25 ?' # 100 ?. ; and eax, 0x100
+ # c1 ?' # e8 ?' # 8 ?' ; shr eax, 8
+ # 50 ?' ; push eax
+next
+
+defword float_less
+ float_more
+ 0 =
+exit
diff --git a/ia32/float/stack.sts b/ia32/float/stack.sts
new file mode 100644
index 0000000..ca95196
--- /dev/null
+++ b/ia32/float/stack.sts
@@ -0,0 +1,19 @@
+defasm float_fload
+ # d9 ?' # 04 ?' # 24 ?' ; fld dword [esp]
+ # 58 ?' ; pop eax
+next
+
+defasm float_iload
+ # db ?' # 04 ?' # 24 ?' ; fild dword [esp]
+ # 58 ?' ; pop eax
+next
+
+defasm float_fstore
+ # 50 ?' ; push eax
+ # d9 ?' # 1c ?' # 24 ?' ; fstp dword [esp]
+next
+
+defasm float_istore
+ # 50 ?' ; push eax
+ # db ?' # 1c ?' # 24 ?' ; fistp dword [esp]
+next
diff --git a/test.sts b/test.sts
index be21ac0..1e96807 100644
--- a/test.sts
+++ b/test.sts
@@ -3,24 +3,10 @@ module ia32/float/float.sts
set_entry
float_init
-21 float_iload
4 float_iload
-21 float_iload
-4 float_iload
-8 float_iload
-0 float_iload
-21 float_iload
-4 float_iload
-float_div
-float_istore
-float_div
-float_istore
-float_div
-float_istore
-float_div
-float_istore
-7 print_stack
-7 print_stack
+5 float_iload
+float_more
+4 print_stack
sys_exit
module ia32/elf/end.sts