about summary refs log tree commit diff
path: root/src/math/i386/atan2f.s
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2019-08-05 18:41:47 -0400
committerRich Felker <dalias@aerifal.cx>2019-08-05 18:41:47 -0400
commitf3ed8bfe8a82af1870ddc8696ed4cc1d5aa6b441 (patch)
tree4b419cdf7843dd8f34a4c33bfe8391491b6e65e3 /src/math/i386/atan2f.s
parent244778f70cecdb08302e47cfe412e8e186113444 (diff)
downloadmusl-f3ed8bfe8a82af1870ddc8696ed4cc1d5aa6b441.tar.gz
musl-f3ed8bfe8a82af1870ddc8696ed4cc1d5aa6b441.tar.xz
musl-f3ed8bfe8a82af1870ddc8696ed4cc1d5aa6b441.zip
fix x87 stack imbalance in corner cases of i386 math asm
commit 31c5fb80b9eae86f801be4f46025bc6532a554c5 introduced underflow
code paths for the i386 math asm, along with checks on the fpu status
word to skip the underflow-generation instructions if the underflow
flag was already raised. unfortunately, at least one such path, in
log1p, returned with 2 items on the x87 stack rather than just 1 item
for the return value. this is a violation of the ABI's calling
convention, and could cause subsequent floating point code to produce
NANs due to x87 stack overflow. if floating point results are used in
flow control, this can lead to runaway wrong code execution.

rather than reviewing each "underflow already raised" code path for
correctness, remove them all. they're likely slower than just
performing the underflow code unconditionally, and significantly more
complex.

all of this code should be ripped out and replaced by C source files
with inline asm. doing so would preclude this kind of error by having
the compiler perform all x87 stack register allocation and stack
manipulation, and would produce comparable or better code. however
such a change is a much larger project.
Diffstat (limited to 'src/math/i386/atan2f.s')
-rw-r--r--src/math/i386/atan2f.s5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/math/i386/atan2f.s b/src/math/i386/atan2f.s
index 14b88ce5..0b264726 100644
--- a/src/math/i386/atan2f.s
+++ b/src/math/i386/atan2f.s
@@ -10,10 +10,7 @@ atan2f:
 	cmp $0x01000000,%eax
 	jae 1f
 		# subnormal x, return x with underflow
-	fnstsw %ax
-	and $16,%ax
-	jnz 1f
 	fld %st(0)
 	fmul %st(1)
 	fstps 4(%esp)
-1:	ret
+	ret