X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ffenv%2Fx86_64%2Ffenv.s;h=98d876da26e98e80052b7f1754636d932aff8053;hb=8f12c4e110acb3bbbdc8abfb3a552c3ced718039;hp=3ed22755b471cf68e5477aa46f4f9b61675fdd89;hpb=773b0fe4473be18fdcc1b822630e2ebdb1719536;p=musl

diff --git a/src/fenv/x86_64/fenv.s b/src/fenv/x86_64/fenv.s
index 3ed22755..98d876da 100644
--- a/src/fenv/x86_64/fenv.s
+++ b/src/fenv/x86_64/fenv.s
@@ -1,58 +1,65 @@
-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
+.hidden __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 +67,7 @@ fegetenv:
 	ret
 
 .global fesetenv
+.type fesetenv,@function
 fesetenv:
 	xor %eax,%eax
 	inc %rdi
@@ -69,7 +77,7 @@ fesetenv:
 	ret
 1:	push %rax
 	push %rax
-	push %rax
+	pushq $0xffff
 	pushq $0x37f
 	fldenv (%rsp)
 	pushq $0x1f80
@@ -78,7 +86,9 @@ fesetenv:
 	ret
 
 .global fetestexcept
+.type fetestexcept,@function
 fetestexcept:
+	and $0x3f,%edi
 	push %rax
 	stmxcsr (%rsp)
 	pop %rsi