Skip to content

Commit 6d7626c

Browse files
107: add an implemetation of asin r=japaric a=japaric Fixes rust-lang#7 Additonally adds inline functions for macros dealing with low and high words of f64s to the root module. Also, the muslc code used a hexdecimal float. This shouldn't be needed because Rust implements floating point parsing well. --- rebased version of rust-lang#95 closes rust-lang#95 Thanks @vjackson725 for the original PR! Co-authored-by: vjackson725 <[email protected]>
2 parents 446d079 + 600a238 commit 6d7626c

File tree

3 files changed

+142
-1
lines changed

3 files changed

+142
-1
lines changed

src/math/asin.rs

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
/* origin: FreeBSD /usr/src/lib/msun/src/e_asin.c */
2+
/*
3+
* ====================================================
4+
* Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
5+
*
6+
* Developed at SunSoft, a Sun Microsystems, Inc. business.
7+
* Permission to use, copy, modify, and distribute this
8+
* software is freely granted, provided that this notice
9+
* is preserved.
10+
* ====================================================
11+
*/
12+
/* asin(x)
13+
* Method :
14+
* Since asin(x) = x + x^3/6 + x^5*3/40 + x^7*15/336 + ...
15+
* we approximate asin(x) on [0,0.5] by
16+
* asin(x) = x + x*x^2*R(x^2)
17+
* where
18+
* R(x^2) is a rational approximation of (asin(x)-x)/x^3
19+
* and its remez error is bounded by
20+
* |(asin(x)-x)/x^3 - R(x^2)| < 2^(-58.75)
21+
*
22+
* For x in [0.5,1]
23+
* asin(x) = pi/2-2*asin(sqrt((1-x)/2))
24+
* Let y = (1-x), z = y/2, s := sqrt(z), and pio2_hi+pio2_lo=pi/2;
25+
* then for x>0.98
26+
* asin(x) = pi/2 - 2*(s+s*z*R(z))
27+
* = pio2_hi - (2*(s+s*z*R(z)) - pio2_lo)
28+
* For x<=0.98, let pio4_hi = pio2_hi/2, then
29+
* f = hi part of s;
30+
* c = sqrt(z) - f = (z-f*f)/(s+f) ...f+c=sqrt(z)
31+
* and
32+
* asin(x) = pi/2 - 2*(s+s*z*R(z))
33+
* = pio4_hi+(pio4-2s)-(2s*z*R(z)-pio2_lo)
34+
* = pio4_hi+(pio4-2f)-(2s*z*R(z)-(pio2_lo+2c))
35+
*
36+
* Special cases:
37+
* if x is NaN, return x itself;
38+
* if |x|>1, return NaN with invalid signal.
39+
*
40+
*/
41+
42+
use super::{fabs, get_high_word, get_low_word, sqrt, with_set_low_word};
43+
44+
const PIO2_HI: f64 = 1.57079632679489655800e+00; /* 0x3FF921FB, 0x54442D18 */
45+
const PIO2_LO: f64 = 6.12323399573676603587e-17; /* 0x3C91A626, 0x33145C07 */
46+
/* coefficients for R(x^2) */
47+
const P_S0: f64 = 1.66666666666666657415e-01; /* 0x3FC55555, 0x55555555 */
48+
const P_S1: f64 = -3.25565818622400915405e-01; /* 0xBFD4D612, 0x03EB6F7D */
49+
const P_S2: f64 = 2.01212532134862925881e-01; /* 0x3FC9C155, 0x0E884455 */
50+
const P_S3: f64 = -4.00555345006794114027e-02; /* 0xBFA48228, 0xB5688F3B */
51+
const P_S4: f64 = 7.91534994289814532176e-04; /* 0x3F49EFE0, 0x7501B288 */
52+
const P_S5: f64 = 3.47933107596021167570e-05; /* 0x3F023DE1, 0x0DFDF709 */
53+
const Q_S1: f64 = -2.40339491173441421878e+00; /* 0xC0033A27, 0x1C8A2D4B */
54+
const Q_S2: f64 = 2.02094576023350569471e+00; /* 0x40002AE5, 0x9C598AC8 */
55+
const Q_S3: f64 = -6.88283971605453293030e-01; /* 0xBFE6066C, 0x1B8D0159 */
56+
const Q_S4: f64 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */
57+
58+
fn comp_r(z: f64) -> f64 {
59+
let p = z * (P_S0 + z * (P_S1 + z * (P_S2 + z * (P_S3 + z * (P_S4 + z * P_S5)))));
60+
let q = 1.0 + z * (Q_S1 + z * (Q_S2 + z * (Q_S3 + z * Q_S4)));
61+
return p / q;
62+
}
63+
64+
pub fn asin(mut x: f64) -> f64 {
65+
let z: f64;
66+
let r: f64;
67+
let s: f64;
68+
let hx: u32;
69+
let ix: u32;
70+
71+
hx = get_high_word(x);
72+
ix = hx & 0x7fffffff;
73+
/* |x| >= 1 or nan */
74+
if ix >= 0x3ff00000 {
75+
let lx: u32;
76+
lx = get_low_word(x);
77+
if (ix - 0x3ff00000 | lx) == 0 {
78+
/* asin(1) = +-pi/2 with inexact */
79+
return x * PIO2_HI + f64::from_bits(0x3870000000000000);
80+
} else {
81+
return 0.0 / (x - x);
82+
}
83+
}
84+
/* |x| < 0.5 */
85+
if ix < 0x3fe00000 {
86+
/* if 0x1p-1022 <= |x| < 0x1p-26, avoid raising underflow */
87+
if ix < 0x3e500000 && ix >= 0x00100000 {
88+
return x;
89+
} else {
90+
return x + x * comp_r(x * x);
91+
}
92+
}
93+
/* 1 > |x| >= 0.5 */
94+
z = (1.0 - fabs(x)) * 0.5;
95+
s = sqrt(z);
96+
r = comp_r(z);
97+
if ix >= 0x3fef3333 {
98+
/* if |x| > 0.975 */
99+
x = PIO2_HI - (2. * (s + s * r) - PIO2_LO);
100+
} else {
101+
let f: f64;
102+
let c: f64;
103+
/* f+c = sqrt(z) */
104+
f = with_set_low_word(s, 0);
105+
c = (z - f * f) / (s + f);
106+
x = 0.5 * PIO2_HI - (2.0 * s * r - (PIO2_LO - 2.0 * c) - (0.5 * PIO2_HI - 2.0 * f));
107+
}
108+
if hx >> 31 != 0 {
109+
return -x;
110+
} else {
111+
return x;
112+
}
113+
}

