Index: uspace/lib/softint/Makefile =================================================================== --- uspace/lib/softint/Makefile (revision 412241029cdceceae7ccb252914ce4d698abd985) +++ (revision ) @@ -1,41 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# 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. -# - -USPACE_PREFIX = ../.. -EXTRA_CFLAGS = -Iinclude -LIBRARY = libsoftint - -SOURCES = \ - generic/bits.c \ - generic/comparison.c \ - generic/division.c \ - generic/multiplication.c \ - generic/shift.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/lib/softint/generic/bits.c =================================================================== --- uspace/lib/softint/generic/bits.c (revision 412241029cdceceae7ccb252914ce4d698abd985) +++ (revision ) @@ -1,118 +1,0 @@ -/* - * Copyright (c) 2013 Vojtech Horky - * 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 softint - * @{ - */ - -#include - -/** Compute number of trailing 0-bits in a number. */ -int __ctzdi2(long a) -{ - unsigned int bits = 0; - while (((a >> bits) & 1) == 0) { - bits++; - if (bits >= sizeof(a) * 8) { - break; - } - } - - return bits; -} - -/** Compute number of trailing 0-bits in a number. */ -int __ctzsi2(int a) -{ - unsigned int bits = 0; - while (((a >> bits) & 1) == 0) { - bits++; - if (bits >= sizeof(a) * 8) { - break; - } - } - - return bits; -} - -/** Compute number of leading 0-bits in a number. */ -int __clzdi2(long a) -{ - int index = sizeof(a) * 8 - 1; - int bits = 0; - while (index >= 0) { - if (((a >> index) & 1) == 0) { - bits++; - } else { - break; - } - index--; - } - - return bits; -} - -/** Compute index of the first 1-bit in a number increased by one. - * - * If the number is zero, zero is returned. - */ -int __ffsdi2(long a) -{ - if (a == 0) { - return 0; - } - - return 1 + __ctzdi2(a); -} - -/** Compute number of set bits in a number. */ -int __popcountsi2(int a) -{ - int bits = 0; - for (unsigned int i = 0; i < sizeof(a) * 8; i++) { - if (((a >> i) & 1) != 0) { - bits++; - } - } - return bits; -} - -/** Compute number of set bits in a number. */ -int __popcountdi2(long a) -{ - int bits = 0; - for (unsigned int i = 0; i < sizeof(a) * 8; i++) { - if (((a >> i) & 1) != 0) { - bits++; - } - } - return bits; -} - -/** @} - */ Index: uspace/lib/softint/generic/comparison.c =================================================================== --- uspace/lib/softint/generic/comparison.c (revision 412241029cdceceae7ccb252914ce4d698abd985) +++ (revision ) @@ -1,90 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * 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 softint - * @{ - */ -/** - * @file Signed and unsigned comparisons. - */ - -#include -#include - -#define LESSER 0; -#define EQUAL 1; -#define GREATER 2; - -int __cmpdi2 (long long a, long long b) -{ - union lltype lla; - union lltype llb; - - lla.s_whole = a; - llb.s_whole = b; - - if (lla.s_half[HI] < llb.s_half[HI]) { - return LESSER; - } else if (lla.s_half[HI] > llb.s_half[HI]) { - return GREATER; - } else { - if (lla.u_half[LO] < llb.u_half[LO]) { - return LESSER; - } else if (lla.u_half[LO] > llb.u_half[LO]) { - return GREATER; - } else { - return EQUAL; - } - } -} - -int __ucmpdi2 (unsigned long long a, unsigned long long b) -{ - union lltype lla; - union lltype llb; - - lla.u_whole = a; - llb.u_whole = b; - - if (lla.u_half[HI] < llb.u_half[HI]) { - return LESSER; - } else if (lla.u_half[HI] > llb.u_half[HI]) { - return GREATER; - } else { - if (lla.u_half[LO] < llb.u_half[LO]) { - return LESSER; - } else if (lla.u_half[LO] > llb.u_half[LO]) { - return GREATER; - } else { - return EQUAL; - } - } -} - -/** @} - */ Index: uspace/lib/softint/generic/division.c =================================================================== --- uspace/lib/softint/generic/division.c (revision 412241029cdceceae7ccb252914ce4d698abd985) +++ (revision ) @@ -1,251 +1,0 @@ -/* - * Copyright (c) 2006 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 softint - * @{ - */ -/** - * @file - * SW implementation of 32 and 64 bit division and modulo. - */ - -#include - -#define ABSVAL(x) ((x) > 0 ? (x) : -(x)) -#define SGN(x) ((x) >= 0 ? 1 : 0) - -static unsigned int divandmod32(unsigned int a, unsigned int b, - unsigned int *remainder) -{ - unsigned int result; - int steps = sizeof(unsigned int) * 8; - - *remainder = 0; - result = 0; - - if (b == 0) { - /* FIXME: division by zero */ - return 0; - } - - if (a < b) { - *remainder = a; - return 0; - } - - for (; steps > 0; steps--) { - /* shift one bit to remainder */ - *remainder = ((*remainder) << 1) | ((a >> 31) & 0x1); - result <<= 1; - - if (*remainder >= b) { - *remainder -= b; - result |= 0x1; - } - a <<= 1; - } - - return result; -} - -static unsigned long long divandmod64(unsigned long long a, - unsigned long long b, unsigned long long *remainder) -{ - unsigned long long result; - int steps = sizeof(unsigned long long) * 8; - - *remainder = 0; - result = 0; - - if (b == 0) { - /* FIXME: division by zero */ - return 0; - } - - if (a < b) { - *remainder = a; - return 0; - } - - for (; steps > 0; steps--) { - /* shift one bit to remainder */ - *remainder = ((*remainder) << 1) | ((a >> 63) & 0x1); - result <<= 1; - - if (*remainder >= b) { - *remainder -= b; - result |= 0x1; - } - a <<= 1; - } - - return result; -} - -/* 32bit integer division */ -int __divsi3(int a, int b) -{ - unsigned int rem; - int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem); - - if (SGN(a) == SGN(b)) - return result; - - return -result; -} - -/* 64bit integer division */ -long long __divdi3(long long a, long long b) -{ - unsigned long long rem; - long long result = (long long) divandmod64(ABSVAL(a), ABSVAL(b), &rem); - - if (SGN(a) == SGN(b)) - return result; - - return -result; -} - -/* 32bit unsigned integer division */ -unsigned int __udivsi3(unsigned int a, unsigned int b) -{ - unsigned int rem; - return divandmod32(a, b, &rem); -} - -/* 64bit unsigned integer division */ -unsigned long long __udivdi3(unsigned long long a, unsigned long long b) -{ - unsigned long long rem; - return divandmod64(a, b, &rem); -} - -/* 32bit remainder of the signed division */ -int __modsi3(int a, int b) -{ - unsigned int rem; - divandmod32(a, b, &rem); - - /* if divident is negative, remainder must be too */ - if (!(SGN(a))) - return -((int) rem); - - return (int) rem; -} - -/* 64bit remainder of the signed division */ -long long __moddi3(long long a, long long b) -{ - unsigned long long rem; - divandmod64(a, b, &rem); - - /* if divident is negative, remainder must be too */ - if (!(SGN(a))) - return -((long long) rem); - - return (long long) rem; -} - -/* 32bit remainder of the unsigned division */ -unsigned int __umodsi3(unsigned int a, unsigned int b) -{ - unsigned int rem; - divandmod32(a, b, &rem); - return rem; -} - -/* 64bit remainder of the unsigned division */ -unsigned long long __umoddi3(unsigned long long a, unsigned long long b) -{ - unsigned long long rem; - divandmod64(a, b, &rem); - return rem; -} - -int __divmodsi3(int a, int b, int *c) -{ - unsigned int rem; - int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem); - - if (SGN(a) == SGN(b)) { - *c = rem; - return result; - } - - *c = -rem; - return -result; -} - -unsigned int __udivmodsi3(unsigned int a, unsigned int b, - unsigned int *c) -{ - return divandmod32(a, b, c); -} - -long long __divmoddi3(long long a, long long b, long long *c) -{ - unsigned long long rem; - long long result = (int) divandmod64(ABSVAL(a), ABSVAL(b), &rem); - - if (SGN(a) == SGN(b)) { - *c = rem; - return result; - } - - *c = -rem; - return -result; -} - -long long __divmoddi4(long long a, long long b, long long *c) -{ - unsigned long long rem; - long long result = (int) divandmod64(ABSVAL(a), ABSVAL(b), &rem); - - if (SGN(a) == SGN(b)) { - *c = rem; - return result; - } - - *c = -rem; - return -result; -} - -unsigned long long __udivmoddi3(unsigned long long a, unsigned long long b, - unsigned long long *c) -{ - return divandmod64(a, b, c); -} - -unsigned long long __udivmoddi4(unsigned long long a, unsigned long long b, - unsigned long long *c) -{ - return divandmod64(a, b, c); -} - -/** @} - */ Index: uspace/lib/softint/generic/multiplication.c =================================================================== --- uspace/lib/softint/generic/multiplication.c (revision 412241029cdceceae7ccb252914ce4d698abd985) +++ (revision ) @@ -1,127 +1,0 @@ -/* - * Copyright (c) 2009 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 softint - * @{ - */ -/** - * @file - * SW implementation of 32 and 64 bit multiplication. - */ - -#include -#include - -/** Set 1 to return INT64_MAX or INT64_MIN on overflow */ -#ifndef SOFTINT_CHECK_OF -#define SOFTINT_CHECK_OF 0 -#endif - -/** Multiply two integers and return long long as result. - * - * This function is overflow safe. - * - */ -static unsigned long long mul(unsigned int a, unsigned int b) -{ - unsigned int a1 = a >> 16; - unsigned int a2 = a & UINT16_MAX; - unsigned int b1 = b >> 16; - unsigned int b2 = b & UINT16_MAX; - - unsigned long long t1 = a1 * b1; - unsigned long long t2 = a1 * b2; - t2 += a2 * b1; - unsigned long long t3 = a2 * b2; - - t3 = (((t1 << 16) + t2) << 16) + t3; - - return t3; -} - -/** Emulate multiplication of two 64-bit long long integers. - * - */ -long long __muldi3 (long long a, long long b) -{ - char neg = 0; - - if (a < 0) { - neg = !neg; - a = -a; - } - - if (b < 0) { - neg = !neg; - b = -b; - } - - unsigned long long a1 = a >> 32; - unsigned long long b1 = b >> 32; - - unsigned long long a2 = a & (UINT32_MAX); - unsigned long long b2 = b & (UINT32_MAX); - - if (SOFTINT_CHECK_OF && (a1 != 0) && (b1 != 0)) { - /* Error (overflow) */ - return (neg ? INT64_MIN : INT64_MAX); - } - - /* - * (if OF checked) a1 or b1 is zero => result fits in 64 bits, - * no need to another overflow check - */ - unsigned long long t1 = mul(a1, b2) + mul(b1, a2); - - if ((SOFTINT_CHECK_OF) && (t1 > UINT32_MAX)) { - /* Error (overflow) */ - return (neg ? INT64_MIN : INT64_MAX); - } - - t1 = t1 << 32; - unsigned long long t2 = mul(a2, b2); - t2 += t1; - - /* - * t2 & (1ull << 63) - if this bit is set in unsigned long long, - * result does not fit in signed one - */ - if (SOFTINT_CHECK_OF && ((t2 < t1) || (t2 & (1ull << 63)))) { - /* Error, overflow */ - return (neg ? INT64_MIN : INT64_MAX); - } - - long long result = t2; - if (neg) - result = -result; - - return result; -} - -/** @} - */ Index: uspace/lib/softint/generic/shift.c =================================================================== --- uspace/lib/softint/generic/shift.c (revision 412241029cdceceae7ccb252914ce4d698abd985) +++ (revision ) @@ -1,136 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * 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 softint - * @{ - */ -/** - * @file Logical and arithmetic shifts. - */ - -#include -#include - -long long __ashldi3 (long long val, int shift) -{ - union lltype ll; - - ll.s_whole = val; - - if (shift <= 0) { - return ll.s_whole; - } - - if (shift >= (int) WHOLE_BIT_CNT) { - ll.u_half[HI] = 0; - ll.u_half[LO] = 0; - return ll.s_whole; - } - - if (shift >= (int) HALF_BIT_CNT) { - ll.u_half[HI] = ll.u_half[LO] << (shift - HALF_BIT_CNT); - ll.u_half[LO] = 0; - } else { - ll.u_half[HI] <<= shift; - ll.u_half[HI] |= ll.u_half[LO] >> (HALF_BIT_CNT - shift); - ll.u_half[LO] <<= shift; - } - - return ll.s_whole; -} - -long long __ashrdi3 (long long val, int shift) -{ - union lltype ll; - - ll.s_whole = val; - - if (shift <= 0) { - return ll.s_whole; - } - - long fill = ll.s_half[HI] >> (HALF_BIT_CNT - 1); - - if (shift >= (int) WHOLE_BIT_CNT) { - ll.s_half[HI] = fill; - ll.s_half[LO] = fill; - return ll.s_whole; - } - - if (shift >= (int) HALF_BIT_CNT) { - ll.s_half[LO] = ll.s_half[HI] >> (shift - HALF_BIT_CNT); - ll.s_half[HI] = fill; - } else { - ll.u_half[LO] >>= shift; - ll.u_half[LO] |= ll.u_half[HI] << (HALF_BIT_CNT - shift); - ll.s_half[HI] >>= shift; - } - - return ll.s_whole; -} - -long long __lshrdi3 (long long val, int shift) -{ - union lltype ll; - - ll.s_whole = val; - - if (shift <= 0) { - return ll.s_whole; - } - - if (shift >= (int) WHOLE_BIT_CNT) { - ll.u_half[HI] = 0; - ll.u_half[LO] = 0; - return ll.s_whole; - } - - if (shift >= (int) HALF_BIT_CNT) { - ll.u_half[LO] = ll.u_half[HI] >> (shift - HALF_BIT_CNT); - ll.u_half[HI] = 0; - } else { - ll.u_half[LO] >>= shift; - ll.u_half[LO] |= ll.u_half[HI] << (HALF_BIT_CNT - shift); - ll.u_half[HI] >>= shift; - } - - return ll.s_whole; -} - -long long __aeabi_llsl(long long val, int shift) -{ - return __ashldi3(val, shift); -} - -long long __aeabi_llsr(long long val, int shift) -{ - return __lshrdi3(val, shift); -} - -/** @} - */ Index: uspace/lib/softint/include/bits.h =================================================================== --- uspace/lib/softint/include/bits.h (revision 412241029cdceceae7ccb252914ce4d698abd985) +++ (revision ) @@ -1,49 +1,0 @@ -/* - * Copyright (c) 2013 Vojtech Horky - * 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 softint - * @{ - */ -/** @file - */ - -#ifndef __SOFTINT_BITS_H_ -#define __SOFTINT_BITS_H_ - -extern int __ctzdi2(long); -extern int __ctzsi2(int); -extern int __clzdi2(long); -extern int __ffsdi2(long); -extern int __popcountsi2(int); -extern int __popcountdi2(long); - - -#endif - -/** @} - */ Index: uspace/lib/softint/include/comparison.h =================================================================== --- uspace/lib/softint/include/comparison.h (revision 412241029cdceceae7ccb252914ce4d698abd985) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * 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 softint - * @{ - */ -/** - * @file Signed and unsigned comparisons. - */ - -#ifndef __SOFTINT_COMPARISON_H__ -#define __SOFTINT_COMPARISON_H__ - -/* Signed comparison (a < b => 0, a == b => 1, a > b => 2). */ -extern int __cmpdi2(long long, long long); - -/* Unsigned comparison (a < b => 0, a == b => 1, a > b => 2). */ -extern int __ucmpdi2(unsigned long long, unsigned long long); - -#endif - -/** @} - */ Index: uspace/lib/softint/include/division.h =================================================================== --- uspace/lib/softint/include/division.h (revision 412241029cdceceae7ccb252914ce4d698abd985) +++ (revision ) @@ -1,64 +1,0 @@ -/* - * Copyright (c) 2006 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 softint - * @{ - */ -/** - * @file - */ - -#ifndef __SOFTINT_DIVISION_H__ -#define __SOFTINT_DIVISION_H__ - -extern int __divsi3(int, int); -extern long long __divdi3(long long, long long); - -extern unsigned int __udivsi3(unsigned int, unsigned int); -extern unsigned long long __udivdi3(unsigned long long, unsigned long long); - -extern int __modsi3(int, int); -extern long long __moddi3(long long, long long); - -extern unsigned int __umodsi3(unsigned int, unsigned int); -extern unsigned long long __umoddi3(unsigned long long, unsigned long long); - -extern int __divmodsi3(int, int, int *); -extern unsigned int __udivmodsi3(unsigned int, unsigned int, unsigned int *); - -extern long long __divmoddi3(long long, long long, long long *); -extern long long __divmoddi4(long long, long long, long long *); -extern unsigned long long __udivmoddi3(unsigned long long, unsigned long long, - unsigned long long *); -extern unsigned long long __udivmoddi4(unsigned long long, unsigned long long, - unsigned long long *); - -#endif - -/** @} - */ Index: uspace/lib/softint/include/lltype.h =================================================================== --- uspace/lib/softint/include/lltype.h (revision 412241029cdceceae7ccb252914ce4d698abd985) +++ (revision ) @@ -1,62 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * 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 softint - * @{ - */ -/** - * @file Abstraction over 64-bit integral type to allow simple manipulation. - */ - -#ifndef __SOFTINT_LLTYPE_H__ -#define __SOFTINT_LLTYPE_H__ - -#include - -#define HALF_BIT_CNT (sizeof(int32_t) * sizeof(char)) -#define WHOLE_BIT_CNT (sizeof(int64_t) * sizeof(char)) - -#ifdef __BE__ -#define LO 1 -#define HI 0 -#else -#define LO 0 -#define HI 1 -#endif - -union lltype { - int64_t s_whole; - uint64_t u_whole; - int32_t s_half[2]; - uint32_t u_half[2]; -}; - -#endif - -/** @} - */ Index: uspace/lib/softint/include/multiplication.h =================================================================== --- uspace/lib/softint/include/multiplication.h (revision 412241029cdceceae7ccb252914ce4d698abd985) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2009 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 softint - * @{ - */ -/** - * @file - */ - -#ifndef __SOFTINT_MULTIPLICATION_H__ -#define __SOFTINT_MULTIPLICATION_H__ - -/* 64 bit multiplication */ -extern long long __muldi3(long long, long long); - -#endif - -/** @} - */ - - Index: uspace/lib/softint/include/shift.h =================================================================== --- uspace/lib/softint/include/shift.h (revision 412241029cdceceae7ccb252914ce4d698abd985) +++ (revision ) @@ -1,56 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * 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 softint - * @{ - */ -/** - * @file Logical and arithmetic shifts. - */ - -#ifndef __SOFTINT_SHIFT_H__ -#define __SOFTINT_SHIFT_H__ - -/* Arithmetic/logical shift left. */ -extern long long __ashldi3(long long, int); - -/* Arithmetic shift right. */ -extern long long __ashrdi3(long long, int); - -/* Logical shift right. */ -extern long long __lshrdi3(long long, int); - - -/* ARM EABI */ -extern long long __aeabi_llsl(long long, int); -extern long long __aeabi_llsr(long long, int); - -#endif - -/** @} - */