提交 f3ed8bfe 编写于 作者: R Rich Felker

fix x87 stack imbalance in corner cases of i386 math asm

commit 31c5fb80 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.
上级 244778f7
...@@ -7,13 +7,10 @@ asinf: ...@@ -7,13 +7,10 @@ asinf:
cmp $0x01000000,%eax cmp $0x01000000,%eax
jae 1f jae 1f
# subnormal x, return x with underflow # subnormal x, return x with underflow
fnstsw %ax
and $16,%ax
jnz 2f
fld %st(0) fld %st(0)
fmul %st(1) fmul %st(1)
fstps 4(%esp) fstps 4(%esp)
2: ret ret
.global asinl .global asinl
.type asinl,@function .type asinl,@function
...@@ -30,11 +27,8 @@ asin: ...@@ -30,11 +27,8 @@ asin:
cmp $0x00200000,%eax cmp $0x00200000,%eax
jae 1f jae 1f
# subnormal x, return x with underflow # subnormal x, return x with underflow
fnstsw %ax
and $16,%ax
jnz 2f
fsts 4(%esp) fsts 4(%esp)
2: ret ret
1: fld %st(0) 1: fld %st(0)
fld1 fld1
fsub %st(0),%st(1) fsub %st(0),%st(1)
......
...@@ -10,8 +10,5 @@ atan: ...@@ -10,8 +10,5 @@ atan:
fpatan fpatan
ret ret
# subnormal x, return x with underflow # subnormal x, return x with underflow
1: fnstsw %ax 1: fsts 4(%esp)
and $16,%ax ret
jnz 2f
fsts 4(%esp)
2: ret
...@@ -10,8 +10,5 @@ atan2: ...@@ -10,8 +10,5 @@ atan2:
cmp $0x00200000,%eax cmp $0x00200000,%eax
jae 1f jae 1f
# subnormal x, return x with underflow # subnormal x, return x with underflow
fnstsw %ax
and $16,%ax
jnz 1f
fsts 4(%esp) fsts 4(%esp)
1: ret ret
...@@ -10,10 +10,7 @@ atan2f: ...@@ -10,10 +10,7 @@ atan2f:
cmp $0x01000000,%eax cmp $0x01000000,%eax
jae 1f jae 1f
# subnormal x, return x with underflow # subnormal x, return x with underflow
fnstsw %ax
and $16,%ax
jnz 1f
fld %st(0) fld %st(0)
fmul %st(1) fmul %st(1)
fstps 4(%esp) fstps 4(%esp)
1: ret ret
...@@ -10,10 +10,7 @@ atanf: ...@@ -10,10 +10,7 @@ atanf:
fpatan fpatan
ret ret
# subnormal x, return x with underflow # subnormal x, return x with underflow
1: fnstsw %ax 1: fld %st(0)
and $16,%ax
jnz 2f
fld %st(0)
fmul %st(1) fmul %st(1)
fstps 4(%esp) fstps 4(%esp)
2: ret ret
...@@ -7,13 +7,10 @@ expm1f: ...@@ -7,13 +7,10 @@ expm1f:
cmp $0x01000000,%eax cmp $0x01000000,%eax
jae 1f jae 1f
# subnormal x, return x with underflow # subnormal x, return x with underflow
fnstsw %ax
and $16,%ax
jnz 2f
fld %st(0) fld %st(0)
fmul %st(1) fmul %st(1)
fstps 4(%esp) fstps 4(%esp)
2: ret ret
.global expm1l .global expm1l
.type expm1l,@function .type expm1l,@function
...@@ -30,11 +27,8 @@ expm1: ...@@ -30,11 +27,8 @@ expm1:
cmp $0x00200000,%eax cmp $0x00200000,%eax
jae 1f jae 1f
# subnormal x, return x with underflow # subnormal x, return x with underflow
fnstsw %ax
and $16,%ax
jnz 2f
fsts 4(%esp) fsts 4(%esp)
2: ret ret
1: fldl2e 1: fldl2e
fmulp fmulp
mov $0xc2820000,%eax mov $0xc2820000,%eax
......
...@@ -16,9 +16,6 @@ log1p: ...@@ -16,9 +16,6 @@ log1p:
fyl2x fyl2x
ret ret
# subnormal x, return x with underflow # subnormal x, return x with underflow
2: fnstsw %ax 2: fsts 4(%esp)
and $16,%ax
jnz 1f
fsts 4(%esp)
fstp %st(1) fstp %st(1)
1: ret ret
...@@ -16,10 +16,7 @@ log1pf: ...@@ -16,10 +16,7 @@ log1pf:
fyl2x fyl2x
ret ret
# subnormal x, return x with underflow # subnormal x, return x with underflow
2: fnstsw %ax 2: fxch
and $16,%ax
jnz 1f
fxch
fmul %st(1) fmul %st(1)
fstps 4(%esp) fstps 4(%esp)
1: ret ret
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册