Index: uspace/lib/softfloat/Makefile =================================================================== --- uspace/lib/softfloat/Makefile (revision 440f57face9947e71dcda9094656d89fd77d22df) +++ uspace/lib/softfloat/Makefile (revision acb8766e94d571205a664a9cf354302228cbf209) @@ -30,4 +30,5 @@ USPACE_PREFIX = ../.. LIBRARY = libsoftfloat +MATH = y SOURCES = \ @@ -39,6 +40,5 @@ mul.c \ comparison.c \ - conversion.c \ - other.c + conversion.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/lib/softfloat/other.c =================================================================== --- uspace/lib/softfloat/other.c (revision 440f57face9947e71dcda9094656d89fd77d22df) +++ (revision ) @@ -1,37 +1,0 @@ -/* - * Copyright (c) 2005 Josef Cejka - * 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 softfloat - * @{ - */ -/** @file Other functions (power, complex). - */ - - -/** @} - */ Index: uspace/lib/softfloat/other.h =================================================================== --- uspace/lib/softfloat/other.h (revision 440f57face9947e71dcda9094656d89fd77d22df) +++ (revision ) @@ -1,41 +1,0 @@ -/* - * Copyright (c) 2005 Josef Cejka - * 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 softfloat - * @{ - */ -/** @file Other functions (power, complex). - */ - -#ifndef __OTHER_H__ -#define __OTHER_H__ - -#endif - -/** @} - */ Index: uspace/lib/softfloat/sftypes.h =================================================================== --- uspace/lib/softfloat/sftypes.h (revision 440f57face9947e71dcda9094656d89fd77d22df) +++ uspace/lib/softfloat/sftypes.h (revision acb8766e94d571205a664a9cf354302228cbf209) @@ -34,209 +34,8 @@ */ -#ifndef __SFTYPES_H__ -#define __SFTYPES_H__ - -#include -#include - -/* - * For recognizing NaNs or infinity use specialized comparison - * functions, comparing with these constants is not sufficient. - */ - -#define FLOAT32_NAN UINT32_C(0x7FC00001) -#define FLOAT32_SIGNAN UINT32_C(0x7F800001) -#define FLOAT32_INF UINT32_C(0x7F800000) - -#define FLOAT64_NAN UINT64_C(0x7FF8000000000001) -#define FLOAT64_SIGNAN UINT64_C(0x7FF0000000000001) -#define FLOAT64_INF UINT64_C(0x7FF0000000000000) - -#define FLOAT96_NAN_HI UINT64_C(0x7FFF80000000) -#define FLOAT96_NAN_LO UINT32_C(0x00010000) -#define FLOAT96_SIGNAN_HI UINT64_C(0x7FFF00000000) -#define FLOAT96_SIGNAN_LO UINT32_C(0x00010000) - -#define FLOAT128_NAN_HI UINT64_C(0x7FFF800000000000) -#define FLOAT128_NAN_LO UINT64_C(0x0000000000000001) -#define FLOAT128_SIGNAN_HI UINT64_C(0x7FFF000000000000) -#define FLOAT128_SIGNAN_LO UINT64_C(0x0000000000000001) -#define FLOAT128_INF_HI UINT64_C(0x7FFF000000000000) -#define FLOAT128_INF_LO UINT64_C(0x0000000000000000) - -#define FLOAT32_FRACTION_SIZE 23 -#define FLOAT64_FRACTION_SIZE 52 -#define FLOAT96_FRACTION_SIZE 64 -#define FLOAT128_FRACTION_SIZE 112 -#define FLOAT128_FRAC_HI_SIZE 48 -#define FLOAT128_FRAC_LO_SIZE 64 - -#define FLOAT32_HIDDEN_BIT_MASK UINT32_C(0x800000) -#define FLOAT64_HIDDEN_BIT_MASK UINT64_C(0x10000000000000) -#define FLOAT128_HIDDEN_BIT_MASK_HI UINT64_C(0x1000000000000) -#define FLOAT128_HIDDEN_BIT_MASK_LO UINT64_C(0x0000000000000000) - -#define FLOAT32_MAX_EXPONENT 0xFF -#define FLOAT64_MAX_EXPONENT 0x7FF -#define FLOAT96_MAX_EXPONENT 0x7FFF -#define FLOAT128_MAX_EXPONENT 0x7FFF - -#define FLOAT32_BIAS 0x7F -#define FLOAT64_BIAS 0x3FF -#define FLOAT96_BIAS 0x3FFF -#define FLOAT128_BIAS 0x3FFF - -#if defined(__BE__) - -typedef union { - uint32_t bin; - - struct { - uint32_t sign : 1; - uint32_t exp : 8; - uint32_t fraction : 23; - } parts __attribute__((packed)); -} float32; - -typedef union { - uint64_t bin; - - struct { - uint64_t sign : 1; - uint64_t exp : 11; - uint64_t fraction : 52; - } parts __attribute__((packed)); -} float64; - -typedef union { - struct { - uint64_t hi; - uint32_t lo; - } bin __attribute__((packed)); - - struct { - uint64_t padding : 16; - uint64_t sign : 1; - uint64_t exp : 15; - uint64_t fraction : 64; - } parts __attribute__((packed)); -} float96; - -typedef union { - struct { - uint64_t hi; - uint64_t lo; - } bin __attribute__((packed)); - - struct { - uint64_t sign : 1; - uint64_t exp : 15; - uint64_t frac_hi : 48; - uint64_t frac_lo : 64; - } parts __attribute__((packed)); -} float128; - -#elif defined(__LE__) - -typedef union { - uint32_t bin; - - struct { - uint32_t fraction : 23; - uint32_t exp : 8; - uint32_t sign : 1; - } parts __attribute__((packed)); -} float32; - -typedef union { - uint64_t bin; - - struct { - uint64_t fraction : 52; - uint64_t exp : 11; - uint64_t sign : 1; - } parts __attribute__((packed)); -} float64; - -typedef union { - struct { - uint32_t lo; - uint64_t hi; - } bin __attribute__((packed)); - - struct { - uint64_t fraction : 64; - uint64_t exp : 15; - uint64_t sign : 1; - uint64_t padding : 16; - } parts __attribute__((packed)); -} float96; - -typedef union { - struct { - uint64_t lo; - uint64_t hi; - } bin __attribute__((packed)); - - struct { - uint64_t frac_lo : 64; - uint64_t frac_hi : 48; - uint64_t exp : 15; - uint64_t sign : 1; - } parts __attribute__((packed)); -} float128; - -#else - #error Unknown endianess -#endif - -typedef union { - float val; - -#if defined(FLOAT_SIZE_32) - float32 data; -#elif defined(FLOAT_SIZE_64) - float64 data; -#elif defined(FLOAT_SIZE_96) - float96 data; -#elif defined(FLOAT_SIZE_128) - float128 data; -#else - #error Unsupported float size -#endif -} float_t; - -typedef union { - double val; - -#if defined(DOUBLE_SIZE_32) - float32 data; -#elif defined(DOUBLE_SIZE_64) - float64 data; -#elif defined(DOUBLE_SIZE_96) - float96 data; -#elif defined(DOUBLE_SIZE_128) - float128 data; -#else - #error Unsupported double size -#endif -} double_t; - -typedef union { - long double val; - -#if defined(LONG_DOUBLE_SIZE_32) - float32 data; -#elif defined(LONG_DOUBLE_SIZE_64) - float64 data; -#elif defined(LONG_DOUBLE_SIZE_96) - float96 data; -#elif defined(LONG_DOUBLE_SIZE_128) - float128 data; -#else - #error Unsupported long double size -#endif -} long_double_t; - +#ifndef SOFTFLOAT_SFTYPES_H__ +#define SOFTFLOAT_SFTYPES_H__ + +#include #if defined(INT_SIZE_8) Index: uspace/lib/softfloat/softfloat.c =================================================================== --- uspace/lib/softfloat/softfloat.c (revision 440f57face9947e71dcda9094656d89fd77d22df) +++ uspace/lib/softfloat/softfloat.c (revision acb8766e94d571205a664a9cf354302228cbf209) @@ -44,5 +44,4 @@ #include "conversion.h" #include "comparison.h" -#include "other.h" /* Arithmetic functions */