src/math/mod.rs

+28
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ macro_rules! force_eval {
88

99
mod acos;
1010
mod acosf;
11+
mod asin;
1112
mod asinf;
1213
mod atanf;
1314
mod cbrt;
@@ -55,6 +56,7 @@ mod truncf;
5556
// Use separated imports instead of {}-grouped imports for easier merging.
5657
pub use self::acos::acos;
5758
pub use self::acosf::acosf;
59+
pub use self::asin::asin;
5860
pub use self::asinf::asinf;
5961
pub use self::atanf::atanf;
6062
pub use self::cbrt::cbrt;
@@ -109,3 +111,29 @@ use self::{
109111
k_cosf::k_cosf, k_sinf::k_sinf, k_tanf::k_tanf, rem_pio2_large::rem_pio2_large,
110112
rem_pio2f::rem_pio2f,
111113
};
114+
115+
#[inline]
116+
pub fn get_high_word(x: f64) -> u32 {
117+
(x.to_bits() >> 32) as u32
118+
}
119+
120+
#[inline]
121+
pub fn get_low_word(x: f64) -> u32 {
122+
x.to_bits() as u32
123+
}
124+
125+
#[inline]
126+
pub fn with_set_high_word(f: f64, hi: u32) -> f64 {
127+
let mut tmp = f.to_bits();
128+
tmp &= 0x00000000_ffffffff;
129+
tmp |= (hi as u64) << 32;
130+
f64::from_bits(tmp)
131+
}
132+
133+
#[inline]
134+
pub fn with_set_low_word(f: f64, lo: u32) -> f64 {
135+
let mut tmp = f.to_bits();
136+
tmp &= 0xffffffff_00000000;
137+
tmp |= lo as u64;
138+
f64::from_bits(tmp)
139+
}

test-generator/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ f32i32_f32! {
698698
// With signature `fn(f64) -> f64`
699699
f64_f64! {
700700
acos,
701-
// asin,
701+
asin,
702702
// atan,
703703
cbrt,
704704
ceil,

0 commit comments

Comments
 (0)