Index: uspace/lib/math/Makefile =================================================================== --- uspace/lib/math/Makefile (revision 47f7390f53c3d64fcfcb8712911ccf9c35f0c9fb) +++ uspace/lib/math/Makefile (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -41,4 +41,6 @@ GENERIC_SOURCES = \ + generic/trig.c \ + generic/mod.c \ generic/trunc.c Index: uspace/lib/math/arch/abs32le/include/libarch/math.h =================================================================== --- uspace/lib/math/arch/abs32le/include/libarch/math.h (revision 47f7390f53c3d64fcfcb8712911ccf9c35f0c9fb) +++ uspace/lib/math/arch/abs32le/include/libarch/math.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -37,5 +37,12 @@ #include +#include #include +#include + +static inline double fmod(double dividend, double divisor) +{ + return double_mod(dividend, divisor); +} static inline double trunc(double val) @@ -52,12 +59,10 @@ static inline double sin(double val) { - // FIXME TODO - return 0; + return double_sin(val); } static inline double cos(double val) { - // FIXME TODO - return 1; + return double_cos(val); } Index: uspace/lib/math/arch/amd64/include/libarch/math.h =================================================================== --- uspace/lib/math/arch/amd64/include/libarch/math.h (revision 47f7390f53c3d64fcfcb8712911ccf9c35f0c9fb) +++ uspace/lib/math/arch/amd64/include/libarch/math.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -36,4 +36,11 @@ #define LIBMATH_amd64_MATH_H_ +#include + +static inline double fmod(double dividend, double divisor) +{ + return double_mod(dividend, divisor); +} + extern double sin(double); extern double cos(double); Index: uspace/lib/math/arch/arm32/include/libarch/math.h =================================================================== --- uspace/lib/math/arch/arm32/include/libarch/math.h (revision 47f7390f53c3d64fcfcb8712911ccf9c35f0c9fb) +++ uspace/lib/math/arch/arm32/include/libarch/math.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -37,5 +37,12 @@ #include +#include #include +#include + +static inline double fmod(double dividend, double divisor) +{ + return double_mod(dividend, divisor); +} static inline double trunc(double val) @@ -52,12 +59,10 @@ static inline double sin(double val) { - // FIXME TODO - return 0; + return double_sin(val); } static inline double cos(double val) { - // FIXME TODO - return 1; + return double_cos(val); } Index: uspace/lib/math/arch/ia32/include/libarch/math.h =================================================================== --- uspace/lib/math/arch/ia32/include/libarch/math.h (revision 47f7390f53c3d64fcfcb8712911ccf9c35f0c9fb) +++ uspace/lib/math/arch/ia32/include/libarch/math.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -36,4 +36,11 @@ #define LIBMATH_ia32_MATH_H_ +#include + +static inline double fmod(double dividend, double divisor) +{ + return double_mod(dividend, divisor); +} + extern double sin(double); extern double cos(double); Index: uspace/lib/math/arch/ia64/include/libarch/math.h =================================================================== --- uspace/lib/math/arch/ia64/include/libarch/math.h (revision 47f7390f53c3d64fcfcb8712911ccf9c35f0c9fb) +++ uspace/lib/math/arch/ia64/include/libarch/math.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -37,5 +37,12 @@ #include +#include #include +#include + +static inline double fmod(double dividend, double divisor) +{ + return double_mod(dividend, divisor); +} static inline double trunc(double val) @@ -52,12 +59,10 @@ static inline double sin(double val) { - // FIXME TODO - return 0; + return double_sin(val); } static inline double cos(double val) { - // FIXME TODO - return 1; + return double_cos(val); } Index: uspace/lib/math/arch/mips32/include/libarch/math.h =================================================================== --- uspace/lib/math/arch/mips32/include/libarch/math.h (revision 47f7390f53c3d64fcfcb8712911ccf9c35f0c9fb) +++ uspace/lib/math/arch/mips32/include/libarch/math.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -37,5 +37,12 @@ #include +#include #include +#include + +static inline double fmod(double dividend, double divisor) +{ + return double_mod(dividend, divisor); +} static inline double trunc(double val) @@ -52,12 +59,10 @@ static inline double sin(double val) { - // FIXME TODO - return 0; + return double_sin(val); } static inline double cos(double val) { - // FIXME TODO - return 1; + return double_cos(val); } Index: uspace/lib/math/arch/mips32eb/include/libarch/math.h =================================================================== --- uspace/lib/math/arch/mips32eb/include/libarch/math.h (revision 47f7390f53c3d64fcfcb8712911ccf9c35f0c9fb) +++ uspace/lib/math/arch/mips32eb/include/libarch/math.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -37,5 +37,12 @@ #include +#include #include +#include + +static inline double fmod(double dividend, double divisor) +{ + return double_mod(dividend, divisor); +} static inline double trunc(double val) @@ -52,12 +59,10 @@ static inline double sin(double val) { - // FIXME TODO - return 0; + return double_sin(val); } static inline double cos(double val) { - // FIXME TODO - return 1; + return double_cos(val); } Index: uspace/lib/math/arch/mips64/include/libarch/math.h =================================================================== --- uspace/lib/math/arch/mips64/include/libarch/math.h (revision 47f7390f53c3d64fcfcb8712911ccf9c35f0c9fb) +++ uspace/lib/math/arch/mips64/include/libarch/math.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -37,5 +37,12 @@ #include +#include #include +#include + +static inline double fmod(double dividend, double divisor) +{ + return double_mod(dividend, divisor); +} static inline double trunc(double val) @@ -52,12 +59,10 @@ static inline double sin(double val) { - // FIXME TODO - return 0; + return double_sin(val); } static inline double cos(double val) { - // FIXME TODO - return 1; + return double_cos(val); } Index: uspace/lib/math/arch/ppc32/include/libarch/math.h =================================================================== --- uspace/lib/math/arch/ppc32/include/libarch/math.h (revision 47f7390f53c3d64fcfcb8712911ccf9c35f0c9fb) +++ uspace/lib/math/arch/ppc32/include/libarch/math.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -37,5 +37,12 @@ #include +#include #include +#include + +static inline double fmod(double dividend, double divisor) +{ + return double_mod(dividend, divisor); +} static inline double trunc(double val) @@ -52,12 +59,10 @@ static inline double sin(double val) { - // FIXME TODO - return 0; + return double_sin(val); } static inline double cos(double val) { - // FIXME TODO - return 1; + return double_cos(val); } Index: uspace/lib/math/arch/sparc32/include/libarch/math.h =================================================================== --- uspace/lib/math/arch/sparc32/include/libarch/math.h (revision 47f7390f53c3d64fcfcb8712911ccf9c35f0c9fb) +++ uspace/lib/math/arch/sparc32/include/libarch/math.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -37,5 +37,12 @@ #include +#include #include +#include + +static inline double fmod(double dividend, double divisor) +{ + return double_mod(dividend, divisor); +} static inline double trunc(double val) @@ -52,12 +59,10 @@ static inline double sin(double val) { - // FIXME TODO - return 0; + return double_sin(val); } static inline double cos(double val) { - // FIXME TODO - return 1; + return double_cos(val); } Index: uspace/lib/math/arch/sparc64/include/libarch/math.h =================================================================== --- uspace/lib/math/arch/sparc64/include/libarch/math.h (revision 47f7390f53c3d64fcfcb8712911ccf9c35f0c9fb) +++ uspace/lib/math/arch/sparc64/include/libarch/math.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -37,5 +37,12 @@ #include +#include #include +#include + +static inline double fmod(double dividend, double divisor) +{ + return double_mod(dividend, divisor); +} static inline double trunc(double val) @@ -52,12 +59,10 @@ static inline double sin(double val) { - // FIXME TODO - return 0; + return double_sin(val); } static inline double cos(double val) { - // FIXME TODO - return 1; + return double_cos(val); } Index: uspace/lib/math/generic/mod.c =================================================================== --- uspace/lib/math/generic/mod.c (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) +++ uspace/lib/math/generic/mod.c (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2014 Martin Decky + * 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 + +/** Double precision modulo + * + * Calculate the modulo of dividend by divisor. + * + * This is a very basic implementation that uses + * division and multiplication (instead of exact + * arithmetics). Thus the result might be very + * imprecise (depending on the magnitude of the + * arguments). + * + * @param dividend Dividend. + * @param divisor Divisor. + * + * @return Modulo. + * + */ +double double_mod(double dividend, double divisor) +{ + // FIXME: replace with exact arithmetics + + double quotient = trunc(dividend / divisor); + + return (dividend - quotient * divisor); +} + +/** @} + */ Index: uspace/lib/math/generic/trig.c =================================================================== --- uspace/lib/math/generic/trig.c (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) +++ uspace/lib/math/generic/trig.c (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -0,0 +1,209 @@ +/* + * Copyright (c) 2014 Martin Decky + * 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 + +#define TAYLOR_DEGREE 13 + +/** Precomputed values for factorial (starting from 1!) */ +static double factorials[TAYLOR_DEGREE] = { + 1, 2, 6, 24, 120, 720, 5040, 40320, 362880, 3628800, 39916800, + 479001600, 6227020800 +}; + +/** Sine approximation by Taylor series + * + * Compute the approximation of sine by a Taylor + * series (using the first TAYLOR_DEGREE terms). + * The approximation is reasonably accurate for + * arguments within the interval [-pi/4, pi/4]. + * + * @param arg Sine argument. + * + * @return Sine value approximation. + * + */ +static double taylor_sin(double arg) +{ + double ret = 0; + double nom = 1; + + for (unsigned int i = 0; i < TAYLOR_DEGREE; i++) { + nom *= arg; + + if ((i % 4) == 0) + ret += nom / factorials[i]; + else if ((i % 4) == 2) + ret -= nom / factorials[i]; + } + + return ret; +} + +/** Cosine approximation by Taylor series + * + * Compute the approximation of cosine by a Taylor + * series (using the first TAYLOR_DEGREE terms). + * The approximation is reasonably accurate for + * arguments within the interval [-pi/4, pi/4]. + * + * @param arg Cosine argument. + * + * @return Cosine value approximation. + * + */ +static double taylor_cos(double arg) +{ + double ret = 1; + double nom = 1; + + for (unsigned int i = 0; i < TAYLOR_DEGREE; i++) { + nom *= arg; + + if ((i % 4) == 1) + ret -= nom / factorials[i]; + else if ((i % 4) == 3) + ret += nom / factorials[i]; + } + + return ret; +} + +/** Sine value for values within base period + * + * Compute the value of sine for arguments within + * the base period [0, 2pi]. For arguments outside + * the base period the returned values can be + * very inaccurate or even completely wrong. + * + * @param arg Sine argument. + * + * @return Sine value. + * + */ +static double base_sin(double arg) +{ + unsigned int period = arg / (M_PI / 4); + + switch (period) { + case 0: + return taylor_sin(arg); + case 1: + case 2: + return taylor_cos(arg - M_PI / 2); + case 3: + case 4: + return -taylor_sin(arg - M_PI); + case 5: + case 6: + return -taylor_cos(arg - 3 * M_PI / 2); + default: + return taylor_sin(arg - 2 * M_PI); + } +} + +/** Cosine value for values within base period + * + * Compute the value of cosine for arguments within + * the base period [0, 2pi]. For arguments outside + * the base period the returned values can be + * very inaccurate or even completely wrong. + * + * @param arg Cosine argument. + * + * @return Cosine value. + * + */ +static double base_cos(double arg) +{ + unsigned int period = arg / (M_PI / 4); + + switch (period) { + case 0: + return taylor_cos(arg); + case 1: + case 2: + return taylor_sin(arg - M_PI / 2); + case 3: + case 4: + return -taylor_cos(arg - M_PI); + case 5: + case 6: + return -taylor_sin(arg - 3 * M_PI / 2); + default: + return taylor_cos(arg - 2 * M_PI); + } +} + +/** Double precision sine + * + * Compute sine value. + * + * @param arg Sine argument. + * + * @return Sine value. + * + */ +double double_sin(double arg) +{ + double base_arg = fmod(arg, 2 * M_PI); + + if (base_arg < 0) + return -base_sin(-base_arg); + + return base_sin(base_arg); +} + +/** Double precision cosine + * + * Compute cosine value. + * + * @param arg Cosine argument. + * + * @return Cosine value. + * + */ +double double_cos(double arg) +{ + double base_arg = fmod(arg, 2 * M_PI); + + if (base_arg < 0) + return base_cos(-base_arg); + + return base_cos(base_arg); +} + +/** @} + */ Index: uspace/lib/math/include/math.h =================================================================== --- uspace/lib/math/include/math.h (revision 47f7390f53c3d64fcfcb8712911ccf9c35f0c9fb) +++ uspace/lib/math/include/math.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -38,4 +38,6 @@ #include +#define M_PI 3.14159265358979323846 + #endif Index: uspace/lib/math/include/mod.h =================================================================== --- uspace/lib/math/include/mod.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) +++ uspace/lib/math/include/mod.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2014 Martin Decky + * 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_MOD_H_ +#define LIBMATH_MOD_H_ + +extern double double_mod(double, double); + +#endif + +/** @} + */ Index: uspace/lib/math/include/trig.h =================================================================== --- uspace/lib/math/include/trig.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) +++ uspace/lib/math/include/trig.h (revision 2e231aba2f8ff8ab107145e459a104ee6792090f) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2014 Martin Decky + * 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_TRIG_H_ +#define LIBMATH_TRIG_H_ + +extern double double_sin(double); +extern double double_cos(double); + +#endif + +/** @} + */