fix fenv exception functions to mask their argument

[musl] / src / fenv / x86_64 / fenv.s

diff --git a/src/fenv/x86_64/fenv.s b/src/fenv/x86_64/fenv.s
index 3ed2275..6aaf25e 100644 (file)
--- a/src/fenv/x86_64/fenv.s
+++ b/src/fenv/x86_64/fenv.s
@@ -1,58 +1,64 @@
-2:     not %edi
-       sub $32,%rsp
-       fnstenv (%rsp)
-       and %edi,4(%rsp)
-       or %esi,4(%rsp)
-       fldenv (%rsp)
-       stmxcsr (%rsp)
-       and %edi,(%rsp)
-       ldmxcsr (%rsp)
-       add $32,%rsp
-       ret
-
 .global feclearexcept
-feclearexcept: 
-       xor %eax,%eax
-       xor %esi,%esi
-       test %edi,%edi
-       jnz 2b
+.type feclearexcept,@function
+feclearexcept:
+               # maintain exceptions in the sse mxcsr, clear x87 exceptions
+       mov %edi,%ecx
+       and $0x3f,%ecx
+       fnstsw %ax
+       test %eax,%ecx
+       jz 1f
+       fnclex
+1:     stmxcsr -8(%rsp)
+       and $0x3f,%eax
+       or %eax,-8(%rsp)
+       test %ecx,-8(%rsp)
+       jz 1f
+       not %ecx
+       and %ecx,-8(%rsp)
+       ldmxcsr -8(%rsp)
+1:     xor %eax,%eax
        ret
 
 .global feraiseexcept
-feraiseexcept: 
+.type feraiseexcept,@function
+feraiseexcept:
+       and $0x3f,%edi
+       stmxcsr -8(%rsp)
+       or %edi,-8(%rsp)
+       ldmxcsr -8(%rsp)
        xor %eax,%eax
-       mov %edi,%esi
-       xor %edi,%edi
-       test %esi,%esi
-       jnz 2b
        ret
 
-.global fesetround
-fesetround:
+.global __fesetround
+.type __fesetround,@function
+__fesetround:
+       push %rax
        xor %eax,%eax
-       sub $32,%rsp
-       fnstenv (%rsp)
+       mov %edi,%ecx
+       fnstcw (%rsp)
        andb $0xf3,1(%rsp)
-       or %edi,(%rsp)
-       fldenv (%rsp)
+       or %ch,1(%rsp)
+       fldcw (%rsp)
        stmxcsr (%rsp)
-       shl $3,%edi
+       shl $3,%ch
        andb $0x9f,1(%rsp)
-       or %edi,(%rsp)
+       or %ch,1(%rsp)
        ldmxcsr (%rsp)
-       add $32,%rsp
+       pop %rcx
        ret
 
 .global fegetround
+.type fegetround,@function
 fegetround:
        push %rax
        stmxcsr (%rsp)
        pop %rax
        shr $3,%eax
-       and $0xc,%ah
+       and $0xc00,%eax
        ret
 
 .global fegetenv
+.type fegetenv,@function
 fegetenv:
        xor %eax,%eax
        fnstenv (%rdi)
@@ -60,6 +66,7 @@ fegetenv:
        ret
 
 .global fesetenv
+.type fesetenv,@function
 fesetenv:
        xor %eax,%eax
        inc %rdi
@@ -78,7 +85,9 @@ fesetenv:
        ret
 
 .global fetestexcept
+.type fetestexcept,@function
 fetestexcept:
+       and $0x3f,%edi
        push %rax
        stmxcsr (%rsp)
        pop %rsi