Index: uspace/app/tester/float/float2.c =================================================================== --- uspace/app/tester/float/float2.c (revision b1b201fd4076227e85653c9c3aebcebb51c89454) +++ uspace/app/tester/float/float2.c (revision b2acdf32b1370506dfcb53d4daf4abb481320895) @@ -43,9 +43,4 @@ }; -static double arguments_atan[OPERANDS] = { - 3.5, 100.0, 50.0, 768.3156, 1080.499999, 1.0, 66.0, - 2.718281828459045, 9.9, 0.001 -}; - static double arguments_exp[OPERANDS] = { 3.5, -2.1, 50.0, 0.0, 1.0, 13.2, -1.1, -5.5, 0.1, -66.0 @@ -64,10 +59,4 @@ static double arguments_tanh[OPERANDS] = { 3.5, -2.1, 50.0, 0.0, 1.0, 13.2, -1.1, -5.5, 0.000001, -66000000.0 -}; - -static double results_atan[OPERANDS] = { - 1.292496667790, 1.560796660108, 1.550798992822, 1.569494779052, - 1.569870829603, 0.785398163397, 1.555645970920, 1.218282905017, - 1.470127674637, 0.000999999667 }; @@ -193,24 +182,4 @@ for (unsigned int i = 0; i < OPERANDS; i++) { - double res = atan(arguments_atan[i]); - - if (!cmp_double(res, results_atan[i])) { - TPRINTF("Double precision atan failed " - "(%.12lf != %.12lf, arg %u)\n", res, results_atan[i], i); - fail = true; - } - } - - for (unsigned int i = 0; i < OPERANDS; i++) { - float res = atanf(arguments_atan[i]); - - if (!cmp_float(res, results_atan[i])) { - TPRINTF("Single precision atan failed " - "(%f != %lf, arg %u)\n", res, results_atan[i], i); - fail = true; - } - } - - for (unsigned int i = 0; i < OPERANDS; i++) { double res = ceil(arguments[i]); Index: uspace/lib/math/Makefile =================================================================== --- uspace/lib/math/Makefile (revision b1b201fd4076227e85653c9c3aebcebb51c89454) +++ uspace/lib/math/Makefile (revision b2acdf32b1370506dfcb53d4daf4abb481320895) @@ -34,6 +34,4 @@ SOURCES = \ - generic/atan.c \ - generic/atan2.c \ generic/ceil.c \ generic/cosh.c \ Index: pace/lib/math/generic/atan.c =================================================================== --- uspace/lib/math/generic/atan.c (revision b1b201fd4076227e85653c9c3aebcebb51c89454) +++ (revision ) @@ -1,141 +1,0 @@ -/* - * Copyright (c) 2015 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libmath - * @{ - */ -/** @file - */ - -#include -#include -#include - -#define SERIES_DEGREE_32 13 -#define SERIES_DEGREE_64 33 - -/** Inverse tangent approximation by Euler's series (32-bit floating point) - * - * Compute the approximation of inverse tangent by a - * series found by Leonhard Euler (using the first SERIES_DEGREE terms). - * - * @param arg Inverse tangent argument. - * - * @return Inverse tangent value approximation. - * - */ -static float32_t series_atan_32(float32_t arg) -{ - float32_t sum = 0; - float32_t a = arg / (1.0 + arg * arg); - - /* - * atan(z) = sum(n=0, +inf) [ (2^2n) * (n!)^2 / (2n + 1)! * - * z^(2n+1) / (1 + z^2)^(n+1) ] - */ - - for (unsigned int n = 0; n < SERIES_DEGREE_32; n++) { - if (n > 0) { - a = a * n * n; - a = a / (2.0 * n + 1.0) / (2.0 * n); - } - sum += a; - a = a * 4.0 * arg * arg / (1.0 + arg * arg); - } - - return sum; -} - -/** Inverse tangent approximation by Euler's series (64-bit floating point) - * - * Compute the approximation of inverse tangent by a - * series found by Leonhard Euler (using the first SERIES_DEGREE terms). - * - * @param arg Inverse tangent argument. - * - * @return Inverse tangent value approximation. - * - */ -static float64_t series_atan_64(float64_t arg) -{ - float64_t sum = 0; - float64_t a = arg / (1.0 + arg * arg); - - /* - * atan(z) = sum(n=0, +inf) [ (2^2n) * (n!)^2 / (2n + 1)! * - * z^(2n+1) / (1 + z^2)^(n+1) ] - */ - - for (unsigned int n = 0; n < SERIES_DEGREE_64; n++) { - if (n > 0) { - a = a * n * n; - a = a / (2.0 * n + 1.0) / (2.0 * n); - } - sum += a; - a = a * 4.0 * arg * arg / (1.0 + arg * arg); - } - - return sum; -} - -/** Inverse tangent (32-bit floating point) - * - * Compute inverse sine value. - * - * @param arg Inverse sine argument. - * - * @return Inverse sine value. - * - */ -float32_t float32_atan(float32_t arg) -{ - if (arg < -1.0 || arg > 1.0) - return 2.0 * series_atan_32(arg / (1.0 + sqrt_f32(1.0 + arg * arg))); - else - return series_atan_32(arg); -} - -/** Inverse tangent (64-bit floating point) - * - * Compute inverse sine value. - * - * @param arg Inverse sine argument. - * - * @return Inverse sine value. - * - */ -float64_t float64_atan(float64_t arg) -{ - if (arg < -1.0 || arg > 1.0) - return 2.0 * series_atan_64(arg / (1.0 + sqrt_f64(1.0 + arg * arg))); - else - return series_atan_64(arg); -} - -/** @} - */ Index: pace/lib/math/generic/atan2.c =================================================================== --- uspace/lib/math/generic/atan2.c (revision b1b201fd4076227e85653c9c3aebcebb51c89454) +++ (revision ) @@ -1,76 +1,0 @@ -/* - * Copyright (c) 2015 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libmath - * @{ - */ -/** @file - */ - -#include -#include -#include - -/** Inverse tangent of two variables (32-bit floating point) - * - * @param y - * @param x - * - * @return Inverse tangent of @a y / @a x. - * - */ -float32_t float32_atan2(float32_t y, float32_t x) -{ - if (x >= 0) - return atan_f32(y / x); - else if (y >= 0) - return M_PI - atan_f32(y / -x); - else - return -M_PI + atan_f32(y / -x); -} - -/** Inverse tangent of two variables (64-bit floating point) - * - * @param y - * @param x - * - * @return Inverse tangent of @a y / @a x. - * - */ -float64_t float64_atan2(float64_t y, float64_t x) -{ - if (x >= 0) - return atan_f64(y / x); - else if (y >= 0) - return M_PI - atan_f64(y / -x); - else - return -M_PI + atan_f64(y / -x); -} - -/** @} - */ Index: pace/lib/math/include/atan.h =================================================================== --- uspace/lib/math/include/atan.h (revision b1b201fd4076227e85653c9c3aebcebb51c89454) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2015 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libmath - * @{ - */ -/** @file - */ - -#ifndef LIBMATH_ATAN_H_ -#define LIBMATH_ATAN_H_ - -#include - -extern float32_t float32_atan(float32_t); -extern float64_t float64_atan(float64_t); - -#endif - -/** @} - */ Index: pace/lib/math/include/atan2.h =================================================================== --- uspace/lib/math/include/atan2.h (revision b1b201fd4076227e85653c9c3aebcebb51c89454) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2015 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libmath - * @{ - */ -/** @file - */ - -#ifndef LIBMATH_ATAN2_H_ -#define LIBMATH_ATAN2_H_ - -#include - -extern float32_t float32_atan2(float32_t, float32_t); -extern float64_t float64_atan2(float64_t, float64_t); - -#endif - -/** @} - */ Index: uspace/lib/math/include/math.h =================================================================== --- uspace/lib/math/include/math.h (revision b1b201fd4076227e85653c9c3aebcebb51c89454) +++ uspace/lib/math/include/math.h (revision b2acdf32b1370506dfcb53d4daf4abb481320895) @@ -37,6 +37,4 @@ #define LIBMATH_MATH_H_ -#include -#include #include #include @@ -62,24 +60,4 @@ #define HUGE_VAL FLOAT64_INF -static inline float64_t atan_f64(float64_t val) -{ - return float64_atan(val); -} - -static inline float32_t atan_f32(float32_t val) -{ - return float32_atan(val); -} - -static inline float64_t atan2_f64(float64_t y, float64_t x) -{ - return float64_atan2(y, x); -} - -static inline float32_t atan2_f32(float32_t y, float32_t x) -{ - return float32_atan2(y, x); -} - static inline float64_t ceil_f64(float64_t val) { @@ -279,24 +257,4 @@ { return float32_trunc(val); -} - -static inline float64_t atan(float64_t val) -{ - return atan_f64(val); -} - -static inline float32_t atanf(float32_t val) -{ - return atan_f32(val); -} - -static inline float64_t atan2(float64_t y, float64_t x) -{ - return atan2_f64(y, x); -} - -static inline float32_t atan2f(float32_t y, float32_t x) -{ - return atan2_f32(y, x); }